[kupu-checkins] r43435 - in kupu/trunk/kupu: common common/kupudrawers plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Wed May 16 17:18:23 2007
New Revision: 43435

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
More style changes

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 17:18:23 2007
@@ -85,8 +85,7 @@
                                 <xsl:variable name="search_value" i18n:translate="kupudrawer_search"
                                     >Search</xsl:variable>
                                 <input id="kupu-searchbox-input"
-                                    class="kupu-searchbox-input nofocus"
-                                    style="color: #666;">
+                                    class="kupu-searchbox-input nofocus">
                                   <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                                     <xsl:attribute name="onkeyup">if(event.keyCode == 13){drawertool.current_drawer.search();return false;}</xsl:attribute>
                                     <xsl:attribute name="value">
@@ -116,6 +115,9 @@
                                     </td>
                                     <td id="kupu-resourcespanel" class="panel">
                                         <div id="kupu-resourceitems" class="overflow">
+                                           <xsl:if test="/libraries/*[@selected]//uploadbutton">
+                                              <xsl:attribute name="class">overflow overflow-with-button</xsl:attribute>
+                                           </xsl:if>
                                             <xsl:apply-templates
                                                 select="/libraries/*[@selected]/items"/>
                                         </div>
@@ -226,8 +228,7 @@
     <xsl:template match="uploadbutton" mode="currentpanel">
         <button class="kupu-dialog-button kupu-upload">
             <xsl:attribute name="onclick"> drawertool.current_drawer.selectUpload(); </xsl:attribute>
-            <span class="drawer-item-title"
-                  i18n:translate="imagedrawer_upload_link">Upload&#xa0;image&#xa0;here...</span>
+            <span tal:omit-tag="" i18n:translate="imagedrawer_upload_link">Upload&#xa0;image&#xa0;here...</span>
         </button>
     </xsl:template>
     <xsl:template match="icon">
@@ -272,8 +273,7 @@
         <div class="kupu-preview-row">
             <xsl:apply-templates select="status"/>
             <xsl:apply-templates select="." mode="image-view" />
-            <div>
-                <xsl:value-of select="size"/>
+            <div class="preview-size">
                 <xsl:if test="width" i18n:translate="imagedrawer_size"> (<span i18n:name="width">
                 <xsl:value-of select="width"/>
                     </span> by <span i18n:name="height">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 17:18:23 2007
@@ -109,10 +109,6 @@
   width: 640px; /* Mozilla bug */
 }
 
-div.kupu-drawer button {
-  margin-right: 0.3em;
-}
-
 div.kupu-panels {
   width: 100%;
   background-color: ButtonFace;
@@ -137,7 +133,7 @@
 }
 
 td.panel {
-  height: 260px;
+  height: 260px; padding:0; margin:0;
 }
 
 td#kupu-librariespanel {
@@ -148,7 +144,7 @@
 div#kupu-librariesitems {
   width: 105px;
   white-space: nowrap;
-  height: 100%;
+  height: 260px;
 }
 
 td#kupu-resourcespanel {
@@ -159,11 +155,13 @@
 div#kupu-resourceitems {
   white-space: nowrap;
   width: 200px;
-  height: 100%;
+}
+div#kupu-resourceitems.overflow-with-button {
+  height:236px;
 }
 
 div#kupu-properties {
-  height: 100%;
+  height: 260px;
 }
 
 div#kupu-librariesitems, div#kupu-resourceitems, div#kupu-properties {
@@ -172,7 +170,7 @@
 
 .overflow {
   overflow: auto;
-  height: 100%;
+  height: 260px;
 }
 
 div.response, div.collection {

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Wed May 16 17:18:23 2007
@@ -223,11 +223,6 @@
   font-size: 100%;
 }
 
-div.kupu-drawer table td button, 
-div.kupu-drawer table td td {
-  font-size: 100%;
-}
-
 div.kupuoverride {
     margin-left: 0.75em;
 }