9 files changed, 89 insertions, 7 deletions
diff --git a/data/config.default.php b/data/config.default.php
index 11aa997..4a17503 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -415,6 +415,15 @@ $enableCommonBookmarkDescription = true;
  */
 $enableVoting = true;
 
+/**
+ * Voting mode:
+ * 1 - voting badge
+ * 2 - voting links: hand up/down
+ *
+ * @var integer
+ */
+$votingMode = 2;
+
 
 /****************************
  * Website Thumbnails
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']) {
diff --git a/www/ajaxVote.php b/www/ajaxVote.php
index 27eb62c..3e603da 100644
--- a/www/ajaxVote.php
+++ b/www/ajaxVote.php
@@ -9,12 +9,19 @@ $bs = SemanticScuttle_Service_Factory::get('Bookmark');
 $ts = SemanticScuttle_Service_Factory::get('Template');
 $bmrow = $bs->getBookmark($bookmark);
 
+switch ($GLOBALS['votingMode']) {
+case 2:
+    $template = 'bookmarks-vote-horizontal.inc.tpl.php';
+    break;
+default:
+    $template = 'bookmarks-vote.inc.tpl.php';
+}
+
 header('Content-Type: text/xml; charset=utf-8');
 echo '<voteresult><bookmark>' . $bookmark . '</bookmark>'
     . '<html xmlns="http://www.w3.org/1999/xhtml">';
 $ts->loadTemplate(
-    'bookmarks-vote.inc.tpl.php',
-    array('row' => $bmrow)
+    $template, array('row' => $bmrow)
 );
 
 echo '</html></voteresult>';
diff --git a/www/images/vote-against-voted.png b/www/images/vote-against-voted.png
new file mode 100644
index 0000000..740dfc8
--- /dev/null
+++ b/www/images/vote-against-voted.png
diff --git a/www/images/vote-against.png b/www/images/vote-against.png
new file mode 100644
index 0000000..f15ea4d
--- /dev/null
+++ b/www/images/vote-against.png
diff --git a/www/images/vote-for-voted.png b/www/images/vote-for-voted.png
new file mode 100644
index 0000000..5abd43e
--- /dev/null
+++ b/www/images/vote-for-voted.png
diff --git a/www/images/vote-for.png b/www/images/vote-for.png
new file mode 100644
index 0000000..5973ae9
--- /dev/null
+++ b/www/images/vote-for.png
diff --git a/www/scuttle.css b/www/scuttle.css
index e7fbf81..f28b46a 100644
--- a/www/scuttle.css
+++ b/www/scuttle.css
@@ -298,12 +298,17 @@ div.vote-horiz .voting {
     font-weight: bold;
 }
 li.xfolkentry div.vote-horiz-for {
-    border-left: 1em solid #ccffbb;
-    padding-left: 0.5em;
+/*    border-left: 1em solid #ccffbb;*/
+/*    padding-left: 0.5em;*/
 }
 li.xfolkentry div.vote-horiz-against {
-    border-left: 1em solid #ffcccc;
-    padding-left: 0.5em;
+/*    border-left: 1em solid #ffcccc;*/
+/*    padding-left: 0.5em;*/
+}
+.vote-horiz a, .vote-horiz .vote-for-inactive,
+.vote-horiz .vote-against-inactive {
+    padding-left: 1.5em;
+    margin-left: 0.7em;
 }
 .vote-horiz a.vote-for:hover {
     background-color: #ccffbb;
@@ -311,6 +316,21 @@ li.xfolkentry div.vote-horiz-against {
 .vote-horiz a.vote-against:hover {
     background-color: #ffcccc;
 }
+.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive {
+    color: #AAA;
+}
+.vote-horiz .vote-for {
+    background: url(images/vote-for.png) no-repeat;
+}
+.vote-horiz .vote-against {
+    background: url(images/vote-against.png) no-repeat;
+}
+.vote-horiz .vote-for-inactive {
+    background: url(images/vote-for-voted.png) no-repeat;
+}
+.vote-horiz .vote-against-inactive {
+    background: url(images/vote-against-voted.png) no-repeat;
+}
 
 
 /* SIDEBAR */