Index: trunk/extensions/AJAXPoll/AJAXPoll_body.php |
— | — | @@ -297,10 +297,8 @@ |
298 | 298 | </script> |
299 | 299 | <div class="ajaxpoll-question">' . strip_tags( $lines[0] ) . '</div>'; |
300 | 300 | |
301 | | - // Different message depending on if the user has already voted or not. |
| 301 | + // Different message depending on if the user has already voted or not, or is entitled to vote |
302 | 302 | |
303 | | - // $message = ( isset( $row[0] ) ) ? $ourLastVoteDate : wfMsg( 'ajaxpoll-no-vote' ); |
304 | | - |
305 | 303 | if ( $wgUser->isAllowed( 'ajaxpoll-vote' ) ) { |
306 | 304 | $message = ( isset( $row[0] ) ) ? $ourLastVoteDate : wfMsg( 'ajaxpoll-no-vote' ); |
307 | 305 | } else { |
— | — | @@ -367,9 +365,7 @@ |
368 | 366 | $wgLang->timeanddate( wfTimestamp( TS_MW, $start_date ), true /* adjust? */ ) |
369 | 367 | ); |
370 | 368 | |
371 | | - $ret .= '<div id="ajaxpoll-info-' . $ID . '" class="ajaxpoll-info">' . $pollSummary . '</div>'; |
372 | | - |
373 | | - $ret .= '</div>'; |
| 369 | + $ret .= '<div id="ajaxpoll-info-' . $ID . '" class="ajaxpoll-info">' . $pollSummary . '<div class="ajaxpoll-id-info">poll-id ' . $ID . '</div></div></div>'; |
374 | 370 | } else { |
375 | 371 | $ret = ''; |
376 | 372 | } |
Index: trunk/extensions/AJAXPoll/AJAXPoll.php |
— | — | @@ -19,7 +19,7 @@ |
20 | 20 | * @author Jack Phoenix <jack@countervandalism.net> |
21 | 21 | * @author Thomas Gries |
22 | 22 | * @maintainer Thomas Gries |
23 | | - * @version 1.64 |
| 23 | + * @version 1.65 |
24 | 24 | * @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation |
25 | 25 | */ |
26 | 26 | |
— | — | @@ -31,7 +31,7 @@ |
32 | 32 | $wgExtensionCredits['parserhook'][] = array( |
33 | 33 | 'path' => __FILE__, |
34 | 34 | 'name' => 'AJAX Poll', |
35 | | - 'version' => '1.64 20120312', |
| 35 | + 'version' => '1.65 20120312', |
36 | 36 | 'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries' ), |
37 | 37 | 'descriptionmsg' => 'ajaxpoll-desc', |
38 | 38 | 'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll', |
Index: trunk/extensions/AJAXPoll/AJAXPoll.css |
— | — | @@ -90,3 +90,9 @@ |
91 | 91 | margin-top: 20px; |
92 | 92 | color: grey; |
93 | 93 | } |
| 94 | + |
| 95 | +.ajaxpoll .ajaxpoll-id-info { |
| 96 | + color:#FAFAFA; |
| 97 | + font-size: 100%; |
| 98 | + float: right; |
| 99 | +} |