From 07656f6724d536de2c2eb234e0368959660093bd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 24 May 2011 06:54:38 +0200 Subject: make changelog fully rST-parsable. that was easy! --- doc/ChangeLog | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'doc/ChangeLog') diff --git a/doc/ChangeLog b/doc/ChangeLog index 3c4e939..8fa208c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -68,11 +68,13 @@ your SemanticScuttle installations! - Fix several SQL injection possibilities - Fix E_NOTICE when calling alltags.php without any parameter - Implement part of request #2928950: + - User adjustable entry count: rss.php?count=20 - Fix HTTP content type header for RSS - Add config option to allow sorting by bookmark creation date instead of modification date -- Implement request #2833793: Export to avahi config files + + - Implement request #2833793: Export to avahi config files - we support zeroconf networking! - Implement request #2934868: Do not display full redirection URL Patch by fnorder@users.sourceforge.net @@ -181,7 +183,7 @@ your SemanticScuttle installations! - Major Refactoring: add a tag cache improving query processing (knowledge inference on tag relations) [DB modified] - Interface fix: allows to remove a tag from the selection into - subtitle bar thanks to a *. + subtitle bar thanks to a \*. - New Feature: authorizes anchors with brackets into descriptions of bookmark. For example: "[city]Paris[/city]". This text between anchors will be highlighted when the @@ -219,6 +221,7 @@ your SemanticScuttle installations! 0.90 - 2008-06-05 ----------------- The main improvements of this new version are: + - menu tags (tags which are included into the "menu" tag and thus which appear on the main page) - connexion with Google Custom Search Engine which allows to @@ -227,6 +230,7 @@ The main improvements of this new version are: All the changes: + - New feature: add Google Custom Search Engine into gsearch/ folder and looking into all bookmarks [Config modified] - Interface design: antispam question is hidden when @@ -279,6 +283,7 @@ The main change of this release is the possibility to preview websites through thumbnails (thanks to artviper.net). All the changes: + - Interface design: display SemanticScuttle version number on "about" page - Bug fix: allow clean urls thanks to .htaccess @@ -298,6 +303,7 @@ All the changes: 0.87 - 2008-02-14 ----------------- This new version brings two major features to SemanticScuttle: + 1) You can now create a synonym link between tags. For example, by linking the tags "monument" and "monuments", you can find resources tagged with the first one when you navigate @@ -310,6 +316,7 @@ This new version brings two major features to SemanticScuttle: ones (more difficult but more powerful). All the changes: + - Interface design: allow to access to users' bookmarks from last user sidebox. (Currently, we can just access to their profiles). - Interface design: hide multiple URLs repeated into history page @@ -335,9 +342,11 @@ All the changes: ----------------- - New feature: Add stats (nb children, nb descendants, depth, nb update) to structured tags + - Allow to visualize structured tags according to stats - Add admin page to update stats from the existing structured tags in the database + - Translation: improve French translation (add missing translations, transform "labels" into "tags") - New feature: List all users in a users page and users block on -- cgit v1.2.3 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 --- build.xml | 13 +- data/config.default.php | 9 + data/templates/about.tpl.php | 34 -- data/templates/admin.tpl.php | 35 -- .../bookmarkcommondescriptionedit.tpl.php | 58 -- data/templates/bookmarklet.inc.php | 117 ---- data/templates/bookmarks-thumbnail.inc.tpl.php | 18 - .../bookmarks-vote-horizontal.inc.tpl.php | 50 -- data/templates/bookmarks-vote.inc.tpl.php | 44 -- data/templates/bookmarks.tpl.php | 443 -------------- data/templates/bottom.inc.php | 34 -- 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 ++ data/templates/dojo.inc.php | 35 -- data/templates/dynamictags.inc.php | 148 ----- data/templates/editbookmark.tpl.php | 221 ------- data/templates/editprofile-sslclientcerts.tpl.php | 60 -- data/templates/editprofile.tpl.php | 73 --- data/templates/error.404.tpl.php | 9 - data/templates/error.500.tpl.php | 9 - data/templates/importDelicious.tpl.php | 42 -- data/templates/importNetscape.tpl.php | 50 -- data/templates/importStructure.tpl.php | 42 -- data/templates/login.tpl.php | 41 -- data/templates/password.tpl.php | 26 - data/templates/profile.tpl.php | 74 --- data/templates/register.tpl.php | 49 -- data/templates/rss.tpl.php | 26 - data/templates/search.menu.php | 57 -- data/templates/sidebar.block.common.php | 28 - data/templates/sidebar.block.linked.php | 66 --- data/templates/sidebar.block.menu.php | 80 --- data/templates/sidebar.block.menu2.php | 71 --- data/templates/sidebar.block.popular.php | 44 -- data/templates/sidebar.block.recent.php | 39 -- data/templates/sidebar.block.related.php | 40 -- data/templates/sidebar.block.search.php | 51 -- data/templates/sidebar.block.tagactions.php | 35 -- data/templates/sidebar.block.users.php | 34 -- data/templates/sidebar.block.watchlist.php | 60 -- data/templates/sidebar.block.watchstatus.php | 28 - data/templates/sidebar.linkedtags.inc.php | 84 --- data/templates/sidebar.tpl.php | 19 - data/templates/tag2tagadd.tpl.php | 57 -- data/templates/tag2tagdelete.tpl.php | 49 -- data/templates/tag2tagedit.tpl.php | 73 --- data/templates/tagcommondescriptionedit.tpl.php | 48 -- data/templates/tagdelete.tpl.php | 20 - data/templates/tagedit.tpl.php | 33 -- data/templates/tagrename.tpl.php | 41 -- data/templates/tags.tpl.php | 31 - data/templates/testdummy/top.inc.php | 66 +++ data/templates/toolbar.inc.php | 37 -- data/templates/top.inc.php | 66 --- data/templates/users.tpl.php | 33 -- doc/ChangeLog | 3 + doc/themes.rst | 48 ++ src/SemanticScuttle/Model/Template.php | 3 + src/SemanticScuttle/Model/Theme.php | 97 +++ src/SemanticScuttle/Service/Template.php | 29 +- src/SemanticScuttle/header.php | 3 + www/icon.png | Bin 771 -> 0 bytes www/images/b_edit.png | Bin 451 -> 0 bytes www/images/bg_admin.png | Bin 1212 -> 0 bytes www/images/bg_bar.png | Bin 873 -> 0 bytes www/images/bg_header.png | Bin 684 -> 0 bytes www/images/bg_sidebar.png | Bin 726 -> 0 bytes www/images/loading.gif | Bin 1582 -> 0 bytes www/images/logo.png | Bin 2973 -> 0 bytes www/images/logo_24.gif | Bin 1530 -> 0 bytes www/images/rss.gif | Bin 401 -> 0 bytes www/images/thumbs_up.orig.png | Bin 19257 -> 0 bytes www/images/vote-against-voted.png | Bin 419 -> 0 bytes www/images/vote-against.png | Bin 495 -> 0 bytes www/images/vote-for-voted.png | Bin 415 -> 0 bytes www/images/vote-for.png | Bin 625 -> 0 bytes www/jsScuttle.php | 5 +- www/scuttle.css | 657 --------------------- www/themes/default/icon.png | Bin 0 -> 771 bytes www/themes/default/images/b_edit.png | Bin 0 -> 451 bytes www/themes/default/images/bg_admin.png | Bin 0 -> 1212 bytes www/themes/default/images/bg_bar.png | Bin 0 -> 873 bytes www/themes/default/images/bg_header.png | Bin 0 -> 684 bytes www/themes/default/images/bg_sidebar.png | Bin 0 -> 726 bytes www/themes/default/images/loading.gif | Bin 0 -> 1582 bytes www/themes/default/images/logo.png | Bin 0 -> 2973 bytes www/themes/default/images/logo_24.gif | Bin 0 -> 1530 bytes www/themes/default/images/rss.gif | Bin 0 -> 401 bytes www/themes/default/images/thumbs_up.orig.png | Bin 0 -> 19257 bytes www/themes/default/images/vote-against-voted.png | Bin 0 -> 419 bytes www/themes/default/images/vote-against.png | Bin 0 -> 495 bytes www/themes/default/images/vote-for-voted.png | Bin 0 -> 415 bytes www/themes/default/images/vote-for.png | Bin 0 -> 625 bytes www/themes/default/scuttle.css | 657 +++++++++++++++++++++ www/themes/testdummy/images/logo.png | Bin 0 -> 2890 bytes www/themes/testdummy/scuttle.css | 12 + 144 files changed, 3908 insertions(+), 3629 deletions(-) delete mode 100644 data/templates/about.tpl.php delete mode 100644 data/templates/admin.tpl.php delete mode 100644 data/templates/bookmarkcommondescriptionedit.tpl.php delete mode 100644 data/templates/bookmarklet.inc.php delete mode 100644 data/templates/bookmarks-thumbnail.inc.tpl.php delete mode 100644 data/templates/bookmarks-vote-horizontal.inc.tpl.php delete mode 100644 data/templates/bookmarks-vote.inc.tpl.php delete mode 100644 data/templates/bookmarks.tpl.php delete mode 100644 data/templates/bottom.inc.php 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 delete mode 100644 data/templates/dojo.inc.php delete mode 100644 data/templates/dynamictags.inc.php delete mode 100644 data/templates/editbookmark.tpl.php delete mode 100644 data/templates/editprofile-sslclientcerts.tpl.php delete mode 100644 data/templates/editprofile.tpl.php delete mode 100644 data/templates/error.404.tpl.php delete mode 100644 data/templates/error.500.tpl.php delete mode 100644 data/templates/importDelicious.tpl.php delete mode 100644 data/templates/importNetscape.tpl.php delete mode 100644 data/templates/importStructure.tpl.php delete mode 100644 data/templates/login.tpl.php delete mode 100644 data/templates/password.tpl.php delete mode 100644 data/templates/profile.tpl.php delete mode 100644 data/templates/register.tpl.php delete mode 100644 data/templates/rss.tpl.php delete mode 100644 data/templates/search.menu.php delete mode 100644 data/templates/sidebar.block.common.php delete mode 100644 data/templates/sidebar.block.linked.php delete mode 100644 data/templates/sidebar.block.menu.php delete mode 100644 data/templates/sidebar.block.menu2.php delete mode 100644 data/templates/sidebar.block.popular.php delete mode 100644 data/templates/sidebar.block.recent.php delete mode 100644 data/templates/sidebar.block.related.php delete mode 100644 data/templates/sidebar.block.search.php delete mode 100644 data/templates/sidebar.block.tagactions.php delete mode 100644 data/templates/sidebar.block.users.php delete mode 100644 data/templates/sidebar.block.watchlist.php delete mode 100644 data/templates/sidebar.block.watchstatus.php delete mode 100644 data/templates/sidebar.linkedtags.inc.php delete mode 100644 data/templates/sidebar.tpl.php delete mode 100644 data/templates/tag2tagadd.tpl.php delete mode 100644 data/templates/tag2tagdelete.tpl.php delete mode 100644 data/templates/tag2tagedit.tpl.php delete mode 100644 data/templates/tagcommondescriptionedit.tpl.php delete mode 100644 data/templates/tagdelete.tpl.php delete mode 100644 data/templates/tagedit.tpl.php delete mode 100644 data/templates/tagrename.tpl.php delete mode 100644 data/templates/tags.tpl.php create mode 100644 data/templates/testdummy/top.inc.php delete mode 100644 data/templates/toolbar.inc.php delete mode 100644 data/templates/top.inc.php delete mode 100644 data/templates/users.tpl.php create mode 100644 doc/themes.rst create mode 100644 src/SemanticScuttle/Model/Theme.php delete mode 100644 www/icon.png delete mode 100644 www/images/b_edit.png delete mode 100644 www/images/bg_admin.png delete mode 100644 www/images/bg_bar.png delete mode 100644 www/images/bg_header.png delete mode 100644 www/images/bg_sidebar.png delete mode 100644 www/images/loading.gif delete mode 100644 www/images/logo.png delete mode 100644 www/images/logo_24.gif delete mode 100644 www/images/rss.gif delete mode 100644 www/images/thumbs_up.orig.png delete mode 100644 www/images/vote-against-voted.png delete mode 100644 www/images/vote-against.png delete mode 100644 www/images/vote-for-voted.png delete mode 100644 www/images/vote-for.png delete mode 100644 www/scuttle.css create mode 100644 www/themes/default/icon.png create mode 100644 www/themes/default/images/b_edit.png create mode 100644 www/themes/default/images/bg_admin.png create mode 100644 www/themes/default/images/bg_bar.png create mode 100644 www/themes/default/images/bg_header.png create mode 100644 www/themes/default/images/bg_sidebar.png create mode 100644 www/themes/default/images/loading.gif create mode 100644 www/themes/default/images/logo.png create mode 100644 www/themes/default/images/logo_24.gif create mode 100644 www/themes/default/images/rss.gif create mode 100644 www/themes/default/images/thumbs_up.orig.png create mode 100644 www/themes/default/images/vote-against-voted.png create mode 100644 www/themes/default/images/vote-against.png create mode 100644 www/themes/default/images/vote-for-voted.png create mode 100644 www/themes/default/images/vote-for.png create mode 100644 www/themes/default/scuttle.css create mode 100644 www/themes/testdummy/images/logo.png create mode 100644 www/themes/testdummy/scuttle.css (limited to 'doc/ChangeLog') diff --git a/build.xml b/build.xml index 9773a63..7b3896b 100644 --- a/build.xml +++ b/build.xml @@ -121,18 +121,19 @@ + diff --git a/data/config.default.php b/data/config.default.php index 8c47e0b..c850521 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -63,6 +63,15 @@ $sidebarTopMessage = ''; */ $sidebarBottomMessage = ''; +/** + * The HTML theme to use. With themes, you can give your semanticscuttle + * installation a new look. + * + * Themes are the folders in data/templates/ + * + * @var string + */ +$theme = 'default'; /*************************************************** diff --git a/data/templates/about.tpl.php b/data/templates/about.tpl.php deleted file mode 100644 index 7bff98d..0000000 --- a/data/templates/about.tpl.php +++ /dev/null @@ -1,34 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    -
  • Store all your favourite links in one place, accessible from anywhere.'); ?>
    • -
  • Share your bookmarks with everyone, with friends on your watchlist or just keep them private.') ;?>
    • -
  • Tag your bookmarks with as many labels as you want, instead of wrestling with folders.'); ?>
    • -
  • '.T_('Register now').' '.T_(' to start using %s!'), $GLOBALS['sitename']); ?>
    • -
- -

-
    -
  • Semantic Scuttle GNU General Public License ()
    • -
  • del.icio.us API. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won\'t let you change the API address, ask the creator to add this setting. You never know, they might just do it.'), $GLOBALS['sitename']); ?>
    • - - - -isAdmin()): ?> -
  • SemanticScuttle v0.97.0
    • - -
- -

- - - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/admin.tpl.php b/data/templates/admin.tpl.php deleted file mode 100644 index 50680f6..0000000 --- a/data/templates/admin.tpl.php +++ /dev/null @@ -1,35 +0,0 @@ -includeTemplate($GLOBALS['top_include']); - -echo '

'.T_('Users management').'

'; - -echo '
    '; - -foreach($users as $user) { - echo '
  1. '."\n"; - - echo '
    '; - echo ''.$user->getUsername().''; - echo ' - '. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .''; - echo '
    '; - - if($user->getUsername() != $currentUser->getUsername()) { - echo '
    '; - echo ''.T_('Delete').''; - echo '
    '; - } - - echo '
    2. '."\n"; -} -echo '
'; -?> -

-

- -

-includeTemplate('sidebar.tpl'); -$this->includeTemplate($GLOBALS['bottom_include']); - -?> diff --git a/data/templates/bookmarkcommondescriptionedit.tpl.php b/data/templates/bookmarkcommondescriptionedit.tpl.php deleted file mode 100644 index 807c58b..0000000 --- a/data/templates/bookmarkcommondescriptionedit.tpl.php +++ /dev/null @@ -1,58 +0,0 @@ -includeTemplate($GLOBALS['top_include']); - -list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']); - - -?> - - -
- - - - - - - - - - - - - - - - - - - - -
- 0) { - echo T_('Last modification:').' '.$description['cdDatetime'].', '; - $lastUser = $userservice->getUser($description['uId']); - echo '' - . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; - } - ?> -
- - -
- - -
- -
-
- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/bookmarklet.inc.php b/data/templates/bookmarklet.inc.php deleted file mode 100644 index 9867745..0000000 --- a/data/templates/bookmarklet.inc.php +++ /dev/null @@ -1,117 +0,0 @@ -

-

- - diff --git a/data/templates/bookmarks-thumbnail.inc.tpl.php b/data/templates/bookmarks-thumbnail.inc.tpl.php deleted file mode 100644 index 200b8f7..0000000 --- a/data/templates/bookmarks-thumbnail.inc.tpl.php +++ /dev/null @@ -1,18 +0,0 @@ -'; -echo ''; - -?> \ No newline at end of file diff --git a/data/templates/bookmarks-vote-horizontal.inc.tpl.php b/data/templates/bookmarks-vote-horizontal.inc.tpl.php deleted file mode 100644 index c4a9f8e..0000000 --- a/data/templates/bookmarks-vote-horizontal.inc.tpl.php +++ /dev/null @@ -1,50 +0,0 @@ -'; -echo sprintf( - T_('Voting %d'), $row['bVoting'] -) . ' '; - -if (isset($row['hasVoted'])) { - if ($row['vote'] != 1) { - echo '' . T_('Vote for') . ' '; - } else { - echo '' - . T_('Vote for') . ' '; - } - - - if ($row['vote'] != -1) { - echo '' . T_('Vote against') . ''; - } else { - echo '' - . T_('Vote against') . ''; - } -} -echo ''; -?> \ No newline at end of file diff --git a/data/templates/bookmarks-vote.inc.tpl.php b/data/templates/bookmarks-vote.inc.tpl.php deleted file mode 100644 index 41572d5..0000000 --- a/data/templates/bookmarks-vote.inc.tpl.php +++ /dev/null @@ -1,44 +0,0 @@ -'; - -if (isset($row['hasVoted']) && $row['vote'] != 1) { - echo '+'; -} else { - echo '+'; -} - -echo '' . $row['bVoting'] . ''; - -if (isset($row['hasVoted']) && $row['vote'] != -1) { - echo '-'; -} else { - echo '-'; -} -echo ''; -?> \ No newline at end of file diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php deleted file mode 100644 index 55d6a0f..0000000 --- a/data/templates/bookmarks.tpl.php +++ /dev/null @@ -1,443 +0,0 @@ - - * @author Christian Weiske - * @author Eric Dane - * @license GPL http://www.gnu.org/licenses/gpl.html - * @link http://sourceforge.net/projects/semanticscuttle - */ - -/* Service creation: only useful services are created */ -$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); -$tagservice = SemanticScuttle_Service_Factory::get('Tag'); -$cdservice = SemanticScuttle_Service_Factory::get('CommonDescription'); - - -$pageName = isset($pageName) ? $pageName : ''; -$user = isset($user) ? $user : ''; -$currenttag = isset($currenttag) ? $currenttag : ''; - - -$this->includeTemplate($GLOBALS['top_include']); - -include('search.menu.php'); -?> - - -

- - - -isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?> -
- -
- - - - - - -

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').')'; - } -} -?>

- - - -getUserByUsername($user); - if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?> - -

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 = '' - . '' . htmlspecialchars($rsschannels[$i][0]) .'' - . ''; - } - - $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 - } - - -?> - - - - 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks"> - &$row) { - $addresses[$row['bId']] = $row['bAddress']; - } - $otherCounts = $bookmarkservice->countOthers($addresses); - if ($userservice->isLoggedOn()) { - $existence = $bookmarkservice->bookmarksExist( - $addresses, $currentUser->getId() - ); - } - - if ($userservice->isLoggedOn()) { - $watchedNames = $userservice->getWatchNames( - $currentUser->getId(), true - ); - } else { - $watchedNames = null; - } - - foreach ($bookmarks as $key => &$row) { - switch ($row['bStatus']) { - case 0: - $access = ''; - break; - case 1: - $access = ' shared'; - break; - case 2: - $access = ' private'; - break; - } - - $cats = ''; - $tagsForCopy = ''; - $tags = $row['tags']; - foreach ($tags as $tkey => &$tag) { - $tagcaturl = sprintf( - $cat_url, - filter($row['username'], 'url'), - filter($tag, 'url') - ); - $cats .= sprintf( - ', ', - $tagcaturl, filter($tag) - ); - $tagsForCopy .= $tag . ','; - } - $cats = substr($cats, 0, -2); - if ($cats != '') { - $cats = T_('Tags:') . ' ' . $cats; - } - - // Edit and delete links - $edit = ''; - if ($bookmarkservice->editAllowed($row)) { - $edit = ' - ' - . T_('Edit') - . '' - . ' ' - . T_('Delete') - .''; - } - - // Last update - $update = ' ('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') '; - - // User attribution - $copy = ' ' . T_('by') . ' '; - if ($userservice->isLoggedOn() - && $currentUser->getUsername() == $row['username'] - ) { - $copy .= T_('you'); - } else { - $copy .= '' - . SemanticScuttle_Model_UserArray::getName($row) - . ''; - } - - // others - if (!isset($hash)) { - $others = $otherCounts[$row['bAddress']]; - $ostart = ''; - $oend = ''; - switch ($others) { - case 0: - break; - case 1: - $copy .= sprintf(T_(' and %s1 other%s'), $ostart, $oend); - break; - default: - $copy .= sprintf(T_(' and %2$s%1$s others%3$s'), $others, $ostart, $oend); - } - } - - // Copy link - if ($userservice->isLoggedOn() - && ($currentUser->getId() != $row['uId']) - && !$existence[$row['bAddress']] - ) { - $copy .= ' - ' - . T_('Copy') - . ''; - } - - // Nofollow option - $rel = ''; - if ($GLOBALS['nofollow']) { - $rel = ' rel="nofollow"'; - } - - $address = filter($row['bAddress']); - $oaddress = $address; - // Redirection option - if ($GLOBALS['useredir']) { - $address = $GLOBALS['url_redir'] . $address; - } - - // Admin specific design - if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) { - $adminBgClass = ' class="adminBackground"'; - $adminStar = ' '; - } else { - $adminBgClass = ''; - $adminStar = ''; - } - - // Private Note (just visible by the owner and his/her contacts) - if ($watchedNames !== null - && ($currentUser->getId() == $row['uId'] - || in_array($row['username'], $watchedNames) - ) - ) { - $privateNoteField = $row['bPrivateNote']; - } else { - $privateNoteField = ''; - } - - if ($GLOBALS['enableVoting'] && $GLOBALS['hideBelowVoting'] !== null - && $row['bVoting'] < $GLOBALS['hideBelowVoting'] - ) { - $access .= ' below-threshold'; - } - - // Output - echo '
  • '."\n"; - include 'bookmarks-thumbnail.inc.tpl.php'; - include 'bookmarks-vote.inc.tpl.php'; - - echo ' ' . "\n"; - - echo '
    ' - . '' - . filter($row['bTitle']) - . '' . $adminStar . "
    \n"; - if ($row['bDescription'] == '') { - $bkDescription = $GLOBALS['blankDescription']; - } else { - // Improve description display (anchors, links, ...) - $bkDescription = preg_replace('|\[\/.*?\]|', '', filter($row['bDescription'])); // remove final anchor - $bkDescription = preg_replace('|\[(.*?)\]|', ' $1 » ', $bkDescription); // highlight starting anchor - $bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '$1$3', $bkDescription); // make url clickable - - } - echo '
    '. nl2br($bkDescription) ."
    \n"; - echo '
    ' . shortenString($oaddress) . "
    \n"; - - echo '
    ' - . $cats . "\n" - . $copy . "\n" - . $edit . "\n" - . $update . "\n" - . "
    \n"; - echo $privateNoteField != '' - ? '
    '.$privateNoteField."
    \n" - : ''; - echo ' '; - include 'bookmarks-vote-horizontal.inc.tpl.php'; - echo " \n"; - - echo "
    • \n"; - } - ?> - - - - 7) { - echo '

    '.T_('Top of the page').'

    '; - } - echo $pagesBanner; // display previous and next links pages + RSS link - - -} else { - echo '

    '.T_('No bookmarks available').'

    '; -} -$this->includeTemplate('sidebar.tpl'); -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/bottom.inc.php b/data/templates/bottom.inc.php deleted file mode 100644 index 0c966a2..0000000 --- a/data/templates/bottom.inc.php +++ /dev/null @@ -1,34 +0,0 @@ - -
    - -'.T_('About').''; -echo ' - '; -echo T_("Propulsed by "); -echo " SemanticScuttle"; - -if($GLOBALS['enableWebsiteThumbnails']) { - // Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE) - echo ' (Thumbnails by )'; -} -?> - -
    - - - - - - - - - - - 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']); +?> + +
      +
    • Store all your favourite links in one place, accessible from anywhere.'); ?>
      • +
    • Share your bookmarks with everyone, with friends on your watchlist or just keep them private.') ;?>
      • +
    • Tag your bookmarks with as many labels as you want, instead of wrestling with folders.'); ?>
      • +
    • '.T_('Register now').' '.T_(' to start using %s!'), $GLOBALS['sitename']); ?>
      • +
    + +

    +
      +
    • Semantic Scuttle GNU General Public License ()
      • +
    • del.icio.us API. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won\'t let you change the API address, ask the creator to add this setting. You never know, they might just do it.'), $GLOBALS['sitename']); ?>
      • + + + +isAdmin()): ?> +
    • SemanticScuttle v0.97.0
      • + +
    + +

    + + + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/admin.tpl.php b/data/templates/default/admin.tpl.php new file mode 100644 index 0000000..50680f6 --- /dev/null +++ b/data/templates/default/admin.tpl.php @@ -0,0 +1,35 @@ +includeTemplate($GLOBALS['top_include']); + +echo '

    '.T_('Users management').'

    '; + +echo '
      '; + +foreach($users as $user) { + echo '
    1. '."\n"; + + echo '
      '; + echo ''.$user->getUsername().''; + echo ' - '. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .''; + echo '
      '; + + if($user->getUsername() != $currentUser->getUsername()) { + echo '
      '; + echo ''.T_('Delete').''; + echo '
      '; + } + + echo '
      2. '."\n"; +} +echo '
    '; +?> +

    +

    + +

    +includeTemplate('sidebar.tpl'); +$this->includeTemplate($GLOBALS['bottom_include']); + +?> diff --git a/data/templates/default/bookmarkcommondescriptionedit.tpl.php b/data/templates/default/bookmarkcommondescriptionedit.tpl.php new file mode 100644 index 0000000..807c58b --- /dev/null +++ b/data/templates/default/bookmarkcommondescriptionedit.tpl.php @@ -0,0 +1,58 @@ +includeTemplate($GLOBALS['top_include']); + +list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']); + + +?> + + +
    + + + + + + + + + + + + + + + + + + + + +
    + 0) { + echo T_('Last modification:').' '.$description['cdDatetime'].', '; + $lastUser = $userservice->getUser($description['uId']); + echo '' + . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; + } + ?> +
    + + +
    + + +
    + +
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php new file mode 100644 index 0000000..9867745 --- /dev/null +++ b/data/templates/default/bookmarklet.inc.php @@ -0,0 +1,117 @@ +

    +

    + + diff --git a/data/templates/default/bookmarks-thumbnail.inc.tpl.php b/data/templates/default/bookmarks-thumbnail.inc.tpl.php new file mode 100644 index 0000000..200b8f7 --- /dev/null +++ b/data/templates/default/bookmarks-thumbnail.inc.tpl.php @@ -0,0 +1,18 @@ +'; +echo ''; + +?> \ No newline at end of file diff --git a/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php b/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php new file mode 100644 index 0000000..c4a9f8e --- /dev/null +++ b/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php @@ -0,0 +1,50 @@ +'; +echo sprintf( + T_('Voting %d'), $row['bVoting'] +) . ' '; + +if (isset($row['hasVoted'])) { + if ($row['vote'] != 1) { + echo '' . T_('Vote for') . ' '; + } else { + echo '' + . T_('Vote for') . ' '; + } + + + if ($row['vote'] != -1) { + echo '' . T_('Vote against') . ''; + } else { + echo '' + . T_('Vote against') . ''; + } +} +echo ''; +?> \ No newline at end of file diff --git a/data/templates/default/bookmarks-vote.inc.tpl.php b/data/templates/default/bookmarks-vote.inc.tpl.php new file mode 100644 index 0000000..41572d5 --- /dev/null +++ b/data/templates/default/bookmarks-vote.inc.tpl.php @@ -0,0 +1,44 @@ +'; + +if (isset($row['hasVoted']) && $row['vote'] != 1) { + echo '+'; +} else { + echo '+'; +} + +echo '' . $row['bVoting'] . ''; + +if (isset($row['hasVoted']) && $row['vote'] != -1) { + echo '-'; +} else { + echo '-'; +} +echo ''; +?> \ No newline at end of file diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php new file mode 100644 index 0000000..91d50bf --- /dev/null +++ b/data/templates/default/bookmarks.tpl.php @@ -0,0 +1,454 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +/* Service creation: only useful services are created */ +$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); +$tagservice = SemanticScuttle_Service_Factory::get('Tag'); +$cdservice = SemanticScuttle_Service_Factory::get('CommonDescription'); + + +$pageName = isset($pageName) ? $pageName : ''; +$user = isset($user) ? $user : ''; +$currenttag = isset($currenttag) ? $currenttag : ''; + + +$this->includeTemplate($GLOBALS['top_include']); + +include('search.menu.php'); +?> + + +

    + + + +isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?> +
    + + + +
    + + + + + + +

    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').')'; + } +} +?>

    + + + +getUserByUsername($user); + if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?> + +

    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 = '' + . '' . htmlspecialchars($rsschannels[$i][0]) .'' + . ''; + } + + $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 + } + + +?> + + + + 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks"> + &$row) { + $addresses[$row['bId']] = $row['bAddress']; + } + $otherCounts = $bookmarkservice->countOthers($addresses); + if ($userservice->isLoggedOn()) { + $existence = $bookmarkservice->bookmarksExist( + $addresses, $currentUser->getId() + ); + } + + if ($userservice->isLoggedOn()) { + $watchedNames = $userservice->getWatchNames( + $currentUser->getId(), true + ); + } else { + $watchedNames = null; + } + + foreach ($bookmarks as $key => &$row) { + switch ($row['bStatus']) { + case 0: + $access = ''; + break; + case 1: + $access = ' shared'; + break; + case 2: + $access = ' private'; + break; + } + + $cats = ''; + $tagsForCopy = ''; + $tags = $row['tags']; + foreach ($tags as $tkey => &$tag) { + $tagcaturl = sprintf( + $cat_url, + filter($row['username'], 'url'), + filter($tag, 'url') + ); + $cats .= sprintf( + ', ', + $tagcaturl, filter($tag) + ); + $tagsForCopy .= $tag . ','; + } + $cats = substr($cats, 0, -2); + if ($cats != '') { + $cats = T_('Tags:') . ' ' . $cats; + } + + // Edit and delete links + $edit = ''; + if ($bookmarkservice->editAllowed($row)) { + $edit = ' - ' + . T_('Edit') + . '' + . ' ' + . T_('Delete') + .''; + } + + // Last update + $update = ' ('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') '; + + // User attribution + $copy = ' ' . T_('by') . ' '; + if ($userservice->isLoggedOn() + && $currentUser->getUsername() == $row['username'] + ) { + $copy .= T_('you'); + } else { + $copy .= '' + . SemanticScuttle_Model_UserArray::getName($row) + . ''; + } + + // others + if (!isset($hash)) { + $others = $otherCounts[$row['bAddress']]; + $ostart = ''; + $oend = ''; + switch ($others) { + case 0: + break; + case 1: + $copy .= sprintf(T_(' and %s1 other%s'), $ostart, $oend); + break; + default: + $copy .= sprintf(T_(' and %2$s%1$s others%3$s'), $others, $ostart, $oend); + } + } + + // Copy link + if ($userservice->isLoggedOn() + && ($currentUser->getId() != $row['uId']) + && !$existence[$row['bAddress']] + ) { + $copy .= ' - ' + . T_('Copy') + . ''; + } + + // Nofollow option + $rel = ''; + if ($GLOBALS['nofollow']) { + $rel = ' rel="nofollow"'; + } + + $address = filter($row['bAddress']); + $oaddress = $address; + // Redirection option + if ($GLOBALS['useredir']) { + $address = $GLOBALS['url_redir'] . $address; + } + + // Admin specific design + if ($userservice->isAdmin($row['username']) + && $GLOBALS['enableAdminColors'] + ) { + $adminBgClass = ' class="adminBackground"'; + $adminStar = ' '; + } else { + $adminBgClass = ''; + $adminStar = ''; + } + + // Private Note (just visible by the owner and his/her contacts) + if ($watchedNames !== null + && ($currentUser->getId() == $row['uId'] + || in_array($row['username'], $watchedNames) + ) + ) { + $privateNoteField = $row['bPrivateNote']; + } else { + $privateNoteField = ''; + } + + if ($GLOBALS['enableVoting'] && $GLOBALS['hideBelowVoting'] !== null + && $row['bVoting'] < $GLOBALS['hideBelowVoting'] + ) { + $access .= ' below-threshold'; + } + + // Output + echo '
  • '."\n"; + include 'bookmarks-thumbnail.inc.tpl.php'; + include 'bookmarks-vote.inc.tpl.php'; + + echo ' ' . "\n"; + + echo '
    ' + . '' + . filter($row['bTitle']) + . '' . $adminStar . "
    \n"; + if ($row['bDescription'] == '') { + $bkDescription = $GLOBALS['blankDescription']; + } else { + // Improve description display (anchors, links, ...) + $bkDescription = preg_replace('|\[\/.*?\]|', '', filter($row['bDescription'])); // remove final anchor + $bkDescription = preg_replace('|\[(.*?)\]|', ' $1 » ', $bkDescription); // highlight starting anchor + $bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '$1$3', $bkDescription); // make url clickable + + } + echo '
    '. nl2br($bkDescription) ."
    \n"; + echo '
    ' . shortenString($oaddress) . "
    \n"; + + echo '
    ' + . $cats . "\n" + . $copy . "\n" + . $edit . "\n" + . $update . "\n" + . "
    \n"; + echo $privateNoteField != '' + ? '
    '.$privateNoteField."
    \n" + : ''; + echo ' '; + include 'bookmarks-vote-horizontal.inc.tpl.php'; + echo " \n"; + + echo "
    • \n"; + } + ?> + + + + 7) { + echo '

    '.T_('Top of the page').'

    '; + } + echo $pagesBanner; // display previous and next links pages + RSS link + + +} else { + echo '

    '.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 @@ + +
    + +'.T_('About').''; +echo ' - '; +echo T_("Propulsed by "); +echo " SemanticScuttle"; + +if($GLOBALS['enableWebsiteThumbnails']) { + // Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE) + echo ' (Thumbnails by )'; +} +?> + +
    + + + + + + + + + + + diff --git a/data/templates/default/dojo.inc.php b/data/templates/default/dojo.inc.php new file mode 100644 index 0000000..366dcfe --- /dev/null +++ b/data/templates/default/dojo.inc.php @@ -0,0 +1,35 @@ + + + + + + + \ No newline at end of file diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php new file mode 100644 index 0000000..8cf07c1 --- /dev/null +++ b/data/templates/default/dynamictags.inc.php @@ -0,0 +1,148 @@ +getCurrentUserId(); + +//tags from current user +$userPopularTags =& $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid); +$userPopularTagsCloud =& $b2tservice->tagCloud($userPopularTags, 5, 90, 175); +$userPopularTagsCount = count($userPopularTags); + +//tags from all users +$allPopularTags =& $b2tservice->getPopularTags(null, 5, $logged_on_userid); +$allPopularTagsCloud =& $b2tservice->tagCloud($allPopularTags, 5, 90, 175); +$allPopularTagsCount = count($allPopularTags); + + +// function printing the cloud +function writeTagsProposition($tagsCloud, $title) +{ + static $id = 0; + ++$id; + + echo <<' ++ '

    $title

    ' ++ '

    ' ++ ''); +JS; + + $taglist = ''; + foreach (array_keys($tagsCloud) as $key) { + $row = $tagsCloud[$key]; + $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $taglist .= '' + . filter($row['tag']) + . ' '; + } + echo '$(\'#edit-tagcloud-' . $id . ' p\').append(' + . json_encode($taglist) + . ");\n"; +} + + +if ($allPopularTagsCount > 0 || $userPopularTagsCount > 0 ) { ?> + +
    + diff --git a/data/templates/default/editbookmark.tpl.php b/data/templates/default/editbookmark.tpl.php new file mode 100644 index 0000000..8b71230 --- /dev/null +++ b/data/templates/default/editbookmark.tpl.php @@ -0,0 +1,221 @@ +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; +} + +function jsEscTitle($title) +{ + return addcslashes($title, "'"); +} +function jsEscTitleDouble($title) +{ + return addcslashes(addcslashes($title, "'"), "'\\"); +} +function fixOperaButtonName($name) { + //yes, opera has problems with double quotes in button names + return str_replace('"', "''", $name); +} + +if (is_array($row['tags'])) { + $row['tags'] = implode(', ', $row['tags']); +} + +$ajaxUrl = ROOT . 'ajax/' + . ( + ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin()) + ? 'getadmintags' + : 'getcontacttags' + ) . '.php'; +?> +
    + + + + + + + + + + + + + + + + +style="display:none"> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ←
    ←
    + + + ← + 0): ?> +

    + + $anchorValue): ?> + + + + +
    ← +
    + + ←
    " to include one tag in another. e.g.: europe>france>paris'))?>
    + +
    + + + + + '; + echo T_('edit common description').')'; + } + + if ($popup) { + ?> + + + + +
    +
    + + + + + + + + + +includeTemplate('dynamictags.inc'); + +// Bookmarklets and import links +if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { + +$this->includeTemplate('bookmarklet.inc.php'); +?> +

    +
      +
    • ()
      • +
      • +
    + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/editprofile-sslclientcerts.tpl.php b/data/templates/default/editprofile-sslclientcerts.tpl.php new file mode 100644 index 0000000..900c193 --- /dev/null +++ b/data/templates/default/editprofile-sslclientcerts.tpl.php @@ -0,0 +1,60 @@ + +

    + + + + + + + + + + + + + + isCurrent()) { echo 'class="ssl-current"'; } ?>> + + + + + + + + +
    Options
    +
    + + +
    +     		sslSerial); ?>sslName); ?>sslEmail); ?>sslClientIssuerDn); ?>
    + +

    + + + + isRegistered($sslClientCerts)) { ?> +

    + +

    +

    + +
    +

    + + +

    + diff --git a/data/templates/default/editprofile.tpl.php b/data/templates/default/editprofile.tpl.php new file mode 100644 index 0000000..cc74f04 --- /dev/null +++ b/data/templates/default/editprofile.tpl.php @@ -0,0 +1,73 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
    + + +

    + + + + + + + + + + + + + + + + + + + + + + +
    ←
    + +

    + + + + + + + + + + + + + + + + + + +
    + + +

    + + + + + + + +
    + / + / + +
    + +
    + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/error.404.tpl.php b/data/templates/default/error.404.tpl.php new file mode 100644 index 0000000..fe9401d --- /dev/null +++ b/data/templates/default/error.404.tpl.php @@ -0,0 +1,9 @@ +includeTemplate($GLOBALS['top_include']); +if (!$error) { + echo '

    '. T_('Not Found') .'

    '; + echo '

    '. T_('The requested URL was not found on this server') .'

    '; +} +$this->includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/error.500.tpl.php b/data/templates/default/error.500.tpl.php new file mode 100644 index 0000000..1d7f7ae --- /dev/null +++ b/data/templates/default/error.500.tpl.php @@ -0,0 +1,9 @@ +includeTemplate($GLOBALS['top_include']); +if (!$error) { + echo '

    '. T_('General server error') .'

    '; + echo '

    '. T_('The requested URL could not be processed') .'

    '; +} +$this->includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/importDelicious.tpl.php b/data/templates/default/importDelicious.tpl.php new file mode 100644 index 0000000..bc4d892 --- /dev/null +++ b/data/templates/default/importDelicious.tpl.php @@ -0,0 +1,42 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
    + + + + + + + + + + + + +
    + + +
    + +
    +
    +
    + +

    +
      +
    1. export page at del.icio.us'); ?>.
      2. +
    2. XML file to your computer'); ?>.
      3. +
    3. Browse... to find this file on your computer. The maximum size the file can be is 1MB'); ?>.
      4. +
    4. .
      5. +
    5. Import to start importing the bookmarks; it may take a minute'); ?>.
      6. +
    + +includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/importNetscape.tpl.php b/data/templates/default/importNetscape.tpl.php new file mode 100644 index 0000000..627a5af --- /dev/null +++ b/data/templates/default/importNetscape.tpl.php @@ -0,0 +1,50 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
    +
    + + + + + + + + + + + + +
    + + +
    + +
    +
    +
    + +

    +
      +
    1. +

      :

      +
        +
      • File > Import and Export... > Export Favorites'); ?>
        • +
      • Bookmarks > Manage Bookmarks... > File > Export...'); ?>
        • +
      • Bookmarks > Manage Bookmarks... > Tools > Export...'); ?>
        • +
      +
      2. +
    2. Browse... to find the saved bookmark file on your computer. The maximum size the file can be is 1MB'); ?>.
      3. +
    3. .
      4. +
    4. Import to start importing the bookmarks; it may take a minute'); ?>.
      5. +
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/importStructure.tpl.php b/data/templates/default/importStructure.tpl.php new file mode 100644 index 0000000..9c54612 --- /dev/null +++ b/data/templates/default/importStructure.tpl.php @@ -0,0 +1,42 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
    +
    + + + + + + + + +
    +
    +
    + +

    +
      +
    1. +

      +
        +
      • firstTagOfLevel1
        • +
      •     firstTagOfLevel2 (the line starts with two spaces)
        • +
      •     secondTagOfLevel2
        • +
      •     thirdTagOfLevel2
        • +
      • secondTagOfLevel1
        • +
      •     fourthTagOfLevel2 (included into secondTagOfLevel1)
        • +
      +
      2. +
    2. +

      +
      3. +
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/login.tpl.php b/data/templates/default/login.tpl.php new file mode 100644 index 0000000..e67808d --- /dev/null +++ b/data/templates/default/login.tpl.php @@ -0,0 +1,41 @@ +includeTemplate($GLOBALS['top_include']); +?> + + + +isSessionStable()) { + echo '

    '.T_('Please activate cookies').'

    '; +} +?> + +
    +
    + + + + + + + + + + + + + + + + +
    +

    »

    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/password.tpl.php b/data/templates/default/password.tpl.php new file mode 100644 index 0000000..55dbed6 --- /dev/null +++ b/data/templates/default/password.tpl.php @@ -0,0 +1,26 @@ +includeTemplate($GLOBALS['top_include']); +?> + +

    + +
    + + + + + + + + + + + + + +
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> \ No newline at end of file diff --git a/data/templates/default/profile.tpl.php b/data/templates/default/profile.tpl.php new file mode 100644 index 0000000..1e2003a --- /dev/null +++ b/data/templates/default/profile.tpl.php @@ -0,0 +1,74 @@ +includeTemplate($GLOBALS['top_include']); +?> + +
    +
    +
    +isLoggedOn() && $currentUser->isAdmin()) { +?> +
    +
    getEmail()) ?>
    +getName() != "") { +?> +
    +
    getName()); ?>
    +getHomepage() != "") { +?> +
    +
    getHomepage()); ?>
    + +
    +
    getDatetime())); ?>
    +getContent() != "") { +?> +
    +
    getContent(); ?>
    +getWatchNames($userid); +if ($watching) { +?> +
    +
    + '. $watchuser .', '; + } + echo substr($list, 0, -2); + ?> +
    +getWatchNames($userid, true); +if ($watchnames) { +?> +
    +
    + '. $watchuser .', '; + } + echo substr($list, 0, -2); + ?> +
    + +
    +
    >>
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/register.tpl.php b/data/templates/default/register.tpl.php new file mode 100644 index 0000000..62cebad --- /dev/null +++ b/data/templates/default/register.tpl.php @@ -0,0 +1,49 @@ +includeTemplate($GLOBALS['top_include']); +?> + + + +

    .

    + +
    + + + + + + + + + + + + + + + + + +0) {?> + + + + + + + + + + + + +
    +
    + +includeTemplate($GLOBALS['bottom_include']); +?> diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php new file mode 100644 index 0000000..e6e66f7 --- /dev/null +++ b/data/templates/default/rss.tpl.php @@ -0,0 +1,26 @@ +\n"; +?> + + + <?php echo htmlspecialchars($feedtitle); ?> + + + + + 60 + + + + <?php echo htmlspecialchars($bookmark['title']); ?> + + + + + + + + + + + \ No newline at end of file diff --git a/data/templates/default/search.menu.php b/data/templates/default/search.menu.php new file mode 100644 index 0000000..5a8f027 --- /dev/null +++ b/data/templates/default/search.menu.php @@ -0,0 +1,57 @@ + + + + diff --git a/data/templates/default/sidebar.block.common.php b/data/templates/default/sidebar.block.common.php new file mode 100644 index 0000000..951ed80 --- /dev/null +++ b/data/templates/default/sidebar.block.common.php @@ -0,0 +1,28 @@ +getRelatedTagsByHash($hash); +$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); + +if ($commonTags && count($commonTags) > 0) { + ?> + +

    +
    +

    '. filter($row['tag']) .' '; +} +echo $contents ."\n"; +?>

    +
    + + diff --git a/data/templates/default/sidebar.block.linked.php b/data/templates/default/sidebar.block.linked.php new file mode 100644 index 0000000..9aa3cc0 --- /dev/null +++ b/data/templates/default/sidebar.block.linked.php @@ -0,0 +1,66 @@ +getCurrentUserId(); +$editingMode = $logged_on_userid !== false; +?> +

    + \ No newline at end of file diff --git a/data/templates/default/sidebar.block.menu.php b/data/templates/default/sidebar.block.menu.php new file mode 100644 index 0000000..94a9fa2 --- /dev/null +++ b/data/templates/default/sidebar.block.menu.php @@ -0,0 +1,80 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} + +// editing mode +if(($logged_on_userid != null) && ($userid === $logged_on_userid)) { + $editingMode = true; +} else { + $editingMode = false; +} + +if(!isset($user) || $user == '') { + $cat_url = createURL('tags', '%2$s'); +} + +$menuTags = $tag2tagservice->getMenuTags($userid); +if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) { +?> + +

    +'.T_('Menu Tags').' '; + //} +?> +

    + + + + + diff --git a/data/templates/default/sidebar.block.menu2.php b/data/templates/default/sidebar.block.menu2.php new file mode 100644 index 0000000..1c177a5 --- /dev/null +++ b/data/templates/default/sidebar.block.menu2.php @@ -0,0 +1,71 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} + + +$cat_url = createURL('tags', '%s'); +$menu2Tags = $GLOBALS['menu2Tags']; + +if (count($menu2Tags) > 0) { +?> + +

    + + +
    > +
      +' + . sprintf( + '%s', + sprintf($cat_url, $menu2Tag), + $menu2Tag + ) + . '' . "\n"; +} +?> +
    +
    + + diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php new file mode 100644 index 0000000..50756c0 --- /dev/null +++ b/data/templates/default/sidebar.block.popular.php @@ -0,0 +1,44 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} +$popularTags =& $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid); +$popularTags =& $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); + +if ($popularTags && count($popularTags) > 0) { +?> + +

    + + + diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php new file mode 100644 index 0000000..1ffeb4d --- /dev/null +++ b/data/templates/default/sidebar.block.recent.php @@ -0,0 +1,39 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} +$recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']); +$recentTags =& $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); + +if ($recentTags && count($recentTags) > 0) { +?> + +

    +
    + '; + + if(!isset($user) || $user == '') { + $user = ''; + $cat_url = createURL('tags', '%2$s'); + } + + foreach ($recentTags as $row) { + $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $contents .= ' '; + } + echo $contents ."

    \n"; + ?> +

    →

    +
    + + diff --git a/data/templates/default/sidebar.block.related.php b/data/templates/default/sidebar.block.related.php new file mode 100644 index 0000000..60ee486 --- /dev/null +++ b/data/templates/default/sidebar.block.related.php @@ -0,0 +1,40 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} + +if(!isset($userid)) { + $userid = NULL; +} + +if(isset($user) && strlen($user)==0) { + $cat_url = createURL('tags', '%2$s'); +} +if ($currenttag) { + $relatedTags = $b2tservice->getRelatedTags($currenttag, $userid, $logged_on_userid); + if (sizeof($relatedTags) > 0) { +?> + +

    + + + diff --git a/data/templates/default/sidebar.block.search.php b/data/templates/default/sidebar.block.search.php new file mode 100644 index 0000000..d3cd8a5 --- /dev/null +++ b/data/templates/default/sidebar.block.search.php @@ -0,0 +1,51 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +/* Service creation: only useful services are created */ +$searchhistoryservice = SemanticScuttle_Service_Factory::get('SearchHistory'); + +$lastSearches = $searchhistoryservice->getAllSearches( + 'all', NULL, 3, NULL, true, false +); + +if ($lastSearches && count($lastSearches) > 0) { +?> + +

    +
    + +' . "\n"; +} +//echo ''; +?> + +
    '; + echo ''; + echo htmlspecialchars($row['shTerms']); + echo ''; + echo ' (' . $row['shNbResults'] . ')'; + echo '
    ...
    +
    + diff --git a/data/templates/default/sidebar.block.tagactions.php b/data/templates/default/sidebar.block.tagactions.php new file mode 100644 index 0000000..3351866 --- /dev/null +++ b/data/templates/default/sidebar.block.tagactions.php @@ -0,0 +1,35 @@ +isLoggedOn()) { + + if ($currentUser->getUsername() == $user) { + $tags = explode('+', $currenttag); + $renametext = T_ngettext('Rename Tag', 'Rename Tags', count($tags)); + $renamelink = createURL('tagrename', $currenttag); + $deletelink = createURL('tagdelete', $currenttag); + $tagdesclink = createURL('tagedit', $currenttag); + $commondesclink = createURL('tagcommondescriptionedit', $currenttag); + $addtag2taglinklink = createURL('tag2tagadd', $currenttag); +?> + +

    +
    +
      +
      • + +
      • + +
      • + isAdmin() )): ?> +
      • + +
      • +
    +
    + + diff --git a/data/templates/default/sidebar.block.users.php b/data/templates/default/sidebar.block.users.php new file mode 100644 index 0000000..58fdfb7 --- /dev/null +++ b/data/templates/default/sidebar.block.users.php @@ -0,0 +1,34 @@ +getCurrentUserId(); +if ($logged_on_userid === false) { + $logged_on_userid = NULL; +} +$lastUsers = $userservice->getUsers(3); + +if ($lastUsers && count($lastUsers) > 0) { +?> + +

    +
    + +'; +} +//echo ''; +?> + +
    '; + echo ''; + echo SemanticScuttle_Model_UserArray::getName($row); + echo ''; + echo ' ('.T_('bookmarks').')'; + echo '
    ...
    +

    →

    +
    + diff --git a/data/templates/default/sidebar.block.watchlist.php b/data/templates/default/sidebar.block.watchlist.php new file mode 100644 index 0000000..3af9c5a --- /dev/null +++ b/data/templates/default/sidebar.block.watchlist.php @@ -0,0 +1,60 @@ +getWatchNames($userid); +$watchedBy = $userservice->getWatchNames($userid, true); + + +$closeContacts = array(); // people in my contacts list and who I am also in the contacts list +foreach($watching as $watchuser) { + if(in_array($watchuser, $watchedBy)) { + $closeContacts[] = $watchuser; + } +} + +?> + +0):?> +

    +
    +
      + +
      • + +
    +
    + + + +

    +
    +
      + isLoggedOn() && $currentUser->getUsername() == $user): ?> +
    • +
      + +
      +
      • + + + +
    • + isLoggedOn() && $currentUser->getUsername() == $user): ?> + - x +
      • + + + +
    +
    + +

    +
    +
      + +
      • + +
    + +
    diff --git a/data/templates/default/sidebar.block.watchstatus.php b/data/templates/default/sidebar.block.watchstatus.php new file mode 100644 index 0000000..99574aa --- /dev/null +++ b/data/templates/default/sidebar.block.watchstatus.php @@ -0,0 +1,28 @@ +isLoggedOn()) { + + if ($currentUser->getUsername() != $user) { + $result = $userservice->getWatchStatus($userid, $userservice->getCurrentUserId()); + if ($result) { + $linkText = T_('Remove from Watchlist'); + } else { + $linkText = T_('Add to Watchlist'); + } + $linkAddress = createURL('watch', $user); +?> + +

    +
    +
      +
      • +
    +
    + + \ No newline at end of file diff --git a/data/templates/default/sidebar.linkedtags.inc.php b/data/templates/default/sidebar.linkedtags.inc.php new file mode 100644 index 0000000..020d0f0 --- /dev/null +++ b/data/templates/default/sidebar.linkedtags.inc.php @@ -0,0 +1,84 @@ + '', 'stoplist' => $stopList); + } + + $tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag'); + $tagstatservice =SemanticScuttle_Service_Factory::get('TagStat'); + + // link '>' + if($level>1) { + if($editingMode) { + $link = '> '; + } else { + $link = '> '; + } + } else { + $link = ''; + } + + $output = ''; + $output.= ''; + $output.= ''; + $output.= ''; + $output.= $level == 1?'':''; + $output.= str_repeat(' ', $level*2) .$link.''; + $output.= $level == 1?'':''; + //$output.= ' - '. $tagstatservice->getMaxDepth($tag, $linkType, $uId); + + $synonymTags = $tag2tagservice->getAllLinkedTags($tag, '=', $uId); + $synonymTags = is_array($synonymTags)?$synonymTags:array($synonymTags); + sort($synonymTags); + $synonymList = ''; + foreach($synonymTags as $synonymTag) { + //$output.= ", ".$synonymTag; + $synonymList.= $synonymTag.' '; + } + if(count($synonymTags)>0) { + $output.= ', '.$synonymTags[0]; + } + if(count($synonymTags)>1) { + $output.= ', etc'; + } + + /*if($editingMode) { + $output.= ' ('; + $output.= '+'; + if(1) { + $output.= ' - '; + $output.= '-'; + } + $output.= ')'; + }*/ + $output.= ''; + $output.= ''; + + $tags = array($tag); + $tags = array_merge($tags, $synonymTags); + foreach($tags as $tag) { + + if(!in_array($tag, $stopList)) { + $linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId); + $precedentTag = $tag; + $stopList[] = $tag; + foreach($linkedTags as $linkedTag) { + $displayLinkedTags = displayLinkedTags($linkedTag, $linkType, $uId, $cat_url, $user, $editingMode, $precedentTag, $level + 1, $stopList); + $output.= $displayLinkedTags['output']; + } + if(isset($displayLinkedTags) && is_array($displayLinkedTags['stopList'])) { + $stopList = array_merge($stopList, $displayLinkedTags['stopList']); + $stopList = array_unique($stopList); + } + } + + } + return array('output' => $output, 'stopList' => $stopList); +} + +?> diff --git a/data/templates/default/sidebar.tpl.php b/data/templates/default/sidebar.tpl.php new file mode 100644 index 0000000..e823af5 --- /dev/null +++ b/data/templates/default/sidebar.tpl.php @@ -0,0 +1,19 @@ +isAdmin($userid)): ?> +'); -JS; - - $taglist = ''; - foreach (array_keys($tagsCloud) as $key) { - $row = $tagsCloud[$key]; - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); - $taglist .= '' - . filter($row['tag']) - . ' '; - } - echo '$(\'#edit-tagcloud-' . $id . ' p\').append(' - . json_encode($taglist) - . ");\n"; -} - - -if ($allPopularTagsCount > 0 || $userPopularTagsCount > 0 ) { ?> - -
    - diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php deleted file mode 100644 index 8b71230..0000000 --- a/data/templates/editbookmark.tpl.php +++ /dev/null @@ -1,221 +0,0 @@ -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; -} - -function jsEscTitle($title) -{ - return addcslashes($title, "'"); -} -function jsEscTitleDouble($title) -{ - return addcslashes(addcslashes($title, "'"), "'\\"); -} -function fixOperaButtonName($name) { - //yes, opera has problems with double quotes in button names - return str_replace('"', "''", $name); -} - -if (is_array($row['tags'])) { - $row['tags'] = implode(', ', $row['tags']); -} - -$ajaxUrl = ROOT . 'ajax/' - . ( - ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin()) - ? 'getadmintags' - : 'getcontacttags' - ) . '.php'; -?> -
    - - - - - - - - - - - - - - - - -style="display:none"> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ←
    ←
    - - - ← - 0): ?> -

    - - $anchorValue): ?> - - - - -
    ← -
    - - ←
    " to include one tag in another. e.g.: europe>france>paris'))?>
    - -
    - - - - - '; - echo T_('edit common description').')'; - } - - if ($popup) { - ?> - - - - -
    -
    - - - - - - - - - -includeTemplate('dynamictags.inc'); - -// Bookmarklets and import links -if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { - -$this->includeTemplate('bookmarklet.inc.php'); -?> -

    -
      -
    • ()
      • -
      • -
    - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/editprofile-sslclientcerts.tpl.php b/data/templates/editprofile-sslclientcerts.tpl.php deleted file mode 100644 index 900c193..0000000 --- a/data/templates/editprofile-sslclientcerts.tpl.php +++ /dev/null @@ -1,60 +0,0 @@ - -

    - - - - - - - - - - - - - - isCurrent()) { echo 'class="ssl-current"'; } ?>> - - - - - - - - -
    Options
    -
    - - -
    -     		sslSerial); ?>sslName); ?>sslEmail); ?>sslClientIssuerDn); ?>
    - -

    - - - - isRegistered($sslClientCerts)) { ?> -

    - -

    -

    - -
    -

    - - -

    - diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php deleted file mode 100644 index cc74f04..0000000 --- a/data/templates/editprofile.tpl.php +++ /dev/null @@ -1,73 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    - - -

    - - - - - - - - - - - - - - - - - - - - - - -
    ←
    - -

    - - - - - - - - - - - - - - - - - - -
    - - -

    - - - - - - - -
    - / - / - -
    - -
    - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/error.404.tpl.php b/data/templates/error.404.tpl.php deleted file mode 100644 index fe9401d..0000000 --- a/data/templates/error.404.tpl.php +++ /dev/null @@ -1,9 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -if (!$error) { - echo '

    '. T_('Not Found') .'

    '; - echo '

    '. T_('The requested URL was not found on this server') .'

    '; -} -$this->includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/error.500.tpl.php b/data/templates/error.500.tpl.php deleted file mode 100644 index 1d7f7ae..0000000 --- a/data/templates/error.500.tpl.php +++ /dev/null @@ -1,9 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -if (!$error) { - echo '

    '. T_('General server error') .'

    '; - echo '

    '. T_('The requested URL could not be processed') .'

    '; -} -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/importDelicious.tpl.php b/data/templates/importDelicious.tpl.php deleted file mode 100644 index bc4d892..0000000 --- a/data/templates/importDelicious.tpl.php +++ /dev/null @@ -1,42 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    - - - - - - - - - - - - -
    - - -
    - -
    -
    -
    - -

    -
      -
    1. export page at del.icio.us'); ?>.
      2. -
    2. XML file to your computer'); ?>.
      3. -
    3. Browse... to find this file on your computer. The maximum size the file can be is 1MB'); ?>.
      4. -
    4. .
      5. -
    5. Import to start importing the bookmarks; it may take a minute'); ?>.
      6. -
    - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/importNetscape.tpl.php b/data/templates/importNetscape.tpl.php deleted file mode 100644 index 627a5af..0000000 --- a/data/templates/importNetscape.tpl.php +++ /dev/null @@ -1,50 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    -
    - - - - - - - - - - - - -
    - - -
    - -
    -
    -
    - -

    -
      -
    1. -

      :

      -
        -
      • File > Import and Export... > Export Favorites'); ?>
        • -
      • Bookmarks > Manage Bookmarks... > File > Export...'); ?>
        • -
      • Bookmarks > Manage Bookmarks... > Tools > Export...'); ?>
        • -
      -
      2. -
    2. Browse... to find the saved bookmark file on your computer. The maximum size the file can be is 1MB'); ?>.
      3. -
    3. .
      4. -
    4. Import to start importing the bookmarks; it may take a minute'); ?>.
      5. -
    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/importStructure.tpl.php b/data/templates/importStructure.tpl.php deleted file mode 100644 index 9c54612..0000000 --- a/data/templates/importStructure.tpl.php +++ /dev/null @@ -1,42 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    -
    - - - - - - - - -
    -
    -
    - -

    -
      -
    1. -

      -
        -
      • firstTagOfLevel1
        • -
      •     firstTagOfLevel2 (the line starts with two spaces)
        • -
      •     secondTagOfLevel2
        • -
      •     thirdTagOfLevel2
        • -
      • secondTagOfLevel1
        • -
      •     fourthTagOfLevel2 (included into secondTagOfLevel1)
        • -
      -
      2. -
    2. -

      -
      3. -
    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/login.tpl.php b/data/templates/login.tpl.php deleted file mode 100644 index e67808d..0000000 --- a/data/templates/login.tpl.php +++ /dev/null @@ -1,41 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -isSessionStable()) { - echo '

    '.T_('Please activate cookies').'

    '; -} -?> - -
    -
    - - - - - - - - - - - - - - - - -
    -

    »

    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/password.tpl.php b/data/templates/password.tpl.php deleted file mode 100644 index 55dbed6..0000000 --- a/data/templates/password.tpl.php +++ /dev/null @@ -1,26 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -

    - -
    - - - - - - - - - - - - - -
    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/profile.tpl.php b/data/templates/profile.tpl.php deleted file mode 100644 index 1e2003a..0000000 --- a/data/templates/profile.tpl.php +++ /dev/null @@ -1,74 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - -
    -
    -
    -isLoggedOn() && $currentUser->isAdmin()) { -?> -
    -
    getEmail()) ?>
    -getName() != "") { -?> -
    -
    getName()); ?>
    -getHomepage() != "") { -?> -
    -
    getHomepage()); ?>
    - -
    -
    getDatetime())); ?>
    -getContent() != "") { -?> -
    -
    getContent(); ?>
    -getWatchNames($userid); -if ($watching) { -?> -
    -
    - '. $watchuser .', '; - } - echo substr($list, 0, -2); - ?> -
    -getWatchNames($userid, true); -if ($watchnames) { -?> -
    -
    - '. $watchuser .', '; - } - echo substr($list, 0, -2); - ?> -
    - -
    -
    >>
    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/register.tpl.php b/data/templates/register.tpl.php deleted file mode 100644 index 62cebad..0000000 --- a/data/templates/register.tpl.php +++ /dev/null @@ -1,49 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -

    .

    - -
    - - - - - - - - - - - - - - - - - -0) {?> - - - - - - - - - - - - -
    -
    - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/rss.tpl.php b/data/templates/rss.tpl.php deleted file mode 100644 index e6e66f7..0000000 --- a/data/templates/rss.tpl.php +++ /dev/null @@ -1,26 +0,0 @@ -\n"; -?> - - - <?php echo htmlspecialchars($feedtitle); ?> - - - - - 60 - - - - <?php echo htmlspecialchars($bookmark['title']); ?> - - - - - - - - - - - \ No newline at end of file diff --git a/data/templates/search.menu.php b/data/templates/search.menu.php deleted file mode 100644 index 5a8f027..0000000 --- a/data/templates/search.menu.php +++ /dev/null @@ -1,57 +0,0 @@ - - - - diff --git a/data/templates/sidebar.block.common.php b/data/templates/sidebar.block.common.php deleted file mode 100644 index 951ed80..0000000 --- a/data/templates/sidebar.block.common.php +++ /dev/null @@ -1,28 +0,0 @@ -getRelatedTagsByHash($hash); -$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); - -if ($commonTags && count($commonTags) > 0) { - ?> - -

    -
    -

    '. filter($row['tag']) .' '; -} -echo $contents ."\n"; -?>

    -
    - - diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php deleted file mode 100644 index 9aa3cc0..0000000 --- a/data/templates/sidebar.block.linked.php +++ /dev/null @@ -1,66 +0,0 @@ -getCurrentUserId(); -$editingMode = $logged_on_userid !== false; -?> -

    - \ No newline at end of file diff --git a/data/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php deleted file mode 100644 index 94a9fa2..0000000 --- a/data/templates/sidebar.block.menu.php +++ /dev/null @@ -1,80 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -// editing mode -if(($logged_on_userid != null) && ($userid === $logged_on_userid)) { - $editingMode = true; -} else { - $editingMode = false; -} - -if(!isset($user) || $user == '') { - $cat_url = createURL('tags', '%2$s'); -} - -$menuTags = $tag2tagservice->getMenuTags($userid); -if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) { -?> - -

    -'.T_('Menu Tags').' '; - //} -?> -

    - - - - - diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php deleted file mode 100644 index 1c177a5..0000000 --- a/data/templates/sidebar.block.menu2.php +++ /dev/null @@ -1,71 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - - -$cat_url = createURL('tags', '%s'); -$menu2Tags = $GLOBALS['menu2Tags']; - -if (count($menu2Tags) > 0) { -?> - -

    - - -
    > -
      -' - . sprintf( - '%s', - sprintf($cat_url, $menu2Tag), - $menu2Tag - ) - . '' . "\n"; -} -?> -
    -
    - - diff --git a/data/templates/sidebar.block.popular.php b/data/templates/sidebar.block.popular.php deleted file mode 100644 index 50756c0..0000000 --- a/data/templates/sidebar.block.popular.php +++ /dev/null @@ -1,44 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} -$popularTags =& $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid); -$popularTags =& $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); - -if ($popularTags && count($popularTags) > 0) { -?> - -

    - - - diff --git a/data/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php deleted file mode 100644 index 1ffeb4d..0000000 --- a/data/templates/sidebar.block.recent.php +++ /dev/null @@ -1,39 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} -$recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']); -$recentTags =& $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); - -if ($recentTags && count($recentTags) > 0) { -?> - -

    -
    - '; - - if(!isset($user) || $user == '') { - $user = ''; - $cat_url = createURL('tags', '%2$s'); - } - - foreach ($recentTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); - $contents .= ' '; - } - echo $contents ."

    \n"; - ?> -

    →

    -
    - - diff --git a/data/templates/sidebar.block.related.php b/data/templates/sidebar.block.related.php deleted file mode 100644 index 60ee486..0000000 --- a/data/templates/sidebar.block.related.php +++ /dev/null @@ -1,40 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -if(!isset($userid)) { - $userid = NULL; -} - -if(isset($user) && strlen($user)==0) { - $cat_url = createURL('tags', '%2$s'); -} -if ($currenttag) { - $relatedTags = $b2tservice->getRelatedTags($currenttag, $userid, $logged_on_userid); - if (sizeof($relatedTags) > 0) { -?> - -

    - - - diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php deleted file mode 100644 index d3cd8a5..0000000 --- a/data/templates/sidebar.block.search.php +++ /dev/null @@ -1,51 +0,0 @@ - - * @author Christian Weiske - * @author Eric Dane - * @license GPL http://www.gnu.org/licenses/gpl.html - * @link http://sourceforge.net/projects/semanticscuttle - */ -/* Service creation: only useful services are created */ -$searchhistoryservice = SemanticScuttle_Service_Factory::get('SearchHistory'); - -$lastSearches = $searchhistoryservice->getAllSearches( - 'all', NULL, 3, NULL, true, false -); - -if ($lastSearches && count($lastSearches) > 0) { -?> - -

    -
    - -' . "\n"; -} -//echo ''; -?> - -
    '; - echo ''; - echo htmlspecialchars($row['shTerms']); - echo ''; - echo ' (' . $row['shNbResults'] . ')'; - echo '
    ...
    -
    - diff --git a/data/templates/sidebar.block.tagactions.php b/data/templates/sidebar.block.tagactions.php deleted file mode 100644 index 3351866..0000000 --- a/data/templates/sidebar.block.tagactions.php +++ /dev/null @@ -1,35 +0,0 @@ -isLoggedOn()) { - - if ($currentUser->getUsername() == $user) { - $tags = explode('+', $currenttag); - $renametext = T_ngettext('Rename Tag', 'Rename Tags', count($tags)); - $renamelink = createURL('tagrename', $currenttag); - $deletelink = createURL('tagdelete', $currenttag); - $tagdesclink = createURL('tagedit', $currenttag); - $commondesclink = createURL('tagcommondescriptionedit', $currenttag); - $addtag2taglinklink = createURL('tag2tagadd', $currenttag); -?> - -

    -
    -
      -
      • - -
      • - -
      • - isAdmin() )): ?> -
      • - -
      • -
    -
    - - diff --git a/data/templates/sidebar.block.users.php b/data/templates/sidebar.block.users.php deleted file mode 100644 index 58fdfb7..0000000 --- a/data/templates/sidebar.block.users.php +++ /dev/null @@ -1,34 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} -$lastUsers = $userservice->getUsers(3); - -if ($lastUsers && count($lastUsers) > 0) { -?> - -

    -
    - -'; -} -//echo ''; -?> - -
    '; - echo ''; - echo SemanticScuttle_Model_UserArray::getName($row); - echo ''; - echo ' ('.T_('bookmarks').')'; - echo '
    ...
    -

    →

    -
    - diff --git a/data/templates/sidebar.block.watchlist.php b/data/templates/sidebar.block.watchlist.php deleted file mode 100644 index 3af9c5a..0000000 --- a/data/templates/sidebar.block.watchlist.php +++ /dev/null @@ -1,60 +0,0 @@ -getWatchNames($userid); -$watchedBy = $userservice->getWatchNames($userid, true); - - -$closeContacts = array(); // people in my contacts list and who I am also in the contacts list -foreach($watching as $watchuser) { - if(in_array($watchuser, $watchedBy)) { - $closeContacts[] = $watchuser; - } -} - -?> - -0):?> -

    -
    -
      - -
      • - -
    -
    - - - -

    -
    -
      - isLoggedOn() && $currentUser->getUsername() == $user): ?> -
    • -
      - -
      -
      • - - - -
    • - isLoggedOn() && $currentUser->getUsername() == $user): ?> - - x -
      • - - - -
    -
    - -

    -
    -
      - -
      • - -
    - -
    diff --git a/data/templates/sidebar.block.watchstatus.php b/data/templates/sidebar.block.watchstatus.php deleted file mode 100644 index 99574aa..0000000 --- a/data/templates/sidebar.block.watchstatus.php +++ /dev/null @@ -1,28 +0,0 @@ -isLoggedOn()) { - - if ($currentUser->getUsername() != $user) { - $result = $userservice->getWatchStatus($userid, $userservice->getCurrentUserId()); - if ($result) { - $linkText = T_('Remove from Watchlist'); - } else { - $linkText = T_('Add to Watchlist'); - } - $linkAddress = createURL('watch', $user); -?> - -

    -
    -
      -
      • -
    -
    - - \ No newline at end of file diff --git a/data/templates/sidebar.linkedtags.inc.php b/data/templates/sidebar.linkedtags.inc.php deleted file mode 100644 index 020d0f0..0000000 --- a/data/templates/sidebar.linkedtags.inc.php +++ /dev/null @@ -1,84 +0,0 @@ - '', 'stoplist' => $stopList); - } - - $tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag'); - $tagstatservice =SemanticScuttle_Service_Factory::get('TagStat'); - - // link '>' - if($level>1) { - if($editingMode) { - $link = '> '; - } else { - $link = '> '; - } - } else { - $link = ''; - } - - $output = ''; - $output.= ''; - $output.= ''; - $output.= ''; - $output.= $level == 1?'':''; - $output.= str_repeat(' ', $level*2) .$link.''; - $output.= $level == 1?'':''; - //$output.= ' - '. $tagstatservice->getMaxDepth($tag, $linkType, $uId); - - $synonymTags = $tag2tagservice->getAllLinkedTags($tag, '=', $uId); - $synonymTags = is_array($synonymTags)?$synonymTags:array($synonymTags); - sort($synonymTags); - $synonymList = ''; - foreach($synonymTags as $synonymTag) { - //$output.= ", ".$synonymTag; - $synonymList.= $synonymTag.' '; - } - if(count($synonymTags)>0) { - $output.= ', '.$synonymTags[0]; - } - if(count($synonymTags)>1) { - $output.= ', etc'; - } - - /*if($editingMode) { - $output.= ' ('; - $output.= '+'; - if(1) { - $output.= ' - '; - $output.= '-'; - } - $output.= ')'; - }*/ - $output.= ''; - $output.= ''; - - $tags = array($tag); - $tags = array_merge($tags, $synonymTags); - foreach($tags as $tag) { - - if(!in_array($tag, $stopList)) { - $linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId); - $precedentTag = $tag; - $stopList[] = $tag; - foreach($linkedTags as $linkedTag) { - $displayLinkedTags = displayLinkedTags($linkedTag, $linkType, $uId, $cat_url, $user, $editingMode, $precedentTag, $level + 1, $stopList); - $output.= $displayLinkedTags['output']; - } - if(isset($displayLinkedTags) && is_array($displayLinkedTags['stopList'])) { - $stopList = array_merge($stopList, $displayLinkedTags['stopList']); - $stopList = array_unique($stopList); - } - } - - } - return array('output' => $output, 'stopList' => $stopList); -} - -?> 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 @@ -isAdmin($userid)): ?> -