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 @@
+';
+echo 'Voting ' . $row['bVoting'] . ' ';
+
+if (isset($row['hasVoted'])) {
+ if ($row['vote'] != 1) {
+ echo 'Vote for ';
+ } else {
+ echo 'Vote for ';
+ }
+
+
+ if ($row['vote'] != -1) {
+ echo 'Vote against';
+ } else {
+ echo 'Vote against';
+ }
+}
+echo '';
+?>
\ 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 '' . $bookmark . ''
. '';
$ts->loadTemplate(
- 'bookmarks-vote.inc.tpl.php',
- array('row' => $bmrow)
+ $template, array('row' => $bmrow)
);
echo '';
diff --git a/www/images/vote-against-voted.png b/www/images/vote-against-voted.png
new file mode 100644
index 0000000..740dfc8
Binary files /dev/null and b/www/images/vote-against-voted.png differ
diff --git a/www/images/vote-against.png b/www/images/vote-against.png
new file mode 100644
index 0000000..f15ea4d
Binary files /dev/null and b/www/images/vote-against.png differ
diff --git a/www/images/vote-for-voted.png b/www/images/vote-for-voted.png
new file mode 100644
index 0000000..5abd43e
Binary files /dev/null and b/www/images/vote-for-voted.png differ
diff --git a/www/images/vote-for.png b/www/images/vote-for.png
new file mode 100644
index 0000000..5973ae9
Binary files /dev/null and b/www/images/vote-for.png differ
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 */