Revert "Merge pull request #1 from salathe/salathe/hide-votes-in-progress"

This reverts commit 1baa2265a6, reversing
changes made to 571d08492a.
This commit is contained in:
Hannes Magnusson
2014-01-06 17:24:14 -08:00
parent 288864265b
commit 19ca75aa1e
3 changed files with 6 additions and 86 deletions

View File

@ -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

View File

@ -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;
}