[kupu-checkins] r43406 - in kupu/trunk/kupu: common common/kupudrawers plone/kupu_plone_layer
duncan at codespeak.net
duncan at codespeak.net
Tue May 15 15:54:36 CEST 2007
Author: duncan
Date: Tue May 15 15:54:35 2007
New Revision: 43406
Modified:
kupu/trunk/kupu/common/kupudrawers.js
kupu/trunk/kupu/common/kupudrawers/drawer.xsl
kupu/trunk/kupu/common/kupudrawerstyles.css
kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
Log:
Changes to image drawer styling for a neater effect (I hope). Removed explicit styling and shuffled labels round a bit.
'Breadcrumbs' on search results changes to 'Locate'.
Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js (original)
+++ kupu/trunk/kupu/common/kupudrawers.js Tue May 15 15:54:35 2007
@@ -722,7 +722,7 @@
var divs = librariespanel.getElementsByTagName('div');
for (var i = 0; i < divs.length; i++) {
var div = divs[i];
- div.className = div.className.replace(/ *selected/,'');
+ div.className = div.className.replace(/[ -]*selected/,'');
}
/* Deselect the currently active collection or library */
var selected;
Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl (original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl Tue May 15 15:54:35 2007
@@ -181,7 +181,7 @@
</xsl:attribute>
<xsl:apply-templates select="icon"/>
<span class="drawer-item-title">
- <xsl:value-of select="title"/>
+ <xsl:copy-of select="title//*|title/text()"/>
</span>
</div>
</xsl:template>
@@ -309,33 +309,30 @@
<input id="kupu-media" type="hidden" value="{media}" />
<input id="kupu-width" type="hidden" value="{width}" />
<input id="kupu-height" type="hidden" value="{height}" />
- <label style="display: block;margin-top: 1em;">Image alignment</label>
- <input type="radio" name="image-align" id="image-align-left" value="image-left">
- <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
- <xsl:if test="$image-align='left'">
+ <label class="kupu-detail-label">Align:</label>
+ <span class="kupu-detail">
+ <input type="radio" name="image-align" id="image-align-left" value="image-left">
+ <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+ <xsl:if test="$image-align='left'">
<xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
- <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
- <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
- <xsl:if test="$image-align='inline'">
- <xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
- <input type="radio" name="image-align" id="image-align-right" value="image-right">
- <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
- <xsl:if test="$image-align='right'">
- <xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
- <div class="discreet" i18n:translate="imagedrawer_image_align_explanation">
- You have to select left/right alignment first, then
- move the image up or down in the document afterwards.
- This is a browser-imposed limitation.
- </div>
+ </xsl:if>
+ </input>
+ <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
+ <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
+ <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+ <xsl:if test="$image-align='inline'">
+ <xsl:attribute name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
+ <input type="radio" name="image-align" id="image-align-right" value="image-right">
+ <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+ <xsl:if test="$image-align='right'">
+ <xsl:attribute name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
+ </span>
</div>
<xsl:if test="$usecaptions='yes'">
@@ -343,7 +340,9 @@
<xsl:when test="media='flash'" />
<xsl:otherwise>
<div>
- <input type="checkbox" name="image-caption" id="image-caption">
+ <label class="kupu-detail-label"
+ for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
+ <input class="kupu-detail" type="checkbox" name="image-caption" id="image-caption">
<xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
<xsl:if test="$image-caption='true'">
<xsl:attribute name="checked">checked</xsl:attribute>
@@ -351,16 +350,15 @@
<xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
this.checked?'none':'';</xsl:attribute>
</input>
- <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
</div>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<xsl:if test="sizes">
<div>
- <label for="image-size-selector"
- style="margin-top: 1em;">Image size:</label> 
- <select name="image-size-selector">
+ <label class="kupu-detail-label"
+ for="image-size-selector">Size:</label> 
+ <select class="kupu-detail" name="image-size-selector">
<option name="image-size-option" value="{uri}">Original</option>
<xsl:apply-templates select="sizes/size" />
</select>
@@ -368,8 +366,9 @@
</xsl:if>
<xsl:if test="class">
<div>
- <label for="kupu-image-class-selector">Image style</label> 
- <select name="kupu-image-class-selector" id="kupu-image-class">
+ <label class="kupu-detail-label"
+ for="kupu-image-class-selector">Style:</label> 
+ <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
<xsl:apply-templates select="class"/>
</select>
</div>
@@ -379,8 +378,10 @@
test="$usecaptions='yes' and $image-caption='true'">
<xsl:attribute name="style">display:none;</xsl:attribute>
</xsl:if>
- <label for="image_alt" i18n:translate="imagedrawer_upload_alt_text">"alt" attribute text</label>
- <input type="text" id="image_alt" size="20" value="{title}">
+ <label class="kupu-detail-label"
+ for="image_alt"
+ i18n:translate="imagedrawer_upload_alt_text">"alt" text:</label>
+ <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
<xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
</input>
</div>
Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css (original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css Tue May 15 15:54:35 2007
@@ -64,7 +64,7 @@
.kupu-alt-row label {
display: block;
}
-
+#image_alt { width:17em; }
div.kupu-linkdrawer-addlink td {
border: 0;
}
@@ -190,10 +190,25 @@
vertical-align: text-bottom;
white-space: nowrap;
}
+.kupu-libsource, .kupu-libsource-selected { margin-left: 20px; }
+.library-icon-library {
+ margin-left: -20px;
+}
div.kupu-upload {
text-align: right; font-style: italic;
}
+label.kupu-detail-label {
+ float:left;clear:left;
+ width:7em;
+ text-align:right;
+ margin: 0.2em;
+}
+.kupu-detail {
+ float:left;
+ margin: 0.2em;
+}
+
/*div.kupu-libsource-selected {
background-repeat: no-repeat;
}*/
@@ -273,6 +288,7 @@
.kupu-drawer label {
font-weight: bold;
+ vertical-align:middle;
}
#kupu-breadcrumbs {
text-align: left; clear:left;
@@ -297,4 +313,4 @@
background: transparent url(kupuimages/treeCollapsed.gif) 4px 6px no-repeat;
padding: 1px 0px 1px 16px;
font-style: italic;
-}
\ No newline at end of file
+}
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt Tue May 15 15:54:35 2007
@@ -6,6 +6,7 @@
<libraries
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
i18n:domain="kupu"
>
@@ -13,12 +14,14 @@
getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
kupu_tool python:getToolByName(context, 'kupu_library_tool');
libraries python:kupu_tool.getCookedLibraries(context);
- ">
+ pss modules/Products/PythonScripts/standard;
+">
<library tal:repeat="library libraries"
tal:attributes="id library/id;selected library/selected;">
<uri tal:content="library/uri">URI</uri>
- <title i18n:translate="" tal:content="library/title">Title</title>
+ <title i18n:translate="" tal:define="title library/title"
+ tal:content="structure python:pss.html_quote(title).replace('\n','\x3cxhtml:br/\x3e')">Title</title>
<src tal:content="library/src">Source</src>
<icon tal:content="library/icon">Icon</icon>
</library>
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt Tue May 15 15:54:35 2007
@@ -20,7 +20,7 @@
<crumb tal:define="locator here/kupulocate.xml/absolute_url;
url python:kupu.kupuUrl(locator);"
tal:attributes="href string:$url&src=$$src$$">
- Breadcrumbs
+ Locate
</crumb>
</breadcrumbs>
<items metal:use-macro="here/kupucollection.xml/macros/collectionItems">
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt Tue May 15 15:54:35 2007
@@ -20,7 +20,7 @@
<crumb tal:define="locator here/kupulocate.xml/absolute_url;
url python:kupu.kupuUrl(locator);"
tal:attributes="href string:$url&src=$$src$$">
- Breadcrumbs
+ Locate
</crumb>
</breadcrumbs>
<items metal:use-macro="here/kupucollection.xml/macros/collectionItems">
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt Tue May 15 15:54:35 2007
@@ -19,7 +19,7 @@
<crumb tal:define="locator here/kupulocate.xml/absolute_url;
url python:kupu.kupuUrl(locator);"
tal:attributes="href string:$url&src=$$src$$">
- Breadcrumbs
+ Locate
</crumb>
</breadcrumbs>
<items metal:use-macro="here/kupucollection.xml/macros/collectionItems">
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt Tue May 15 15:54:35 2007
@@ -23,7 +23,7 @@
tal:define="url context/portal_url;
resource_type request/resource_type | string:mediaobject;"
tal:attributes="href string:${context/portal_url}/kupulocate.xml?resource_type=${resource_type}&src=$$src$$">
- Breadcrumbs
+ Locate
</crumb>
</breadcrumbs>
<items metal:use-macro="here/kupucollection.xml/macros/collectionItems">
More information about the kupu-checkins
mailing list