Commit a283a3b7 authored by Dries's avatar Dries

- Patch by Gerhard: move the updates to database/updates.inc so packaging
  systems can by-pass update.php.
parent e3bedc47
This diff is collapsed.
......@@ -118,7 +118,7 @@ function poll_form(&$node, &$error) {
$output .= '<div class="poll-form">';
// Poll choices
$opts = drupal_map_assoc(range(2, $node->choices * 2 + 5));
$opts = drupal_map_assoc(range(2, $node->choices * 2 + 5));
for ($a = 0; $a < $node->choices; $a++) {
$group1 .= form_textfield(t('Choice %n', array('%n' => ($a + 1))), "choice][$a][chtext", $node->choice[$a]['chtext'], 50, 127, $error["choice][$a][chtext"]);
if ($admin) {
......@@ -129,7 +129,7 @@ function poll_form(&$node, &$error) {
$group1 .= form_checkbox(t('Need more choices'), 'morechoices', 1, 0, t("If the amount of boxes above isn't enough, check this box and click the Preview button below to add some more."));
$output .= form_group(t('Choices'), $group1);
// Poll attributes
$_duration = array_merge(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'));
......@@ -138,8 +138,8 @@ function poll_form(&$node, &$error) {
$group2 .= form_radios(t('Poll status'), 'active', isset($node->active) ? $node->active : 1, $_active, t('When a poll is closed, visitors can no longer vote for it.'));
}
$group2 .= form_select(t('Poll duration'), 'runtime', $node->runtime ? $node->runtime : 0, $_duration, t('After this period, the poll will be closed automatically.'));
$output .= form_group(t('Settings'), $group2);
$output .= form_group(t('Settings'), $group2);
$output .= '</div>';
return $output;
......
......@@ -118,7 +118,7 @@ function poll_form(&$node, &$error) {
$output .= '<div class="poll-form">';
// Poll choices
$opts = drupal_map_assoc(range(2, $node->choices * 2 + 5));
$opts = drupal_map_assoc(range(2, $node->choices * 2 + 5));
for ($a = 0; $a < $node->choices; $a++) {
$group1 .= form_textfield(t('Choice %n', array('%n' => ($a + 1))), "choice][$a][chtext", $node->choice[$a]['chtext'], 50, 127, $error["choice][$a][chtext"]);
if ($admin) {
......@@ -129,7 +129,7 @@ function poll_form(&$node, &$error) {
$group1 .= form_checkbox(t('Need more choices'), 'morechoices', 1, 0, t("If the amount of boxes above isn't enough, check this box and click the Preview button below to add some more."));
$output .= form_group(t('Choices'), $group1);
// Poll attributes
$_duration = array_merge(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'));
......@@ -138,8 +138,8 @@ function poll_form(&$node, &$error) {
$group2 .= form_radios(t('Poll status'), 'active', isset($node->active) ? $node->active : 1, $_active, t('When a poll is closed, visitors can no longer vote for it.'));
}
$group2 .= form_select(t('Poll duration'), 'runtime', $node->runtime ? $node->runtime : 0, $_duration, t('After this period, the poll will be closed automatically.'));
$output .= form_group(t('Settings'), $group2);
$output .= form_group(t('Settings'), $group2);
$output .= '</div>';
return $output;
......
......@@ -5,16 +5,16 @@
*/
body {
color: #000;
background-color: #fff;
margin: 0;
background-color: #fff;
margin: 0;
padding: 0;
}
body, p, td, li, ul, ol {
font-family: Verdana, Helvetica, Arial, sans-serif;
body, p, td, li, ul, ol {
font-family: Verdana, Helvetica, Arial, sans-serif;
}
h1, h2, h3, h4, h5, h6 {
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
color: #369;
h1, h2, h3, h4, h5, h6 {
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
color: #369;
}
img {
display: block;
......@@ -89,8 +89,8 @@ pre {
/*
** Page layout blocks / IDs
*/
table#primary-links-table {
background-color: #e0edfb;
table#primary-links-table {
background-color: #e0edfb;
}
table#primary-links-table tr {
background: transparent url(header-a.jpg) left bottom repeat;
......@@ -105,33 +105,33 @@ td#home a:hover img {
width: 144px;
height: 63px;
}
#primary-links {
#primary-links {
background: transparent url(header-b.jpg) left top no-repeat;
font-size: 0.85em;
}
#primary-links h1, #primary-links h2, #primary-links h3 {
#primary-links h1, #primary-links h2, #primary-links h3 {
font-size: 1.7em;
}
#primary-links a {
color: #369;
#primary-links a {
color: #369;
}
#primary-links a:hover {
color: #000;
}
table#secondary-links-table {
background-color: #369;
border-top: 3px solid #69c;
table#secondary-links-table {
background-color: #369;
border-top: 3px solid #69c;
border-bottom: 3px solid #69c;
font-size: 0.85em;
}
td#secondary-links {
td#secondary-links {
color: #e4e9eb;
}
#secondary-links a {
#secondary-links a {
color: #e4e9eb;
}
#secondary-links a:hover {
color: #fff;
#secondary-links a:hover {
color: #fff;
text-decoration: underline;
}
#content {
......@@ -161,11 +161,11 @@ td#secondary-links {
#mission {
background-color: #fff;
color: #696969;
border-top: 2px solid #dcdcdc;
border-top: 2px solid #dcdcdc;
border-bottom: 2px solid #dcdcdc;
padding: 10px 10px 10px 10px;
margin: 20px 35px 0px 35px;
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
font-size: 1.1em;
font-weight: normal;
}
......@@ -221,7 +221,7 @@ td#secondary-links {
color: #aaa;
}
table#footer-links {
border-top: 3px solid #6699cc;
border-top: 3px solid #6699cc;
border-bottom: 3px solid #6699cc;
background-color: #369;
color: #e4e9eb;
......@@ -280,7 +280,7 @@ table#footer-links {
.box h2 {
font-size: 9px;
}
.block .title h3 {
.block .title h3 {
border-bottom: 2px solid #6699cc;
color: #369;
font-size: 18px;
......@@ -289,7 +289,7 @@ table#footer-links {
margin-bottom: .25em;
background: transparent url(icon-block.gif) left center no-repeat;
}
.block .content {
.block .content {
padding: 5px 5px 5px 5px;
}
.block {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment