Changeset 13865 for trunk/themes/default/template/picture.tpl

Timestamp:

Apr 2, 2012, 10:49:46 PM (12 years ago)

Author:

rvelices

Message:

• comment edit form looks ok now with the new comment layout
• removed unused css / simplify it
• simplified jquery drop boxes ...

File:

• trunk/themes/default/template/picture.tpl (modified) (5 diffs)

trunk/themes/default/template/picture.tpl

@@ -36 +36 @@
 }
 
-$(document).ready(function() {
-  $("#derivativeSwitchBox").css({'top':0,'left':0});
-  var derivativeSwitchBox_width = $("#derivativeSwitchBox").outerWidth(true);
-  var derivativeSwitchBox_height = $("#derivativeSwitchBox").outerHeight(true);
-  
-  $("#derivativeSwitchLink").click(function() {
-    $("#derivativeSwitchBox").toggle();
-    
-    if ($(this).offset().left + derivativeSwitchBox_width > $(window).width()) {
-      $("#derivativeSwitchBox").css("left", $(window).width() - derivativeSwitchBox_width - 5);
-    } else {
-      $("#derivativeSwitchBox").css("left", $(this).offset().left);
-    }
-    $("#derivativeSwitchBox").css("top", $(this).offset().top + $(this).outerHeight(true));
-  });
-  
-  $("#derivativeSwitchBox").bind("mouseleave click", function() {
-    $(this).hide();
-  });
+$("#derivativeSwitchLink").click(function() {
+        var elt = $("#derivativeSwitchBox");
+        elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5))
+                .css("top", $(this).offset().top + $(this).outerHeight(true))
+                .toggle();
+});
+$("#derivativeSwitchBox").on("mouseleave click", function() {
+        $(this).hide();
 });
 {/literal}{/footer_script}
@@ -60 +49 @@
   <span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
 </a>
-<div id="derivativeSwitchBox" class="switchBox" style="display:none">
+<div id="derivativeSwitchBox" class="switchBox">
   <div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
   {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
@@ -210 +199 @@
         {/if}
         {if $display_info.categories and isset($related_categories)}
-        <div id="Categories"  class="imageInfo">
+        <div id="Categories" class="imageInfo">
                 <dt>{'Albums'|@translate}</dt>
                 <dd>
@@ -306 +295 @@
                 elt.style.left = (ePos.offsetLeft)+"px";
                 elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px";
-                elt.style.display="";
+                elt.style.display="block";
         }
         else
@@ -351 +340 @@
                         <div id="commentAdd">
                                 <h4>{'Add a comment'|@translate}</h4>
-                                <form  method="post" action="{$comment_add.F_ACTION}" id="addComment" >
+                                <form method="post" action="{$comment_add.F_ACTION}" id="addComment" >
                                         {if $comment_add.SHOW_AUTHOR}
-                                                <p><label>{'Author'|@translate}&nbsp;:</label></p>
+                                                <p><label>{'Author'|@translate} :</label></p>
                                                 <p><input type="text" name="author" /></p>
-                                                <p><label>{'Comment'|@translate}&nbsp;:</label></p>
+                                                <p><label>{'Comment'|@translate} :</label></p>
                                         {/if}
                                         <p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p>
                                         <p><input type="hidden" name="key" value="{$comment_add.KEY}" />
-                                                <input class="submit" type="submit" value="{'Submit'|@translate}"></p>
+                                                <input type="submit" value="{'Submit'|@translate}"></p>
                                 </form>
                         </div>