diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 335156ec3eb2cbfee5212b899eb39e513edd15ac..f378ce9ebcbdb27570924121e25e7155d1240a25 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -601,7 +601,7 @@ function drupal_get_messages($type = NULL) {
}
/**
- * Perform an access check for a given mask and rule type. Rules are usually created via admin/access/rules page.
+ * Perform an access check for a given mask and rule type. Rules are usually created via admin/user/rules page.
*/
function drupal_is_denied($type, $mask) {
$allow = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 1 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
diff --git a/includes/common.inc b/includes/common.inc
index 66c4341faeb8443ba821934df18ddf8ea4d70042..934f8a82904420c0ee478205c9314c0d95c1a98d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -230,7 +230,7 @@ function drupal_get_destination() {
* the query string of an URI) or the $_REQUEST['edit']-array (i.e. by
* using a hidden form field). This is used to direct the user back to
* the proper page after completing a form. For example, after editing
- * a post on the 'admin/node'-page or after having logged on using the
+ * a post on the 'admin/content/node'-page or after having logged on using the
* 'user login'-block in a sidebar. The function drupal_get_destination()
* can be used to help set the destination URL.
*
@@ -940,7 +940,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL
* Generate a URL from a Drupal menu path. Will also pass-through existing URLs.
*
* @param $path
- * The Drupal path being linked to, such as "admin/node", or an existing URL
+ * The Drupal path being linked to, such as "admin/content/node", or an existing URL
* like "http://drupal.org/".
* @param $query
* A query string to append to the link or URL.
@@ -1058,11 +1058,11 @@ function drupal_attributes($attributes = array()) {
* @param $text
* The text to be enclosed with the anchor tag.
* @param $path
- * The Drupal path being linked to, such as "admin/node". Can be an external
+ * The Drupal path being linked to, such as "admin/content/node". Can be an external
* or internal URL.
* - If you provide the full URL, it will be considered an
* external URL.
- * - If you provide only the path (e.g. "admin/node"), it is considered an
+ * - If you provide only the path (e.g. "admin/content/node"), it is considered an
* internal link. In this case, it must be a system URL as the url() function
* will generate the alias.
* @param $attributes
diff --git a/includes/locale.inc b/includes/locale.inc
index bf5ed75ed75b806d7eabf9139cc7256a39ee1c8a..7fa3aa9c3ac3de427b825873206495620e7521cb 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -199,7 +199,7 @@ function locale_add_language_form_submit($form_id, $form_values) {
_locale_add_language($form_values['langcode'], $isocodes[$form_values['langcode']][0]);
}
- return 'admin/locale';
+ return 'admin/settings/locale';
}
/**
@@ -264,7 +264,7 @@ function _locale_admin_import_submit($form_id, $form_values) {
watchdog('locale', $message, WATCHDOG_ERROR);
}
- return 'admin/locale';
+ return 'admin/settings/locale';
}
/**
diff --git a/includes/path.inc b/includes/path.inc
index f2c5141fe5d92854d17075c3fd435289e701c530..9112cb14653744993a3faa07a2b382b55c1d5d0e 100644
--- a/includes/path.inc
+++ b/includes/path.inc
@@ -123,9 +123,9 @@ function drupal_get_normal_path($path) {
/**
* Return a component of the current Drupal path.
*
- * When viewing a page at the path "admin/node/configure", for example, arg(0)
- * would return "admin", arg(1) would return "node", and arg(2) would return
- * "configure".
+ * When viewing a page at the path "admin/content/types", for example, arg(0)
+ * would return "admin", arg(1) would return "content", and arg(2) would return
+ * "types".
*
* Avoid use of this function where possible, as resulting code is hard to read.
* Instead, attempt to use named arguments in menu callback functions. See the
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 4a7d42152ef69e7295eb4181d0c7116701f9bf9f..8e7ab05d89d0af47acdb6fe8e5dff49f9173a3f6 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -16,15 +16,15 @@ function aggregator_help($section) {
$output .= '<p>'. t('Users can view the latest news chronologically in the <a href="%aggregator">main news aggregator display</a> or by <a href="%aggregator-sources">source</a>. Administrators can add, edit and delete feeds and choose how often to check for newly updated news for each individual feed. Administrators can also tag individual feeds with categories, offering selective grouping of some feeds into separate displays. Listings of the latest news for individual sources or categorized sources can be enabled as blocks for display in the sidebar through the <a href="%admin-block">block administration page</a>. The news aggregator requires cron to check for the latest news from the sites to which you have subscribed. Drupal also provides a <a href="%aggregator-opml">machine-readable OPML file</a> of all of your subscribed feeds.', array('%aggregator' => url('aggregator'), '%aggregator-sources' => url('aggregator/sources'), '%admin-block' => url('admin/build/block'), '%aggregator-opml' => url('aggregator/opml'))) .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>administer your list of news feeds <a href="%admin-aggregator">administer >> aggregator</a>.</li>
-<li>add a new feed <a href="%admin-aggregator-add-feed">administer >> aggregator >> add feed</a>.</li>
-<li>add a new category <a href="%admin-aggregator-add-category">administer >> aggregator >> add category</a>.</li>
-<li>configure global settings for the news aggregator <a href="%admin-settings-aggregator">administer >> settings >> aggregator</a>.</li>
-<li>control access to the aggregator module through access permissions <a href="%admin-access">administer >> access control >> permissions</a>.</li>
-<li>set permissions to access new feeds for user roles such as anonymous users at <a href="%admin-access">administer >> access control</a>.</li>
+<li>administer your list of news feeds <a href="%admin-aggregator">administer >> content management >> RSS aggregator</a>.</li>
+<li>add a new feed <a href="%admin-aggregator-add-feed">administer >> content management >> RSS aggregator >> add feed</a>.</li>
+<li>add a new category <a href="%admin-aggregator-add-category">administer >> content management >> RSS aggregator >> add category</a>.</li>
+<li>configure global settings for the news aggregator <a href="%admin-settings-aggregator">administer >> content management >> RSS aggregator >> settings</a>.</li>
+<li>control access to the aggregator module through access permissions <a href="%admin-access">administer >> user management >> access control</a>.</li>
+<li>set permissions to access new feeds for user roles such as anonymous users at <a href="%admin-access">administer >> user management >> access control</a>.</li>
<li>view the <a href="%aggregator">aggregator page</a>.</li>
</ul>
-', array('%admin-aggregator' => url('admin/content/aggregator'), '%admin-aggregator-add-feed' => url('admin/content/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/content/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/access'), '%aggregator' => url('aggregator')));
+', array('%admin-aggregator' => url('admin/content/aggregator'), '%admin-aggregator-add-feed' => url('admin/content/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/content/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/user/access'), '%aggregator' => url('aggregator')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%aggregator">Aggregator page</a>.', array('%aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index 387330c6e495dec448ef3ea6bd908514fb42d50a..edaa8de3374095f946635b9c925849b876ba2c9e 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -17,7 +17,7 @@ function archive_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>view your <a href="%archive">archive by day</a>.</li>
-<li>enable the <em>browse archives</em> block at <a href="%admin-block">administer >> block</a>.</li>
+<li>enable the <em>browse archives</em> block at <a href="%admin-block">administer >> site building >> blocks</a>.</li>
</ul>
', array('%archive' => url('archive'), '%admin-block' => url('admin/build/block')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://drupal.org/handbook/modules/archive/')) .'</p>';
diff --git a/modules/block/block.module b/modules/block/block.module
index 2cedded9e6530f01a1fbbbbf12b053afb9ba38b1..2b6d6b9481273973fa55de0cd6b936d9fbbb3357 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -32,8 +32,8 @@ function block_help($section) {
$output .= '<p>'. t('Administrators can also define custom blocks. These blocks consist of a title, a description, and a body which can be as long as you wish. Block content can be in any of the input formats supported for other content.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>enable, throttle and configure blocks at <a href="%admin-block">administer >> blocks</a>.</li>
-<li>add an administrator-defined block at <a href="%admin-block-add">administer >> blocks >> add block</a>.</li>
+<li>enable, throttle and configure blocks at <a href="%admin-block">administer >> site building >> blocks</a>.</li>
+<li>add an administrator-defined block at <a href="%admin-block-add">administer >> site building >> blocks >> add block</a>.</li>
</ul>
', array('%admin-block' => url('admin/build/block'), '%admin-block-add' => url('admin/build/block/add')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://drupal.org/handbook/modules/block/')) .'</p>';
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 1b277be3d9589ca02e748a6d8c65ac23293a88d2..4613c063429b79d4f56495b5fbcbd000dc5a3147 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -69,9 +69,9 @@ function blog_help($section) {
<ul>
<li>read your blog via your user profile at <a href="%user">my account</a>.</li>
<li>post a blog at <a href="%node-add-blog">create content >> personal blog entry</a>.</li>
-<li>administer blog at <a href="%admin-node-configure-types-blog">administer >> settings >> content types >> configure blog entry</a>.</li>
-<li>administer blog api at <a href="%admin-settings-blogapi">administer >> settings >> blogapi</a>.</li>
-<li>enable the "recent blog posts" block at <a href="%admin-block">administer >> blocks</a> to show the 10 most recent blog posts.</li>
+<li>administer blog at <a href="%admin-node-configure-types-blog">administer >> content management >> content types >> blog entry</a>.</li>
+<li>administer blog api at <a href="%admin-settings-blogapi">administer >> site configuration >> blog APIs</a>.</li>
+<li>enable the "recent blog posts" block at <a href="%admin-block">administer >> site building >> blocks</a> to show the 10 most recent blog posts.</li>
</ul>
', array('%user' => url('user'), '%node-add-blog' => url('node/add/blog'), '%admin-node-configure-types-blog' => url('admin/content/types/blog'), '%admin-settings-blogapi' => url('admin/settings/blogapi'), '%admin-block' => url('admin/build/block')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://drupal.org/handbook/modules/blog/')) .'</p>';
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index f002ced1d55fb2f23a89c8f83c9f621993159648..f34dd4c82398f587977312425bc8b793eab9bd81 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -18,7 +18,7 @@ function blogapi_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>view the XML-RPC page on your site at >> <a href="%file-xmlrpc">xmlrpc.php</a>.</li>
-<li><a href="%admin-settings-blogapi">administer >> settings >> blog api</a>.</li>
+<li><a href="%admin-settings-blogapi">administer >> site configuration >> blog APIs</a>.</li>
</ul>
', array('%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-blogapi' => url('admin/settings/blogapi')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blogapi">BlogApi page</a>.', array('%blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'</p>';
diff --git a/modules/book/book.module b/modules/book/book.module
index caf0291ba316572ee05347b345a5008354b3df31..003a0360d502ed5e03940c1af6732a5cf0dc8bb2 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -1003,12 +1003,12 @@ function book_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>create new book pages: <a href="%node-add-book">create content >> book page</a>.</li>
-<li>administer individual books (choose a book from list): <a href="%admin-node-book">administer >> content >> books</a>.</li>
-<li>set workflow and other global book settings on the book configuration page: <a href="%admin-settings-content-types-book-page" title="book page content type">administer >> settings >> content types >> configure book page</a>.</li>
-<li>enable the book navigation block: <a href="%admin-block">administer >> blocks</a>.</li>
-<li>control who can create, edit, and outline posts in books by setting access permissions: <a href="%admin-access">administer >> access control</a>.</li>
+<li>administer individual books (choose a book from list): <a href="%admin-node-book">administer >> content management >> books</a>.</li>
+<li>set workflow and other global book settings on the book configuration page: <a href="%admin-settings-content-types-book-page" title="book page content type">administer >> content management >> content types >> book page</a>.</li>
+<li>enable the book navigation block: <a href="%admin-block">administer >> site building >> blocks</a>.</li>
+<li>control who can create, edit, and outline posts in books by setting access permissions: <a href="%admin-access">administer >> user management >> access control</a>.</li>
</ul>
-', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/content/book'), '%admin-settings-content-types-book-page' => url('admin/content/types/book'), '%admin-block' => url('admin/build/block'), '%admin-access' => url('admin/access')));
+', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/content/book'), '%admin-settings-content-types-book-page' => url('admin/content/types/book'), '%admin-block' => url('admin/build/block'), '%admin-access' => url('admin/user/access')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://drupal.org/handbook/modules/book/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f135e27cb42e0326c4bb02cfdf54dde9589c99ff..3d4be56b7a5e729908676e934f854406c3ad0420 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -74,10 +74,10 @@ function comment_help($section) {
$output .= '<p>'. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>control access for various comment module functions through access permissions <a href="%admin-access">administer >> access control</a>.</li>
-<li>administer comments <a href="%admin-comment-configure"> administer >> comments >> configure</a>.</li>
+<li>control access for various comment module functions through access permissions <a href="%admin-access">administer >> user management >> access control</a>.</li>
+<li>administer comments <a href="%admin-comment-configure"> administer >> content management >> comments >> settings</a>.</li>
</ul>
-', array('%admin-access' => url('admin/access'), '%admin-settings-comment' => url('admin/content/comment/settings')));
+', array('%admin-access' => url('admin/user/access'), '%admin-settings-comment' => url('admin/content/comment/settings')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%comment">Comment page</a>.', array('%comment' => 'http://drupal.org/handbook/modules/comment/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
@@ -438,7 +438,7 @@ function comment_admin_settings() {
COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information')),
- '#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="%url">permissions page</a>.', array('%url' => url('admin/access'))),
+ '#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="%url">permissions page</a>.', array('%url' => url('admin/user/access'))),
);
if (!user_access('post comments', user_load(array('uid' => 0)))) {
$form['posting_settings']['comment_anonymous']['#attributes'] = array('disabled' => 'disabled');
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index ab77e1bffbda854ab9fe84a19231bbb42ba4d208..40ce116c7b0bc35df524b33ce33a32cb47b0f0f2 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -26,7 +26,7 @@ function drupal_help($section) {
<ul>
<li>run your cron job at your site\'s <a href="%file-cron">cron page</a></li>
<li>view your <a href="%file-xmlrpc">XML-RPC page</a>.</li>
- <li>administer Drupal <a href="%admin-settings-drupal">administer >> settings >> drupal</a>.</li>
+ <li>administer Drupal <a href="%admin-settings-drupal">administer >> site configuration >> distributed authentication</a>.</li>
</ul>
', array('%file-cron' => 'cron.php', '%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-drupal' => url('admin/settings/distributed-authentication')));
$output .= '<p>'. t('If you maintain a directory of sites, you can list them on a page using the <code>drupal_client_page()</code> function. Sample instructions:
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index bdf2185709ca932c1dc906a7624529f8b934c524..2aafbe0ece327d74bc4bdf869d34904407767be4 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -24,8 +24,8 @@ function filter_help($section) {
$output .= '<p>'. t('Users can choose between the available input formats when creating or editing content. Administrators can configure which input formats are available to which user roles, as well as choose a default input format. Administrators can also create new input formats. Each input format can be configured to use a selection of filters.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>administer input format permissions and settings at <a href="%admin-filters">administer >> input formats</a>.</li>
-<li>configure the filters for each input format at <a href="%admin-filters">administer >> input formats >> configure</a>.</li>
+<li>administer input format permissions and settings at <a href="%admin-filters">administer >> site configuration >> input formats</a>.</li>
+<li>configure the filters for each input format at <a href="%admin-filters">administer >> site configuration >> input formats</a>.</li>
</ul>
', array('%admin-filters' => url('admin/settings/filters')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%filter">Filter page</a>.', array('%filter' => 'http://drupal.org/handbook/modules/filter/')) .'</p>';
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index ec1caa25deae908247843b770c9e6a0d42b06a86..2c414ed0e215e3082881908fb10dca5d674f3db9 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -17,8 +17,8 @@ function forum_help($section) {
$output .= '<p>'. t('Forums module <strong>requires Taxonomy and Comments module</strong> be enabled.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>administer forums at <a href="%admin-forum">administer >> forums</a>.</li>
-<li>enable the required comment and taxonomy modules at <a href="%admin-modules">administer >> modules</a>.</li>
+<li>administer forums at <a href="%admin-forum">administer >> content management >> forums</a>.</li>
+<li>enable the required comment and taxonomy modules at <a href="%admin-modules">administer >> site configuration >> modules</a>.</li>
<li>read about the comment module at <a href="%admin-help-comment">administer >> help >> comment</a>.</li>
<li>read about the taxonomy module at <a href="%admin-help-taxonomy">administer >> help >> taxonomy</a>.</li>
</ul>
@@ -341,7 +341,7 @@ function forum_submit(&$node) {
}
}
$old_tid = db_result(db_query_range("SELECT tid FROM {forum} WHERE nid = %d ORDER BY vid DESC", $node->nid, 0,1));
- if ($old_tid) {
+ if ($old_tid) {
if (($node->tid != $old_tid) && $node->shadow) {
// A shadow copy needs to be created. Retain new term and add old term.
$node->taxonomy[] = $old_tid;
diff --git a/modules/help/help.module b/modules/help/help.module
index 1aa985f24995589f9384b95b02ce631e623917dc..e8ef6ce39e9cfdfc4dea4675d356f509dc3268b0 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -102,7 +102,7 @@ function help_help($section) {
$output .= t('<p>Modules can make documentation available to other modules with this module. All user help should be presented using this module. Some examples of help: </p>
<ul>
<li>The name of a module (unused, but there).</li>
-<li>The description found on the admin/system/modules page.</li>
+<li>The description found on the admin/settings/modules page.</li>
<li>The module\'s help text, displayed on the admin/help page and through the module\'s individual help link.</li>
<li>The help for a distributed authorization module (if applicable).</li>
<li>The description of a post type (if applicable).</li>
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 8f36b87e1e5807467c242aa637065c47e4b07ba0..cf721d43de1c48a3b32fed96ffc7797cd9a8a9a0 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -24,9 +24,9 @@ function locale_help($section) {
$output .= '<p>'. t('If an existing translation does not meet your needs, the <em>.po</em> files are easily edited with special editing tools. The locale module\'s import feature allows you to add strings from such files into your site\'s database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>administer localization at <a href="%admin-locale">administer >> localization</a>.</li>
-<li>manage strings for the localization: <a href="%admin-locale-string-search">administer >> localization >> manage strings</a>.</li>
-<li>add a locale language: <a href="%admin-locale-language-add">administer >> localization >> add language</a>.</li>
+<li>administer localization at <a href="%admin-locale">administer >> site configuration >> localization</a>.</li>
+<li>manage strings for the localization: <a href="%admin-locale-string-search">administer >> site configuration >> localization >> manage strings</a>.</li>
+<li>add a locale language: <a href="%admin-locale-language-add">administer >> site configuration >> localization >> add language</a>.</li>
<li>download translation files from the <a href="%external-http-drupal-org-project-Translations">Drupal translations page</a>.
</li>
</ul>
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index f738dfa81796fc5a4c544dbae5425107164a4e68..3936ba821350735d41188f1788d93962bcbe7eac 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -22,11 +22,11 @@ function menu_help($section) {
</ul>', array('%navigation' => theme('placeholder', 'Navigation'), '%primary-links' => theme('placeholder', 'primary links'), '%secondary-links' => theme('placeholder', 'secondary links'), '%admin-block' => url('admin/build/block'), '%menu-settings' => url('admin/build/menu/settings')));
$output .= t('<p>You can</p>
<ul>
- <li>administer menus at <a href="%admin-menu">administer >> menus</a>.</li>
- <li>add a menu at <a href="%admin-menu-menu-add">administer >> menus >> add menu</a>.</li>
- <li>add a menu item at <a href="%admin-menu-item-add">administer >> menus >> add menu item</a>.</li>
- <li>modify menu settings (in particular, to specify a menu to use for primary or secondary links) at <a href="%admin-settings-menus">administer >> settings >> menus</a>.</li>
- <li>manage menu blocks at <a href="%admin-block">administer >> blocks</a>.</li>
+ <li>administer menus at <a href="%admin-menu">administer >> site building >> menus</a>.</li>
+ <li>add a menu at <a href="%admin-menu-menu-add">administer >> site building >> menus >> add menu</a>.</li>
+ <li>add a menu item at <a href="%admin-menu-item-add">administer >> site building >> menus >> add menu item</a>.</li>
+ <li>modify menu settings (in particular, to specify a menu to use for primary or secondary links) at <a href="%admin-settings-menus">administer >> site building >> menus >> settings</a>.</li>
+ <li>manage menu blocks at <a href="%admin-block">administer >> site building >> blocks</a>.</li>
</ul>
', array('%admin-menu' => url('admin/build/menu'), '%admin-block' => url('admin/build/block'), '%admin-menu-menu-add' => url('admin/build/menu/menu/add'), '%admin-menu-item-add' => url('admin/build/menu/item/add'), '%admin-settings-menus' => url('admin/build/menu/settings')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%menu">Menu page</a>.', array('%menu' => 'http://drupal.org/handbook/modules/menu/')) .'</p>';
diff --git a/modules/node/node.module b/modules/node/node.module
index 88d17d0875f00354eefe2f068ca951257b419e51..9424cbb6e0ea3988633b0206f47ac0ecf1bfcc31 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -27,7 +27,7 @@ function node_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>search for content at <a href="%search">search</a>.</li>
-<li>administer nodes at <a href="%admin-settings-content-types">administer >> settings >> content types</a>.</li>
+<li>administer nodes at <a href="%admin-settings-content-types">administer >> content management >> content types</a>.</li>
</ul>
', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/content/types')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://drupal.org/handbook/modules/node/')) .'</p>';
@@ -2226,7 +2226,7 @@ function node_page_default() {
</li>
</ol>
<p>For more information, please refer to the <a href="%help">help section</a>, or the <a href="%handbook">online Drupal handbooks</a>. You may also post at the <a href="%forum">Drupal forum</a>, or view the wide range of <a href="%support">other support options</a> available.</p>',
- array('%drupal' => 'http://drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/settings/modules'), '%download_modules' => 'http://drupal.org/project/modules', '%themes' => url('admin/themes'), '%download_themes' => 'http://drupal.org/project/themes', '%content' => url('node/add'), '%help' => url('admin/help'), '%handbook' => 'http://drupal.org/handbooks', '%forum' => 'http://drupal.org/forum', '%support' => 'http://drupal.org/support')
+ array('%drupal' => 'http://drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/settings/modules'), '%download_modules' => 'http://drupal.org/project/modules', '%themes' => url('admin/build/themes'), '%download_themes' => 'http://drupal.org/project/themes', '%content' => url('node/add'), '%help' => url('admin/help'), '%handbook' => 'http://drupal.org/handbooks', '%forum' => 'http://drupal.org/forum', '%support' => 'http://drupal.org/support')
);
$output = '<div id="first-time">'. $output .'</div>';
}
diff --git a/modules/path/path.module b/modules/path/path.module
index 66a7a146c673e232b537aa552000dc647fbaee99..2415ff6deacc669634788f49316a547b87125362 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -26,10 +26,10 @@ function path_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>set the path for a post with the path module.</li>
-<li>add a URL alias: <a href="%admin-path-add">administer >> url aliases >> add alias</a>.</li>
-<li>administer the list of URL aliases: <a href="%admin-path">administer >> url aliases</a>.</li>
+<li>add a URL alias: <a href="%admin-path-add">administer >> site building >> url aliases >> add alias</a>.</li>
+<li>administer the list of URL aliases: <a href="%admin-path">administer >> site building >> url aliases</a>.</li>
<li>read how to <a href="%external-http-drupal-org-node-15365">configure clean URLs</a> for your webserver.
-<li>enable clean url\'s to remove the =? at <a href="%admin-clean-url-settings">administer >> settings >> clean URLs</a>.</li>
+<li>enable clean url\'s to remove the =? at <a href="%admin-clean-url-settings">administer >> site configuration >> clean URLs</a>.</li>
</ul>
', array('%admin-path-add' => url('admin/build/path/add'), '%admin-path' => url('admin/build/path'), '%external-http-drupal-org-node-15365' => 'http://drupal.org/node/15365', '%admin-clean-url-settings' => url('admin/settings/clean-urls')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%path">Path page</a>.', array('%path' => 'http://drupal.org/handbook/modules/path/')) .'</p>';
diff --git a/modules/ping/ping.module b/modules/ping/ping.module
index c76e301b6454cc942f1beee2e372277236ed93ef..8297ada68141b80e4b00a209eeba512d13384f5f 100644
--- a/modules/ping/ping.module
+++ b/modules/ping/ping.module
@@ -16,7 +16,7 @@ function ping_help($section) {
$output .= '<p>'. t('The ping module requires <code>cron</code> or a similar periodic job scheduler to be enabled.') .'</p>';
$output .= t('<p>You can:</p>
<ul>
-<li> enable or disable the ping module at <a href="%admin-modules">administer >> modules</a>.</li>
+<li> enable or disable the ping module at <a href="%admin-modules">administer >> site configuration >> modules</a>.</li>
<li>run your cron job at your sites <a href="%file-cron">cron page</a>.</li>
<li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li>
</ul></p>
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index be57aa4431c7a8685ed2c68026fc1720d18d2acc..97390c5b234bdf3f8da2eade162541422e69532f 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -18,7 +18,7 @@ function poll_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>view the <a href="%poll">polls page</a>.</li>
-<li><a href="%admin-node-configure-types-poll">administer >> settings >> content types >> configure poll</a>.</li>
+<li><a href="%admin-node-configure-types-poll">administer >> content management >> content types >> poll</a>.</li>
</ul>
', array('%poll' => url('poll'), '%admin-node-configure-types-poll' => url('admin/content/types/poll')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%poll">Poll page</a>.', array('%poll' => 'http://drupal.org/handbook/modules/poll/')) .'</p>';
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index db86fc314a8d661775e875f85e8dc5dbe2be0648..a10f2cf693124395dd4d7a13ba6b93ebf49d947f 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -35,7 +35,7 @@ function profile_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>view user <a href="%profile">profiles</a>.</li>
-<li>administer profile settings: <a href="%admin-settings-profile">administer >> settings >> profiles</a>.</li>
+<li>administer profile settings: <a href="%admin-settings-profile">administer >> user management >> profiles</a>.</li>
</ul>
', array('%profile' => url('profile'), '%admin-settings-profile' => url('admin/user/profile')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%profile">Profile page</a>.', array('%profile' => 'http://drupal.org/handbook/modules/profile/')) .'</p>';
diff --git a/modules/search/search.module b/modules/search/search.module
index 7d0d1cdc9def4b0222f6c5f98ff68bed75442b82..abf27a4658ea7bb99058e5037cf6fac509ac42ef 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -103,7 +103,7 @@ function search_help($section) {
<li>read about how your site uses cron in the <a href="%admin-help-system">administer >> help >> system</a>.</li>
<li>run your <a href="%file-cron">cron.php</a>.</li>
<li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li>
-<li><a href="%admin-settings-search">administer >> settings >> search</a>.</li></ul>
+<li><a href="%admin-settings-search">administer >> site configuration >> search</a>.</li></ul>
', array('%admin-help-system' => url('admin/help/system'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714', '%admin-settings-search' => url('admin/settings/search')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%search">Search page</a>.', array('%search' => 'http://drupal.org/handbook/modules/search/')) .'</p>';
return $output;
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index f6015fa3527f1888fa936d1fd20bb38b053c7d2e..729eaa76957d22752005f28a5285e8bf887158bc 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -33,10 +33,10 @@ function statistics_help($section) {
');
$output .= t('<p>You can</p>
<ul>
-<li>administer statistics <a href="%admin-settings-statistics">administer >> settings >> statistics</a>.</li>
+<li>administer statistics <a href="%admin-settings-statistics">administer >> logs >> access log settings</a>.</li>
<li>access statistics logs <a href="%admin-logs">administer >> logs</a>.</li>
<li>view recent hits <a href="%admin-logs-hits">administer >> logs >> recent hits</a>.</li>
-<li>enable \'popular content\' block in block administration <a href="%admin-block">administer >> blocks </a> but only after you have enabled \'Count content views\' in settings.</li>
+<li>enable \'popular content\' block in block administration <a href="%admin-block">administer >> site building >> blocks </a> but only after you have enabled \'Count content views\' in settings.</li>
</ul>
', array('%admin-settings-statistics' => url('admin/logs/settings'), '%admin-logs' => url('admin/logs'), '%admin-logs-hits' => url('admin/logs/hits'), '%admin-block' => url('admin/build/block')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%statistics">Statistics page</a>.', array('%statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'</p>';
@@ -333,7 +333,7 @@ function statistics_top_visitors() {
while ($account = db_fetch_object($result)) {
$qs = drupal_get_destination();
- $ban_link = $account->aid ? l(t('unban'), "admin/access/rules/delete/$account->aid", array(), $qs) : l(t('ban'), "admin/access/rules/add/$account->hostname/host", array(), $qs);
+ $ban_link = $account->aid ? l(t('unban'), "admin/user/rules/delete/$account->aid", array(), $qs) : l(t('ban'), "admin/user/rules/add/$account->hostname/host", array(), $qs);
$rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link);
}
diff --git a/modules/system/system.module b/modules/system/system.module
index a0a9759e33d4dce09a6cd08e0d1226dd7d4f752d..17b55d3759e53e0909c89eb22cd115c6ece938f9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -23,9 +23,9 @@ function system_help($section) {
<ul>
<li>activate your cron job on the cron page <a href="%file-cron">cron.php</a>.</li>
<li>read how to <a href="%external-http-drupal-org-cron">configure cron jobs</a>.</li>
-<li>administer cache settings in <a href="%admin-settings">administer >> settings >> caching</a>.</li>
+<li>administer cache settings in <a href="%admin-settings">administer >> site configuration >> page caching</a>.</li>
</ul>
-', array('%file-cron' => 'cron.php', '%external-http-drupal-org-cron' => 'http://drupal.org/cron', '%admin-settings' => url('admin/settings/caching')));
+', array('%file-cron' => 'cron.php', '%external-http-drupal-org-cron' => 'http://drupal.org/cron', '%admin-settings' => url('admin/settings/page-caching')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%system">System page</a>.', array('%system' => 'http://drupal.org/handbook/modules/system/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
@@ -42,7 +42,7 @@ function system_help($section) {
return t('<p>These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="%global">global settings</a> for this theme.</p>', array('%template' => $theme, '%global' => url('admin/build/themes/settings')));
case 'admin/settings/modules':
return t('<p>Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new <a href="%permissions">permissions</a> might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the <a href="%throttle">throttle configuration page</a> after having enabled the throttle module.</p>
-<p>It is important that <a href="%update-php">update.php</a> is run every time a module is updated to a newer version.</p>', array('%permissions' => url('admin/access/permissions'), '%throttle' => url('admin/settings/throttle'), '%update-php' => $base_url .'/update.php'));
+<p>It is important that <a href="%update-php">update.php</a> is run every time a module is updated to a newer version.</p>', array('%permissions' => url('admin/user/access'), '%throttle' => url('admin/settings/throttle'), '%update-php' => $base_url .'/update.php'));
}
}
@@ -316,7 +316,7 @@ function system_admin_menu_block($block) {
/**
* Provide a single block from the administration menu as a page.
* This function is often a destination for these blocks.
- * For example, 'admin/page' needs to have a destination to be valid
+ * For example, 'admin/content/types' needs to have a destination to be valid
* in the Drupal menu system, but too much information there might be
* hidden, so we supply the contents of the block.
*/
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 543f4b66193540be6bd31c16b66c4e3a038fd018..fc83e9c5479f1aef450d01f9f823a5b489157f90 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1339,8 +1339,8 @@ function taxonomy_help($section) {
$output .= '<p>'. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer >> categories >> add vocabulary</a>.</li>
-<li>administer taxonomy at <a href="%admin-taxonomy">administer >> categories</a>.</li>
+<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer >> content management >> categories >> add vocabulary</a>.</li>
+<li>administer taxonomy at <a href="%admin-taxonomy">administer >> content management >> categories</a>.</li>
<li>restrict content access by category for specific users roles using the <a href="%external-http-drupal-org-project-taxonomy_access">taxonomy access module</a>.</li>
<li>build a custom view of your categories using the <a href="%external-http-drupal-org-project-taxonomy_browser">taxonomy browser</a>.</li>
</ul>
diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module
index 52aa2ddfceff72f269a924c7388f2abdfee49a04..8526e2ad0fe258ebb07e9bc032407c20e3b66eae 100644
--- a/modules/throttle/throttle.module
+++ b/modules/throttle/throttle.module
@@ -125,9 +125,9 @@ function throttle_help($section) {
$output .= '<p>'. t('The congestion control throttle can be automatically enabled when the number of anonymous or authenticated users currently visiting the site exceeds the specified threshold. ') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>enable throttle for modules at <a href="%admin-modules">administer >> module</a>.</li>
-<li>enable throttle for blocks at <a href="%admin-block">administer >> block</a>.</li>
-<li>administer throttle at <a href="%admin-settings-throttle">administer >> settings >> throttle</a>.</li>
+<li>enable throttle for modules at <a href="%admin-modules">administer >> site configuration >> modules</a>.</li>
+<li>enable throttle for blocks at <a href="%admin-block">administer >> site building >> blocks</a>.</li>
+<li>administer throttle at <a href="%admin-settings-throttle">administer >> site configuration >> throttle</a>.</li>
</ul>
', array('%admin-modules' => url('admin/settings/modules'), '%admin-block' => url('admin/build/block'), '%admin-settings-throttle' => url('admin/settings/throttle')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%throttle">Throttle page</a>.', array('%throttle' => 'http://drupal.org/handbook/modules/throttle/')) .'</p>';
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index d36dc2011216818a924ccdef4331b9f5934493e9..15edcd43cecd8cc8214281bafbb22f86201210ec 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -17,17 +17,17 @@ function upload_help($section) {
$output .= '<p>'. t('Users with the upload files permission can upload attachments. You can choose which post types can take attachments on the content types settings page. Each user role can be customized for the file size of uploads, and the dimension of image files.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>administer user permissions at <a href="%admin-access">administer >> access control</a>.</li>
-<li>administer content at <a href="%admin-content-types">administer >> settings >> content types</a>.</li>
-<li>administer upload at <a href="%admin-upload">administer >> settings >> upload</a>.</li>
+<li>administer user permissions at <a href="%admin-access">administer >> user management >> access control</a>.</li>
+<li>administer content at <a href="%admin-content-types">administer >> content management >> content types</a>.</li>
+<li>administer upload at <a href="%admin-upload">administer >> site configuration >> file upload</a>.</li>
</ul>
-', array('%admin-access' => url('admin/access'), '%admin-content-types' => url('admin/settings/types'), '%admin-upload' => url('admin/settings/upload')));
+', array('%admin-access' => url('admin/user/access'), '%admin-content-types' => url('admin/settings/types'), '%admin-upload' => url('admin/settings/upload')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%upload">Upload page</a>.', array('%upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
return t('Allows users to upload and attach files to content.');
case 'admin/settings/upload':
- return t('<p>Users with the <a href="%permissions">upload files permission</a> can upload attachments. Users with the <a href="%permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="%types">content types settings</a> page.</p>', array('%permissions' => url('admin/access'), '%types' => url('admin/settings/types')));
+ return t('<p>Users with the <a href="%permissions">upload files permission</a> can upload attachments. Users with the <a href="%permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="%types">content types settings</a> page.</p>', array('%permissions' => url('admin/user/access'), '%types' => url('admin/settings/types')));
}
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 8469051b291e9bedc272d2829fa33b3c1a1ecf1e..d49f7415de7e7cbcec898c78413eca71390492ce 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2219,12 +2219,12 @@ function user_help($section) {
$output .= t('<p>You can</p>
<ul>
<li>view your <a href="%user">user page</a>.</li>
-<li>administer users at <a href="%admin-user">administer >> user</a>.</li>
-<li>allow users who have the "select different theme" permission to select themes from their user account by enabling themes in <a href="%admin-themes">administer >> themes</a>.</li>
+<li>administer users at <a href="%admin-user">administer >> user management</a>.</li>
+<li>allow users who have the "select different theme" permission to select themes from their user account by enabling themes in <a href="%admin-themes">administer >> site building >> themes</a>.</li>
<li>read user profile help at <a href="%admin-help-profile">administer >> help >> profile</a>.</li>
<li>read about distributed authentication in the system module help at <a href="%admin-help-system">administer >> help >> system</a>.</li>
</ul>
-', array('%user' => url('user'), '%admin-user' => url('admin/user/user'), '%admin-themes' => url('admin/themes'), '%admin-help-profile' => url('admin/help/profile'), '%admin-help-system' => url('admin/help/system')));
+', array('%user' => url('user'), '%admin-user' => url('admin/user/user'), '%admin-themes' => url('admin/build/themes'), '%admin-help-profile' => url('admin/help/profile'), '%admin-help-system' => url('admin/help/system')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%user">User page</a>.', array('%user' => 'http://drupal.org/handbook/modules/user/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index f7f2c59f8c017c3b1cbc9ce793688679a4200c21..c81b6e352e9ad156a2ec93cdeda0295a9f470479 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -22,10 +22,10 @@ function watchdog_help($section) {
$output .= '<p>'. t('The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the watchdog report on a regular basis to ensure their site is working properly.') .'</p>';
$output .= t('<p>You can</p>
<ul>
-<li>view watchdog logs at <a href="%admin-watchdog">administer >> watchdog</a>.</li>
-<li>view watchdog event logs at <a href="%admin-watchdog-events">administer >> watchdog >> events</a>.</li>
+<li>view watchdog logs at <a href="%admin-watchdog">administer >> logs >> watchdog</a>.</li>
+<li>view watchdog event logs at <a href="%admin-watchdog-events">administer >> logs >> watchdog >> events</a>.</li>
</ul>
-', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events')));
+', array('%admin-watchdog' => url('admin/logs/watchdog'), '%admin-watchdog-events' => url('admin/logs/watchdog/events')));
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%watchdog">Watchdog page</a>.', array('%watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'</p>';
return $output;
case 'admin/settings/modules#description':
diff --git a/themes/chameleon/common.css b/themes/chameleon/common.css
index 8d8041564ab90c9e22c350416c204d8b9a0cefbc..14192d89d641bc99d362a052a2dc0b0790f2ac7c 100644
--- a/themes/chameleon/common.css
+++ b/themes/chameleon/common.css
@@ -114,7 +114,7 @@ br {
}
/*
-** Common navigation links added on the admin/themes/settings page
+** Common navigation links added on the admin/build/themes/settings page
*/
.navlinks {
padding: 0em 0.5em 1.5em 0em;