diff --git a/profiles/wcm_base/modules/contrib/special_menu_items/LICENSE.txt b/profiles/wcm_base/modules/contrib/special_menu_items/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/special_menu_items/LICENSE.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/profiles/wcm_base/modules/contrib/special_menu_items/README.txt b/profiles/wcm_base/modules/contrib/special_menu_items/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6745fd5b8c336adcf1a81dfc56a0dd826b3cc669
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/special_menu_items/README.txt
@@ -0,0 +1,41 @@
+Special Menu Items Module
+------------------------
+Written by Tamir Al Zoubi and Karim Djelid - Servit Open Source Solutions - www.servit.ch
+
+
+Description
+-----------
+Special Menu Items is module that enables placeholder and separator menu items.Placeholder is a menu item which is
+actually not a link. Something like this is useful with drop down menus where we want to have a parent link which
+is actually not linking to a page but which is just acting as a parent grouping some children below it.
+A separator menu item is something like "-------" which is also not linking anywhere but merely a mean to structure menus.
+
+This module depends on the Menu module. It is recommended that the SimpleMenu module or another drop down menu module
+is used, or you will not be able to acess children of nolink menu items.
+
+Features
+--------
+ - User can create a new menu item and place either "<nolink>" or "<separator>" in the Path field, without quotes.
+ - When the menu is rendered the "nolink" item will be rendered similar to a normal menu link item, but there will
+ be no link, just the title. Since version 1.3 you can change HTML tag used for menu item.
+ - When the menu is rendered the "separator" item will be rendered as an item which has no link,
+ and the default title will be "-------". Since version 1.3 it is possible to change both the HTML tag and title.
+ - Breadcrumb of "<nolink>" will be rendered same as "<nolink>" menu item.
+ - CSS class "nolink" is added to "<nolink>" menu item.
+ - CSS class "seperator" is added to "<seperator>" menu item.
+ - Compatible with the Sitemap module.
+
+Installation
+------------
+1. Copy the special_menu_items folder to your sites/all/modules directory.
+2. At Administer -> Site building -> Modules (admin/modules) enable the module.
+3. Configure the module settings at Administer -> Site configuration -> Special Menu Items (admin/config/system/special_menu_items).
+
+Upgrading
+---------
+Just overwrite (or replace) the older special_menu_items folder with the newer version.
+
+Contact
+-------
+This module is developed by Servit Open Source Solutions - http://servit.ch
+and maintained by Khaled Zaidan - zaidan@servit.ch
diff --git a/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.info b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.info
new file mode 100644
index 0000000000000000000000000000000000000000..44dd8dfeb6412d8b22e7687752b90397fe6a98ea
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.info
@@ -0,0 +1,13 @@
+name = Special menu items
+description = "Allow users to add placeholder and/or separator menu items."
+core = 7.x
+dependencies[] = menu
+
+configure = admin/config/system/special_menu_items
+
+; Information added by drupal.org packaging script on 2012-09-04
+version = "7.x-2.0"
+core = "7.x"
+project = "special_menu_items"
+datestamp = "1346788411"
+
diff --git a/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.install b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.install
new file mode 100644
index 0000000000000000000000000000000000000000..37369d006acbe77f3ea0e528509781c3dd52fa11
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.install
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function special_menu_items_uninstall() {
+ variable_del('special_menu_items_nolink_tag');
+ variable_del('special_menu_items_seperator_tag');
+ variable_del('special_menu_items_seperator_value');
+ variable_del('special_menu_items_menu_item_link');
+}
+
+/**
+ * "nolink" to <nolink> and "separator" to <separator>
+ */
+function special_menu_items_update_7000(&$sandbox){
+
+ //change "nolink" to <nolink>
+ db_update('menu_links')
+ ->fields(array(
+ 'link_path' => '<nolink>',
+ 'router_path' => '<nolink>',
+ ))
+ ->condition('router_path', 'nolink', '=')
+ ->execute();
+
+ //change "separator" to <separator>
+ db_update('menu_links')
+ ->fields(array(
+ 'link_path' => '<separator>',
+ 'router_path' => '<separator>',
+ ))
+ ->condition('router_path', 'separator', '=')
+ ->execute();
+
+ //we don't need this variable anymore
+ variable_del('special_menu_items_menu_item_link');
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.module b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.module
new file mode 100644
index 0000000000000000000000000000000000000000..ebebcf9b6bda130a90a2f140fc7fbe81693002b9
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/special_menu_items/special_menu_items.module
@@ -0,0 +1,199 @@
+<?php
+
+/**
+ * @file
+ * Module to enable placeholder or separator menu items.Placeholder is a menu item which is
+ * actually not a link. Something like this is useful with drop down menus where we want to
+ * have a parent link which is actually not linking to a page but which is just acting as a
+ * parent and grouping some children below it.
+ * A separator menu item is something like "-------" which is also not linking anywhere but
+ * merely a mean to structure menus.
+ *
+ * Written by Tamir Al Zoubi and Karim Djelid - Servit Open Source Solutions - www.servit.ch
+ */
+
+/**
+*Implementation of hook_menu()
+*/
+function special_menu_items_menu() {
+ $items['<nolink>'] = array(
+ 'page callback' => 'drupal_not_found',
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
+
+ $items['<separator>'] = array(
+ 'page callback' => 'drupal_not_found',
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
+
+ $items['admin/config/system/special_menu_items'] = array(
+ 'title' => 'Special Menu Items',
+ 'description' => 'Configure Special Menu Items.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('special_menu_items_admin_settings_form'),
+ 'access arguments' => array('administer site configuration'),
+ 'type' => MENU_NORMAL_ITEM,
+ );
+
+ return $items;
+}
+
+/**
+ * Override of theme_link()
+ * This function will render link if it is "nolink" or "separator". Otherwise it will call originally
+ * overwritten menu_item_link function.
+ */
+function special_menu_items_link(array $variables) {
+ if (in_array($variables['path'], array('<nolink>', '<separator>'))) {
+ switch ($variables['path']) {
+ case '<nolink>':
+ $tag = variable_get('special_menu_items_nolink_tag', '<span>');
+ $title = $variables['options']['html'] ? $variables['text'] : check_plain($variables['text']);
+ $variables['options']['attributes']['class'][] = 'nolink';
+ break;
+
+ case '<separator>':
+ $tag = variable_get('special_menu_items_separator_tag', '<span>');
+ $title = variable_get('special_menu_items_separator_value', '<hr>');
+ $variables['options']['attributes']['class'][] = 'separator';
+ break;
+ }
+
+ $attributes = drupal_attributes($variables['options']['attributes']);
+
+ if ($tag != '<a>') {
+ // <a> tags can have these but a <span> cannot, so we remove them.
+ foreach (array('accesskey', 'target', 'rel', 'name') as $attribute) {
+ $attributes = preg_replace("/ $attribute=\".*\"/i", "", $attributes);
+ }
+ }
+
+ return special_menu_items_render_menu_item($tag, $title, $attributes);
+ }
+ // Call the original theme function for normal menu link.
+ return theme('special_menu_items_link_default', $variables);
+}
+
+
+/**
+ * Returns menu item rendered.
+ */
+function special_menu_items_render_menu_item($tag, $value, $attrs = array()) {
+ // $attrs may be a string already or an array
+ if (is_array($attrs)) {
+ $attrs = drupal_attributes($attrs);
+ }
+ $length = strlen($tag);
+ if ($tag[0] == '<' && $tag[$length - 1] == '>') {
+ $tag = substr($tag, 1, $length-2);
+ }
+ $closingtag = explode(' ', $tag,2);
+ $closingtag = '</' . $closingtag[0] . '>';
+ $tag = '<' . $tag . $attrs . '>';
+
+ return $tag . $value . $closingtag;
+}
+
+
+
+
+/**
+ * Implementation of hook_theme_registry_alter()
+ * We replace theme_menu_item_link with our own function.
+ */
+function special_menu_items_theme_registry_alter(&$registry) {
+ // Save previous value from registry in case another theme overwrites menu_item_link
+ $registry['special_menu_items_link_default'] = $registry['link'];
+ $registry['link']['function'] = 'special_menu_items_link';
+}
+
+/**
+ * Implementation of hook_form_FROM_ID_alter()
+ * Description changed, added nolink and separator as path types.
+ */
+function special_menu_items_form_menu_edit_item_alter(&$form, &$form_state) {
+ // Some menu items have a pre-defined path which cannot be modified hence no default_value
+ if (isset($form['link_path']['#default_value'])) {
+ $default_value = $form['link_path']['#default_value'];
+
+ if (preg_match('/^<nolink>\/[0-9]+$/', $default_value)) {
+ $default_value = '<nolink>';
+ }
+ elseif (preg_match('/^<separator>\/[0-9]+$/', $default_value)) {
+ $default_value = '<separator>';
+ }
+
+ $form['link_path']['#default_value'] = $default_value;
+ $form['link_path']['#description'] .= ' ' . t('Enter "%nolink" to generate non-linkable item, enter "%separator" to generate separator item.', array('%nolink' => '<nolink>', '%separator' => '<separator>'));
+ }
+}
+
+/**
+ * Implementation of hook_init().
+ */
+function special_menu_items_init() {
+ // Make breadcrumb of nolink menu item nonlinkable.
+ $breadcrumb = drupal_get_breadcrumb();
+
+ foreach($breadcrumb as $key => $crumb){
+ if (strlen(strstr($crumb,'<nolink>')) > 0) {
+ $crumb = strip_tags($crumb);
+ $tag = variable_get('special_menu_items_nolink_tag', '<span>');
+ $breadcrumb[$key] = special_menu_items_render_menu_item($tag, $crumb);
+ }
+ }
+
+ drupal_set_breadcrumb($breadcrumb);
+}
+
+/**
+ * Special Menu Items admin settings form.
+ *
+ * @return
+ * The settings form used by Special Menu Items.
+ */
+function special_menu_items_admin_settings_form() {
+ $form['special_menu_items_nolink_tag'] = array(
+ '#type' => 'textfield',
+ '#title' => t('HTML tag for "nolink"'),
+ '#description' => t('By default, Special Menu Items will use a span tag for the nolink menu item. Here you can specify your own tag.'),
+ '#default_value' => variable_get('special_menu_items_nolink_tag', '<span>'),
+ );
+
+ $form['special_menu_items_separator_tag'] = array(
+ '#type' => 'textfield',
+ '#title' => t('HTML tag for "separator"'),
+ '#description' => t('By default, Special Menu Items will use a span tag for the separator menu item. Here you can specify your own tag.'),
+ '#default_value' => variable_get('special_menu_items_separator_tag', '<span>'),
+ );
+
+ $form['special_menu_items_separator_value'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Value to be displayed for the "separator"'),
+ '#description' => t('By default, Special Menu Items will use a "<hr>" value for the separator. You can specify your own value for the separator.'),
+ '#default_value' => variable_get('special_menu_items_separator_value', '<hr>'),
+ );
+
+ return system_settings_form($form);
+}
+
+/**
+ * Implements hook_menu_link_update()
+ *
+ */
+
+/*
+function special_menu_items_menu_link_update($link) {
+ //do all links in db
+ global $db_type;
+ if ($db_type == 'pgsql') {
+ db_query("UPDATE {menu_links} SET link_path=link_path||'/'||mlid WHERE (link_path='<nolink>' OR link_path='<separator>') AND hidden != -1");
+ }
+ else {
+ db_query("UPDATE {menu_links} SET link_path=CONCAT(CONCAT(link_path,'/'),mlid) WHERE (link_path='<nolink>' OR link_path='<separator>') AND hidden!=-1");
+ }
+}
+ *
+ */
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/ckeditor.inc b/profiles/wcm_base/modules/contrib/wysiwyg/editors/ckeditor.inc
index 80c9fff99c44855a8a7c694c33d60f45dedf3f07..3f10626563ce391e8b580eb83f5df48ef2db6829 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/ckeditor.inc
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/ckeditor.inc
@@ -193,7 +193,7 @@ function wysiwyg_ckeditor_settings_form(&$form, &$form_state) {
'#title' => t('Force paste as plain text'),
'#default_value' => !empty($settings['forcePasteAsPlainText']),
'#return_value' => 1,
- '#description' => t('If enabled, all pasting operations insert plain text into the editor, loosing any formatting information possibly available in the source text. Note: Paste from Word is not affected by this setting.') . ' ' . t('Uses the <a href="@url">@setting</a> setting internally.', array('@setting' => 'forcePasteAsPlainText', '@url' => url('http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-forcePasteAsPlainText'))),
+ '#description' => t('If enabled, all pasting operations insert plain text into the editor, losing any formatting information possibly available in the source text. Note: Paste from Word is not affected by this setting.') . ' ' . t('Uses the <a href="@url">@setting</a> setting internally.', array('@setting' => 'forcePasteAsPlainText', '@url' => url('http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-forcePasteAsPlainText'))),
);
if (version_compare($installed_version, '4.1.0', '>=')) {
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info b/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
index cd0d336e09ec324488e5f6be076767523340352c..156b65f8ac83372e9ecc73adb783410e37f34f6e 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
@@ -6,9 +6,9 @@ hidden = TRUE
dependencies[] = wysiwyg
files[] = wysiwyg_test.module
-; Information added by Drupal.org packaging script on 2015-06-20
-version = "7.x-2.2+60-dev"
+; Information added by Drupal.org packaging script on 2015-06-29
+version = "7.x-2.2+62-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1434841086"
+datestamp = "1435591383"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.php b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.php
index 06b3808d083c21fbd8e07374378104ccf46cc69a..53e81a96daef4f911d2a310e0e3fd6a8b1f1ba85 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.php
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.php
@@ -75,7 +75,7 @@ function hook_wysiwyg_plugin($editor, $version) {
// Most plugins should define TRUE here.
'load' => TRUE,
// Boolean whether this plugin is a native plugin, i.e. shipped with
- // the editor. Definition must be ommitted for plugins provided by
+ // the editor. Definition must be omitted for plugins provided by
// other modules. TRUE means 'path' and 'filename' above are ignored
// and the plugin is instead loaded from the editor's plugin folder.
'internal' => TRUE,
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
index 2bb0827bcbf2a8c11140d43ad01079cc3f01773a..f800f66b5713f65f6fe1bec5f76f09359ea3b460 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
@@ -9,9 +9,9 @@ configure = admin/config/content/wysiwyg
files[] = wysiwyg.module
files[] = tests/wysiwyg.test
-; Information added by Drupal.org packaging script on 2015-06-20
-version = "7.x-2.2+60-dev"
+; Information added by Drupal.org packaging script on 2015-06-29
+version = "7.x-2.2+62-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1434841086"
+datestamp = "1435591383"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.module b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.module
index 381b182ffb715826159d508d0a71f5858717e02e..ce8974696e7819b145db31541a4d0d004399b9f6 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.module
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.module
@@ -663,7 +663,7 @@ function wysiwyg_get_css() {
$files = array();
foreach (drupal_add_css() as $filepath => $info) {
- if ($info['group'] >= CSS_THEME && $info['type'] != 'inline' && $info['media'] != 'print') {
+ if ($info['group'] >= CSS_THEME && $info['type'] != 'inline' && $info['media'] != 'print' && file_exists($filepath)) {
$files[] = file_create_url($filepath);
}
}
diff --git a/profiles/wcm_base/modules/custom/ocio_admin_menu/css/ocio_admin_menu.icons.css b/profiles/wcm_base/modules/custom/ocio_admin_menu/css/ocio_admin_menu.icons.css
index ad85ef01cd02bfba58933198c6718d9e78d9b268..7caa92a3279258ab8e14c177662b655cff77abc8 100644
--- a/profiles/wcm_base/modules/custom/ocio_admin_menu/css/ocio_admin_menu.icons.css
+++ b/profiles/wcm_base/modules/custom/ocio_admin_menu/css/ocio_admin_menu.icons.css
@@ -2,17 +2,20 @@
* Most of these are defined by the navbar module, but we make some changes.
*/
- /* Menu - a littl different due to overlap with top menu item */
+/* Menu - a littl different due to overlap with top menu item */
.navbar-box .navbar-icon-navigation:before {
background-image: url("../images/icon-menu.svg");
}
+
.navbar-box .navbar-icon-navigation:active:before,
.navbar-box .navbar-icon-navigation.navbar-active:before {
background-image: url("../images/icon-menu-active.svg");
}
+
.no-svg .navbar-box .navbar-icon-navigation:before {
background-image: url("../images/icon-menu.png");
}
+
.no-svg .navbar-box .navbar-icon-navigation:active:before,
.no-svg .navbar-box .navbar-icon-navigation.navbar-active:before {
background-image: url("../images/icon-menu-active.png");
@@ -22,13 +25,16 @@
.navbar-box .navbar-icon-advanced:before {
background-image: url("../images/icon-advanced.svg");
}
+
.navbar-box .navbar-icon-advanced:active:before,
.navbar-box .navbar-icon-advanced.navbar-active:before {
background-image: url("../images/icon-advanced-active.svg");
}
+
.no-svg .navbar-box .navbar-icon-advanced:before {
background-image: url("../images/icon-advanced.png");
}
+
.no-svg .navbar-box .navbar-icon-advanced:active:before,
.no-svg .navbar-box .navbar-icon-advanced.navbar-active:before {
background-image: url("../images/icon-advanced-active.png");
@@ -38,13 +44,16 @@
.navbar-box .navbar-icon-site-information:before {
background-image: url("../images/icon-site-information.svg");
}
+
.navbar-box .navbar-icon-site-information:active:before,
.navbar-box .navbar-icon-site-information.navbar-active:before {
background-image: url("../images/icon-site-information-active.svg");
}
+
.no-svg .navbar-box .navbar-icon-site-information:before {
background-image: url("../images/icon-site-information.png");
}
+
.no-svg .navbar-box .navbar-icon-site-information:active:before,
.no-svg .navbar-box .navbar-icon-site-information.navbar-active:before {
background-image: url("../images/icon-menu-site-information.png");
diff --git a/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module b/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
index acadb41616247e4452ba33a7c65e58f70f102767..7a4e6a1093470ac0094a41aacec9a56db2e0c411 100644
--- a/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
+++ b/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
@@ -14,6 +14,9 @@ function ocio_admin_menu_permission() {
'access ocio advanced menu' => array(
'title' => t('Access advanced admin menu'),
),
+ 'clear all caches' => array(
+ 'title' => t('Clear all cached data'),
+ ),
);
}
@@ -32,6 +35,14 @@ function ocio_admin_menu_menu() {
'file' => 'system.admin.inc',
);
+ $items['admin/advanced/clear-cache'] = array(
+ 'title' => 'Clear Cache',
+ 'description' => 'Clears all cached data (may take several minutes).',
+ 'page callback' => '_ocio_admin_menu_clear_cache',
+ 'access arguments' => array('clear all caches'),
+ 'weight' => 50,
+ );
+
return $items;
}
@@ -90,6 +101,15 @@ function ocio_admin_menu_navbar_alter(&$items) {
}
}
+/**
+ * Clear all caches.
+ */
+function _ocio_admin_menu_clear_cache() {
+ drupal_flush_all_caches();
+ drupal_set_message(t('Cache successfully cleared.'));
+ drupal_goto($_SERVER['HTTP_REFERER']);
+}
+
/**
* Implements hook_flush_caches().
*/
@@ -174,3 +194,4 @@ function ocio_admin_menu_landing_page_access($path) {
}
return $paths[$path];
}
+
diff --git a/profiles/wcm_base/modules/custom/ocio_front_page/ocio_front_page.pages_default.inc b/profiles/wcm_base/modules/custom/ocio_front_page/ocio_front_page.pages_default.inc
index a61eed7ee338864e3f7de3cb07632cc0e2c6a367..24b6f48a0bec296741fc94989674e3659d6338cd 100644
--- a/profiles/wcm_base/modules/custom/ocio_front_page/ocio_front_page.pages_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_front_page/ocio_front_page.pages_default.inc
@@ -57,7 +57,7 @@ function ocio_front_page_default_page_manager_pages() {
'relationships' => array(),
);
$display = new panels_display();
- $display->layout = 'ocio-omega-twocol-flipped';
+ $display->layout = 'ocio-omega-tiles-equalcol';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.features_overrides.inc
new file mode 100644
index 0000000000000000000000000000000000000000..8919a79fe1cd76935599c0d0022fe2430f6ee90b
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.features_overrides.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @file
+ * ocio_landing_page.features.features_overrides.inc
+ */
+
+/**
+ * Implements hook_features_override_default_overrides().
+ */
+function ocio_landing_page_features_override_default_overrides() {
+ // This code is only used for UI in features. Exported alters hooks do the magic.
+ $overrides = array();
+
+ // Exported overrides for: variable
+ $overrides["variable.panelizer_defaults_node_ocio_landing_page.value|view modes|default|default"] = 1;
+ $overrides["variable.panelizer_defaults_node_ocio_landing_page.value|view modes|page_manager|status"] = 0;
+
+ return $overrides;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
index 2abe4e3e7f91eddc52398804d17fe74eda7e1284..54838eef196b92fe0029ac6d92cdeb745f971c85 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
@@ -5,3 +5,19 @@
*/
include_once 'ocio_landing_page.features.inc';
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function ocio_landing_page_form_panels_ipe_edit_control_form_alter(&$form, &$form_state) {
+ $form['#after_build'][] = '_ocio_landing_page_ipe_buttons';
+}
+
+/**
+ * Hide revert button and change value of 'Save as custom' button.
+ */
+function _ocio_landing_page_ipe_buttons($form) {
+ $form['buttons']['revert_default']['#access'] = FALSE;
+ $form['buttons']['submit']['#value'] = t('Save');
+ return $form;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
index ad5beffecfeb30cefd2487bf81245c582f76d847..cfd5c2062d4b14d570797557263f152de2376392 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
@@ -86,45 +86,28 @@ function ocio_landing_page_panelizer_defaults() {
$panelizer->view_mode = 'default';
$panelizer->css_class = '';
$panelizer->title_element = 'H2';
- $panelizer->link_to_entity = TRUE;
+ $panelizer->link_to_entity = FALSE;
$panelizer->extra = array();
$display = new panels_display();
- $display->layout = 'flexible';
+ $display->layout = 'ocio-omega-equalcol';
$display->layout_settings = array();
- $display->panel_settings = array();
+ $display->panel_settings = array(
+ 'style_settings' => array(
+ 'default' => NULL,
+ 'center' => NULL,
+ 'header' => NULL,
+ 'column1' => NULL,
+ 'column2' => NULL,
+ 'footer' => NULL,
+ ),
+ );
$display->cache = array();
$display->title = '%node:title';
$display->uuid = 'a4772a7f-2edb-48a7-bf72-05cc7e169d07';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-0b63d21f-cb9b-4e3a-86f8-a9cc413861a1';
- $pane->panel = 'center';
- $pane->type = 'node_links';
- $pane->subtype = 'node_links';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'override_title' => FALSE,
- 'override_title_text' => '',
- 'build_mode' => 'default',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array();
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '0b63d21f-cb9b-4e3a-86f8-a9cc413861a1';
- $display->content['new-0b63d21f-cb9b-4e3a-86f8-a9cc413861a1'] = $pane;
- $display->panels['center'][0] = 'new-0b63d21f-cb9b-4e3a-86f8-a9cc413861a1';
- $display->hide_title = PANELS_TITLE_FIXED;
- $display->title_pane = 'new-0b63d21f-cb9b-4e3a-86f8-a9cc413861a1';
+ $display->hide_title = PANELS_TITLE_NONE;
+ $display->title_pane = '0';
$panelizer->display = $display;
$export['node:ocio_landing_page:default:default'] = $panelizer;
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
index a684ab0e67605f91630a43509f95dbbbaad645d3..4ec46d8db71c9c110e9fec13119c4ce09b987378 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
@@ -91,13 +91,13 @@ function ocio_landing_page_strongarm() {
'status' => 1,
'view modes' => array(
'page_manager' => array(
- 'status' => 1,
+ 'status' => 0,
'default' => 0,
'choice' => 0,
),
'default' => array(
- 'status' => 0,
- 'default' => 0,
+ 'status' => 1,
+ 'default' => 1,
'choice' => 0,
),
'teaser' => array(
@@ -177,7 +177,7 @@ function ocio_landing_page_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'panelizer_node:ocio_landing_page_allowed_layouts_default';
- $strongarm->value = 0;
+ $strongarm->value = 1;
$export['panelizer_node:ocio_landing_page_allowed_layouts_default'] = $strongarm;
$strongarm = new stdClass();
@@ -408,6 +408,8 @@ function ocio_landing_page_strongarm() {
'token-file:field_basic_image_caption' => 0,
'token-user:name-raw' => 0,
'token-user:field_display_in_directory' => 0,
+ 'token-user:field_display_in_leadership_list' => 0,
+ 'token-user:field_bio' => 0,
'token-user:field_first_name' => 0,
'token-user:field_job_title' => 0,
'token-user:field_last_name' => 0,
@@ -449,6 +451,8 @@ function ocio_landing_page_strongarm() {
'entity_form_field-file:field_file_description' => 0,
'entity_form_field-taxonomy_term:field_featured_image' => 0,
'entity_form_field-user:field_display_in_directory' => 0,
+ 'entity_form_field-user:field_display_in_leadership_list' => 0,
+ 'entity_form_field-user:field_bio' => 0,
'entity_form_field-user:field_first_name' => 0,
'entity_form_field-user:field_job_title' => 0,
'entity_form_field-user:field_last_name' => 0,
@@ -486,6 +490,8 @@ function ocio_landing_page_strongarm() {
'entity_field-file:field_file_description' => 0,
'entity_field-taxonomy_term:field_featured_image' => 0,
'entity_field-user:field_display_in_directory' => 0,
+ 'entity_field-user:field_display_in_leadership_list' => 0,
+ 'entity_field-user:field_bio' => 0,
'entity_field-user:field_first_name' => 0,
'entity_field-user:field_job_title' => 0,
'entity_field-user:field_last_name' => 0,
@@ -499,6 +505,9 @@ function ocio_landing_page_strongarm() {
'entity_field_extra-taxonomy_term:description' => 'entity_field_extra-taxonomy_term:description',
'entity_field_extra-user:summary' => 0,
'custom-custom' => 0,
+ 'block-aggregator-category-1' => 0,
+ 'block-aggregator-feed-1' => 0,
+ 'block-aggregator-feed-2' => 0,
'block-apachesolr_search-mlt-001' => 0,
'block-apachesolr_search-sort' => 0,
'block-calendar-calendar_legend' => 0,
@@ -569,7 +578,7 @@ function ocio_landing_page_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'panelizer_node:ocio_landing_page_allowed_types_default';
- $strongarm->value = 0;
+ $strongarm->value = 1;
$export['panelizer_node:ocio_landing_page_allowed_types_default'] = $strongarm;
$strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
index 339c47410bfab94f7e1eb72023f519fa3d73fd45..0adc3f6f488289830814596a22a6c06f312f6a53 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
@@ -13,6 +13,7 @@ dependencies[] = menu
dependencies[] = menu_block
dependencies[] = responsive_menus
dependencies[] = search
+dependencies[] = special_menu_items
dependencies[] = strongarm
dependencies[] = superfish
features[context][] = main-menu
@@ -57,6 +58,9 @@ features[variable][] = responsive_menus_mean_menu_remove_attrs
features[variable][] = responsive_menus_mean_menu_show_children
features[variable][] = responsive_menus_mean_menu_trigger_txt
features[variable][] = responsive_menus_style
+features[variable][] = special_menu_items_nolink_tag
+features[variable][] = special_menu_items_separator_tag
+features[variable][] = special_menu_items_separator_value
features[variable][] = superfish_arrow_1
features[variable][] = superfish_depth_1
features[variable][] = superfish_expanded_1
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
index 58ec8797c50250cdb44da289b8b83167b87f0d73..a40cb5324322c5cf53f27d4cb022b673245c11a9 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
@@ -271,6 +271,27 @@ function ocio_main_menu_strongarm() {
$strongarm->value = 'mean_menu';
$export['responsive_menus_style'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'special_menu_items_nolink_tag';
+ $strongarm->value = '<span>';
+ $export['special_menu_items_nolink_tag'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'special_menu_items_separator_tag';
+ $strongarm->value = '<span>';
+ $export['special_menu_items_separator_tag'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'special_menu_items_separator_value';
+ $strongarm->value = '<hr>';
+ $export['special_menu_items_separator_value'] = $strongarm;
+
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
index d8bdaf779ba06689f0dd1615b9d3b1393eaaf8ad..226384caba6f140875fad04a1d6b282e5b8fd675 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
@@ -107,7 +107,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
$data['node_edit_panel_context']->conf['display']->content['new-c0926cca-059c-4bb1-bccd-2838ec7a93f2']->position = 5; /* WAS: 6 */
$data['node_edit_panel_context']->conf['display']->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c']->position = 2; /* WAS: 3 */
$data['node_edit_panel_context']->conf['display']->content['new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52']->position = 4; /* WAS: 2 */
- $data['node_edit_panel_context']->conf['display']->layout = 'ocio-omega-twocol-flipped'; /* WAS: 'burr_flipped' */
+ $data['node_edit_panel_context']->conf['display']->layout = 'ocio-omega-twocol-flipped'; /* WAS: 'radix_burr_flipped' */
$data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['footer'] = NULL; /* WAS: '' */
$data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['header'] = NULL; /* WAS: '' */
$data['node_edit_panel_context']->conf['display']->panels['contentmain'][3] = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd'; /* WAS: '' */
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
index 54fe5b3ff94bfd016376970b7b4598f619974da4..f97c2a40cf1cb6dbed8363aef72f9a03760090fd 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
@@ -57,4 +57,3 @@ features[variable][] = panels_page_allowed_types
features[variable][] = panels_page_default
features_exclude[dependencies][file_entity] = file_entity
features_exclude[features_overrides][file_display.image__preview__file_field_image.settings|image_style] = file_display.image__preview__file_field_image.settings|image_style
-mtime = 1424271431
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
index 500937223006a36f4c04984f5793537cc334fc26..6e35dbd58cbef00efcac18797cdabd3917536eb1 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
@@ -14,7 +14,7 @@ function ocio_panels_settings_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'panels_page_allowed_layouts';
- $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:86:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:1;s:19:"ocio-omega-threecol";b:1;s:25:"ocio-omega-twocol-flipped";b:1;s:17:"ocio-omega-twocol";b:1;s:12:"radix_whelan";b:1;s:18:"radix_webb_flipped";b:1;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;}s:10:"form_state";N;}';
+ $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:89:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:1;s:19:"ocio-omega-threecol";b:1;s:25:"ocio-omega-twocol-flipped";b:1;s:17:"ocio-omega-twocol";b:1;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:12:"omega:ocio-3";b:0;}s:10:"form_state";N;}';
$export['panels_page_allowed_layouts'] = $strongarm;
$strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
index 5b8bea44da5b4595d5fb5af75f52ab2131c27433..018b3e9263f0da69be4bd20344811cb0f1f5b492 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
@@ -108,6 +108,8 @@ function ocio_permissions_user_default_permissions() {
'name' => 'access ocio advanced menu',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'ocio_admin_menu',
);
@@ -564,6 +566,8 @@ function ocio_permissions_user_default_permissions() {
'name' => 'administer panelizer node ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'panelizer',
);
@@ -591,6 +595,8 @@ function ocio_permissions_user_default_permissions() {
'name' => 'administer panelizer node ocio_landing_page layout',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'panelizer',
);
@@ -906,6 +912,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'panels',
);
+ // Exported permission: 'clear all caches'.
+ $permissions['clear all caches'] = array(
+ 'name' => 'clear all caches',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'ocio_admin_menu',
+ );
+
// Exported permission: 'configure osu site info'.
$permissions['configure osu site info'] = array(
'name' => 'configure osu site info',
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
index ec78d294d0a63e23ad598d8079aaabf84ebce9c2..07b7febf3c779f80c10a10c3a7f801fb56a50c72 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
+++ b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
@@ -156,6 +156,7 @@ features[user_permission][] = bypass file access
features[user_permission][] = bypass node access
features[user_permission][] = bypass workbench moderation
features[user_permission][] = change layouts in place editing
+features[user_permission][] = clear all caches
features[user_permission][] = configure osu site info
features[user_permission][] = configure tablefield
features[user_permission][] = context ajax block access
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.inc
index 29e3a8e5efd97a7d976b54467621f15afbb58076..6b769dc58cd9eb0ec67e2c3f2e0463b810e65475 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.inc
@@ -3,7 +3,7 @@
$plugin = array(
'title' => t('Equal Columns'),
'icon' => 'ocio-omega-equalcol.png',
- 'category' => t('OCIO Web Content Management'),
+ 'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-equalcol',
'css' => 'ocio-omega-equalcol.css',
'regions' => array(
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.inc
index f1b3c02f293a86a0c59bc0e78a4e4e99eca9e936..f91224dde5182731c95d9a4706a6126e204d284b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.inc
@@ -3,7 +3,7 @@
$plugin = array(
'title' => t('Three Column'),
'icon' => 'ocio-omega-threecol.png',
- 'category' => t('OCIO Web Content Management'),
+ 'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-threecol',
'css' => 'ocio-omega-threecol.css',
'regions' => array(
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.css b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.css
new file mode 100644
index 0000000000000000000000000000000000000000..d612b0d8943c56892fd28d8005df179358604bc9
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.css
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * ocio-omega-tiles-equalcol panel layout
+**/
+
+.ocio-omega-tiles-equalcol-container .panel-pane {
+ margin-bottom: 1em;
+}
+
+.ocio-omega-tiles-equalcol-trio-content-region {
+ min-height: 1px;
+ width: 33.9%;
+ float: left;
+}
+
+.ocio-omega-tiles-equalcol-trio-content-region-inner {
+ margin-right: 5%;
+}
+
+.ocio-omega-tiles-equalcol-trio3 {
+ width: 32.2%;
+}
+
+.ocio-omega-tiles-equalcol-trio3-inner {
+ margin-right: 0;
+}
+
+.ocio-omega-tiles-equalcol-container .panel-pane {
+ margin-bottom: 1em;
+}
+
+.ocio-omega-tiles-equalcol-column {
+ width: 51.064%;
+ float: left;
+}
+
+.ocio-omega-tiles-equalcol-column-inner {
+ margin-right: 20px;
+}
+
+.ocio-omega-tiles-equalcol-column2 {
+ width: 48.936%;
+}
+
+.ocio-omega-tiles-equalcol-column2-inner {
+ margin-right: 0;
+}
+
+
+/* iPad or less */
+@media only screen and (max-width: 760px) {
+ .ocio-omega-tiles-equalcol-trio-content-region,
+ .ocio-omega-tiles-equalcol-trio3 {
+ width: 100%;
+ float: none;
+ }
+
+ .ocio-omega-tiles-equalcol-trio-content-region-inner {
+ margin-right: 0;
+ }
+
+ .ocio-omega-tiles-equalcol-column,
+ .ocio-omega-tiles-equalcol-column2 {
+ width: 100%;
+ float: none;
+ }
+
+ .ocio-omega-tiles-equalcol-column-inner {
+ margin-right: 0;
+ }
+
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.inc
new file mode 100644
index 0000000000000000000000000000000000000000..fa0e1e424ce4dabf078eca7ae1e6fcb95ccffe65
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.inc
@@ -0,0 +1,18 @@
+<?php
+// Plugin definition
+$plugin = array(
+ 'title' => t('Tiles with two equal columns below'),
+ 'icon' => 'ocio-omega-tiles-equalcol.png',
+ 'category' => t('WCM Layouts'),
+ 'theme' => 'ocio-omega-tiles-equalcol',
+ 'css' => 'ocio-omega-tiles-equalcol.css',
+ 'regions' => array(
+ 'header' => t('Header'),
+ 'trio1' => t('First Column'),
+ 'trio2' => t('Second Column'),
+ 'trio3' => t('Third Column'),
+ 'column1' => t('First Column'),
+ 'column2' => t('Second Column'),
+ 'footer' => t('Footer'),
+ ),
+);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.png b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1dc5b459863480a27967bd250a5bc266902401b
Binary files /dev/null and b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.png differ
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..af306855dc34b5b4c5bbc876e074949be2f64809
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @file
+ * Template for custom ocio-omega-tiles-equalcol Panopoly layout.
+ *
+ * Variables:
+ * - $css_id: An optional CSS id to use for the layout.
+ * - $content: An array of content, each item in the array is keyed to one
+ * panel of the layout. This layout supports the following sections:
+ */
+?>
+
+<div class="panel-display ocio-omega-tiles-equalcol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-header clearfix panel-panel row-fluid">
+ <div class="ocio-omega-tiles-equalcol-container-inner ocio-omega-tiles-equalcol-header-inner panel-panel-inner span12">
+ <?php print $content['header']; ?>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-trio-content clearfix row-fluid">
+ <div class="ocio-omega-tiles-equalcol-trio-content-region ocio-omega-tiles-equalcol-trio1 panel-panel span4">
+ <div class="ocio-omega-tiles-equalcol-trio-content-region-inner ocio-omega-tiles-equalcol-trio1-inner panel-panel-inner">
+ <?php print $content['trio1']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-equalcol-trio-content-region ocio-omega-tiles-equalcol-trio2 panel-panel span4">
+ <div class="ocio-omega-tiles-equalcol-trio-content-region-inner ocio-omega-tiles-equalcol-trio2-inner panel-panel-inner">
+ <?php print $content['trio2']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-equalcol-trio-content-region ocio-omega-tiles-equalcol-trio3 panel-panel span4">
+ <div class="ocio-omega-tiles-equalcol-trio-content-region-inner ocio-omega-tiles-equalcol-trio3-inner panel-panel-inner">
+ <?php print $content['trio3']; ?>
+ </div>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-column-content clearfix row-fluid">
+ <div class="ocio-omega-tiles-equalcol-column-content-region ocio-omega-tiles-equalcol-column1 ocio-omega-tiles-equalcol-column panel-panel span6">
+ <div class="ocio-omega-tiles-equalcol-column-content-region-inner ocio-omega-tiles-equalcol-column1-inner ocio-omega-tiles-equalcol-column-inner panel-panel-inner">
+ <?php print $content['column1']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-equalcol-column-content-region ocio-omega-tiles-equalcol-column2 ocio-omega-tiles-equalcol-column panel-panel span6">
+ <div class="ocio-omega-tiles-equalcol-column-content-region-inner ocio-omega-tiles-equalcol-column2-inner ocio-omega-tiles-equalcol-column-inner panel-panel-inner">
+ <?php print $content['column2']; ?>
+ </div>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-footer clearfix panel-panel row-fluid">
+ <div class="ocio-omega-tiles-equalcol-container-inner ocio-omega-tiles-equalcol-footer-inner panel-panel-inner span12">
+ <?php print $content['footer']; ?>
+ </div>
+ </div>
+
+</div><!-- /.ocio-omega-tiles-equalcol -->
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.css b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.css
new file mode 100644
index 0000000000000000000000000000000000000000..de18450b94b8f009ffb0d04b51311445da38fdf5
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.css
@@ -0,0 +1,76 @@
+/**
+ * @file
+ * ocio-omega-tiles-twocol panel layout
+**/
+
+.ocio-omega-tiles-twocol-container .panel-pane {
+ margin-bottom: 1em;
+}
+
+.ocio-omega-tiles-twocol-trio-content-region {
+ min-height: 1px;
+ width: 33.9%;
+ float: left;
+}
+
+.ocio-omega-tiles-twocol-trio-content-region-inner {
+ margin-right: 5%;
+}
+
+.ocio-omega-tiles-twocol-trio3 {
+ width: 32.2%;
+}
+
+.ocio-omega-tiles-twocol-trio3-inner {
+ margin-right: 0;
+}
+
+.ocio-omega-tiles-twocol-container .panel-pane {
+ margin-bottom: 1em;
+}
+
+.ocio-omega-tiles-twocol-column {
+ min-height: 1px;
+ width: 34.043%;
+ float: left;
+}
+
+.ocio-omega-tiles-twocol-column-inner {
+ margin-right: 20px;
+}
+
+.ocio-omega-tiles-twocol-column2 {
+ min-height: 1px;
+ width: 65.957%;
+ float: left;
+}
+
+.ocio-omega-tiles-twocol-column2-inner {
+ margin-right: 0;
+}
+
+
+
+/* iPad or less */
+@media only screen and (max-width: 760px) {
+ .ocio-omega-tiles-twocol-trio-content-region,
+ .ocio-omega-tiles-twocol-trio3 {
+ width: 100%;
+ float: none;
+ }
+
+ .ocio-omega-tiles-twocol-trio-content-region-inner {
+ margin-right: 0;
+ }
+
+ .ocio-omega-tiles-twocol-column,
+ .ocio-omega-tiles-twocol-column2 {
+ width: 100%;
+ float: none;
+ }
+
+ .ocio-omega-tiles-twocol-column-inner {
+ margin-right: 0;
+ }
+
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.inc
new file mode 100644
index 0000000000000000000000000000000000000000..ef00eb2759f9540f2e81d332e9b1aae9f1e2f889
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.inc
@@ -0,0 +1,18 @@
+<?php
+// Plugin definition
+$plugin = array(
+ 'title' => t('Tiles with two columns below'),
+ 'icon' => 'ocio-omega-tiles-twocol.png',
+ 'category' => t('WCM Layouts'),
+ 'theme' => 'ocio-omega-tiles-twocol',
+ 'css' => 'ocio-omega-tiles-twocol.css',
+ 'regions' => array(
+ 'header' => t('Header'),
+ 'trio1' => t('First Column'),
+ 'trio2' => t('Second Column'),
+ 'trio3' => t('Third Column'),
+ 'column1' => t('First Column'),
+ 'column2' => t('Second Column'),
+ 'footer' => t('Footer'),
+ ),
+);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.png b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.png
new file mode 100644
index 0000000000000000000000000000000000000000..872377b48bf9bfb456be4451e25236fb934a648c
Binary files /dev/null and b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.png differ
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d9e4de813c2a8ae211108a8241175f9fc93aeaa
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @file
+ * Template for custom ocio-omega-tiles-twocol Panopoly layout.
+ *
+ * Variables:
+ * - $css_id: An optional CSS id to use for the layout.
+ * - $content: An array of content, each item in the array is keyed to one
+ * panel of the layout. This layout supports the following sections:
+ */
+?>
+
+<div class="panel-display ocio-omega-tiles-twocol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-header clearfix panel-panel row-fluid">
+ <div class="ocio-omega-tiles-twocol-container-inner ocio-omega-tiles-twocol-header-inner panel-panel-inner span12">
+ <?php print $content['header']; ?>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-trio-content clearfix row-fluid">
+ <div class="ocio-omega-tiles-twocol-trio-content-region ocio-omega-tiles-twocol-trio1 panel-panel span4">
+ <div class="ocio-omega-tiles-twocol-trio-content-region-inner ocio-omega-tiles-twocol-trio1-inner panel-panel-inner">
+ <?php print $content['trio1']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-twocol-trio-content-region ocio-omega-tiles-twocol-trio2 panel-panel span4">
+ <div class="ocio-omega-tiles-twocol-trio-content-region-inner ocio-omega-tiles-twocol-trio2-inner panel-panel-inner">
+ <?php print $content['trio2']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-twocol-trio-content-region ocio-omega-tiles-twocol-trio3 panel-panel span4">
+ <div class="ocio-omega-tiles-twocol-trio-content-region-inner ocio-omega-tiles-twocol-trio3-inner panel-panel-inner">
+ <?php print $content['trio3']; ?>
+ </div>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-column-content clearfix row-fluid">
+ <div class="ocio-omega-tiles-twocol-column-content-region ocio-omega-tiles-twocol-column1 ocio-omega-tiles-twocol-column panel-panel span3">
+ <div class="ocio-omega-tiles-twocol-column-content-region-inner ocio-omega-tiles-twocol-column1-inner ocio-omega-tiles-twocol-column-inner panel-panel-inner">
+ <?php print $content['column1']; ?>
+ </div>
+ </div>
+ <div class="ocio-omega-tiles-twocol-column-content-region ocio-omega-tiles-twocol-column2 ocio-omega-tiles-twocol-column panel-panel span9">
+ <div class="ocio-omega-tiles-twocol-column-content-region-inner ocio-omega-tiles-twocol-column2-inner ocio-omega-tiles-twocol-column-inner panel-panel-inner">
+ <?php print $content['column2']; ?>
+ </div>
+ </div>
+ </div>
+
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-footer clearfix panel-panel row-fluid">
+ <div class="ocio-omega-tiles-twocol-container-inner ocio-omega-tiles-twocol-footer-inner panel-panel-inner span12">
+ <?php print $content['footer']; ?>
+ </div>
+ </div>
+
+</div><!-- /.ocio-omega-tiles-twocol -->
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol-flipped.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol-flipped.inc
index 489be21a2847d7aefeebd0addefdd7d4e207fa7b..bd2e6c22cbbd02415ff5df8b54e8654fcbfaa64b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol-flipped.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol-flipped.inc
@@ -3,7 +3,7 @@
$plugin = array(
'title' => t('Two Column Flipped'),
'icon' => 'ocio-omega-twocol-flipped.png',
- 'category' => t('OCIO Web Content Management'),
+ 'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-twocol-flipped',
'css' => 'ocio-omega-twocol-flipped.css',
'regions' => array(
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol.inc b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol.inc
index a40785b7ecc3b00ebf2b97ff42e63eef523b71b3..21317479d7207555a01bcb1991b1b0a89b4b468e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol.inc
@@ -3,7 +3,7 @@
$plugin = array(
'title' => t('Two Column'),
'icon' => 'ocio-omega-twocol.png',
- 'category' => t('OCIO Web Content Management'),
+ 'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-twocol',
'css' => 'ocio-omega-twocol.css',
'regions' => array(
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index ab8343fae832efc0411da29ea7f9133052a5e2f4..931b62cccf6c2d519ffbe91db852f52f27027a5a 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -63,6 +63,9 @@ projects[realname][subdir] = contrib
projects[redis][version] = 2.12
projects[redis][subdir] = contrib
+projects[special_menu_items][version] = 2.0
+projects[special_menu_items][subdir] = contrib
+
projects[token][version] = 1.5
projects[token][subdir] = contrib