add sort-by-voting to frontend
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@461 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
55554bc0f1
commit
cadcca8d6a
1 changed files with 50 additions and 30 deletions
|
@ -92,36 +92,56 @@ window.onload = playerLoad;
|
||||||
|
|
||||||
<p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?>
|
<p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?>
|
||||||
<?php
|
<?php
|
||||||
|
$titleArrow = '';
|
||||||
|
$dateArrow = '';
|
||||||
|
$votingArrow = '';
|
||||||
|
$dateSort = 'date_desc';
|
||||||
|
$titleSort = 'title_asc';
|
||||||
|
$votingSort = 'voting_asc';
|
||||||
|
|
||||||
switch(getSortOrder()) {
|
switch(getSortOrder()) {
|
||||||
case 'date_asc':
|
case 'date_asc':
|
||||||
$titleArrow = '';
|
|
||||||
$dateArrow = ' ↑';
|
$dateArrow = ' ↑';
|
||||||
$dateSort = 'date_desc';
|
$dateSort = 'date_desc';
|
||||||
$titleSort = 'title_asc';
|
|
||||||
break;
|
break;
|
||||||
case 'title_asc':
|
|
||||||
|
case 'title_asc':
|
||||||
$titleArrow = ' ↑';
|
$titleArrow = ' ↑';
|
||||||
$dateArrow = '';
|
$titleSort = 'title_desc';
|
||||||
$dateSort = 'date_desc';
|
|
||||||
$titleSort = 'title_desc';
|
|
||||||
break;
|
break;
|
||||||
case 'title_desc':
|
|
||||||
|
case 'title_desc':
|
||||||
$titleArrow = ' ↓';
|
$titleArrow = ' ↓';
|
||||||
$dateArrow = '';
|
$titleSort = 'title_asc';
|
||||||
$dateSort = 'date_desc';
|
|
||||||
$titleSort = 'title_asc';
|
|
||||||
break;
|
break;
|
||||||
case 'date_desc':
|
|
||||||
default:
|
case 'voting_asc':
|
||||||
$titleArrow = '';
|
$votingArrow = ' ↑';
|
||||||
|
$votingSort = 'voting_desc';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'voting_desc':
|
||||||
|
$votingArrow = ' ↓';
|
||||||
|
$votingSort = 'voting_asc';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'date_desc':
|
||||||
|
default:
|
||||||
$dateArrow = ' ↓';
|
$dateArrow = ' ↓';
|
||||||
$dateSort = 'date_asc';
|
$dateSort = 'date_asc';
|
||||||
$titleSort = 'title_asc';
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
?> <a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date").$dateArrow; ?></a><span>
|
?>
|
||||||
/ </span> <a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title").$titleArrow; ?></a><span>
|
<a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date").$dateArrow; ?></a>
|
||||||
/ </span> <?php
|
<span>/</span>
|
||||||
|
<a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title").$titleArrow; ?></a>
|
||||||
|
<span>/</span>
|
||||||
|
<?php if ($GLOBALS['enableVoting']) { ?>
|
||||||
|
<a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a>
|
||||||
|
<span>/</span>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<?php
|
||||||
if($currenttag!= '') {
|
if($currenttag!= '') {
|
||||||
if($user!= '') {
|
if($user!= '') {
|
||||||
echo ' - ';
|
echo ' - ';
|
||||||
|
@ -183,10 +203,10 @@ 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";
|
$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
|
echo $pagesBanner; // display a page banner if too many bookmarks to manage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
@ -230,14 +250,14 @@ if($currenttag!= '') {
|
||||||
if ($bookmarkservice->editAllowed($row)) {
|
if ($bookmarkservice->editAllowed($row)) {
|
||||||
$edit = ' - <a href="'. createURL('edit', $row['bId']) .'">'. T_('Edit') .'</a><script type="text/javascript">document.write(" - <a href=\"#\" onclick=\"deleteBookmark(this, '. $row['bId'] .'); return false;\">'. T_('Delete') .'<\/a>");</script>';
|
$edit = ' - <a href="'. createURL('edit', $row['bId']) .'">'. T_('Edit') .'</a><script type="text/javascript">document.write(" - <a href=\"#\" onclick=\"deleteBookmark(this, '. $row['bId'] .'); return false;\">'. T_('Delete') .'<\/a>");</script>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Last update
|
// Last update
|
||||||
$update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
|
$update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
|
||||||
|
|
||||||
// User attribution
|
// User attribution
|
||||||
$copy = ' '. T_('by'). ' ';
|
$copy = ' '. T_('by'). ' ';
|
||||||
if($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username']) {
|
if($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username']) {
|
||||||
$copy.= T_('you');
|
$copy.= T_('you');
|
||||||
} else {
|
} else {
|
||||||
$copy.= '<a href="'. createURL('bookmarks', $row['username']) .'">'. $row['username'] .'</a>';
|
$copy.= '<a href="'. createURL('bookmarks', $row['username']) .'">'. $row['username'] .'</a>';
|
||||||
}
|
}
|
||||||
|
@ -282,7 +302,7 @@ if($currenttag!= '') {
|
||||||
if ($GLOBALS['useredir']) {
|
if ($GLOBALS['useredir']) {
|
||||||
$address = $GLOBALS['url_redir'] . $address;
|
$address = $GLOBALS['url_redir'] . $address;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Admin specific design
|
// Admin specific design
|
||||||
if($userservice->isAdmin($row['uId'])) {
|
if($userservice->isAdmin($row['uId'])) {
|
||||||
$adminBgClass = 'class="adminBackground"';
|
$adminBgClass = 'class="adminBackground"';
|
||||||
|
@ -291,19 +311,19 @@ if($currenttag!= '') {
|
||||||
$adminBgClass = '';
|
$adminBgClass = '';
|
||||||
$adminStar = '';
|
$adminStar = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Private Note (just visible by the owner and his/her contacts)
|
// 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)))) {
|
if($userservice->isLoggedOn() && ($currentUser->getId() == $row['uId'] || in_array($row['username'], $userservice->getWatchNames($currentUser->getId(), true)))) {
|
||||||
$privateNoteField = $row['bPrivateNote'];
|
$privateNoteField = $row['bPrivateNote'];
|
||||||
} else {
|
} else {
|
||||||
$privateNoteField = '';
|
$privateNoteField = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Output
|
// Output
|
||||||
echo '<li class="xfolkentry'. $access .'" >'."\n";
|
echo '<li class="xfolkentry'. $access .'" >'."\n";
|
||||||
include 'bookmarks-thumbnail.inc.tpl.php';
|
include 'bookmarks-thumbnail.inc.tpl.php';
|
||||||
include 'bookmarks-vote.inc.tpl.php';
|
include 'bookmarks-vote.inc.tpl.php';
|
||||||
|
|
||||||
echo '<div '.$adminBgClass.' >';;
|
echo '<div '.$adminBgClass.' >';;
|
||||||
|
|
||||||
echo '<div class="link"><a href="'. $address .'"'. $rel .' class="taggedlink" target="_blank">'. filter($row['bTitle']) ."</a>" . $adminStar . "</div>\n";
|
echo '<div class="link"><a href="'. $address .'"'. $rel .' class="taggedlink" target="_blank">'. filter($row['bTitle']) ."</a>" . $adminStar . "</div>\n";
|
||||||
|
@ -314,7 +334,7 @@ if($currenttag!= '') {
|
||||||
$bkDescription = preg_replace('|\[\/.*?\]|', '', filter($row['bDescription'])); // remove final anchor
|
$bkDescription = preg_replace('|\[\/.*?\]|', '', filter($row['bDescription'])); // remove final anchor
|
||||||
$bkDescription = preg_replace('|\[(.*?)\]|', ' <span class="anchorBookmark">$1</span> » ', $bkDescription); // highlight starting anchor
|
$bkDescription = preg_replace('|\[(.*?)\]|', ' <span class="anchorBookmark">$1</span> » ', $bkDescription); // highlight starting anchor
|
||||||
$bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '<a href="$1" rel="nofollow">$1</a>$3', $bkDescription); // make url clickable
|
$bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '<a href="$1" rel="nofollow">$1</a>$3', $bkDescription); // make url clickable
|
||||||
|
|
||||||
}
|
}
|
||||||
echo '<div class="description">'. nl2br($bkDescription) ."</div>\n";
|
echo '<div class="description">'. nl2br($bkDescription) ."</div>\n";
|
||||||
//if(!isset($hash)) {
|
//if(!isset($hash)) {
|
||||||
|
@ -332,11 +352,11 @@ if($currenttag!= '') {
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
if(getPerPageCount($currentUser)>7) {
|
if(getPerPageCount($currentUser)>7) {
|
||||||
echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>';
|
echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>';
|
||||||
}
|
}
|
||||||
echo $pagesBanner; // display previous and next links pages + RSS link
|
echo $pagesBanner; // display previous and next links pages + RSS link
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
echo '<p class="error">'.T_('No bookmarks available').'</p>';
|
echo '<p class="error">'.T_('No bookmarks available').'</p>';
|
||||||
|
|
Loading…
Reference in a new issue