Multiple minor improvements and bugfixes regarding the new templates:

[github/shaarli/Shaarli.git] / tpl / default / editlink.html

diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index 4f10ffb2d5d8e9d26fda44ae3b466fdc7743eb57..d6f81f9651edd8aaf4ebae8193759092a9b179a9 100644 (file)
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -33,8 +33,7 @@
         <label for="lf_description">{'Description'|t}</label>
       </div>
       <div>
-        <textarea name="lf_description" id="lf_description" onkeyup="textAreaAdjust(this)"
-        >{$link.description}</textarea>
+        <textarea name="lf_description" id="lf_description">{$link.description}</textarea>
       </div>
       <div>
         <label for="lf_tags">{'Tags'|t}</label>
@@ -46,7 +45,7 @@
 
       <div>
         <input type="checkbox"  name="lf_private" id="lf_private"
-        {if="($link_is_new && $default_private_links) || $link.private == true"}
+        {if="($link_is_new && $default_private_links || $link.private == true)"}
           checked="checked"
         {/if}>
         &nbsp;<label for="lf_private">{'Private'|t}</label>
@@ -62,7 +61,7 @@
       <div class="submit-buttons center">
         <input type="submit" value="{'Save'|t}" name="save_edit" class="">
         {if="!$link_is_new"}
-        <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}"
+        <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}"
            title="" name="delete_link" class="button button-red confirm-delete">
           {'Delete'|t}
         </a>
@@ -75,7 +74,7 @@
       {/if}
     </form>
   </div>
-  {if="$source !== 'firefoxsocialapi'"}
+  {if="$source !== 'firefoxsocialapi' && $source !== 'bookmarklet'"}
     {include="page.footer"}
   {/if}
 <script>
@@ -87,12 +86,6 @@
   } else {
     document.linkform.lf_tags.focus();
   }
-  function textAreaAdjust(el) {
-    el.style.height = (el.scrollHeight > el.clientHeight) ? (el.scrollHeight) + "px" : (el.clientHeight - 18) + "px";
-  }
-  (function (window, document) {
-    textAreaAdjust(document.linkform.lf_description)
-  })(this, this.document);
 </script>
 </body>
 </html>