diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/bookmarks.tpl.php | 2 | ||||
| -rw-r--r-- | templates/editbookmark.tpl.php | 2 | ||||
| -rw-r--r-- | templates/login.tpl.php | 2 | ||||
| -rw-r--r-- | templates/sidebar.block.recent.php | 7 | ||||
| -rw-r--r-- | templates/toolbar.inc.php | 2 | ||||
| -rw-r--r-- | templates/top.inc.php | 8 |
6 files changed, 12 insertions, 11 deletions
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php index 27dfb6e..5567d7b 100644 --- a/templates/bookmarks.tpl.php +++ b/templates/bookmarks.tpl.php @@ -257,7 +257,7 @@ window.onload = playerLoad; $brss = ''; $size = count($rsschannels); for ($i = 0; $i < $size; $i++) { - $brss = '<a style="background:#FFFFFF" href="'. $rsschannels[$i][1] .'" title="'. $rsschannels[$i][0] .'"><img src="'. $GLOBALS['root'] .'images/rss.gif" width="16" height="16" alt="'. $rsschannels[$i][0] .'" /></a>'; + $brss = '<a style="background:#FFFFFF" href="'. $rsschannels[$i][1] .'" title="'. $rsschannels[$i][0] .'"><img src="'. ROOT .'images/rss.gif" width="16" height="16" alt="'. $rsschannels[$i][0] .'" /></a>'; } echo '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ." </p>\n"; diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php index f6affc4..c947ec3 100644 --- a/templates/editbookmark.tpl.php +++ b/templates/editbookmark.tpl.php @@ -43,7 +43,7 @@ switch ($row['bStatus']) { <tr> <th align="left"><?php echo T_('Tags'); ?></th> <td class="scuttletheme"> - <span dojoType="dojo.data.ItemFileReadStore" jsId="memberTagStore" url="<?php echo $GLOBALS['root']?>ajax/gettags.php"></span> + <span dojoType="dojo.data.ItemFileReadStore" jsId="memberTagStore" url="<?php echo ROOT?>ajax/gettags.php"></span> <input type="text" dojoType="dojox.form.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false"/></td> <td>← <?php echo T_('Comma-separated'); ?></td> </tr> diff --git a/templates/login.tpl.php b/templates/login.tpl.php index 6137dc0..def2d72 100644 --- a/templates/login.tpl.php +++ b/templates/login.tpl.php @@ -27,7 +27,7 @@ window.onload = function() { <td></td> </tr> </table> - <p>» <a href="<?php echo $GLOBALS['root'] ?>password.php"><?php echo T_('Forgotten your password?') ?></p> + <p>» <a href="<?php echo ROOT ?>password.php"><?php echo T_('Forgotten your password?') ?></p> </form> <?php diff --git a/templates/sidebar.block.recent.php b/templates/sidebar.block.recent.php index a128e70..fef85f2 100644 --- a/templates/sidebar.block.recent.php +++ b/templates/sidebar.block.recent.php @@ -20,11 +20,12 @@ if ($recentTags && count($recentTags) > 0) { <?php $contents = '<p class="tags">'; - if(strlen($user)==0) { - $cat_url = createURL('tags', '%2$s'); + if(!isset($user)) { + $user = ''; + $cat_url = createURL('tags', '%2$s'); } - foreach ($recentTags as $row) { + foreach ($recentTags as $row) { $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } diff --git a/templates/toolbar.inc.php b/templates/toolbar.inc.php index 92d8d59..0b052e0 100644 --- a/templates/toolbar.inc.php +++ b/templates/toolbar.inc.php @@ -13,7 +13,7 @@ if ($userservice->isLoggedOn()) { <li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><?php echo T_('Watchlist'); ?></a></li> <li><a href="<?php echo $userservice->getProfileUrl($cUserId, $cUsername); ?>"><?php echo T_('Profile'); ?></a></li> <li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><?php echo T_('Add a Bookmark'); ?></a></li> - <li class="access"><?php echo $cUsername?><a href="<?php echo $GLOBALS['root']; ?>?action=logout">(<?php echo T_('Log Out'); ?>)</a></li> + <li class="access"><?php echo $cUsername?><a href="<?php echo ROOT ?>?action=logout">(<?php echo T_('Log Out'); ?>)</a></li> <li><a href="<?php echo createURL('about'); ?>"><?php echo T_('About'); ?></a></li> <?php if($isAdmin): ?>
<li><a href="<?php echo createURL('admin', ''); ?>"><?php echo '['.T_('Admin').']'; ?></a></li>
diff --git a/templates/top.inc.php b/templates/top.inc.php index 88a949a..0d59dfb 100644 --- a/templates/top.inc.php +++ b/templates/top.inc.php @@ -5,9 +5,9 @@ <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" /> + href="<?php echo ROOT ?>icon.png" /> <link rel="stylesheet" type="text/css" - href="<?php echo $GLOBALS['root']; ?>scuttle.css" /> + href="<?php echo ROOT ?>scuttle.css" /> <?php if(isset($rsschannels)) { $size = count($rsschannels); @@ -20,7 +20,7 @@ if(isset($rsschannels)) { <?php if (isset($loadjs)) :?> <script type="text/javascript" - src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script> + src="<?php echo ROOT ?>jsScuttle.php"></script> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css"> @@ -50,7 +50,7 @@ if(isset($_GET['popup'])) { ?> <div id="header" <?php echo $headerstyle; ?>> -<h1><a href="<?php echo $GLOBALS['root']; ?>"><?php echo $GLOBALS['sitename']; ?></a></h1> +<h1><a href="<?php echo ROOT ?>"><?php echo $GLOBALS['sitename']; ?></a></h1> <?php if(!isset($_GET['popup'])) { $this->includeTemplate('toolbar.inc'); |