From 8e438bb1ffce7c2165a15b81f374b352ef915261 Mon Sep 17 00:00:00 2001 From: Zach Schmid Date: Tue, 28 May 2013 13:50:12 -0400 Subject: [PATCH] date-time tweaks --- .../Drupal/system/Form/DateFormatDeleteForm.php | 4 ++-- .../lib/Drupal/system/Form/DateFormatFormBase.php | 2 +- .../system/Form/DateFormatLocalizeResetForm.php | 4 ++-- .../system/lib/Drupal/system/Form/RegionalForm.php | 2 +- .../Drupal/system/Tests/Common/FormatDateTest.php | 4 ++-- .../lib/Drupal/system/Tests/System/AdminTest.php | 4 ++-- .../Tests/System/DateFormatsLanguageTest.php | 12 +++++----- .../Drupal/system/Tests/System/DateTimeTest.php | 16 ++++++------- core/modules/system/system.admin.inc | 12 +++++----- core/modules/system/system.module | 28 ++++++++++++---------- core/modules/system/system.routing.yml | 8 +++---- 11 files changed, 50 insertions(+), 46 deletions(-) diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index b56f3cf..1e689c0 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -82,7 +82,7 @@ protected function getConfirmText() { * {@inheritdoc} */ protected function getCancelPath() { - return 'admin/config/regional/date-time/formats'; + return 'admin/config/regional/settings/date-time/formats'; } /** @@ -106,7 +106,7 @@ public function submitForm(array &$form, array &$form_state) { system_date_format_delete($this->formatID); drupal_set_message(t('Removed date format %format.', array('%format' => $this->format['name']))); - $form_state['redirect'] = 'admin/config/regional/date-time/formats'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/formats'; } } diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php index eef17d8..dfca8e4 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php @@ -65,7 +65,7 @@ public function submitForm(array &$form, array &$form_state) { drupal_set_message(t('Custom date format added.')); } - $form_state['redirect'] = 'admin/config/regional/date-time/formats'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/formats'; } } diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php index a3576c5..216e542 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php @@ -74,7 +74,7 @@ protected function getConfirmText() { * {@inheritdoc} */ protected function getCancelPath() { - return 'admin/config/regional/date-time/locale'; + return 'admin/config/regional/settings/date-time/locale'; } /** @@ -103,7 +103,7 @@ public function buildForm(array $form, array &$form_state, $langcode = NULL) { public function submitForm(array &$form, array &$form_state) { $this->configFactory->get('locale.config.' . $this->language->langcode . '.system.date')->delete(); - $form_state['redirect'] = 'admin/config/regional/date-time/locale'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/locale'; } } diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php index 323a3bb..822eb5d 100644 --- a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php +++ b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php @@ -34,7 +34,7 @@ public function buildForm(array $form, array &$form_state) { $form['locale'] = array( '#type' => 'details', - '#title' => t('Locale'), + '#title' => t('Default Country & Language'), ); $form['locale']['site_default_country'] = array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php index 118a059..d4b8d81 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php @@ -68,7 +68,7 @@ function testAdminDefinedFormatDate() { 'date_format_name' => 'Example Style', 'date_format_pattern' => 'j M y', ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Add a second date format with a different case than the first. $edit = array( @@ -76,7 +76,7 @@ function testAdminDefinedFormatDate() { 'date_format_name' => 'Example Style Uppercase', 'date_format_pattern' => 'j M Y', ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('Custom date format updated.')); $timestamp = strtotime('2007-03-10T00:00:00+00:00'); diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php index 1c42936..e62b9ad 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php @@ -80,7 +80,7 @@ function testAdminPages() { $this->drupalGet($page); $this->assertLinkByHref('admin/config'); $this->assertLinkByHref('admin/config/regional/settings'); - $this->assertLinkByHref('admin/config/regional/date-time'); + $this->assertNoLinkByHref('admin/config/regional/settings/date-time'); $this->assertLinkByHref('admin/config/regional/language'); $this->assertNoLinkByHref('admin/config/regional/language/detection/session'); $this->assertNoLinkByHref('admin/config/regional/language/detection/url'); @@ -97,7 +97,7 @@ function testAdminPages() { $this->drupalGet($page); $this->assertLinkByHref('admin/config'); $this->assertNoLinkByHref('admin/config/regional/settings'); - $this->assertNoLinkByHref('admin/config/regional/date-time'); + $this->assertNoLinkByHref('admin/config/regional/settings/date-time'); $this->assertNoLinkByHref('admin/config/regional/language'); $this->assertNoLinkByHref('admin/config/regional/language/detection/session'); $this->assertNoLinkByHref('admin/config/regional/language/detection/url'); diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php index 4d98340..90ae346 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php @@ -65,7 +65,7 @@ function testLocalizeDateFormats() { 'date_format_pattern' => 'd.m.Y - H:i', 'date_langcode[]' => array('fr'), ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Add new date format for English. $edit = array( @@ -74,17 +74,17 @@ function testLocalizeDateFormats() { 'date_format_pattern' => 'j M Y - g:ia', 'date_langcode[]' => array('en'), ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Configure date formats. - $this->drupalGet('admin/config/regional/date-time/locale'); + $this->drupalGet('admin/config/regional/settings/date-time/locale'); $this->assertText('French', 'Configured languages appear.'); $edit = array( 'date_format_long' => 'example_style_fr', 'date_format_medium' => 'example_style_fr', 'date_format_short' => 'example_style_fr', ); - $this->drupalPost('admin/config/regional/date-time/locale/fr/edit', $edit, t('Save configuration')); + $this->drupalPost('admin/config/regional/settings/date-time/locale/fr/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'French date formats updated.'); $edit = array( @@ -92,7 +92,7 @@ function testLocalizeDateFormats() { 'date_format_medium' => 'example_style_en', 'date_format_short' => 'example_style_en', ); - $this->drupalPost('admin/config/regional/date-time/locale/en/edit', $edit, t('Save configuration')); + $this->drupalPost('admin/config/regional/settings/date-time/locale/en/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'English date formats updated.'); // Create node content. @@ -107,7 +107,7 @@ function testLocalizeDateFormats() { $this->assertText($french_date, 'French date format appears'); // Make sure we can reset dates back to default. - $this->drupalPost('admin/config/regional/date-time/locale/en/reset', array(), t('Reset')); + $this->drupalPost('admin/config/regional/settings/date-time/locale/en/reset', array(), t('Reset')); $this->drupalGet('node/' . $node->nid); $this->assertNoText($english_date, 'English date format does not appear'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php index c867581..616405c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php @@ -78,7 +78,7 @@ function testTimeZoneHandling() { */ function testDateFormatConfiguration() { // Confirm 'no custom date formats available' message appears. - $this->drupalGet('admin/config/regional/date-time/formats'); + $this->drupalGet('admin/config/regional/settings/date-time/formats'); // Add custom date format. $this->clickLink(t('Add format')); @@ -90,26 +90,26 @@ function testDateFormatConfiguration() { 'date_format_name' => $name, 'date_format_pattern' => $date_format, ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Date format added confirmation message appears.'); $this->assertText($date_format_id, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); // Edit custom date format. - $this->drupalGet('admin/config/regional/date-time/formats'); + $this->drupalGet('admin/config/regional/settings/date-time/formats'); $this->clickLink(t('Edit')); $edit = array( 'date_format_pattern' => 'Y m', ); $this->drupalPost($this->getUrl(), $edit, t('Save format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.'); // Delete custom date format. $this->clickLink(t('Delete')); - $this->drupalPost('admin/config/regional/date-time/formats/' . $date_format_id . '/delete', array(), t('Remove')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->drupalPost('admin/config/regional/settings/date-time/formats/' . $date_format_id . '/delete', array(), t('Remove')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Removed date format ' . $name), 'Custom date format removed.'); // Make sure the date does not exist in config. @@ -152,7 +152,7 @@ function testDateFormatXSS() { ); system_date_format_save('xss_short', $date_format_info); - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->assertNoRaw("", 'The date format was properly sanitized'); } } diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 2dc1c57..bbf00d6 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1807,11 +1807,11 @@ function system_date_time_formats() { $links = array(); $links['edit'] = array( 'title' => t('Edit'), - 'href' => 'admin/config/regional/date-time/formats/' . $date_format_id . '/edit', + 'href' => 'admin/config/regional/settings/date-time/formats/' . $date_format_id . '/edit', ); $links['delete'] = array( 'title' => t('Delete'), - 'href' => 'admin/config/regional/date-time/formats/' . $date_format_id . '/delete', + 'href' => 'admin/config/regional/settings/date-time/formats/' . $date_format_id . '/delete', ); $row['operations'] = array('data' => array( '#type' => 'operations', @@ -1827,7 +1827,7 @@ function system_date_time_formats() { '#theme' => 'table', '#header' => $header, '#rows' => $rows, - '#empty' => t('No custom date formats available. Add date format.', array('@link' => url('admin/config/regional/date-time/formats/add'))), + '#empty' => t('No custom date formats available. Add date format.', array('@link' => url('admin/config/regional/settings/date-time/formats/add'))), ); return $build; @@ -1858,11 +1858,11 @@ function system_date_format_language_overview_page() { $links = array(); $links['edit'] = array( 'title' => t('Edit'), - 'href' => "admin/config/regional/date-time/locale/$langcode/edit", + 'href' => "admin/config/regional/settings/date-time/locale/$langcode/edit", ); $links['reset'] = array( 'title' => t('Reset'), - 'href' => "admin/config/regional/date-time/locale/$langcode/reset", + 'href' => "admin/config/regional/settings/date-time/locale/$langcode/reset", ); $row[] = array( 'data' => array( @@ -1972,7 +1972,7 @@ function system_date_format_localize_form_submit($form, &$form_state) { } } drupal_set_message(t('Configuration saved.')); - $form_state['redirect'] = 'admin/config/regional/date-time/locale'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/locale'; } /** diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 2c70d82..ecd42e6 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -88,7 +88,7 @@ function system_help($path, $arg) { $output .= '
' . t('Performing system maintenance') . '
'; $output .= '
' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis. The System module manages this task by making use of a system cron job. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online handbook entry for configuring cron jobs. You can set up cron job by visiting Cron configuration page', array('@status' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron', '@cron' => url('admin/config/system/cron'))) . '
'; $output .= '
' . t('Configuring basic site settings') . '
'; - $output .= '
' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/date-time'), '@file-system' => url('admin/config/media/file-system'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
'; + $output .= '
' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/settings/date-time'), '@file-system' => url('admin/config/media/file-system'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
'; $output .= ''; return $output; case 'admin/index': @@ -859,27 +859,31 @@ function system_menu() { 'file' => 'system.admin.inc', ); $items['admin/config/regional/settings'] = array( - 'title' => 'Regional settings', - 'description' => "Settings for the site's default time zone and country.", + 'title' => 'Regional, date and time setting', + 'description' => "Set default time zones, default country and configure display format strings for date and time.", 'route_name' => 'system_regional_settings', 'weight' => -20, ); - $items['admin/config/regional/date-time'] = array( + $items['admin/config/regional/settings/list'] = array( + 'title' => 'Settings', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + $items['admin/config/regional/settings/date-time'] = array( 'title' => 'Date and time formats', 'description' => 'Configure display format strings for date and time.', 'page callback' => 'system_date_time_formats', 'access arguments' => array('administer site configuration'), - 'weight' => -9, + 'type' => MENU_LOCAL_TASK, 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/formats/add'] = array( + $items['admin/config/regional/settings/date-time/formats/add'] = array( 'title' => 'Add format', 'description' => 'Allow users to add additional date formats.', 'type' => MENU_LOCAL_ACTION, 'route_name' => 'date_format_add', 'weight' => -10, ); - $items['admin/config/regional/date-time/formats/%/edit'] = array( + $items['admin/config/regional/settings/date-time/formats/%/edit'] = array( 'title' => 'Edit date format', 'description' => 'Allow users to edit a configured date format.', 'page callback' => 'drupal_get_form', @@ -887,12 +891,12 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/formats/%/delete'] = array( + $items['admin/config/regional/settings/date-time/formats/%/delete'] = array( 'title' => 'Delete date format', 'description' => 'Allow users to delete a configured date format.', 'route_name' => 'date_format_delete', ); - $items['admin/config/regional/date-time/formats/lookup'] = array( + $items['admin/config/regional/settings/date-time/formats/lookup'] = array( 'title' => 'Date and time lookup', 'page callback' => 'system_date_time_lookup', 'access arguments' => array('administer site configuration'), @@ -1006,7 +1010,7 @@ function system_menu() { // Localize date formats. if (module_exists('language')) { - $items['admin/config/regional/date-time/locale'] = array( + $items['admin/config/regional/settings/date-time/locale'] = array( 'title' => 'Localize', 'description' => 'Configure date formats for each locale', 'page callback' => 'system_date_format_language_overview_page', @@ -1015,7 +1019,7 @@ function system_menu() { 'weight' => -8, 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/locale/%/edit'] = array( + $items['admin/config/regional/settings/date-time/locale/%/edit'] = array( 'title' => 'Localize date formats', 'description' => 'Configure date formats for each locale', 'page callback' => 'drupal_get_form', @@ -1023,7 +1027,7 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/locale/%/reset'] = array( + $items['admin/config/regional/settings/date-time/locale/%/reset'] = array( 'title' => 'Reset date formats', 'description' => 'Reset localized date formats to global defaults', 'route_name' => 'date_format_localize_reset', diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index f39cf3b..792dfd3 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -75,28 +75,28 @@ system_site_maintenance_mode: _permission: 'administer site configuration' date_format_add: - pattern: '/admin/config/regional/date-time/formats/add' + pattern: '/admin/config/regional/settings/date-time/formats/add' defaults: _form: '\Drupal\system\Form\DateFormatAddForm' requirements: _permission: 'administer site configuration' date_format_edit: - pattern: '/admin/config/regional/date-time/formats/{date_format_id}/edit' + pattern: '/admin/config/regional/settings/date-time/formats/{date_format_id}/edit' defaults: _form: '\Drupal\system\Form\DateFormatEditForm' requirements: _permission: 'administer site configuration' date_format_delete: - pattern: 'admin/config/regional/date-time/formats/{format_id}/delete' + pattern: 'admin/config/regional/settings/date-time/formats/{format_id}/delete' defaults: _form: '\Drupal\system\Form\DateFormatDeleteForm' requirements: _permission: 'administer site configuration' date_format_localize_reset: - pattern: 'admin/config/regional/date-time/locale/{langcode}/reset' + pattern: 'admin/config/regional/settings/date-time/locale/{langcode}/reset' defaults: _form: '\Drupal\system\Form\DateFormatLocalizeResetForm' requirements: -- 1.7.11.1 From dc8402afd2a0319b3036c531fdb2620c88c19592 Mon Sep 17 00:00:00 2001 From: Zach Schmid Date: Tue, 28 May 2013 14:12:08 -0400 Subject: [PATCH] A few more tweaks to make tests pass --- core/modules/system/system.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/system/system.module b/core/modules/system/system.module index ecd42e6..593688b 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1023,7 +1023,7 @@ function system_menu() { 'title' => 'Localize date formats', 'description' => 'Configure date formats for each locale', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_date_format_localize_form', 5), + 'page arguments' => array('system_date_format_localize_form', 6), 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); -- 1.7.11.1