diff options
-rw-r--r-- | modules/archive.module | 16 | ||||
-rw-r--r-- | modules/archive/archive.module | 16 | ||||
-rw-r--r-- | modules/system.module | 1 | ||||
-rw-r--r-- | modules/system/system.module | 1 |
4 files changed, 2 insertions, 32 deletions
diff --git a/modules/archive.module b/modules/archive.module index abc8148ad..b9347202b 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -213,12 +213,6 @@ function archive_menu() { 'access' => user_access('access content'), 'callback' => 'archive_page', 'type' => MENU_SUGGESTED_ITEM); - $items[] = array('path' => 'archive/browse', 'title' => t('browse'), - 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'archive/configure', 'title' => t('configure'), - 'access' => user_access('administer site configuration'), - 'callback' => 'archive_configure', - 'type' => MENU_LOCAL_TASK); return $items; } @@ -262,14 +256,4 @@ function archive_page($year = 0, $month = 0, $day = 0) { print theme('page', $output); } -function archive_configure() { - if ($_POST) { - system_settings_save(); - } - - $output = form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week. By changing this value you choose how the calendar block is rendered.')); - - print theme('page', system_settings_form($output)); -} - ?> diff --git a/modules/archive/archive.module b/modules/archive/archive.module index abc8148ad..b9347202b 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -213,12 +213,6 @@ function archive_menu() { 'access' => user_access('access content'), 'callback' => 'archive_page', 'type' => MENU_SUGGESTED_ITEM); - $items[] = array('path' => 'archive/browse', 'title' => t('browse'), - 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'archive/configure', 'title' => t('configure'), - 'access' => user_access('administer site configuration'), - 'callback' => 'archive_configure', - 'type' => MENU_LOCAL_TASK); return $items; } @@ -262,14 +256,4 @@ function archive_page($year = 0, $month = 0, $day = 0) { print theme('page', $output); } -function archive_configure() { - if ($_POST) { - system_settings_save(); - } - - $output = form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week. By changing this value you choose how the calendar block is rendered.')); - - print theme('page', system_settings_form($output)); -} - ?> diff --git a/modules/system.module b/modules/system.module index 073b5a561..e909c2762 100644 --- a/modules/system.module +++ b/modules/system.module @@ -241,6 +241,7 @@ function system_view_general() { $group .= form_select(t('Short date format'), 'date_format_short', variable_get('date_format_short', $dateshort[0]), $dateshortchoices, t('The short format of date display.')); $group .= form_select(t('Medium date format'), 'date_format_medium', variable_get('date_format_medium', $datemedium[0]), $datemediumchoices, t('The medium sized date display.')); $group .= form_select(t('Long date format'), 'date_format_long', variable_get('date_format_long', $datelong[0]), $datelongchoices, t('Longer date format used for detailed display.')); + $group .= form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); $output .= form_group(t('Date settings'), $group); diff --git a/modules/system/system.module b/modules/system/system.module index 073b5a561..e909c2762 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -241,6 +241,7 @@ function system_view_general() { $group .= form_select(t('Short date format'), 'date_format_short', variable_get('date_format_short', $dateshort[0]), $dateshortchoices, t('The short format of date display.')); $group .= form_select(t('Medium date format'), 'date_format_medium', variable_get('date_format_medium', $datemedium[0]), $datemediumchoices, t('The medium sized date display.')); $group .= form_select(t('Long date format'), 'date_format_long', variable_get('date_format_long', $datelong[0]), $datelongchoices, t('Longer date format used for detailed display.')); + $group .= form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); $output .= form_group(t('Date settings'), $group); |