diff --git a/docroot/.htaccess b/docroot/.htaccess index 0ba171f..7ccb6a2 100644 --- a/docroot/.htaccess +++ b/docroot/.htaccess @@ -2,12 +2,6 @@ # Apache/PHP/Drupal settings: # -# Prevent site release related files. - - Order deny,allow - Deny from all - - # Protect files and directories from prying eyes. Order allow,deny @@ -62,12 +56,6 @@ DirectoryIndex index.php index.html index.htm RewriteEngine on - # securing the admin section of the site - RewriteCond %{HTTP_HOST} !^edit-fbk(.*)$ - RewriteCond %{HTTP_HOST} !^(.*)jjconsumer.com$ - RewriteCond %{HTTP_HOST} !^(.*)localhost$ - RewriteRule ^(scripts|profile|includes|cron\.php|install\.php|update\.php|xmlrpc\.php|filter($|/)|user($|/)|admin($|/)) - [F,L] - # Set "protossl" to "s" if we were accessed via https://. This is used later # if you enable "www." stripping or enforcement, in order to ensure that # you don't bounce between http and https. @@ -128,10 +116,6 @@ DirectoryIndex index.php index.html index.htm RewriteCond %{REQUEST_URI} !=/favicon.ico RewriteRule ^ index.php [L] - RewriteCond %{HTTP_HOST} ^(w{3}\.)?doublecleansing\.ca$ [NC] - RewriteRule ^(.*)$ http://www.neutrogenaca.ca/cleansers/doublecleansing [L,R=301] - - # Rules to correctly serve gzip compressed CSS and JS files. # Requires both mod_rewrite and mod_headers to be enabled. diff --git a/docroot/sites/sites.php b/docroot/sites/sites.php index 95bdc14..2ad7ef2 100644 --- a/docroot/sites/sites.php +++ b/docroot/sites/sites.php @@ -4,7 +4,7 @@ * @file * Configuration file for Drupal's multi-site directory aliasing feature. */ - +$sites['zantac.localhost'] = 'www_neutrogena_ca'; // Base sites $sites['jnjconcanada01dev.prod.acquia-sites.com'] = 'www_benadryl_ca'; $sites['jnjconcanada01stg.prod.acquia-sites.com'] = 'www_benadryl_ca'; diff --git a/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.module b/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.module index dabaf3c..fa74c76 100644 --- a/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.module +++ b/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.module @@ -24,7 +24,7 @@ function menu_attributes_permission() { /** * Implements hook_menu_link_alter(). */ -function menu_attributes_menu_link_alter(&$item, $menu) { +function menu_attributes_menu_link_alter(&$item) { if (isset($item['options']['attributes']) && is_array($item['options']['attributes'])) { // Filter out blank attributes. foreach ($item['options']['attributes'] as $key => $value) { @@ -37,6 +37,15 @@ function menu_attributes_menu_link_alter(&$item, $menu) { if (isset($item['options']['attributes']['class']) && is_string($item['options']['attributes']['class'])) { $item['options']['attributes']['class'] = array_filter(explode(' ', $item['options']['attributes']['class'])); } + + // Allow html rendering of the menu link title. + if (isset($item['options']['attributes']['title_html']) && $item['options']['attributes']['title_html']) { + $item['options']['html'] = $item['options']['attributes']['title_html']; + } else { + if (isset($item['options']['html'])) { + unset($item['options']['html']); + } + } } } @@ -44,6 +53,14 @@ function menu_attributes_menu_link_alter(&$item, $menu) { * Implements hook_menu_attribute_info(). */ function menu_attributes_menu_attribute_info() { + + $info['title_html'] = array( + 'label' => t('HTML in menu link title'), + 'description' => t('If you want to add html tags to the menu link title, enable this. This should only be accessible to trusted users.'), + 'form' => array( + '#type' => 'checkbox', + ), + ); $info['title'] = array( 'label' => t('Title'), 'description' => t('The description displayed when hovering over the link.'), diff --git a/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.test b/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.test index 4cabdfd..a987e27 100644 --- a/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.test +++ b/docroot/sites/www_neutrogena_ca/modules/contrib/menu_attributes/menu_attributes.test @@ -40,6 +40,7 @@ class MenuAttributesTestHelper extends DrupalWebTestCase { 'style' => $this->randomName(10), 'target' => '_top', 'accesskey' => $this->randomName(1), + 'title_html' => 1, ); $this->menu_attributes_edit = array( @@ -51,6 +52,7 @@ class MenuAttributesTestHelper extends DrupalWebTestCase { 'style' => $this->randomName(10), 'target' => '_self', 'accesskey' => $this->randomName(1), + 'title_html' => 1, ); } @@ -91,6 +93,7 @@ class MenuAttributesTestHelper extends DrupalWebTestCase { 'options[attributes][style]' => $menu_attributes['style'], 'options[attributes][target]' => $menu_attributes['target'], 'options[attributes][accesskey]' => $menu_attributes['accesskey'], + 'options[attributes][title_html]' => $menu_attributes['title_html'], ); // Add menu link. @@ -225,6 +228,7 @@ class MenuAttributesNodeTestCase extends MenuAttributesTestHelper { 'menu[options][attributes][style]' => $this->menu_attributes_new['style'], 'menu[options][attributes][target]' => $this->menu_attributes_new['target'], 'menu[options][attributes][accesskey]' => $this->menu_attributes_new['accesskey'], + 'menu[options][attributes][title_html]' => $this->menu_attributes_new['title_html'], ); $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); // Assert that the link exists. @@ -248,6 +252,7 @@ class MenuAttributesNodeTestCase extends MenuAttributesTestHelper { 'menu[options][attributes][style]' => $this->menu_attributes_edit['style'], 'menu[options][attributes][target]' => $this->menu_attributes_edit['target'], 'menu[options][attributes][accesskey]' => $this->menu_attributes_edit['accesskey'], + 'menu[options][attributes][title_html]' => $this->menu_attributes_edit['title_html'], ); $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));