summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/shortcut/shortcut.module20
-rw-r--r--themes/seven/seven.info1
2 files changed, 12 insertions, 9 deletions
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index 783f87e31..0fd34b1d1 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -558,15 +558,17 @@ function shortcut_preprocess_page(&$variables) {
$link_path = 'admin/config/system/shortcut/link/' . $mlid . '/delete';
}
- $variables['title_suffix']['add_or_remove_shortcut'] = array(
- '#attached' => array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')),
- '#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
- '#type' => 'link',
- '#title' => '<span class="icon"></span><span class="text">' . $link_text . '</span>',
- '#href' => $link_path,
- '#options' => array('query' => $query, 'html' => TRUE),
- '#suffix' => '</div>',
- );
+ if (theme_get_setting('shortcut_module_link')) {
+ $variables['title_suffix']['add_or_remove_shortcut'] = array(
+ '#attached' => array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')),
+ '#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
+ '#type' => 'link',
+ '#title' => '<span class="icon"></span><span class="text">' . $link_text . '</span>',
+ '#href' => $link_path,
+ '#options' => array('query' => $query, 'html' => TRUE),
+ '#suffix' => '</div>',
+ );
+ }
}
}
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index ef4ba7a33..fa8629887 100644
--- a/themes/seven/seven.info
+++ b/themes/seven/seven.info
@@ -7,6 +7,7 @@ core = 7.x
engine = phptemplate
stylesheets[screen][] = reset.css
stylesheets[screen][] = style.css
+settings[shortcut_module_link] = 1
regions[content] = Content
regions[help] = Help
regions[page_top] = Page top