diff options
| author | PayBas <contact@paybas.com> | 2014-04-01 14:37:49 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-04-04 18:52:59 +0200 |
| commit | bf37342c86fe3f31cb8cd8c9da7749c221842ba8 (patch) | |
| tree | e0bcc0d7e0db2f23deed7d116f5bf11808bfe574 /phpBB/viewtopic.php | |
| parent | 82fa935d5d1d1665b4aa30daef775df87e506f88 (diff) | |
| download | forums-bf37342c86fe3f31cb8cd8c9da7749c221842ba8.tar forums-bf37342c86fe3f31cb8cd8c9da7749c221842ba8.tar.gz forums-bf37342c86fe3f31cb8cd8c9da7749c221842ba8.tar.bz2 forums-bf37342c86fe3f31cb8cd8c9da7749c221842ba8.tar.xz forums-bf37342c86fe3f31cb8cd8c9da7749c221842ba8.zip | |
[ticket/12327] Changing poll result-bars width from absolute to relative
PHPBB3-12327
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 61a28940b1..b4fb759299 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -842,9 +842,11 @@ if (!empty($topic_data['poll_start'])) } $poll_total = 0; + $poll_most = 0; foreach ($poll_info as $poll_option) { $poll_total += $poll_option['poll_option_total']; + $poll_most = ($poll_option['poll_option_total'] >= $poll_most) ? $poll_option['poll_option_total'] : $poll_most; } $parse_flags = ($poll_info[0]['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; @@ -860,15 +862,18 @@ if (!empty($topic_data['poll_start'])) { $option_pct = ($poll_total > 0) ? $poll_option['poll_option_total'] / $poll_total : 0; $option_pct_txt = sprintf("%.1d%%", round($option_pct * 100)); + $option_pct_rel = ($poll_most > 0) ? $poll_option['poll_option_total'] / $poll_most : 0; + $option_pct_rel_txt = sprintf("%.1d%%", round($option_pct_rel * 100)); $template->assign_block_vars('poll_option', array( - 'POLL_OPTION_ID' => $poll_option['poll_option_id'], - 'POLL_OPTION_CAPTION' => $poll_option['poll_option_text'], - 'POLL_OPTION_RESULT' => $poll_option['poll_option_total'], - 'POLL_OPTION_PERCENT' => $option_pct_txt, - 'POLL_OPTION_PCT' => round($option_pct * 100), - 'POLL_OPTION_WIDTH' => round($option_pct * 250), - 'POLL_OPTION_VOTED' => (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false) + 'POLL_OPTION_ID' => $poll_option['poll_option_id'], + 'POLL_OPTION_CAPTION' => $poll_option['poll_option_text'], + 'POLL_OPTION_RESULT' => $poll_option['poll_option_total'], + 'POLL_OPTION_PERCENT' => $option_pct_txt, + 'POLL_OPTION_PERCENT_REL' => $option_pct_rel_txt, + 'POLL_OPTION_PCT' => round($option_pct * 100), + 'POLL_OPTION_WIDTH' => round($option_pct * 250), + 'POLL_OPTION_VOTED' => (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false) ); } |