diff options
| -rw-r--r-- | web/html/tu.php | 25 | ||||
| -rw-r--r-- | web/template/tu_details.php | 137 | ||||
| -rw-r--r-- | web/template/tu_list.php | 112 |
3 files changed, 137 insertions, 137 deletions
diff --git a/web/html/tu.php b/web/html/tu.php index 9d4fc508..362679a3 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -154,17 +154,20 @@ if ($atype == "Trusted User" || $atype == "Developer") { $qnext = "SELECT ID FROM TU_VoteInfo"; $nextresult = db_query($qnext, $dbh); ?> -<div class="pgbox"> -<p><a href='addvote.php'><?php print __("Add Proposal") ?></a></p> - - <?php if (mysql_num_rows($result)) { $by = htmlentities($by, ENT_QUOTES); ?> - <?php if ($off != 0) { $back = (($off - $limit) <= 0) ? 0 : $off - $limit; ?> - <a href='tu.php?off=<?php print $back ?>&by=<?php print $by ?>'><?php print __("Back") ?></a> - <?php } ?> - <?php if (($off + $limit) < mysql_num_rows($nextresult)) { $forw = $off + $limit; ?> - <a href='tu.php?off=<?php print $forw ?>&by=<?php print $by ?>'><?php print __("Next") ?></a> - <?php } ?> - <?php } ?> +<div class="box"> + <p><a href="addvote.php"><?php print __("Add Proposal") ?></a></p> + + <?php if (mysql_num_rows($result)): + $by = htmlentities($by, ENT_QUOTES); ?> + <?php if ($off != 0): + $back = (($off - $limit) <= 0) ? 0 : $off - $limit; ?> + <a href='tu.php?off=<?php print $back ?>&by=<?php print $by ?>'><?php print __("Back") ?></a> + <?php endif; ?> + <?php if (($off + $limit) < mysql_num_rows($nextresult)): + $forw = $off + $limit; ?> + <a href="tu.php?off=<?php print $forw ?>&by=<?php print $by ?>"><?php print __("Next") ?></a> + <?php endif; ?> + <?php endif; ?> </div> <?php } diff --git a/web/template/tu_details.php b/web/template/tu_details.php index 45c7f9a9..33e87a85 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -1,76 +1,75 @@ -<div class="pgbox"> -<h2><?php print __("Proposal Details") ?></h2> -<div class="pgboxbody"> -<?php -if ($isrunning == 1) { ?> -<p style='font-weight: bold; color: red'> -<?php print __("This vote is still running.") ?> -</p> -<?php -} ?> +<div class="box"> + <h2><?php print __("Proposal Details") ?></h2> -<p> -<?php echo __('User') ?>: <b> -<?php if (!empty($row['User'])) { ?> -<a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> -<?php } else { ?> -N/A -<?php } ?> -</b><br /> -<?php print __("Submitted: %s by %s", "<b>" . gmdate("Y-m-d H:i", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> -<?php print __('End') ?>: <b><?php print gmdate("Y-m-d H:i", $row['End']) ?></b></p> + <?php if ($isrunning == 1): ?> + <p style="font-weight: bold; color: red"> + <?php print __("This vote is still running.") ?> + </p> + <?php endif; ?> -<p> -<?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?> -</p> + <p> + <?php echo __("User") ?>: + <b> + <?php if (!empty($row['User'])): ?> + <a href="packages.php?K=<?php print $row['User'] ?>&SeB=m"><?php print $row['User'] ?></a> + <?php else: ?> + N/A + <?php endif; ?> + </b> + <br /> + <?php print __("Submitted: %s by %s", "<b>" . gmdate("Y-m-d H:i", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?> + <br /> + <?php print __("End") ?>: + <b><?php print gmdate("Y-m-d H:i", $row['End']) ?></b> + </p> -<table class="boxSoft"> -<tr> -<th class='boxSoftTitle'><span class='f2'><?php print __("Yes") ?></span></th> -<th class='boxSoftTitle'><span class='f2'><?php print __("No") ?></span></th> -<th class='boxSoftTitle'><span class='f2'><?php print __("Abstain") ?></span></th> -<th class='boxSoftTitle'><span class='f2'><?php print __("Total") ?></span></th> -<th class='boxSoftTitle'><span class='f2'><?php print __('Voted') ?></span></th> -</tr> -<tr> -<td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> -<td class='data1'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td> -<td class='data1'><span class='f5'><span class='blue'><?php print $row['Abstain'] ?></span></span></td> -<td class='data1'><span class='f5'><span class='blue'><?php print ($row['Yes'] + $row['No'] + $row['Abstain']) ?></span></span></td> -<td class='data1'><span class='f5'><span class='blue'> -<?php if ($hasvoted == 0) { ?> -<span style='color: red; font-weight: bold'><?php print __("No") ?></span> -<?php } else { ?> -<span style='color: green; font-weight: bold'><?php print __("Yes") ?></span> -<?php } ?> -</span></span></td> -</tr> -</table> -</div></div> + <p> + <?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?> + </p> -<?php -if (!$isrunning) { ?> -<div class="pgbox"> - <h2><?php echo __('Voters'); ?></h2> - <div class="pgboxbody"> + <table> + <tr> + <th><?php print __("Yes") ?></th> + <th><?php print __("No") ?></th> + <th><?php print __("Abstain") ?></th> + <th><?php print __("Total") ?></th> + <th><?php print __('Voted') ?></th> + </tr> + <tr> + <td><?php print $row['Yes'] ?></td> + <td><?php print $row['No'] ?></td> + <td><?php print $row['Abstain'] ?></td> + <td><?php print ($row['Yes'] + $row['No'] + $row['Abstain']) ?></td> + <td> + <?php if ($hasvoted == 0): ?> + <span style="color: red; font-weight: bold"><?php print __("No") ?></span> + <?php else: ?> + <span style="color: green; font-weight: bold"><?php print __("Yes") ?></span> + <?php endif; ?> + </td> + </tr> + </table> +</div> + +<?php if (!$isrunning): ?> +<div class="box"> + <h2><?php echo __("Voters"); ?></h2> <?php echo $whovoted; ?> - </div> </div> -<?php -} ?> +<?php endif; ?> -<div class='pgbox'> -<div class='pgboxbody'> -<?php if ($canvote == 1) { ?> -<form action='tu.php?id=<?php print $row['ID'] ?>' method='post'> -<fieldset> -<input type='submit' class='button' name='voteYes' value='<?php print __("Yes") ?>' /> -<input type='submit' class='button' name='voteNo' value='<?php print __("No") ?>' /> -<input type='submit' class='button' name='voteAbstain' value='<?php print __("Abstain") ?>' /> -<input type='hidden' name='doVote' value='1' /> -</fieldset> -</form> -<?php } else { ?> -<?php print $errorvote ?> -<?php } ?> -</div></div> +<div class="box"> + +<?php if ($canvote == 1): ?> + <form action="tu.php?id=<?php print $row['ID'] ?>" method="post"> + <fieldset> + <input type="submit" class="button" name="voteYes" value="<?php print __("Yes") ?>" /> + <input type="submit" class="button" name="voteNo" value="<?php print __("No") ?>" /> + <input type="submit" class="button" name="voteAbstain" value="<?php print __("Abstain") ?>" /> + <input type="hidden" name="doVote" value="1" /> + </fieldset> + </form> +<?php else: + print $errorvote ?> +<?php endif; ?> +</div> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 7eb6f323..d8acd713 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -1,60 +1,58 @@ -<div class="pgbox"> +<div class="box"> <h2><?php print $type ?></h2> - <table class='results'> - <tr> - <th class='header'><span class='f2'><?php print __("Proposal") ?></span></th> - <th class='header'><span class='f2'> - <a href='?off=<?php print $off ?>&by=<?php print $by_next ?>'><?php print __("Start") ?></a> - </span></th> - <th class='header'><span class='f2'><?php print __("End") ?></span></th> - <th class='header'><span class='f2'><?php print __("User") ?></span></th> - <th class='header'><span class='f2'><?php print __("Yes") ?></span></th> - <th class='header'><span class='f2'><?php print __("No") ?></span></th> - <th class='header'><span class='f2'><?php print __('Voted') ?></span></th> - </tr> - <?php if (mysql_num_rows($result) == 0) { ?> - <tr><td align='center' colspan='0'><?php print __("No results found.") ?></td></tr> - <?php } else { for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?> - <tr> - <td class='<?php print $c ?>'><span class='f4'><span class='blue'> - <?php - $row["Agenda"] = htmlspecialchars(substr($row["Agenda"], 0, $prev_Len)); - ?> - <a href='tu.php?id=<?php print $row['ID'] ?>'><?php print $row["Agenda"] ?></a></span></span> - </td> - <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("Y-m-d", $row["Submitted"]) ?></span></span></td> - <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("Y-m-d", $row["End"]) ?></span></span></td> - <td class='<?php print $c ?>'><span class='f6'><span class='blue'> + <table class="results"> + <thead> + <tr> + <th><?php print __("Proposal") ?></th> + <th><a href="?off=<?php print $off ?>&by=<?php print $by_next ?>"><?php print __("Start") ?></a></th> + <th><?php print __("End") ?></th> + <th><?php print __("User") ?></th> + <th><?php print __("Yes") ?></th> + <th><?php print __("No") ?></th> + <th><?php print __('Voted') ?></th> + </tr> + </thead> + + <tbody> + <?php if (mysql_num_rows($result) == 0): ?> + <tr><td align="center" colspan="0"><?php print __("No results found.") ?></td></tr> + <?php else: for ($i = 0; $row = mysql_fetch_assoc($result); $i++): (($i % 2) == 0) ? $c = 'odd' : $c = 'even'; ?> + <tr class="<?php print $c ?>"> + <td><?php $row["Agenda"] = htmlspecialchars(substr($row["Agenda"], 0, $prev_Len)); ?> + <a href="tu.php?id=<?php print $row['ID'] ?>"><?php print $row["Agenda"] ?></a></span></span> + </td> + <td><?php print gmdate("Y-m-d", $row["Submitted"]) ?></td> + <td><?php print gmdate("Y-m-d", $row["End"]) ?></td> + <td> + <?php if (!empty($row['User'])): ?> + <a href="packages.php?K=<?php echo $row['User'] ?>&SeB=m"><?php echo $row['User'] ?></a> + <?php else: + print "N/A"; + endif; + ?> + </td> + <td><?php print $row['Yes'] ?></td> + <td><?php print $row['No'] ?></td> + <td> <?php - if (!empty($row['User'])) { - print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>"; - } else { - print "N/A"; - } - ?> - </span></span></td> - <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> - <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td> - <td class='<?php print $c ?>'> - <?php - $q = "SELECT * FROM TU_Votes WHERE VoteID = " . $row['ID'] . " AND UserID = " . uid_from_sid($_COOKIE["AURSID"]); - $result_tulist = db_query($q, $dbh); - if ($result_tulist) { - $hasvoted = mysql_num_rows($result_tulist); - } - else { - $hasvoted = 0; - } - ?> - <span class='f5'><span class='blue'> - <?php if ($hasvoted == 0) { ?> - <span style='color: red; font-weight: bold'><?php print __("No") ?></span> - <?php } else { ?> - <span style='color: green; font-weight: bold'><?php print __("Yes") ?></span> - <?php } ?> - </span></span> - </td> - </tr> - <?php } } ?> - </table> + $q = "SELECT * FROM TU_Votes WHERE VoteID = " . $row['ID'] . " AND UserID = " . uid_from_sid($_COOKIE["AURSID"]); + $result_tulist = db_query($q, $dbh); + if ($result_tulist): + $hasvoted = mysql_num_rows($result_tulist); + else: + $hasvoted = 0; + endif; + if ($hasvoted == 0): ?> + <span style="color: red; font-weight: bold"><?php print __("No") ?></span> + <?php else: ?> + <span style="color: green; font-weight: bold"><?php print __("Yes") ?></span> + <?php endif; ?> + </td> + </tr> + <?php + endfor; + endif; + ?> + </tbody> + </table> </div> |