#184198 by Eaton: move button title change in polls to the theme, so it does not interfere with the cached form
parent
b94f2716cf
commit
2cc43fffd4
modules/poll
|
@ -238,10 +238,6 @@ function poll_form(&$node, $form_state) {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
// If we're using the javascript version (99% use-case), change the button
|
|
||||||
// title to 'Add another choice' to reflect the javascript behavior.
|
|
||||||
drupal_add_js("if (Drupal.jsEnabled) { $(document).ready(function() { $('#edit-poll-more').val('". t('Add another choice') ."'); }); }", 'inline');
|
|
||||||
|
|
||||||
// Poll attributes
|
// Poll attributes
|
||||||
$_duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval");
|
$_duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval");
|
||||||
$_active = array(0 => t('Closed'), 1 => t('Active'));
|
$_active = array(0 => t('Closed'), 1 => t('Active'));
|
||||||
|
@ -633,6 +629,9 @@ function poll_view_results(&$node, $teaser, $page, $block) {
|
||||||
* Theme the admin poll form for choices.
|
* Theme the admin poll form for choices.
|
||||||
*/
|
*/
|
||||||
function theme_poll_choices($form) {
|
function theme_poll_choices($form) {
|
||||||
|
// Change the button title to reflect the behavior when using JavaScript.
|
||||||
|
drupal_add_js('if (Drupal.jsEnabled) { $(document).ready(function() { $("#edit-poll-more").val("'. t('Add another choice') .'"); }); }', 'inline');
|
||||||
|
|
||||||
$rows = array();
|
$rows = array();
|
||||||
$headers = array(
|
$headers = array(
|
||||||
t('Choice'),
|
t('Choice'),
|
||||||
|
|
Loading…
Reference in New Issue