daily build

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.x, 2015-11-24
+----------------------------
+- OCIO Permissions: Added edit permissions for Editors specific panel types.
+
 WCM Base 7.x-1.x, 2015-11-19
 ----------------------------
 - OCIO News: Reduced image sizes on news article featured images.

profiles/wcm_base/libraries/superfish/sfsmallscreen.js

@@ -239,7 +239,7 @@
           // Creating the <option> elements.
           var newMenu = toSelect(refinedMenu, 1),
           // Creating the <select> element and assigning an ID and class name.
-          selectList = $('<select class="' + classes + '" id="' + menuID + '-select"/>')
+          selectList = $('<select' + classes + ' id="' + menuID + '-select"/>')
           // Attaching the title and the items to the <select> element.
           .html('<option>' + options.title + '</option>' + newMenu)
           // Attaching an event then.

profiles/wcm_base/libraries/superfish/style/space.css

@@ -88,7 +88,7 @@ div.sf-accordion-toggle.sf-style-space a.sf-expanded,
   padding-left: 2em;
 }
 .sf-menu.sf-style-space.sf-accordion li li li a,
-.sf-menu.sf-style-space.sf-accordion li li li span.nolink
+.sf-menu.sf-style-space.sf-accordion li li li span.nolink {
   padding-left: 3em;
 }
 .sf-menu.sf-style-space.sf-accordion li li li li a,
@@ -134,4 +134,4 @@ div.sf-accordion-toggle.sf-style-space a.sf-expanded,
 }
 .sf-menu.sf-style-space.rtl ul.sf-megamenu li.sf-megamenu-wrapper ol li.sf-megamenu-column {
   float: right;
-}
\ No newline at end of file
+}

profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js

@@ -49,7 +49,7 @@ Drupal.wysiwyg.editor.update.ckeditor = function(settings, pluginInfo) {
   }
   // Register Font styles (versions 3.2.1 and above).
   for (var format in settings) {
-    if (settings[format].stylesSet) {
+    if (settings[format].stylesSet && (!CKEDITOR.stylesSet || !CKEDITOR.stylesSet.registered[format])) {
       CKEDITOR.stylesSet.add(format, settings[format].stylesSet);
     }
   }

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-11-18
-version = "7.x-2.2+72-dev"
+; Information added by Drupal.org packaging script on 2015-11-21
+version = "7.x-2.2+73-dev"
 core = "7.x"
 project = "wysiwyg"
-datestamp = "1447885145"
+datestamp = "1448090343"
 

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-11-18
-version = "7.x-2.2+72-dev"
+; Information added by Drupal.org packaging script on 2015-11-21
+version = "7.x-2.2+73-dev"
 core = "7.x"
 project = "wysiwyg"
-datestamp = "1447885145"
+datestamp = "1448090343"
 

profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc

@@ -778,33 +778,6 @@ function ocio_permissions_user_default_permissions() {
     'module' => 'panelizer',
   );
 
-  // Exported permission: 'administer panelizer user user breadcrumbs'.
-  $permissions['administer panelizer user user breadcrumbs'] = array(
-    'name' => 'administer panelizer user user breadcrumbs',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
-  // Exported permission: 'administer panelizer user user content'.
-  $permissions['administer panelizer user user content'] = array(
-    'name' => 'administer panelizer user user content',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
-  // Exported permission: 'administer panelizer user user context'.
-  $permissions['administer panelizer user user context'] = array(
-    'name' => 'administer panelizer user user context',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
   // Exported permission: 'administer panelizer user user defaults'.
   $permissions['administer panelizer user user defaults'] = array(
     'name' => 'administer panelizer user user defaults',
@@ -814,33 +787,6 @@ function ocio_permissions_user_default_permissions() {
     'module' => 'panelizer',
   );
 
-  // Exported permission: 'administer panelizer user user layout'.
-  $permissions['administer panelizer user user layout'] = array(
-    'name' => 'administer panelizer user user layout',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
-  // Exported permission: 'administer panelizer user user overview'.
-  $permissions['administer panelizer user user overview'] = array(
-    'name' => 'administer panelizer user user overview',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
-  // Exported permission: 'administer panelizer user user settings'.
-  $permissions['administer panelizer user user settings'] = array(
-    'name' => 'administer panelizer user user settings',
-    'roles' => array(
-      'administrator' => 'administrator',
-    ),
-    'module' => 'panelizer',
-  );
-
   // Exported permission: 'administer panels layouts'.
   $permissions['administer panels layouts'] = array(
     'name' => 'administer panels layouts',
@@ -2138,6 +2084,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable basic_file',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2149,6 +2096,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable fieldable_panels_pane',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2160,6 +2108,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable image',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2171,6 +2120,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable map',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2182,6 +2132,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable quick_links',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2202,6 +2153,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable table',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2213,6 +2165,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable text',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2224,6 +2177,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable tile_pane',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2235,6 +2189,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable tile_pane_plus_text_area',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),
@@ -2246,6 +2201,7 @@ function ocio_permissions_user_default_permissions() {
     'name' => 'edit fieldable video',
     'roles' => array(
       'administrator' => 'administrator',
+      'editor' => 'editor',
       'site builder' => 'site builder',
       'site manager' => 'site manager',
     ),

profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info

@@ -153,13 +153,7 @@ features[user_permission][] = administer panelizer taxonomy_term panopoly_catego
 features[user_permission][] = administer panelizer taxonomy_term panopoly_categories layout
 features[user_permission][] = administer panelizer taxonomy_term panopoly_categories overview
 features[user_permission][] = administer panelizer taxonomy_term panopoly_categories settings
-features[user_permission][] = administer panelizer user user breadcrumbs
-features[user_permission][] = administer panelizer user user content
-features[user_permission][] = administer panelizer user user context
 features[user_permission][] = administer panelizer user user defaults
-features[user_permission][] = administer panelizer user user layout
-features[user_permission][] = administer panelizer user user overview
-features[user_permission][] = administer panelizer user user settings
 features[user_permission][] = administer panels layouts
 features[user_permission][] = administer panels styles
 features[user_permission][] = administer pathauto