diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 292411af44b65d5069e1baabe473333fc9fee2e9..14181dea44c4a5d101f94ce5b2cd3b07935295db 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,7 @@
+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.
diff --git a/profiles/wcm_base/libraries/superfish/sfsmallscreen.js b/profiles/wcm_base/libraries/superfish/sfsmallscreen.js
index aeee270d2f6d33c8c9491ff604eae4e6658efdaf..ed83e0b9c65d2ef040fc382864346ea2fcd929ee 100644
--- a/profiles/wcm_base/libraries/superfish/sfsmallscreen.js
+++ b/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.
diff --git a/profiles/wcm_base/libraries/superfish/style/space.css b/profiles/wcm_base/libraries/superfish/style/space.css
index 74c9a19eed51d6f3c7b2524d2073c390a4232bc6..f8d770a09368c92d76e9cd3ff9625bf3bfcd14da 100644
--- a/profiles/wcm_base/libraries/superfish/style/space.css
+++ b/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
+}
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js
index 12e5233a4e4562d9c4342f2f49d2b65b50f27f2f..e9709759c504c899058253f117a3b3ec4bcbe272 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js
+++ b/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);
}
}
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 bb4fd02a2e2b6535f36b3a5efaccddbb05a27501..030133d24c934db2a86b13d6b7617efebb581719 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-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"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
index 838c79d685fb74e447f549df28d5a9df9058dea8..f65f99d745866bb57af6b82b77dbd677fd0741a8 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-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"
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 65895b53e21b3ee49b6af6aa465bbddc66071c28..789a217d44483dd86860d71c046636bb9124b206 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
@@ -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',
),
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 8ae53c9d160a2b282cfaf6131d779bec79fbca12..3f76602db8ebb981add427f9fd72738a0a8bd34e 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
+++ b/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