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

[duncan at codespeak.net]

Author: duncan
Date: Thu May 17 10:39:30 2007
New Revision: 43448

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/common/kupuhelpers.js
Log:
Tidied up html/css for image form again: now it lays out correctly in IE6.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 17 10:39:30 2007
@@ -315,7 +315,7 @@
           <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 class="kupu-detail-label">Align:</label>
+          <label class="kupu-detail">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>
@@ -343,45 +343,53 @@
              <xsl:choose>
                 <xsl:when test="media='flash'" />
                 <xsl:otherwise>
-                   <label class="kupu-detail-label"
+                   <label class="kupu-detail"
                           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>
-                      </xsl:if>
-                      <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
-                         this.checked?'none':'';</xsl:attribute>
-                   </input>
+                   <span class="kupu-detail">
+                      <input 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>
+                         </xsl:if>
+                         <xsl:attribute name="onclick">toggleAltFieldVisibility(this);</xsl:attribute>
+                      </input>
+                   </span>
                 </xsl:otherwise>
              </xsl:choose>
           </xsl:if>
           <xsl:if test="sizes">
-             <label class="kupu-detail-label"
+             <label class="kupu-detail"
                     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>
+             <span class="kupu-detail">
+                <select name="image-size-selector">
+                   <option name="image-size-option" value="{uri}">Original</option>
+                   <xsl:apply-templates select="sizes/size" />
+                </select>
+             </span>
           </xsl:if>
           <xsl:if test="class">
-             <label class="kupu-detail-label"
+             <label class="kupu-detail"
                     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>
+             <span class="kupu-detail">
+                <select name="kupu-image-class-selector" id="kupu-image-class">
+                   <xsl:apply-templates select="class"/>
+                </select>
+             </span>
           </xsl:if>
-          <div id="image_alt_div">
+          <label class="kupu-detail" id="image-alt-label"
+                 for="image_alt"
+                 i18n:translate="imagedrawer_upload_alt_text">
+             <xsl:if test="$usecaptions='yes' and $image-caption='true'">
+                <xsl:attribute name="style">display:none;</xsl:attribute>
+             </xsl:if>
+             "alt"&#xa0;text:
+          </label>
+          <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
                 <xsl:attribute name="style">display:none;</xsl:attribute>
              </xsl:if>   
-             <label class="kupu-detail-label"
-                    for="image_alt"
-                    i18n:translate="imagedrawer_upload_alt_text">"alt"&#xa0;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>
+             <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+          </input>
        </div>
     </xsl:template>
     <xsl:template match="class">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Thu May 17 10:39:30 2007
@@ -64,7 +64,7 @@
 .kupu-alt-row label {
    display: block;
 }
-#image_alt { width:17em; }
+
 div.kupu-linkdrawer-addlink td {
   border: 0;
 }
@@ -194,17 +194,18 @@
   margin-left: -20px;
 }
 
-label.kupu-detail-label {
-  float:left;clear:left;
-  width:7em;
-  text-align:right;
-  margin: 0.2em;
+.kupu-image-fields {
+  width: 270px; margin:0; padding:0;
 }
 .kupu-detail {
   float:left;
-  margin: 0.2em;
+  width: 185px;
+  margin: 2px 0; padding: 0;
+}
+label.kupu-detail {
+  clear:left; width:75px; text-align:right;
+  margin-right: 5px;
 }
-
 /*div.kupu-libsource-selected {
   background-repeat: no-repeat;
 }*/

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Thu May 17 10:39:30 2007
@@ -1508,3 +1508,12 @@
     image.height = height;
     image.width = width;
 }
+function toggleAltFieldVisibility(me) {
+    var label = document.getElementById('image-alt-label');
+    var vis = me.checked?'none':'';
+    if (label) {
+        label.style.display = vis;
+        var fld = document.getElementById(label.htmlFor);
+        if(fld) { fld.style.display = vis; }
+    }
+}
\ No newline at end of file