diff --git a/core/modules/poll/poll-results.tpl.php b/core/modules/poll/poll-results.tpl.php index bb4cee38292c66d5dacf08dfec039783d40668f3..4eb0fe256e6ce02580583ef975115aedfc58faca 100644 --- a/core/modules/poll/poll-results.tpl.php +++ b/core/modules/poll/poll-results.tpl.php @@ -21,7 +21,9 @@ <?php if ($block): ?> <h3 class="poll-title"><?php print $title; ?></h3> <?php endif; ?> - <?php print $results; ?> + <dl> + <?php print $results; ?> + </dl> <div class="total"> <?php print t('Total votes: @votes', array('@votes' => $votes)); ?> </div> diff --git a/core/modules/poll/poll.css b/core/modules/poll/poll.css index 6abcaf5a1e84e64b09ea5a26c93a1df370e5b567..ddd59eb7c091007057903a42ac157c8f6b09b2ac 100644 --- a/core/modules/poll/poll.css +++ b/core/modules/poll/poll.css @@ -2,6 +2,10 @@ .poll { overflow: hidden; } +.poll dl, +.poll dd { + margin: 0; +} .poll .bar { height: 1em; margin: 1px 0; diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module index 84a24d555ae4d9e59b8f8fe7a8c225d3d337c230..c4f8ac6f2b3d55ef1519fed5d19676360c660de6 100644 --- a/core/modules/poll/poll.module +++ b/core/modules/poll/poll.module @@ -823,7 +823,8 @@ function poll_view_results($node, $view_mode, $block = FALSE) { $poll_results[] = array( '#theme' => 'meter', - '#prefix' => '<div class="choice-title">' . check_plain($choice['chtext']) . '</div>', + '#prefix' => '<dt class="choice-title">' . check_plain($choice['chtext']) . '</dt>' . PHP_EOL . '<dd class="choice-result">', + '#suffix' => '</dd>' . PHP_EOL, '#display_value' => t('!percentage%', array('!percentage' => $percentage)) . $display_votes, '#min' => 0, '#max' => $total_votes, diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test index 9275af84b7c7dc88c08ba3a402c20a1611c5f2ad..f8ca7fdafc5652a67d2cac0b14ffec2d478dae21 100644 --- a/core/modules/poll/poll.test +++ b/core/modules/poll/poll.test @@ -228,7 +228,7 @@ class PollCreateTestCase extends PollTestCase { $this->clickLink($title); $this->assertText($new_option, 'New option found.'); - $option = $this->xpath('//div[@id="node-1"]//article[@class="poll"]//div[@class="choice-title"]'); + $option = $this->xpath('//div[@id="node-1"]//article[@class="poll"]//dt[@class="choice-title"]'); $this->assertEqual(end($option), $new_option, 'Last item is equal to new option.'); $votes = $this->xpath('//div[@id="node-1"]//article[@class="poll"]//div[@class="percent"]');