From 29422fa55379aa61a61019b832c83dab6d450264 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sat, 3 Oct 2009 14:00:33 +0000 Subject: move files to new locations git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@386 b3834d28-1941-0410-a4f8-b48e95affb8f --- templates/about.tpl.php | 34 --- templates/admin.tpl.php | 35 --- templates/bookmarkcommondescriptionedit.tpl.php | 57 ---- templates/bookmarks.tpl.php | 344 ------------------------ templates/bottom.inc.php | 34 --- templates/dojo.inc.php | 35 --- templates/dynamictags.inc.php | 141 ---------- templates/editbookmark.tpl.php | 177 ------------ templates/editprofile.tpl.php | 73 ----- templates/error.404.tpl.php | 9 - templates/error.500.tpl.php | 9 - templates/importDelicious.tpl.php | 42 --- templates/importNetscape.tpl.php | 50 ---- templates/importStructure.tpl.php | 42 --- templates/login.tpl.php | 41 --- templates/password.tpl.php | 26 -- templates/profile.tpl.php | 74 ----- templates/register.tpl.php | 49 ---- templates/rss.tpl.php | 28 -- templates/sidebar.block.common.php | 28 -- templates/sidebar.block.linked.php | 105 -------- templates/sidebar.block.menu.php | 80 ------ templates/sidebar.block.menu2.php | 58 ---- templates/sidebar.block.popular.php | 44 --- templates/sidebar.block.recent.php | 39 --- templates/sidebar.block.related.php | 40 --- templates/sidebar.block.search.php | 34 --- templates/sidebar.block.tagactions.php | 35 --- templates/sidebar.block.users.php | 34 --- templates/sidebar.block.watchlist.php | 60 ----- templates/sidebar.block.watchstatus.php | 28 -- templates/sidebar.linkedtags.inc.php | 84 ------ templates/sidebar.tpl.php | 19 -- templates/tag2tagadd.tpl.php | 57 ---- templates/tag2tagdelete.tpl.php | 49 ---- templates/tag2tagedit.tpl.php | 73 ----- templates/tagcommondescriptionedit.tpl.php | 48 ---- templates/tagdelete.tpl.php | 20 -- templates/tagedit.tpl.php | 34 --- templates/tagrename.tpl.php | 41 --- templates/tags.tpl.php | 31 --- templates/toolbar.inc.php | 35 --- templates/top.inc.php | 61 ----- templates/users.tpl.php | 26 -- 44 files changed, 2463 deletions(-) delete mode 100644 templates/about.tpl.php delete mode 100644 templates/admin.tpl.php delete mode 100644 templates/bookmarkcommondescriptionedit.tpl.php delete mode 100644 templates/bookmarks.tpl.php delete mode 100644 templates/bottom.inc.php delete mode 100644 templates/dojo.inc.php delete mode 100644 templates/dynamictags.inc.php delete mode 100644 templates/editbookmark.tpl.php delete mode 100644 templates/editprofile.tpl.php delete mode 100644 templates/error.404.tpl.php delete mode 100644 templates/error.500.tpl.php delete mode 100644 templates/importDelicious.tpl.php delete mode 100644 templates/importNetscape.tpl.php delete mode 100644 templates/importStructure.tpl.php delete mode 100644 templates/login.tpl.php delete mode 100644 templates/password.tpl.php delete mode 100644 templates/profile.tpl.php delete mode 100644 templates/register.tpl.php delete mode 100644 templates/rss.tpl.php delete mode 100644 templates/sidebar.block.common.php delete mode 100644 templates/sidebar.block.linked.php delete mode 100644 templates/sidebar.block.menu.php delete mode 100644 templates/sidebar.block.menu2.php delete mode 100644 templates/sidebar.block.popular.php delete mode 100644 templates/sidebar.block.recent.php delete mode 100644 templates/sidebar.block.related.php delete mode 100644 templates/sidebar.block.search.php delete mode 100644 templates/sidebar.block.tagactions.php delete mode 100644 templates/sidebar.block.users.php delete mode 100644 templates/sidebar.block.watchlist.php delete mode 100644 templates/sidebar.block.watchstatus.php delete mode 100644 templates/sidebar.linkedtags.inc.php delete mode 100644 templates/sidebar.tpl.php delete mode 100644 templates/tag2tagadd.tpl.php delete mode 100644 templates/tag2tagdelete.tpl.php delete mode 100644 templates/tag2tagedit.tpl.php delete mode 100644 templates/tagcommondescriptionedit.tpl.php delete mode 100644 templates/tagdelete.tpl.php delete mode 100644 templates/tagedit.tpl.php delete mode 100644 templates/tagrename.tpl.php delete mode 100644 templates/tags.tpl.php delete mode 100644 templates/toolbar.inc.php delete mode 100644 templates/top.inc.php delete mode 100644 templates/users.tpl.php (limited to 'templates') diff --git a/templates/about.tpl.php b/templates/about.tpl.php deleted file mode 100644 index 4a93d75..0000000 --- a/templates/about.tpl.php +++ /dev/null @@ -1,34 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -

- - -

- - - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/templates/admin.tpl.php b/templates/admin.tpl.php deleted file mode 100644 index c8d47e8..0000000 --- a/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/templates/bookmarkcommondescriptionedit.tpl.php b/templates/bookmarkcommondescriptionedit.tpl.php deleted file mode 100644 index af5909a..0000000 --- a/templates/bookmarkcommondescriptionedit.tpl.php +++ /dev/null @@ -1,57 +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 ''.$lastUser['username'].''; - } - ?> -
- - -
- - -
- -
-
- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php deleted file mode 100644 index 2b673b7..0000000 --- a/templates/bookmarks.tpl.php +++ /dev/null @@ -1,344 +0,0 @@ -includeTemplate($GLOBALS['top_include']); - -include('search.inc.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 ' '; - } elseif(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 = ''. $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"> - - '. 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') .''; - } - - // 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.= ''. $row['username'] .''; - } - - // Udders! - if (!isset($hash)) { - $others = $bookmarkservice->countOthers($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']) - && !$bookmarkservice->bookmarkExists($row['bAddress'], $currentUser->getId())) { - $copy .= ' - '. T_('Copy') .''; - } - - // Nofollow option - $rel = ''; - if ($GLOBALS['nofollow']) { - $rel = ' rel="nofollow"'; - } - - $address = filter($row['bAddress']); - - // Redirection option - if ($GLOBALS['useredir']) { - $address = $GLOBALS['url_redir'] . $address; - } - - // Admin specific design - if($userservice->isAdmin($row['uId'])) { - $adminBgClass = 'class="adminBackground"'; - $adminStar = ' '; - } else { - $adminBgClass = ''; - $adminStar = ''; - } - - // Private Note (just visible by the owner and his/her contacts) - if($userservice->isLoggedOn() && ($currentUser->getId() == $row['uId'] || in_array($row['username'], $userservice->getWatchNames($currentUser->getId(), true)))) { - $privateNoteField = $row['bPrivateNote']; - } else { - $privateNoteField = ''; - } - - // Output - echo '
  1. '."\n"; - if ($GLOBALS['enableWebsiteThumbnails']) { - $thumbnailHash = md5($address.$GLOBALS['thumbnailsUserId'].$GLOBALS['thumbnailsKey']); - //echo ''; - echo ''; - } - - echo '
    ';; - - echo '
    '. filter($row['bTitle']) ."" . $adminStar . "
    \n"; - if ($row['bDescription'] == '') { - $bkDescription = '-'; - } 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"; - //if(!isset($hash)) { - echo '
    '.shortenString($address).'
    '; - //} - - echo '
    '. $cats . $copy . $edit . $update ."
    \n"; - echo $privateNoteField!=''?'
    '.$privateNoteField."
    \n":''; - echo '
    '; - - echo "
    2. \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/templates/bottom.inc.php b/templates/bottom.inc.php deleted file mode 100644 index a1b65bf..0000000 --- a/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 artViper designstudio)"; -} -?> - -
- - - - - - - - - - - diff --git a/templates/dojo.inc.php b/templates/dojo.inc.php deleted file mode 100644 index 16b22c6..0000000 --- a/templates/dojo.inc.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/templates/dynamictags.inc.php b/templates/dynamictags.inc.php deleted file mode 100644 index c6b0d16..0000000 --- a/templates/dynamictags.inc.php +++ /dev/null @@ -1,141 +0,0 @@ -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) { - echo 'document.write(\'
\');'; - echo 'document.write(\'

'. $title .'<\/h3>\');'; - echo 'document.write(\'

\');'; - - $taglist = ''; - foreach(array_keys($tagsCloud) as $key) { - $row =& $tagsCloud[$key]; - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); - $taglist .= ''. filter($row['tag']) .'<\/span> '; - } - - echo 'document.write(\''. $taglist .'\');'; - echo 'document.write(\'<\/p>\');'; - echo 'document.write(\'<\/div>\');'; - -} - - -if ($allPopularTagsCount > 0 || $userPopularTagsCount > 0 ) { ?> - - - - diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php deleted file mode 100644 index 8a08717..0000000 --- a/templates/editbookmark.tpl.php +++ /dev/null @@ -1,177 +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; -} - -$this->includeTemplate("dojo.inc"); -?> - - - - - -

- - - - - - - - - - - - - - - - -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)) { -?> - -

-

- - -

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

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

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

- - - - - - - -
- / - / - -
- -
- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/templates/error.404.tpl.php b/templates/error.404.tpl.php deleted file mode 100644 index fe9401d..0000000 --- a/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/templates/error.500.tpl.php b/templates/error.500.tpl.php deleted file mode 100644 index 1d7f7ae..0000000 --- a/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/templates/importDelicious.tpl.php b/templates/importDelicious.tpl.php deleted file mode 100644 index bc4d892..0000000 --- a/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/templates/importNetscape.tpl.php b/templates/importNetscape.tpl.php deleted file mode 100644 index 627a5af..0000000 --- a/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/templates/importStructure.tpl.php b/templates/importStructure.tpl.php deleted file mode 100644 index 9c54612..0000000 --- a/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/templates/login.tpl.php b/templates/login.tpl.php deleted file mode 100644 index e68ab54..0000000 --- a/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/templates/password.tpl.php b/templates/password.tpl.php deleted file mode 100644 index 55dbed6..0000000 --- a/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/templates/profile.tpl.php b/templates/profile.tpl.php deleted file mode 100644 index 1e2003a..0000000 --- a/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/templates/register.tpl.php b/templates/register.tpl.php deleted file mode 100644 index da3deec..0000000 --- a/templates/register.tpl.php +++ /dev/null @@ -1,49 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -

.

- -
- - - - - - - - - - - - - - - - - -0) {?> - - - - - - - - - - - - -
-
- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/templates/rss.tpl.php b/templates/rss.tpl.php deleted file mode 100644 index 0f03c06..0000000 --- a/templates/rss.tpl.php +++ /dev/null @@ -1,28 +0,0 @@ -\n"; -?> - - - - <?php echo $feedtitle; ?> - - - 60 - - - - <?php echo $bookmark['title']; ?> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/sidebar.block.common.php b/templates/sidebar.block.common.php deleted file mode 100644 index 6f1e9f7..0000000 --- a/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/templates/sidebar.block.linked.php b/templates/sidebar.block.linked.php deleted file mode 100644 index 0fa36c9..0000000 --- a/templates/sidebar.block.linked.php +++ /dev/null @@ -1,105 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -$explodedTags = array(); -if (strlen($currenttag)>0) { - $explodedTags = explode('+', $currenttag); -} else { - if($summarizeLinkedTags == true) { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb"); - } else { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid); - } - - foreach($orphewTags as $orphewTag) { - $explodedTags[] = $orphewTag['tag']; - } -} - -?> - -includeTemplate("dojo.inc"); -?> - -0 || $editingMode):?> - -

getUser($userid); -//echo '('.T_('all tags').')'; -//} -?>

- - - - - diff --git a/templates/sidebar.block.menu.php b/templates/sidebar.block.menu.php deleted file mode 100644 index ed1069a..0000000 --- a/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/templates/sidebar.block.menu2.php b/templates/sidebar.block.menu2.php deleted file mode 100644 index 8329ef3..0000000 --- a/templates/sidebar.block.menu2.php +++ /dev/null @@ -1,58 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - - -$cat_url = createURL('tags', '%2$s'); -$menu2Tags = $GLOBALS['menu2Tags']; - -if (sizeOf($menu2Tags) > 0) { - $this->includeTemplate("dojo.inc"); - ?> - -

- - -
> - -
'; - echo '
'; - echo ''; - //echo ''; - //echo ''; - //echo ''; - echo '
'; -} -?> -
- - - diff --git a/templates/sidebar.block.popular.php b/templates/sidebar.block.popular.php deleted file mode 100644 index 4279620..0000000 --- a/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/templates/sidebar.block.recent.php b/templates/sidebar.block.recent.php deleted file mode 100644 index 71f9aa9..0000000 --- a/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/templates/sidebar.block.related.php b/templates/sidebar.block.related.php deleted file mode 100644 index 182ea83..0000000 --- a/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/templates/sidebar.block.search.php b/templates/sidebar.block.search.php deleted file mode 100644 index 4e3c801..0000000 --- a/templates/sidebar.block.search.php +++ /dev/null @@ -1,34 +0,0 @@ -getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true, false); - -if ($lastSearches && count($lastSearches) > 0) { -?> - -

-
- -'; -} -//echo ''; -?> - -
'; - echo ''; - echo $row['shTerms']; - echo ''; - echo ' ('.$row['shNbResults'].')'; - echo '
...
-
- diff --git a/templates/sidebar.block.tagactions.php b/templates/sidebar.block.tagactions.php deleted file mode 100644 index 3351866..0000000 --- a/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); -?> - -

-
- -
- - diff --git a/templates/sidebar.block.users.php b/templates/sidebar.block.users.php deleted file mode 100644 index 3ad18bc..0000000 --- a/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 $row['username']; - echo ''; - echo ' ('.T_('bookmarks').')'; - echo '
...
-

→

-
- diff --git a/templates/sidebar.block.watchlist.php b/templates/sidebar.block.watchlist.php deleted file mode 100644 index 8f4984e..0000000 --- a/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):?> -

-
- -
- - - -

-
- -
- -

-
- - -
diff --git a/templates/sidebar.block.watchstatus.php b/templates/sidebar.block.watchstatus.php deleted file mode 100644 index 99574aa..0000000 --- a/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/templates/sidebar.linkedtags.inc.php b/templates/sidebar.linkedtags.inc.php deleted file mode 100644 index 555eafc..0000000 --- a/templates/sidebar.linkedtags.inc.php +++ /dev/null @@ -1,84 +0,0 @@ - '', 'stoplist' => $stopList); - } - - $tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService'); - $tagstatservice =& ServiceFactory::getServiceInstance('TagStatService'); - - // 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/templates/sidebar.tpl.php b/templates/sidebar.tpl.php deleted file mode 100644 index e823af5..0000000 --- a/templates/sidebar.tpl.php +++ /dev/null @@ -1,19 +0,0 @@ -isAdmin($userid)): ?> -