diff options
| author | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-10-27 20:30:33 +0000 | 
|---|---|---|
| committer | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-10-27 20:30:33 +0000 | 
| commit | f01fb1362274426d5ebcc4339c4c300a079bbb8e (patch) | |
| tree | 25d98f299b77dc0c482a39972106f980a79047e2 /data | |
| parent | 10f59ea7718e30804ceaffec807b184d838d5ed0 (diff) | |
| download | semanticscuttle-f01fb1362274426d5ebcc4339c4c300a079bbb8e.tar.gz semanticscuttle-f01fb1362274426d5ebcc4339c4c300a079bbb8e.tar.bz2 | |
move bookmark thumbnail code in separate template file
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@436 b3834d28-1941-0410-a4f8-b48e95affb8f
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/bookmarks-vote.inc.tpl.php | 11 | ||||
| -rw-r--r-- | data/templates/bookmarks.tpl.php | 19 | 
2 files changed, 18 insertions, 12 deletions
| diff --git a/data/templates/bookmarks-vote.inc.tpl.php b/data/templates/bookmarks-vote.inc.tpl.php index 89818f8..37a58c1 100644 --- a/data/templates/bookmarks-vote.inc.tpl.php +++ b/data/templates/bookmarks-vote.inc.tpl.php @@ -8,19 +8,24 @@  if (!$GLOBALS['enableVoting']) {      return;  } -echo '<span class="vote-badge">'; +if ($row['hasVoted']) { +    $classes = 'vote-badge vote-badge-inactive'; +} else { +    $classes = 'vote-badge'; +} +echo '<span class="' . $classes . '">';  if (!$row['hasVoted']) {      echo '<a class="vote-for" href="'          . createVoteURL(true, $row['bId']) . '">+</a>';  } else { -    echo '<span class="vote-against-i">+</span>'; +    echo '<span class="vote-for-inactive">+</span>';  }  echo '<span class="voting">' . $row['bVoting'] . '</span>';  if (!$row['hasVoted']) {      echo '<a class="vote-against" href="'          . createVoteURL(false, $row['bId']) . '">-</a>';  } else { -    echo '<span class="vote-against-i">-</span>'; +    echo '<span class="vote-against-inactive">-</span>';  }  echo '</span>';  ?>
\ No newline at end of file diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index f35139a..7a47a7f 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -184,7 +184,7 @@ if($currenttag!= '') {  	$pagesBanner = '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ." </p>\n"; -	if(getPerPageCount($currentUser) > 10) { +	if (getPerPageCount($currentUser) > 10) {  		echo $pagesBanner; // display a page banner if too many bookmarks to manage  	}  @@ -260,9 +260,14 @@ if($currenttag!= '') {  		// Copy link  		if ($userservice->isLoggedOn() -		&& ($currentUser->getId() != $row['uId']) -		&& !$bookmarkservice->bookmarkExists($row['bAddress'], $currentUser->getId())) { -			$copy .= ' - <a href="'. createURL('bookmarks', $currentUser->getUsername() .'?action=add&copyOf='. $row['bId']) .'" title="'.T_('Copy this bookmark to YOUR bookmarks.').'">'. T_('Copy') .'</a>'; +            && ($currentUser->getId() != $row['uId']) +            && !$bookmarkservice->bookmarkExists($row['bAddress'], $currentUser->getId()) +        ) { +			$copy .= ' - <a href="' +                . createURL('bookmarks', $currentUser->getUsername() .'?action=add&copyOf='. $row['bId']) +                . '" title="'.T_('Copy this bookmark to YOUR bookmarks.').'">' +                . T_('Copy') +                . '</a>';  		}  		// Nofollow option @@ -296,11 +301,7 @@ if($currenttag!= '') {  		// Output  		echo '<li class="xfolkentry'. $access .'" >'."\n"; -		if ($GLOBALS['enableWebsiteThumbnails']) { -			$thumbnailHash = md5($address.$GLOBALS['thumbnailsUserId'].$GLOBALS['thumbnailsKey']); -			//echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; -			echo '<img class="thumbnail" onclick="window.location.href=\''.$address.'\'" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; -		} +        include 'bookmarks-thumbnail.inc.tpl.php';          include 'bookmarks-vote.inc.tpl.php';  		echo '<div '.$adminBgClass.' >';; | 
