com web/wiki: Revert "Merge pull request #1 from salathe/salathe/hide-votes-in-progress": dokuwiki/lib/plugins/d oodle/doodle_template.php
dokuwiki/lib/plugins/doodle/sty le.css systems/doodle-hide-votes-in-progress.diff

Commit: 19ca75aa1e06b3c5ad9a61204bbc34189368f02b Author: Hannes Magnusson <bjori@mongodb.com> Mon, 6 Jan 2014 17:24:14 -0800 Parents: 288864265b11ecfdc244ee3fa250866b7b2cace9 Branches: master Link: http://git.php.net/?p=web/wiki.git;a=commitdiff;h=19ca75aa1e06b3c5ad9a61204bbc34189368f02b Log: Revert "Merge pull request #1 from salathe/salathe/hide-votes-in-progress" This reverts commit 1baa2265a6e1e7d7c43696dc361541382c0e085f, reversing changes made to 571d08492a5239114663667eb947a98aaa76b172. Bugs: https://bugs.php.net/1 Changed paths: M dokuwiki/lib/plugins/doodle/doodle_template.php M dokuwiki/lib/plugins/doodle/style.css D systems/doodle-hide-votes-in-progress.diff Diff: diff --git a/dokuwiki/lib/plugins/doodle/doodle_template.php b/dokuwiki/lib/plugins/doodle/doodle_template.php index 843a7cd..0dafba4 100755 --- a/dokuwiki/lib/plugins/doodle/doodle_template.php +++ b/dokuwiki/lib/plugins/doodle/doodle_template.php @@ -9,7 +9,6 @@ global $ID; $template = $this->template; - $is_closed = $this->params['closed']; $c = count($template['choices']); ?> @@ -43,30 +42,18 @@ <?php $fullname = '<a href="//people.php.net/user.php?username=' . $fullname.'">' .$fullname. '</a>';?> <?php echo $userData['editLinks'].$fullname.$userData['username'] ?> </td> - <?php - if ($is_closed || $INFO['userinfo']['name'] == $fullname) { - for ($col = 0; $col < $c; $col++) { - echo $userData['choice'][$col]; - } - } else { - ?><td class="votehidden" colspan="<?php echo $c ?>">&nbsp;</td><?php - } - ?> + <?php for ($col = 0; $col < $c; $col++) { + echo $userData['choice'][$col]; + } ?> </tr> <?php } ?> <!-- Results / sum per column --> <tr> <th class="rightalign"><b><?php echo $template['result'] ?></b></th> - <?php - if ($is_closed) { - for ($col = 0; $col < $c; $col++) { - ?><th class="centeralign"><b><?php echo $template['count'][$col] ?></b></th><?php - } - } else { - ?><th class="centeralign" colspan="<?php echo $c ?>"><?php echo count($template['doodleData']) ?></th><?php - } - ?> +<?php for ($col = 0; $col < $c; $col++) { ?> + <th class="centeralign"><b><?php echo $template['count'][$col] ?></b></th> +<?php } ?> </tr> <?php diff --git a/dokuwiki/lib/plugins/doodle/style.css b/dokuwiki/lib/plugins/doodle/style.css index 661dfbc..0db25ee 100644 --- a/dokuwiki/lib/plugins/doodle/style.css +++ b/dokuwiki/lib/plugins/doodle/style.css @@ -27,8 +27,3 @@ div.dokuwiki table.inline td.notokay { border: 0; color: rgba(0, 0, 0, 0); } - -div.dokuwiki table.inline td.votehidden { - background-color: #f3f3f3; - text-align: center; -} diff --git a/systems/doodle-hide-votes-in-progress.diff b/systems/doodle-hide-votes-in-progress.diff deleted file mode 100644 index 9a6da8f..0000000 --- a/systems/doodle-hide-votes-in-progress..diff +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/dokuwiki/lib/plugins/doodle/doodle_template.php b/dokuwiki/lib/plugins/doodle/doodle_template..php -index 0dafba4..843a7cd 100755 ---- a/dokuwiki/lib/plugins/doodle/doodle_template.php -+++ b/dokuwiki/lib/plugins/doodle/doodle_template.php -@@ -9,6 +9,7 @@ - global $ID; - - $template = $this->template; -+ $is_closed = $this->params['closed']; - $c = count($template['choices']); - ?> - -@@ -42,18 +43,30 @@ - <?php $fullname = '<a href="//people.php.net/user.php?username=' . $fullname..'">' .$fullname. '</a>';?> - <?php echo $userData['editLinks']..$fullname.$userData['username'] ?> - </td> -- <?php for ($col = 0; $col < $c; $col++) { -- echo $userData['choice'][$col]; -- } ?> -+ <?php -+ if ($is_closed || $INFO['userinfo']['name'] == $fullname) { -+ for ($col = 0; $col < $c; $col++) { -+ echo $userData['choice'][$col]; -+ } -+ } else { -+ ?><td class="votehidden" colspan="<?php echo $c ?>">&nbsp;</td><?php -+ } -+ ?> - </tr> - <?php } ?> - - <!-- Results / sum per column --> - <tr> - <th class="rightalign"><b><?php echo $template['result'] ?></b></th> --<?php for ($col = 0; $col < $c; $col++) { ?> -- <th class="centeralign"><b><?php echo $template['count'][$col] ?></b></th> --<?php } ?> -+ <?php -+ if ($is_closed) { -+ for ($col = 0; $col < $c; $col++) { -+ ?><th class="centeralign"><b><?php echo $template['count'][$col] ?></b></th><?php -+ } -+ } else { -+ ?><th class="centeralign" colspan="<?php echo $c ?>"><?php echo count($template['doodleData']) ?></th><?php -+ } -+ ?> - </tr> - - <?php -diff --git a/dokuwiki/lib/plugins/doodle/style.css b/dokuwiki/lib/plugins/doodle/style.css -index 0db25ee..661dfbc 100644 ---- a/dokuwiki/lib/plugins/doodle/style.css -+++ b/dokuwiki/lib/plugins/doodle/style.css -@@ -27,3 +27,8 @@ div.dokuwiki table.inline td.notokay { - border: 0; - color: rgba(0, 0, 0, 0); - } -+ -+div.dokuwiki table.inline td.votehidden { -+ background-color: #f3f3f3; -+ text-align: center; -+}