]> projects.mako.cc - scuttle/commitdiff
Merge branch 'autocomplete-tags'
authorBenjamin Mako Hill <mako@atdot.cc>
Sun, 8 Apr 2012 19:21:20 +0000 (15:21 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Sun, 8 Apr 2012 19:21:20 +0000 (15:21 -0400)
1  2 
templates/editbookmark.tpl.php
templates/top.inc.php

index fbb21bd23c7c633276c79c698837fe28a30f6995,16b56c7fd0ad47274ad852bcc850e50843ea47ec..2304134db607bc64ca20448a9846c1cec54648d4
@@@ -31,12 -31,12 +31,12 @@@ switch ($row['bStatus']) 
  </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 class="autocomplete" 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 echo filter(implode(', ', $row['tags']), 'xml'); ?>" /></td>
      <td>&larr; <?php echo T_('Comma-separated'); ?></td>
  </tr>
  <tr>
@@@ -69,7 -69,7 +69,7 @@@
  </form>
  <script type="text/javascript">
  $(function() {
 -  $("#address").focus();
 +  $("#tags").focus();
  });
  </script>
  
@@@ -108,4 -108,4 +108,4 @@@ document.write('<\/ul>')
  <?php
  }
  $this->includeTemplate($GLOBALS['bottom_include']); 
 -?>
 +?>
diff --combined templates/top.inc.php
index 390fbf392ab165be9ad82d1a191da65e15da0afa,d7a6731cef34dc2ec310e1ad1957f9e04050e262..6a1bdb8e9fa8440e2b7accb28354c72b7fac3006
@@@ -5,9 -5,8 +5,8 @@@
      <title><?php echo filter($GLOBALS['sitename'] . (isset($pagetitle) ? ': ' . $pagetitle : '')); ?></title>
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
      <link rel="icon" type="image/png" href="<?php echo $GLOBALS['root']; ?>icon.png" />
-     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['root']; ?>includes/smoothness/jquery-ui-1.8.9.custom.css" />
      <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['root']; ?>scuttle.css" />
+     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['root']; ?>jquery-ui-1.8.9.autocomplete.css" />
      <?php
      $size = count($rsschannels);
      for ($i = 0; $i < $size; $i++) {
      }
      ?>
      <?php if ($loadjs): ?>
-         <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.5.min.js"></script>
-         <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-ui-1.8.9.min.js"></script>
-               <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
+       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.4.4.min.js"></script>
+       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-ui-1.8.9.autocomplete.min.js"></script>
+       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
      <?php endif; ?>
  </head>
  <body>
@@@ -41,11 -39,7 +39,11 @@@ if (isset($_GET['popup'])) 
  
  <?php
  if (isset($subtitle)) {
 -    echo '<h2>'. $subtitle ."</h2>\n";
 +    echo '<h2>'. $subtitle;
 +    if (isset($total)) {
 +        echo " (" . $total . ")";
 +    }
 +    echo "</h2>\n";
  }
  if (isset($error)) {
      echo '<p class="error">'. $error ."</p>\n";

Benjamin Mako Hill || Want to submit a patch?