[kupu-checkins] r43434 - in kupu/trunk/kupu/common: . kupudrawers

[duncan at codespeak.net]

Author: duncan
Date: Wed May 16 15:41:53 2007
New Revision: 43434

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
Upload button moved to the bottom of the panel.
selected-item class is now applied to the containing div instead of the span.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Wed May 16 15:41:53 2007
@@ -1003,7 +1003,8 @@
             if (item) {
                 var spans = item.getElementsByTagName('span');
                 for (var j = 0; j < spans.length; j++) {
-                    spans[j].className = spans[j].className.replace(' selected-item', '');
+                    var p = spans[j].parentNode;
+                    p.className = p.className.replace(/(\s+|^)selected-item/, '');
                 }
             }
         }
@@ -1070,8 +1071,9 @@
         var span = item.getElementsByTagName('span');
         if (span.length > 0) {
             span = span[0];
-            span.className += ' selected-item';
-            var inp = span.parentNode.getElementsByTagName('input');
+            var p = span.parentNode;
+            p.className += ' selected-item';
+            var inp = p.getElementsByTagName('input');
             if (inp) inp[0].checked = check;
         }
 

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 15:41:53 2007
@@ -119,6 +119,8 @@
                                             <xsl:apply-templates
                                                 select="/libraries/*[@selected]/items"/>
                                         </div>
+                                        <xsl:apply-templates select="/libraries/*[@selected]//uploadbutton"
+                                                                mode="currentpanel"/>
                                     </td>
                                     <td id="kupu-propertiespanel" class="panel">
                                         <div id="kupu-properties" class="overflow">
@@ -186,10 +188,17 @@
         </div>
     </xsl:template>
     <xsl:template match="items">
-        <xsl:apply-templates select="collection|resource|uploadbutton" mode="currentpanel"/>
+        <xsl:apply-templates select="collection|resource" mode="currentpanel"/>
     </xsl:template>
     <xsl:template match="resource|collection" mode="currentpanel">
-        <div id="{@id}" class="kupu-{local-name()} {@class}" title="{description}">
+        <div id="{@id}" title="{description}">
+           <xsl:attribute name="class">
+              <xsl:value-of select="@class"/>
+              kupu-<xsl:value-of select="local-name()"/>
+              <xsl:if test="@selected">
+                 selected-item
+              </xsl:if>
+           </xsl:attribute>
             <xsl:attribute name="onclick">
                 <xsl:choose>
                     <xsl:when test="local-name()='collection'">drawertool.current_drawer.selectCollection(this);</xsl:when>
@@ -229,9 +238,6 @@
     </xsl:template>
     <xsl:template match="label|title">
         <span class="drawer-item-title">
-            <xsl:if test="../@selected">
-                <xsl:attribute name="class">drawer-item-title selected-item</xsl:attribute>
-            </xsl:if>
             <xsl:choose>
                 <xsl:when test="string-length() &gt; $titlelength">
                     <xsl:value-of select="substring(., 0, $titlelength)"/>... </xsl:when>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 15:41:53 2007
@@ -195,9 +195,6 @@
 .library-icon-library {
   margin-left: -20px;
 }
-.kupu-upload {
-  margin-top: 1em; float:right;
-}
 
 label.kupu-detail-label {
   float:left;clear:left;
@@ -240,7 +237,7 @@
   padding-top: 2px;
 }
 
-span.drawer-item-title.selected-item {
+.selected-item span.drawer-item-title {
   background-color:#C0C0C0;
 }