diff --git a/modules/system/admin.css b/modules/system/admin.css
index 8ffd625bad1c830888241200ca721f049cd5f1bc..91df676530fecab10c00d7dc68a83fe8f6524482 100644
--- a/modules/system/admin.css
+++ b/modules/system/admin.css
@@ -117,9 +117,15 @@ table.screenshot {
*/
div.date-container {
overflow: auto;
+ clear: left;
}
-div.date-container > div {
+div.date-container > div, div.date-container > div > div {
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+div.date-container div {
float: left;
}
diff --git a/modules/system/system.install b/modules/system/system.install
index 3f870533eb7155e6036256cce2fd8be732fa50ec..b8cecee2cda8c29da6e322cd26b2ca932c64d4fe 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -891,14 +891,14 @@ function system_install() {
description varchar(255) NOT NULL default '',
position varchar(255) NOT NULL default '',
weight int NOT NULL default 0,
- PRIMARY KEY (path),
+ PRIMARY KEY (path)
)");
db_query("CREATE INDEX {menu_router}_fit_idx ON {menu_router} (fit)");
db_query("CREATE INDEX {menu_router}_tab_parent_idx ON {menu_router} (tab_parent)");
- db_query("CREATE TABLE {menu_link} (
+ db_query("CREATE TABLE {menu_links} (
menu_name varchar(64) NOT NULL default '',
- mlid int NOT NULL default '0',
+ mlid serial,
plid int NOT NULL default '0',
href varchar(255) NOT NULL default '',
router_path varchar(255) NOT NULL default '',
@@ -919,9 +919,9 @@ function system_install() {
options text,
PRIMARY KEY (mlid)
)");
- db_query("CREATE INDEX {menu_link}_parents_idx ON {menu_link} (plid, p1, p2, p3, p4, p5)");
- db_query("CREATE INDEX {menu_link}_menu_name_idx ON {menu_link} (menu_name, href)");
- db_query("CREATE INDEX {menu_link}_expanded_children_idx ON {menu_link} (expanded, has_children)");
+ db_query("CREATE INDEX {menu_links}_parents_idx ON {menu_links} (plid, p1, p2, p3, p4, p5)");
+ db_query("CREATE INDEX {menu_links}_menu_name_idx ON {menu_links} (menu_name, href)");
+ db_query("CREATE INDEX {menu_links}_expanded_children_idx ON {menu_links} (expanded, has_children)");
db_query("CREATE TABLE {node} (
nid serial CHECK (nid >= 0),
diff --git a/modules/system/system.module b/modules/system/system.module
index 4ba52e8c334df0e7fbef3631d84d9663a1c3cf4d..7499bc623786cdeeb1f4f903001191da7cfb48d7 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -867,7 +867,12 @@ function system_date_time_settings() {
$date_long_choices['custom'] = $date_medium_choices['custom'] = $date_short_choices['custom'] = t('Custom format');
- $form['date_default_timezone'] = array(
+ $form['locale'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Locale settings'),
+ );
+
+ $form['locale']['date_default_timezone'] = array(
'#type' => 'select',
'#title' => t('Default time zone'),
'#default_value' => variable_get('date_default_timezone', 0),
@@ -875,16 +880,29 @@ function system_date_time_settings() {
'#description' => t('Select the default site time zone.')
);
- $form['configurable_timezones'] = array(
+ $form['locale']['configurable_timezones'] = array(
'#type' => 'radios',
- '#title' => t('Configurable time zones'),
+ '#title' => t('User-configurable time zones'),
'#default_value' => variable_get('configurable_timezones', 1),
'#options' => array(t('Disabled'), t('Enabled')),
- '#description' => t('Enable or disable user-configurable time zones. When enabled, users can set their own time zone and dates will be updated accordingly.')
+ '#description' => t('When enabled, users can set their own time zone and dates will be displayed accordingly.')
+ );
+
+ $form['locale']['date_first_day'] = array(
+ '#type' => 'select',
+ '#title' => t('First day of week'),
+ '#default_value' => variable_get('date_first_day', 0),
+ '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')),
+ '#description' => t('The first day of the week for calendar views.')
+ );
+
+ $form['date_formats'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Formatting'),
);
$date_format_short = variable_get('date_format_short', $date_short[1]);
- $form['date_format_short'] = array(
+ $form['date_formats']['date_format_short'] = array(
'#prefix' => '<div class="date-container"><div>',
'#suffix' => '</div>',
'#type' => 'select',
@@ -896,7 +914,7 @@ function system_date_time_settings() {
);
$default_short_custom = variable_get('date_format_short_custom', (isset($date_short_choices[$date_format_short]) ? $date_format_short : ''));
- $form['date_format_short_custom'] = array(
+ $form['date_formats']['date_format_short_custom'] = array(
'#prefix' => '<div class="custom-container">',
'#suffix' => '</div></div>',
'#type' => 'textfield',
@@ -907,7 +925,7 @@ function system_date_time_settings() {
);
$date_format_medium = variable_get('date_format_medium', $date_medium[1]);
- $form['date_format_medium'] = array(
+ $form['date_formats']['date_format_medium'] = array(
'#prefix' => '<div class="date-container"><div>',
'#suffix' => '</div>',
'#type' => 'select',
@@ -919,7 +937,7 @@ function system_date_time_settings() {
);
$default_medium_custom = variable_get('date_format_medium_custom', (isset($date_medium_choices[$date_format_medium]) ? $date_format_medium : ''));
- $form['date_format_medium_custom'] = array(
+ $form['date_formats']['date_format_medium_custom'] = array(
'#prefix' => '<div class="custom-container">',
'#suffix' => '</div></div>',
'#type' => 'textfield',
@@ -930,7 +948,7 @@ function system_date_time_settings() {
);
$date_format_long = variable_get('date_format_long', $date_long[0]);
- $form['date_format_long'] = array(
+ $form['date_formats']['date_format_long'] = array(
'#prefix' => '<div class="date-container"><div>',
'#suffix' => '</div>',
'#type' => 'select',
@@ -942,7 +960,7 @@ function system_date_time_settings() {
);
$default_long_custom = variable_get('date_format_long_custom', (isset($date_long_choices[$date_format_long]) ? $date_format_long : ''));
- $form['date_format_long_custom'] = array(
+ $form['date_formats']['date_format_long_custom'] = array(
'#prefix' => '<div class="custom-container">',
'#suffix' => '</div></div>',
'#type' => 'textfield',
@@ -952,21 +970,13 @@ function system_date_time_settings() {
'#description' => t('A user-defined long date format. See the <a href="@url">PHP manual</a> for available options. This format is currently set to display as <span>%date</span>.', array('@url' => 'http://php.net/manual/function.date.php', '%date' => format_date(time(), 'custom', $default_long_custom))),
);
- $form['date_first_day'] = array(
- '#type' => 'select',
- '#title' => t('First day of week'),
- '#default_value' => variable_get('date_first_day', 0),
- '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')),
- '#description' => t('The first day of the week for calendar views.')
- );
$form = system_settings_form($form);
// We will call system_settings_form_submit() manually, so remove it for now.
- unset($form['#submit']['system_settings_form_submit']);
- $form['#submit']['system_date_time_settings_submit'] = array();
+ unset($form['#submit']);
return $form;
}
-function system_date_time_settings_submit($form_id, $form_values) {
+function system_date_time_settings_submit($form_values, $form, &$form_state) {
if ($form_values['date_format_short'] == 'custom') {
$form_values['date_format_short'] = $form_values['date_format_short_custom'];
}
@@ -976,7 +986,7 @@ function system_date_time_settings_submit($form_id, $form_values) {
if ($form_values['date_format_long'] == 'custom') {
$form_values['date_format_long'] = $form_values['date_format_long_custom'];
}
- return system_settings_form_submit($form_id, $form_values);
+ return system_settings_form_submit($form_values, $form, $form_state);
}
/**