diff options
Diffstat (limited to 'modules/image')
| -rw-r--r-- | modules/image/image.admin.inc | 32 | ||||
| -rw-r--r-- | modules/image/image.module | 34 | ||||
| -rw-r--r-- | modules/image/image.test | 8 |
3 files changed, 37 insertions, 37 deletions
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc index 1702997f7..79279fcb2 100644 --- a/modules/image/image.admin.inc +++ b/modules/image/image.admin.inc @@ -75,10 +75,10 @@ function image_style_form(&$form_state, $style) { '#default_value' => $effect['weight'], ); $form['effects'][$ieid]['configure'] = array( - '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '', + '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '', ); $form['effects'][$ieid]['remove'] = array( - '#markup' => l(t('delete'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'), + '#markup' => l(t('delete'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'), ); } @@ -140,7 +140,7 @@ function image_style_form_add_submit($form, &$form_state) { // Load the configuration form for this option. if (isset($effect['form callback'])) { - $path = 'admin/settings/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new']; + $path = 'admin/config/media/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new']; $form_state['redirect'] = array($path, array('weight' => $form_state['values']['weight'])); } // If there's no form, immediately add the image effect. @@ -177,7 +177,7 @@ function image_style_form_submit($form, &$form_state) { if ($form_state['values']['op'] == t('Update style')) { drupal_set_message('Changes to the style have been saved.'); } - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -215,7 +215,7 @@ function image_style_add_form_submit($form, &$form_state) { $style = array('name' => $form_state['values']['name']); $style = image_style_save($style); drupal_set_message(t('Style %name was created.', array('%name' => $style['name']))); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -258,7 +258,7 @@ function image_style_delete_form($form_state, $style) { return confirm_form( $form, t('Optionally select a style before deleting %style', array('%style' => $style['name'])), - 'admin/settings/image-styles', + 'admin/config/media/image-styles', t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted.'), t('Delete'), t('Cancel') ); @@ -272,7 +272,7 @@ function image_style_delete_form_submit($form, &$form_state) { image_style_delete($style, $form_state['values']['replacement']); drupal_set_message(t('Style %name was deleted.', array('%name' => $style['name']))); - $form_state['redirect'] = 'admin/settings/image-styles'; + $form_state['redirect'] = 'admin/config/media/image-styles'; } /** @@ -314,7 +314,7 @@ function image_effect_form(&$form_state, $style, $effect) { // If no configuration for this image effect, return to the image style page. if (!isset($effect['form callback'])) { - drupal_goto('admin/settings/image-styles/edit/' . $style['name']); + drupal_goto('admin/config/media/image-styles/edit/' . $style['name']); } $form = array( @@ -337,7 +337,7 @@ function image_effect_form(&$form_state, $style, $effect) { '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'), ); $form['buttons']['cancel'] = array( - '#markup' => l(t('Cancel'), 'admin/settings/image-styles/edit/' . $style['name']), + '#markup' => l(t('Cancel'), 'admin/config/media/image-styles/edit/' . $style['name']), ); return $form; @@ -352,7 +352,7 @@ function image_effect_form_submit($form, &$form_state) { $effect['isid'] = $style['isid']; image_effect_save($effect); drupal_set_message(t('The image effect was successfully applied.')); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -371,7 +371,7 @@ function image_effect_delete_form(&$form_state, $style, $effect) { $form = array(); $question = t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label'])); - return confirm_form($form, $question, 'admin/settings/image-styles/edit/' . $style['name'], '', t('Delete')); + return confirm_form($form, $question, 'admin/config/media/image-styles/edit/' . $style['name'], '', t('Delete')); } /** @@ -383,7 +383,7 @@ function image_effect_delete_form_submit($form, &$form_state) { image_effect_delete($effect); drupal_set_message(t('The image effect %name has been deleted.', array('%name' => $effect['label']))); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -577,21 +577,21 @@ function theme_image_style_list($styles) { $rows = array(); foreach ($styles as $style) { $row = array(); - $row[] = l($style['name'], 'admin/settings/image-styles/edit/' . $style['name']); + $row[] = l($style['name'], 'admin/config/media/image-styles/edit/' . $style['name']); $link_attributes = array( 'attributes' => array( 'class' => 'image-style-link', ), ); - $row[] = l(t('edit'), 'admin/settings/image-styles/edit/' . $style['name'], $link_attributes); - $row[] = l(t('delete'), 'admin/settings/image-styles/delete/' . $style['name'], $link_attributes); + $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes); + $row[] = l(t('delete'), 'admin/config/media/image-styles/delete/' . $style['name'], $link_attributes); $rows[] = $row; } if (empty($rows)) { $rows[] = array(array( 'colspan' => 4, - 'data' => t('There are currently no styles. <a href="!url">Add a new one</a>.', array('!url' => url('admin/settings/image-styles/add'))), + 'data' => t('There are currently no styles. <a href="!url">Add a new one</a>.', array('!url' => url('admin/config/media/image-styles/add'))), )); } diff --git a/modules/image/image.module b/modules/image/image.module index 10c6a39ec..42689cd02 100644 --- a/modules/image/image.module +++ b/modules/image/image.module @@ -16,7 +16,7 @@ function image_help($path, $arg) { $naming_approaches[] = t('Based on where it will be used: !name', array('!name' => '<code>profile-picture</code>')); $naming_approaches[] = t('Describing its appearance: !name', array('!name' => '<code>square-85x85</code>')); $output = ''; - $output .= '<p>' . t('The Image module provides functionality for displaying images on your site though <a href="!url">image styles</a>.', array('!url' => url('admin/settings/image-styles'))) .'</p>'; + $output .= '<p>' . t('The Image module provides functionality for displaying images on your site though <a href="!url">image styles</a>.', array('!url' => url('admin/config/media/image-styles'))) .'</p>'; $output .= '<h3>' . t('Image styles') . '</h3>'; $output .= '<p>' . t('Image <em>styles</em> allow your site to output an image in several different ways without affecting the original image. Any created images will automatically be refreshed if any changes are made to the image style.') .'</p>'; $output .= '<p>' . t('Every image style must have a name, which will be used in the URL of generated images. There are two common approaches to naming image styles:') . '</p>'; @@ -24,10 +24,10 @@ function image_help($path, $arg) { $output .= '<p>' . t('Both approaches are common and which you choose depends on how you use the image style.') . '</p>'; $output .= '<p>' . t('After creating an image style, <em>effects</em> may be added to the style. Image module comes with some basic effects such as <em>crop</em>, <em>scale</em>, <em>desaturate</em>, and <em>rotate</em>. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the <em>crop and scale</em> effect and the <em>desaturate</em> effect, you could create square, grayscale thumbnails.'); return $output; - case 'admin/settings/image-styles': + case 'admin/config/media/image-styles': return '<p>' . t('Image styles commonly provide thumbnail sizes by scaling and cropping images, but can also add various effects before an image is displayed. When an image is displayed with a style, a new file is created and the original image is left unchanged.') . '</p>'; - case 'admin/settings/image-styles/edit/%/add/%': - case 'admin/settings/image-styles/edit/%/effects/%': + case 'admin/config/media/image-styles/edit/%/add/%': + case 'admin/config/media/image-styles/edit/%/effects/%': $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6]); return isset($effect['help']) ? ('<p>' . $effect['help'] . '</p>') : NULL; } @@ -46,13 +46,13 @@ function image_menu() { 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles'] = array( + $items['admin/config/media/image-styles'] = array( 'title' => 'Image styles', 'description' => 'Configure styles that can be used for resizing or adjusting images on display.', 'page callback' => 'image_style_list', 'access arguments' => array('administer image styles'), ); - $items['admin/settings/image-styles/list'] = array( + $items['admin/config/media/image-styles/list'] = array( 'title' => 'List', 'description' => 'List the current image styles on the site.', 'page callback' => 'image_style_list', @@ -60,7 +60,7 @@ function image_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 1, ); - $items['admin/settings/image-styles/add'] = array( + $items['admin/config/media/image-styles/add'] = array( 'title' => 'Add style', 'description' => 'Add a new image style.', 'page callback' => 'drupal_get_form', @@ -69,53 +69,53 @@ function image_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); - $items['admin/settings/image-styles/edit/%image_style'] = array( + $items['admin/config/media/image-styles/edit/%image_style'] = array( 'title' => 'Edit style', 'title callback' => 'image_style_title', 'title arguments' => array('!name', 4), 'description' => 'Configure an image style.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('image_style_form', 4), + 'page arguments' => array('image_style_form', 5), 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/delete/%image_style'] = array( + $items['admin/config/media/image-styles/delete/%image_style'] = array( 'title' => 'Delete style', 'title callback' => 'image_style_title', 'title arguments' => array('Delete !name', 4), 'description' => 'Delete an image style.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('image_style_delete_form', 4, TRUE), + 'page arguments' => array('image_style_delete_form', 5, TRUE), 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect'] = array( + $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array( 'title' => 'Edit image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('!label effect', 6), 'description' => 'Edit an exiting effect within a style.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('image_effect_form', 4, 6), + 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( + $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( 'title' => 'Delete image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('Delete !label', 6), 'description' => 'Delete an exiting effect from a style.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('image_effect_delete_form', 4, 6), + 'page arguments' => array('image_effect_delete_form', 5, 7), 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/add/%image_effect_definition'] = array( + $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array( 'title' => 'Add image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('Add !label effect', 6), 'description' => 'Add a new effect to a style.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('image_effect_form', 4, 6), + 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); diff --git a/modules/image/image.test b/modules/image/image.test index 31e489cdf..94ce353d3 100644 --- a/modules/image/image.test +++ b/modules/image/image.test @@ -282,7 +282,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase { function testStyle() { // Setup a style to be created and effects to add to it. $style_name = strtolower($this->randomName(10)); - $style_path = 'admin/settings/image-styles/edit/' . $style_name; + $style_path = 'admin/config/media/image-styles/edit/' . $style_name; $effect_edits = array( 'image_resize' => array( 'data[width]' => 100, @@ -317,7 +317,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase { $edit = array( 'name' => $style_name, ); - $this->drupalPost('admin/settings/image-styles/add', $edit, t('Create new style')); + $this->drupalPost('admin/config/media/image-styles/add', $edit, t('Create new style')); $this->assertRaw(t('Style %name was created.', array('%name' => $style_name)), t('Image style successfully created.')); // Add effect form. @@ -376,7 +376,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase { $this->drupalPost($style_path, $edit, t('Update style')); // Note that after changing the style name, the style path is changed. - $style_path = 'admin/settings/image-styles/edit/' . $style_name; + $style_path = 'admin/config/media/image-styles/edit/' . $style_name; // Check that the URL was updated. $this->drupalGet($style_path); @@ -416,7 +416,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase { // Style deletion form. // Delete the style. - $this->drupalPost('admin/settings/image-styles/delete/' . $style_name, array(), t('Delete')); + $this->drupalPost('admin/config/media/image-styles/delete/' . $style_name, array(), t('Delete')); // Confirm the style directory has been removed. $directory = file_directory_path() . '/styles/' . $style_name; |