Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 50 insertions, 0 deletions

diff --git a/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php b/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php
new file mode 100644
index 0000000..c4a9f8e
--- /dev/null
+++ b/data/templates/default/bookmarks-vote-horizontal.inc.tpl.php
@@ -0,0 +1,50 @@
+<?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 sprintf(
+    T_('Voting <span class="voting">%d</span>'), $row['bVoting']
+) . ' ';
+
+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;"'
+            . '>' . T_('Vote for') . '</a> ';
+    } else {
+        echo '<span class="vote-for-inactive">'
+            . T_('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;"'
+            . '>' . T_('Vote against') . '</a>';
+    } else {
+        echo '<span class="vote-against-inactive">'
+            . T_('Vote against') . '</span>';
+    }
+}
+echo '</div>';
+?>
\ No newline at end of file