diff options
| author |  Mark Pemberton | 2011-06-04 00:38:07 -0400 |
|---|---|---|
| committer | Mark Pemberton | 2011-06-04 00:38:07 -0400 |
| commit | b628e63e015bc3b2eadc712feaa6c4d05cf75bbd (patch) | |
| tree | ebdcec5c8133a3b6f86d06dc3f6fb3de46609f04 /data/templates/sidebar.tpl.php | |
| parent | 84e603aa91a303a1419962ff3ff6086710a7b1a9 (diff) | |
| parent | 4c8a53c5bc632302aaf8978e711eb53a03166db5 (diff) | |
| download | scuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.gz scuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.zip | |
Merge branch 'master' into privatekey2
Conflicts:
data/templates/default/bookmarks.tpl.php
Diffstat (limited to 'data/templates/sidebar.tpl.php')
| -rw-r--r-- | data/templates/sidebar.tpl.php | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/data/templates/sidebar.tpl.php b/data/templates/sidebar.tpl.php deleted file mode 100644 index e823af5..0000000 --- a/data/templates/sidebar.tpl.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?> -<div id="sidebar" class="adminBackground"> -<?php else: ?> -<div id="sidebar"> -<?php endif ?> - - -<?php -echo $GLOBALS['sidebarTopMessage'].' '; - -$size = count($sidebar_blocks); -for ($i = 0; $i < $size; $i++) { - $this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]); -} - -echo $GLOBALS['sidebarBottomMessage']; -?> - -</div> |