From 5ba53394fcda4ae9cfa9af52b37fb67517deeb5a Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 25 May 2011 19:43:36 +0200 Subject: implement request #1989987: theme support. merge themes branch with --squash --- data/templates/default/about.tpl.php | 34 ++ data/templates/default/admin.tpl.php | 35 ++ .../default/bookmarkcommondescriptionedit.tpl.php | 58 +++ data/templates/default/bookmarklet.inc.php | 117 ++++++ .../default/bookmarks-thumbnail.inc.tpl.php | 18 + .../default/bookmarks-vote-horizontal.inc.tpl.php | 50 +++ data/templates/default/bookmarks-vote.inc.tpl.php | 44 ++ data/templates/default/bookmarks.tpl.php | 454 +++++++++++++++++++++ data/templates/default/bottom.inc.php | 34 ++ data/templates/default/dojo.inc.php | 35 ++ data/templates/default/dynamictags.inc.php | 148 +++++++ data/templates/default/editbookmark.tpl.php | 221 ++++++++++ .../default/editprofile-sslclientcerts.tpl.php | 60 +++ data/templates/default/editprofile.tpl.php | 73 ++++ data/templates/default/error.404.tpl.php | 9 + data/templates/default/error.500.tpl.php | 9 + data/templates/default/importDelicious.tpl.php | 42 ++ data/templates/default/importNetscape.tpl.php | 50 +++ data/templates/default/importStructure.tpl.php | 42 ++ data/templates/default/login.tpl.php | 41 ++ data/templates/default/password.tpl.php | 26 ++ data/templates/default/profile.tpl.php | 74 ++++ data/templates/default/register.tpl.php | 49 +++ data/templates/default/rss.tpl.php | 26 ++ data/templates/default/search.menu.php | 57 +++ data/templates/default/sidebar.block.common.php | 28 ++ data/templates/default/sidebar.block.linked.php | 66 +++ data/templates/default/sidebar.block.menu.php | 80 ++++ data/templates/default/sidebar.block.menu2.php | 71 ++++ data/templates/default/sidebar.block.popular.php | 44 ++ data/templates/default/sidebar.block.recent.php | 39 ++ data/templates/default/sidebar.block.related.php | 40 ++ data/templates/default/sidebar.block.search.php | 51 +++ .../templates/default/sidebar.block.tagactions.php | 35 ++ data/templates/default/sidebar.block.users.php | 34 ++ data/templates/default/sidebar.block.watchlist.php | 60 +++ .../default/sidebar.block.watchstatus.php | 28 ++ data/templates/default/sidebar.linkedtags.inc.php | 84 ++++ data/templates/default/sidebar.tpl.php | 19 + data/templates/default/tag2tagadd.tpl.php | 57 +++ data/templates/default/tag2tagdelete.tpl.php | 49 +++ data/templates/default/tag2tagedit.tpl.php | 73 ++++ .../default/tagcommondescriptionedit.tpl.php | 48 +++ data/templates/default/tagdelete.tpl.php | 20 + data/templates/default/tagedit.tpl.php | 33 ++ data/templates/default/tagrename.tpl.php | 41 ++ data/templates/default/tags.tpl.php | 31 ++ data/templates/default/toolbar.inc.php | 37 ++ data/templates/default/top.inc.php | 66 +++ data/templates/default/users.tpl.php | 33 ++ 50 files changed, 2973 insertions(+) create mode 100644 data/templates/default/about.tpl.php create mode 100644 data/templates/default/admin.tpl.php create mode 100644 data/templates/default/bookmarkcommondescriptionedit.tpl.php create mode 100644 data/templates/default/bookmarklet.inc.php create mode 100644 data/templates/default/bookmarks-thumbnail.inc.tpl.php create mode 100644 data/templates/default/bookmarks-vote-horizontal.inc.tpl.php create mode 100644 data/templates/default/bookmarks-vote.inc.tpl.php create mode 100644 data/templates/default/bookmarks.tpl.php create mode 100644 data/templates/default/bottom.inc.php create mode 100644 data/templates/default/dojo.inc.php create mode 100644 data/templates/default/dynamictags.inc.php create mode 100644 data/templates/default/editbookmark.tpl.php create mode 100644 data/templates/default/editprofile-sslclientcerts.tpl.php create mode 100644 data/templates/default/editprofile.tpl.php create mode 100644 data/templates/default/error.404.tpl.php create mode 100644 data/templates/default/error.500.tpl.php create mode 100644 data/templates/default/importDelicious.tpl.php create mode 100644 data/templates/default/importNetscape.tpl.php create mode 100644 data/templates/default/importStructure.tpl.php create mode 100644 data/templates/default/login.tpl.php create mode 100644 data/templates/default/password.tpl.php create mode 100644 data/templates/default/profile.tpl.php create mode 100644 data/templates/default/register.tpl.php create mode 100644 data/templates/default/rss.tpl.php create mode 100644 data/templates/default/search.menu.php create mode 100644 data/templates/default/sidebar.block.common.php create mode 100644 data/templates/default/sidebar.block.linked.php create mode 100644 data/templates/default/sidebar.block.menu.php create mode 100644 data/templates/default/sidebar.block.menu2.php create mode 100644 data/templates/default/sidebar.block.popular.php create mode 100644 data/templates/default/sidebar.block.recent.php create mode 100644 data/templates/default/sidebar.block.related.php create mode 100644 data/templates/default/sidebar.block.search.php create mode 100644 data/templates/default/sidebar.block.tagactions.php create mode 100644 data/templates/default/sidebar.block.users.php create mode 100644 data/templates/default/sidebar.block.watchlist.php create mode 100644 data/templates/default/sidebar.block.watchstatus.php create mode 100644 data/templates/default/sidebar.linkedtags.inc.php create mode 100644 data/templates/default/sidebar.tpl.php create mode 100644 data/templates/default/tag2tagadd.tpl.php create mode 100644 data/templates/default/tag2tagdelete.tpl.php create mode 100644 data/templates/default/tag2tagedit.tpl.php create mode 100644 data/templates/default/tagcommondescriptionedit.tpl.php create mode 100644 data/templates/default/tagdelete.tpl.php create mode 100644 data/templates/default/tagedit.tpl.php create mode 100644 data/templates/default/tagrename.tpl.php create mode 100644 data/templates/default/tags.tpl.php create mode 100644 data/templates/default/toolbar.inc.php create mode 100644 data/templates/default/top.inc.php create mode 100644 data/templates/default/users.tpl.php (limited to 'data/templates/default') diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php new file mode 100644 index 0000000..7bff98d --- /dev/null +++ b/data/templates/default/about.tpl.php @@ -0,0 +1,34 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
getLastTagDescription($currenttag)) {
+ $cDescription = $cdservice->getLastTagDescription($currenttag);
+ echo nl2br(filter($cDescription['cdDescription']));
+} elseif(isset($hash) && $cdservice->getLastBookmarkDescription($hash)) {
+ $cDescription = $cdservice->getLastBookmarkDescription($hash);
+ echo nl2br(filter($cDescription['cdTitle'])). "
";
+ echo nl2br(filter($cDescription['cdDescription'])). "
";
+}
+
+//common tag description edit
+if ($userservice->isLoggedOn()) {
+ if ($currenttag != ''
+ && ($GLOBALS['enableCommonTagDescriptionEditedByAll']
+ || $currentUser->isAdmin()
+ )
+ ) {
+ echo ' ';
+ echo !is_array($cDescription) || strlen($cDescription['cdDescription'])==0?T_('Edit the common description of this tag'):'';
+ echo ' ';
+ } else if (isset($hash)) {
+ echo ' (';
+ echo T_('Edit the common description of this bookmark').')';
+ }
+}
+?>
getDescription($currenttag, $userObject['uId']); +echo nl2br(filter($pDescription['tDescription'])); + +//personal tag description edit +if($userservice->isLoggedOn()) { + if($currenttag!= '') { + echo ' '; + echo strlen($pDescription['tDescription'])==0?T_('Edit your personal description of this tag'):''; + echo ' '; + } +} +?>
+ + + + 0) { ?> + + +- + + + / + + / + + + / + + +'; + echo T_('Bookmarks from other users for this tag').''; + //echo T_(' for these tags'); + } else if ($userservice->isLoggedOn()){ + echo ' - '; + echo ''; + echo T_('Only your bookmarks for this tag').''; + //echo T_(' for these tags'); + } +} +?>
+ +'. T_('First') .''; + $bprev = ''. T_('Previous') .''; + } else { + $prev = $page - 1; + $prev = 'page='. $prev; + $start = ($page - 1) * $perpage; + $bfirst= ''. T_('First') .''; + $bprev = ''. T_('Previous') .''; + } + + // Next + $next = $page + 1; + $totalpages = ceil($total / $perpage); + if (count($bookmarks) < $perpage || $perpage * $page == $total) { + $bnext = ''. T_('Next') .''; + $blast = ''. T_('Last') ."\n"; + } else { + $bnext = ''. T_('Next') .''; + $blast = ''. T_('Last') ."\n"; + } + + // RSS + $brss = ''; + $size = count($rsschannels); + for ($i = 0; $i < $size; $i++) { + $brss = '' + . '' + . ''; + } + + $pagesBanner = ''. $bfirst .' / '. $bprev .' / '. $bnext .' / '. $blast .' / '. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ."
\n"; + + if (getPerPageCount($currentUser) > 10) { + echo $pagesBanner; // display a page banner if too many bookmarks to manage + } + + +?> + + + +'.T_('No bookmarks available').'
'; +} +$this->includeTemplate('sidebar.tpl'); +$this->includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/bottom.inc.php b/data/templates/default/bottom.inc.php new file mode 100644 index 0000000..0c966a2 --- /dev/null +++ b/data/templates/default/bottom.inc.php @@ -0,0 +1,34 @@ + +