Merge remote-tracking branch 'remotes/gh-mjjstorey/master'

[scuttle] / templates / editbookmark.tpl.php

diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index a590d818aa54fa0806de91ce25879ce80c3b02e2..304ede6466701d46da4fc023882414da650ec644 100644 (file)
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -17,12 +17,6 @@ switch ($row['bStatus']) {
 }
 ?>
 
 }
 ?>
 

-<script type="text/javascript">
-window.onload = function() {
-    document.getElementById("address").focus();
-}
-</script>
-

 <form action="<?php echo $formaction; ?>" method="post">
 <table>
 <tr>
 <form action="<?php echo $formaction; ?>" method="post">
 <table>
 <tr>


@@ -37,12 +31,12 @@ window.onload = function() {
 </tr>
 <tr>
     <th align="left"><?php echo T_('Description'); ?></th>
 </tr>
 <tr>
     <th align="left"><?php echo T_('Description'); ?></th>

-    <td><input type="text" name="description" size="75" maxlength="255" value="<?php echo filter($row['bDescription'], 'xml'); ?>" /></td>
+    <td><textarea name="description" cols="74" rows="5" maxlength="1000"><?php echo filter($row['bDescription'], 'xml'); ?></textarea></td>

     <td></td>
 </tr>
 <tr>
     <th align="left"><?php echo T_('Tags'); ?></th>
     <td></td>
 </tr>
 <tr>
     <th align="left"><?php echo T_('Tags'); ?></th>

-    <td><input type="text" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" /></td>
+    <td><input class="autocomplete" type="text" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" /></td>

     <td>&larr; <?php echo T_('Comma-separated'); ?></td>
 </tr>
 <tr>
     <td>&larr; <?php echo T_('Comma-separated'); ?></td>
 </tr>
 <tr>


@@ -60,27 +54,24 @@ window.onload = function() {
     <td></td>
     <td>
         <input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" />
     <td></td>
     <td>
         <input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" />

-        <?php
-        if ($showdelete) {
-        ?>
-        <input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" />
-        <?php
-        }
-        if ($popup) {
-        ?>
-        <input type="hidden" name="popup" value="1" />
-        <?php
-        } elseif ($referrer) {
-        ?>
-        <input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
-        <?php
-        }
-        ?>
+        <?php if ($showdelete): ?>
+          <input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" />
+        <?php endif; ?>
+        <?php if ($popup): ?>
+          <input type="hidden" name="popup" value="1" />
+        <?php elseif ($referrer): ?>
+          <input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
+        <?php endif; ?>

     </td>
     <td></td>
 </tr>
 </table>
 </form>
     </td>
     <td></td>
 </tr>
 </table>
 </form>

+<script type="text/javascript">
+$(function() {
+  $("#address").focus();
+});
+</script>

 
 <?php
 // Dynamic tag selection
 
 <?php
 // Dynamic tag selection


@@ -117,4 +108,4 @@ document.write('<\/ul>');
 <?php
 }
 $this->includeTemplate($GLOBALS['bottom_include']); 
 <?php
 }
 $this->includeTemplate($GLOBALS['bottom_include']); 

-?>
\ No newline at end of file
+?>