X-Git-Url: https://projects.mako.cc/source/scuttle/blobdiff_plain/c20b44263a89d8bf1a78bfa632daaae3cb4f1da2..1b57a8783f47606807c879bff785ab64b6860939:/templates/editbookmark.tpl.php

diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index a590d81..358b239 100644
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -4,24 +4,21 @@ $this->includeTemplate($GLOBALS['top_include']);
 $accessPublic = '';
 $accessShared = '';
 $accessPrivate = '';
-switch ($row['bStatus']) {
-    case 0 :
-        $accessPublic = ' selected="selected"';
-        break;
-    case 1 :
-        $accessShared = ' selected="selected"';
-        break;
-    case 2 :
-        $accessPrivate = ' selected="selected"';
-        break;
-}
-?>
 
-<script type="text/javascript">
-window.onload = function() {
-    document.getElementById("address").focus();
+if (isset($row['bStatus'])) {
+    switch ($row['bStatus']) {
+        case 0 :
+            $accessPublic = ' selected="selected"';
+            break;
+        case 1 :
+            $accessShared = ' selected="selected"';
+            break;
+        case 2 :
+            $accessPrivate = ' selected="selected"';
+            break;
+    }
 }
-</script>
+?>
 
 <form action="<?php echo $formaction; ?>" method="post">
 <table>
@@ -37,12 +34,12 @@ window.onload = function() {
 </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><input type="text" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" /></td>
+    <td><input type="text" id="tags" name="tags" size="75" value="<?php if (isset($row['tags'])) { echo filter(implode(', ', $row['tags']), 'xml'); }?>" /></td>
     <td>&larr; <?php echo T_('Comma-separated'); ?></td>
 </tr>
 <tr>
@@ -60,34 +57,31 @@ window.onload = function() {
     <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 (isset($showdelete) && $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 (isset($referrer) && $referrer): ?>
+          <input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
+        <?php endif; ?>
     </td>
     <td></td>
 </tr>
 </table>
 </form>
+<script type="text/javascript">
+$(function() {
+  $("#tags").focus();
+});
+</script>
 
 <?php
 // Dynamic tag selection
 $this->includeTemplate('dynamictags.inc');
 
 // Bookmarklets and import links
-if (empty($_REQUEST['popup']) && !$showdelete) {
+if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {
 ?>
 
 <h3><?php echo T_('Bookmarklet'); ?></h3>
@@ -117,4 +111,4 @@ document.write('<\/ul>');
 <?php
 }
 $this->includeTemplate($GLOBALS['bottom_include']); 
-?>
\ No newline at end of file
+?>