add horizontal voting links and switch config setting

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@498 b3834d28-1941-0410-a4f8-b48e95affb8f

2 files changed, 47 insertions, 1 deletions

diff --git a/data/templates/bookmarks-vote-horizontal.inc.tpl.php b/data/templates/bookmarks-vote-horizontal.inc.tpl.php
new file mode 100644
index 0000000..acdfbf7
--- /dev/null
+++ b/data/templates/bookmarks-vote-horizontal.inc.tpl.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Bookmark voting badge.
+ * Shows the number of votes and buttons to vote for or
+ * against a bookmark.
+ * Expects a $row variable with bookmark data
+ */
+if (!$GLOBALS['enableVoting'] || $GLOBALS['votingMode'] != 2) {
+    return;
+}
+if (!isset($row['hasVoted'])) {
+    $classes = 'vote-horiz vote-horiz-inactive';
+} else if (isset($row['vote']))  {
+    $classes = 'vote-horiz '
+        . ($row['vote'] == 1
+           ? 'vote-horiz-for'
+           : 'vote-horiz-against'
+        );
+} else {
+    $classes = 'vote-horiz';
+}
+echo '<div class="' . $classes . '" id="bmv-' . $row['bId'] . '">';
+echo 'Voting <span class="voting">' . $row['bVoting'] . '</span> ';
+
+if (isset($row['hasVoted'])) {
+    if ($row['vote'] != 1) {
+        echo '<a class="vote-for" rel="nofollow" href="'
+            . createVoteURL(true, $row['bId']) . '"'
+            . ' onclick="javascript:vote(' . $row['bId'] . ',1); return false;"'
+            . '>Vote for</a> ';
+    } else {
+        echo '<span class="vote-for-inactive">Vote for</span> ';
+    }
+    
+    
+    if ($row['vote'] != -1) {
+        echo '<a class="vote-against" rel="nofollow" href="'
+            . createVoteURL(false, $row['bId']) . '"'
+            . ' onclick="vote(' . $row['bId'] . ',-1); return false;"'
+            . '>Vote against</a>';
+    } else {
+        echo '<span class="vote-against-inactive">Vote against</span>';
+    }
+}
+echo '</div>';
+?>
\ No newline at end of file
diff --git a/data/templates/bookmarks-vote.inc.tpl.php b/data/templates/bookmarks-vote.inc.tpl.php
index e80c894..f65cf37 100644
--- a/data/templates/bookmarks-vote.inc.tpl.php
+++ b/data/templates/bookmarks-vote.inc.tpl.php
@@ -5,7 +5,7 @@
  * against a bookmark.
  * Expects a $row variable with bookmark data
  */
-if (!$GLOBALS['enableVoting']) {
+if (!$GLOBALS['enableVoting'] || $GLOBALS['votingMode'] != 1) {
     return;
 }
 if (isset($row['hasVoted']) && !$row['hasVoted']) {