diff options
author | Dries Buytaert <dries@buytaert.net> | 2005-10-31 14:28:17 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2005-10-31 14:28:17 +0000 |
commit | 8ba2d2bf410ef5441e4102e0a7016ee2f28987e6 (patch) | |
tree | d786b612e3b427850ccef67617edbc4a31f6c5cd /modules/poll | |
parent | 6938e6cbe85916101971dc260313679f4bfc8373 (diff) | |
download | brdo-8ba2d2bf410ef5441e4102e0a7016ee2f28987e6.tar.gz brdo-8ba2d2bf410ef5441e4102e0a7016ee2f28987e6.tar.bz2 |
- Patch #35086 by stefan: improved themeability of the poll results.
Diffstat (limited to 'modules/poll')
-rw-r--r-- | modules/poll/poll.module | 75 |
1 files changed, 47 insertions, 28 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 52765dd48..7088dc2dd 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -334,32 +334,53 @@ function theme_poll_view_voting($form) { * Generates a graphical representation of the results of a poll. */ function poll_view_results(&$node, $teaser, $page, $block) { - // Display the results - // Count the votes and find the maximum foreach ($node->choice as $choice) { - $votestotal += $choice['chvotes']; - $votesmax = max($votesmax, $choice['chvotes']); + $total_votes += $choice['chvotes']; + $max_votes = max($max_votes, $choice['chvotes']); } - // Output the divs for the text, bars and percentages - $output .= '<div class="poll">'; - if ($block) { - $output .= '<div class="title">'. check_plain($node->title) .'</div>'; - } foreach ($node->choice as $i => $choice) { if ($choice['chtext'] != '') { - $percentage = round($choice['chvotes'] * 100 / max($votestotal, 1)); - $output .= '<div class="text">'. check_plain($choice['chtext']) .'</div>'; - $output .= '<div class="bar">'; - $output .= '<div style="width: '. $percentage .'%;" class="foreground"></div>'; - $output .= '</div>'; - $output .= '<div class="percent">'. $percentage .'%'. (!$block ? ' ('. format_plural($choice['chvotes'], '1 vote', '%count votes') .')' : '') .'</div>'; + $poll_results .= theme('poll_bar', check_plain($choice['chtext']), round($choice['chvotes'] * 100 / max($total_votes, 1)), format_plural($choice['chvotes'], '1 vote', '%count votes'), $block); } } - $output .= '<div class="total">'. t('Total votes') .": $votestotal</div>"; - $output .= '</div>'; + $output .= theme('poll_results', check_plain($node->title), $poll_results, $total_votes, $node->links, $block); + + return $output; +} + +function theme_poll_results($title, $results, $votes, $links, $block) { + if ($block) { + $output .= '<div class="poll">'; + $output .= '<div class="title">'. $title .'</div>'; + $output .= $results; + $output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>'; + $output .= '</div>'; + $output .= '<div class="links">'. theme('links', $links) .'</div>'; + } + else { + $output .= '<div class="poll">'; + $output .= $results; + $output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>'; + $output .= '</div>'; + } + + return $output; +} + +function theme_poll_bar($title, $percentage, $votes, $block) { + if ($block) { + $output = '<div class="text">'. $title .'</div>'; + $output .= '<div class="bar"><div style="width: '. $percentage .'%;" class="foreground"></div></div>'; + $output .= '<div class="percent">'. $percentage .'%</div>'; + } + else { + $output = '<div class="text">'. $title .'</div>'; + $output .= '<div class="bar"><div style="width: '. $percentage .'%;" class="foreground"></div></div>'; + $output .= '<div class="percent">'. $percentage .'% ('. $votes .')</div>'; + } return $output; } @@ -423,13 +444,6 @@ function poll_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) { global $user; $output = ''; - if ($node->allowvotes && ($block || arg(2) != 'results')) { - $output .= poll_view_voting($node, $teaser, $page, $block); - } - else { - $output .= poll_view_results($node, $teaser, $page, $block); - } - // Special display for side-block if ($block) { // No 'read more' link @@ -441,7 +455,14 @@ function poll_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) { $links[] = l(t('results'), 'node/'. $node->nid .'/results', array('title' => t('View the current poll results.'))); } - $output .= '<div class="links">'. theme("links", $links) .'</div>'; + $node->links = $links; + } + + if ($node->allowvotes && ($block || arg(2) != 'results')) { + $output .= poll_view_voting($node, $teaser, $page, $block); + } + else { + $output .= poll_view_results($node, $teaser, $page, $block); } $node->body = $node->teaser = $output; @@ -462,6 +483,4 @@ function poll_update($node) { db_query("INSERT INTO {poll_choices} (nid, chtext, chvotes, chorder) VALUES (%d, '%s', %d, %d)", $node->nid, $chtext, $chvotes, $i++); } } -} - - +}
\ No newline at end of file |