From cee739e6278020dd4d79a5dcd86465c6c6a44a6c Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Mon, 2 Nov 2009 09:38:02 +0000
Subject: [PATCH] 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
---
 data/config.default.php                       |   9 ++++
 .../bookmarks-vote-horizontal.inc.tpl.php     |  46 ++++++++++++++++++
 data/templates/bookmarks-vote.inc.tpl.php     |   2 +-
 www/ajaxVote.php                              |  11 ++++-
 www/images/vote-against-voted.png             | Bin 0 -> 419 bytes
 www/images/vote-against.png                   | Bin 0 -> 495 bytes
 www/images/vote-for-voted.png                 | Bin 0 -> 415 bytes
 www/images/vote-for.png                       | Bin 0 -> 625 bytes
 www/scuttle.css                               |  28 +++++++++--
 9 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 data/templates/bookmarks-vote-horizontal.inc.tpl.php
 create mode 100644 www/images/vote-against-voted.png
 create mode 100644 www/images/vote-against.png
 create mode 100644 www/images/vote-for-voted.png
 create mode 100644 www/images/vote-for.png

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 0000000000000000000000000000000000000000..740dfc82fdd3e7b344bb9df2108e9965f065b806
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%N7>k44ofy`glX(f`uqAoByD<C*
z!3BGlPX>x`7I;J!Gca%qgD@k*tT_@uLG}_)Usv{<+>B!42D}xwP6JI*_H=O!(Kugw
zX}_MUqX657`?lvqTb*<TRpgvRqF1a4;c8`(UF!8vP(^5OQ+vQ>#Yd7aL>8$EP5<p~
z>~3~_@4l2x*1Lb7H8-}_ZJhI2W}bnd``!&=euZ;_UUf5DK2MEF5M&N<e6v{gHLKpo
zz~fKlo+*1I|J{+@`irmZ;>zN4><>c{?<%cz3*4B0eMaAueO)Vr7lurd`jWlo$m5j?
z-;-o}6hlSB4!?ByvTWY13?8kRR%6MFuE)Km%H8|W(Jpm+$5FOv2EwIgUd($ERF{7F
z^V?sw=v?{@eGl0+OQ)=BzkNeMYmIpDN7=~*xi0Uea}pJeejLm6dilivciW%C0WTlP
zxG%nST`Oqzq3SE2x^AX99M@Vp#V+~O?j7>(5>xM~<rO@a|HDvb>0eiv)BXY&f()Ln
KelF{r5}E)y7O7MK

literal 0
HcmV?d00001

diff --git a/www/images/vote-against.png b/www/images/vote-against.png
new file mode 100644
index 0000000000000000000000000000000000000000..f15ea4d302e6fdc79a147a2c6f1a663870e8c076
GIT binary patch
literal 495
zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%N7>k44ofy`glX(f`uqAoBy8vk*
z`02d69!PN(ctjR6FmMZlFeAgPITAoY_7YEDSN5CSjAFd17dnpo2AY!Z>EaloalUur
zMsKD<k>mTz_d8onEiMq6^=ey2K!(sBUzLDG_KOskH@9t@9V^Wh6tl=xhAS(xFi^n7
zBdc)d!U>!C_-sl7-apUYZ1HK&`7dqXYu_KPW~%E{nS8Rn#%{f@+T`~kTB_PzLir|A
z{);bquqPaBXIYRV!KN-hEw#}1vK@oWFK6+oUa5(<zjggfG@HG)Xy+W!?xXWmJ$JD;
z*t!PBnX~?pXxo^=pm+Q2x6W0ol$;*y((7c9xxG!&N$Iqa;#|MkbBejV_r`r+;-Vxd
zc=T=B;fE7uFY`Q`cA2^1ani<&t68S&uVz*5jmv+zYu)$qs;yD698Cq>4|oo|j1qN_
zJ7C!`-EaBkZ*RZ<jx&+k%Y7xG$JVOvv7lh@@#J-@UP(7p1f*>b(K_4FA#?oUOrK}M
z2kIV(c}~h>Yi=~3>sM(u`!7?$hPMuD0yHdKT%HzH@;%51Ui@NpIm3e6Z}&03X#KTK
jfg^m^y7Q9B*Bxu^ZGT9ot$vc=1&S(9S3j3^P6<r_%HPOm

literal 0
HcmV?d00001

diff --git a/www/images/vote-for-voted.png b/www/images/vote-for-voted.png
new file mode 100644
index 0000000000000000000000000000000000000000..5abd43e3dfe5ce31cc8443c1100937e3426fa09e
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%N7>k44ofy`glX(f`uqAoByD<C*
z!3BGlPX>x`7I;J!Gca%qgD@k*tT_@uLG}_)Usv{<+>B!4Qr8X(%K}Z2_jGX#(Kz3G
z$yT2=P~h0d`|GYdxh$Hjq2e{a!6L(yYp>hFX&O_xS{Gc@aB+Xc9H8m<ka>lui^vv_
zJ+a}&vt<tTdYbK?ZG8UEd}HION=4^{Zyb&E$~-L}`2UCfL7rtL9jg|6c`SH$$8is@
zmz$L}mwsvT-eTCZcTVwF`Rdylthti2{|m}Kw92rJIBU7SROG0vU$a_^wB_@g`MoDB
zzbCMAOB@$qJG5xQy+os>CAT~JHg>F22zj_5$BFy=#jEXkXO16?4*YAoPx^PPL{Ivf
zW0f*rT!XCd$=9FVcFa{}AIn<Fs@D5$zat-O3RN{PdvPy+(XKAhTgQVc!UJvvuF(v5
zxOL|X#yq8!p6j}%Z7=As^qJ0W-L<;unwHy!=C5gu`xzbwhuVENTR#;TdJLYfelF{r
G5}E*}FR17M

literal 0
HcmV?d00001

diff --git a/www/images/vote-for.png b/www/images/vote-for.png
new file mode 100644
index 0000000000000000000000000000000000000000..5973ae94c515ee81db5c40f928712656ccc1b254
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000dD000mO1^@s6&7<`>00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXe&
z77GR>wGs~i00HqyL_t(2&yA8jsM=r@hEFtC8XVNYA`&5B)uo#isvs@spp8Eu2tuJa
z3Kpk=n{I`wi$y3Xoy5{b3^+D|L%F&rE?QcL3c<mtSc<vHmwaEB-izMe7N6<Bd7rbK
z*9fOPWEkdyrfK&9;1bTk<#K(IBnjE=_QC&hhNJmjC=`0YvMe141cJAA|Hk9-%v4py
zgTVmNH2n?$sB^sM&1Mr3LP)36Q7MXgbB<)-IBtzG#)J^kXf#v+cy*5WcC}g|@`qxv
zC<DOL+o1~pc<FRHKZV2L@6l-V$6~R#krYM2!C+7V0N0J-a5z4W$77`HI-X9aNEAg)
zmSs$i*lxF4CX?Cw{r+z@o9#2CQmLPkB&peK_Nrd5YrS4iOC%D?Znx9P9aO7T1Qv@$
zn9t{k5JF^G#_e_+`FuXqYPFQRBtZ}~dcWUaRw|We48vRzLa1CWXPitXR3s7sp64;g
zaVJkUo6VR8fL}hJkBZ0R7c@;9XS11>&*ycE#X_yu>%SyPk_^`$Z`W$I7gnp)==FMm
zWm&3LtKq}pK)T(o2>@U;8sX(~N%i}E<@&&5x7+<SnM|rY&ntyOK@|i6#bPl<*L6G`
z4mE~h-UGlB0C;p#@^m__Y&IKB6h)NDWRy~=bSRh0vdLt6eO%z*NZcZZpDO8p00000
LNkvXXu0mjf;*<<T

literal 0
HcmV?d00001

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 */