Skip to content
Snippets Groups Projects
Commit 7b186278 authored by Chris Gross's avatar Chris Gross
Browse files

daily build

parent 6d885cfb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 242 deletions
profiles/wcm_base/CHANGELOG.txt
+ 10
− 4
View file @ 7b186278
WCM Base 7.x-1.x, 2015-10-2
WCM Base 7.x-1.x, 2015-10-06
----------------------------
- OCIO Aggregator: Removed custom module from distribution.
- OCIO Landing Page: Removed twitter and aggregator panes from allowed content.
- OCIO Permissions: Granted Landing Page edit permission to editors.
WCM Base 7.x-1.x, 2015-10-02
----------------------------
- OCIO Omega Base:
- Added ocio-omega-all-tiles panels layout.
- Adjusted vertical spacing between pane regions on several panels layouts.
- Added ocio-omega-all-tiles panels layout.
- Adjusted vertical spacing between pane regions on several panels layouts.
- OCIO Permissions: Added taxonomy permissions.
- OCIO Taxonomy: Added user vocabularies for Contact Groups and Leadership Group.
- WCM User Contact: Display and group users on Contact page/pane by Contact Group.
......@@ -11,7 +17,7 @@ WCM Base 7.x-1.x, 2015-10-2
- Removed default Leadership page.
- WCM User Profile: Contact/Leadership group fields dependent on boolean display fields.
WCM Base 7.x-1.x, 2015-10-1
WCM Base 7.x-1.x, 2015-10-01
----------------------------
- OCIO Landing Page:
- Added news archive trio pane to allowed panes.
......
profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
+ 0
− 1
View file @ 7b186278
......@@ -132,7 +132,6 @@ function ocio_admin_menu_flush_caches() {
'admin/modules',
'admin/config',
'admin/advanced_help',
'admin/config/services/aggregator',
);
foreach ($advanced_items as $path) {
......
profiles/wcm_base/modules/custom/ocio_aggregator/README.md deleted 100644 → 0
+ 0
− 4
View file @ 6d885cfb
OCIO Aggregator
==========
TODO: write some documentation.
profiles/wcm_base/modules/custom/ocio_aggregator/ocio_aggregator.info deleted 100644 → 0
+ 0
− 5
View file @ 6d885cfb
name = OCIO Aggregator
description = Fixes and enhancements to the core aggregator module.
dependencies[] = aggregator
package = OCIO Configuration
core = 7.x
profiles/wcm_base/modules/custom/ocio_aggregator/ocio_aggregator.install deleted 100644 → 0
+ 0
− 14
View file @ 6d885cfb
<?php
/**
* @file ocio_aggregator.install
*
* Installation operations
*/
/**
* Implements hook_install().
*/
function ocio_aggregator_install() {
variable_set('aggregator_clear', 0);
}
profiles/wcm_base/modules/custom/ocio_aggregator/ocio_aggregator.module deleted 100644 → 0
+ 0
− 187
View file @ 6d885cfb
<?php
/**
* @file ocio_aggregator.module
*
* Fixes and enhancements to the core aggregator module.
*/
/**
* Implements hook_menu().
*/
function ocio_aggregator_menu(){
$items['admin/config/services/aggregator/update/all'] = array(
'title' => 'Update all feeds',
'access arguments' => array('administer news feeds'),
'page callback' => 'ocio_aggregator_update_all_feeds',
'type' => MENU_LOCAL_ACTION,
);
return $items;
}
/**
* Implements hook_menu_alter().
*/
function ocio_aggregator_menu_alter(&$items){
$items['aggregator/categories/%/categorize']['access callback'] = FALSE;
$items['aggregator/sources/%/categorize']['access callback'] = FALSE;
}
/**
* Implements hook_theme_registry_alter().
*/
function ocio_aggregator_theme_registry_alter(&$theme_registry) {
if (isset($theme_registry['aggregator_block_item'])) {
$theme_registry['aggregator_block_item']['function'] = 'ocio_aggregator_aggregator_block_item';
}
}
/**
* Overrides theme_aggregator_block_item().
*/
function ocio_aggregator_aggregator_block_item($vars) {
$feed = aggregator_feed_load($vars['item']->fid);
return '<span class="aggregator-feed-source">' . $feed->title . ': </span><a href="' . check_url($vars['item']->link) . '">' . check_plain($vars['item']->title) . "</a>\n";
}
/**
* Implements hook_block_view_alter().
*/
function ocio_aggregator_block_view_alter(&$data, $block) {
if ($block->module == 'aggregator') {
preg_match('/^feed-\d+$/', $block->delta, $matches);
if (!empty($matches)) {
$data['content'] = preg_replace('/<span class="aggregator-feed-source">.*<\/span>/', '', $data['content']);
}
}
}
/**
* Implements hook_form_FORM_ID_alter().
*/
function ocio_aggregator_form_aggregator_form_feed_alter(&$form, &$form_state) {
$form['refresh']['#description'] = t("The length of time between feed updates.");
$form['block']['#description'] = t("This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.");
$form['category']['#description'] = t("Feed items are automatically filed in the checked categories.");
$form['#submit'][] = 'ocio_aggregator_form_aggregator_form_feed_submit';
}
/**
* Feed edit form submit handler.
*/
function ocio_aggregator_form_aggregator_form_feed_submit(&$form, &$form_state) {
if (isset($form_state['values']['fid'])) {
$feed_items = db_query("SELECT iid FROM {aggregator_item} WHERE fid = :fid", array(":fid" => $form_state['values']['fid']));
// Update the category of each feed item to match parent feed.
foreach ($feed_items as $item) {
foreach ($form_state['values']['category'] as $cid => $status) {
if (empty($status)) {
db_delete('aggregator_category_item')
->condition('cid', $cid)
->condition('iid', $item->iid)
->execute();
}
else {
db_merge('aggregator_category_item')
->key(array('iid' => $item->iid, 'cid' => $cid))
->fields(array('iid' => $item->iid, 'cid' => $cid))
->execute();
}
}
}
}
else {
// Clear block cache
module_invoke('block', 'flush_caches');
if (arg(0) == 'admin') {
$form_state['redirect'] = 'admin/config/services/aggregator/';
}
}
}
/**
* Implements hook_form_FORM_ID_alter().
*/
function ocio_aggregator_form_aggregator_form_category_alter(&$form, &$form_state) {
if (isset($form['cid'])) {
$category = aggregator_category_load($form['cid']['#value']);
}
// Allow number of feed items shown in category block to be set.
$form['block'] = array('#type' => 'select',
'#title' => t('News items in block'),
'#default_value' => isset($category['block']) ? $category['block'] : 5,
'#options' => drupal_map_assoc(range(0, 20)),
'#description' => t("This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled."),
);
$form['#submit'][] = 'ocio_aggregator_form_aggregator_form_category_submit';
}
/**
* Category edit form submit handler.
*/
function ocio_aggregator_form_aggregator_form_category_submit(&$form, &$form_state) {
if (isset($form_state['values']['cid'])){
$update_key = array('cid' => $form_state['values']['cid']);
}
else {
$update_key = array('title' => $form_state['values']['title']);
}
db_merge('aggregator_category')
->key($update_key)
->fields(array('block' => $form_state['values']['block']))
->execute();
if (arg(0) == 'admin') {
$form_state['redirect'] = 'admin/config/services/aggregator/';
}
}
/**
* Implements hook_form_FORM_ID_alter().
*/
function ocio_aggregator_form_aggregator_admin_form_alter(&$form, &$form_state) {
$form['aggregator_allowed_html_tags']['#access'] = FALSE;
$form['modules']['aggregator']['aggregator_summary_items']['#access'] = FALSE;
$form['modules']['aggregator']['aggregator_category_selector']['#access'] = FALSE;
$form['modules']['aggregator']['aggregator_teaser_length']['#access'] = FALSE;
$form['modules']['aggregator']['aggregator_clear']['#description'] = '<div class="messages warning">' . t('Decreasing this value will permanently delete all feed items outside of the selected timeframe. Old items will likely be unrecoverable, as they may no longer be available from the source feed. Increasing this value will only affect newly imported feed items and will not retreive older items. These changes will not take effect until the next update of each feed.') . '</div>';
}
/**
* Implements hook_menu_breadcrumb_alter().
*
* Fix breadcrumb breadcrumbs on aggreggator category and source pages.
*/
function ocio_aggregator_menu_breadcrumb_alter(&$active_trail, $item) {
if ($item['path'] == 'aggregator/sources/%') {
$active_trail[3]['title'] = $item['page_arguments'][0]->title;
menu_set_active_trail($active_trail);
}
elseif ($item['path'] == 'aggregator/categories/%') {
$active_trail[2] = menu_link_get_preferred('aggregator/categories');
$active_trail[3] = $active_trail[1];
$active_trail[1] = menu_link_get_preferred('aggregator');
menu_set_active_trail($active_trail);
}
}
/**
* Refresh all feeds.
*/
function ocio_aggregator_update_all_feeds() {
$feeds = db_query("SELECT fid FROM {aggregator_feed}");
foreach ($feeds as $fid) {
$feed = aggregator_feed_load($fid->fid);
aggregator_refresh($feed);
}
drupal_goto('admin/config/services/aggregator');
}
profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
+ 9
− 9
View file @ 7b186278
......@@ -209,7 +209,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';
$strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:32:"panelizer_node:ocio_landing_page";s:23:"allowed_layout_settings";a:92:{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: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:4:"webb";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:5:"rolph";b:0;s:4:"pond";b:0;s:6:"phelan";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:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:6:"boxton";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";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:12:"omega:ocio-3";b:0;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:12:"omega:ocio-2";b:0;s:12:"omega:ocio-4";b:0;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:14:"ocio-omega-dps";b:1;s:14:"ocio-omega-alx";b:1;}s:10:"form_state";N;}';
$strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:32:"panelizer_node:ocio_landing_page";s:23:"allowed_layout_settings";a:93:{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: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:4:"webb";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:5:"rolph";b:0;s:4:"pond";b:0;s:6:"phelan";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:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:6:"boxton";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";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:12:"omega:ocio-3";b:0;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:12:"omega:ocio-2";b:0;s:12:"omega:ocio-4";b:0;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:14:"ocio-omega-dps";b:1;s:14:"ocio-omega-alx";b:1;s:20:"ocio-omega-all-tiles";b:1;}s:10:"form_state";N;}';
$export['panelizer_node:ocio_landing_page_allowed_layouts'] = $strongarm;
$strongarm = new stdClass();
......@@ -299,7 +299,6 @@ function ocio_landing_page_strongarm() {
'token-node:source' => 'token-node:source',
'token-node:log' => 'token-node:log',
'token-node:content-type' => 'token-node:content-type',
'token-node:menu-link' => 'token-node:menu-link',
'token-node:nid' => 'token-node:nid',
'token-node:vid' => 'token-node:vid',
'token-node:title' => 'token-node:title',
......@@ -313,6 +312,7 @@ function ocio_landing_page_strongarm() {
'token-node:author' => 'token-node:author',
'token-node:uuid' => 'token-node:uuid',
'token-node:vuuid' => 'token-node:vuuid',
'token-node:menu-link' => 'token-node:menu-link',
'token-node:original' => 'token-node:original',
'token-node:field_ocio_body' => 'token-node:field_ocio_body',
'token-node:field_tags' => 'token-node:field_tags',
......@@ -413,11 +413,6 @@ function ocio_landing_page_strongarm() {
'token-file-type:machine-name' => 'token-file-type:machine-name',
'token-file-type:count' => 'token-file-type:count',
'token-file-type:edit-url' => 'token-file-type:edit-url',
'token-menu:name' => 'token-menu:name',
'token-menu:machine-name' => 'token-menu:machine-name',
'token-menu:description' => 'token-menu:description',
'token-menu:menu-link-count' => 'token-menu:menu-link-count',
'token-menu:edit-url' => 'token-menu:edit-url',
'token-site:name' => 'token-site:name',
'token-site:slogan' => 'token-site:slogan',
'token-site:mail' => 'token-site:mail',
......@@ -437,6 +432,11 @@ function ocio_landing_page_strongarm() {
'token-view:machine-name' => 'token-view:machine-name',
'token-view:title' => 'token-view:title',
'token-view:url' => 'token-view:url',
'token-menu:name' => 'token-menu:name',
'token-menu:machine-name' => 'token-menu:machine-name',
'token-menu:description' => 'token-menu:description',
'token-menu:menu-link-count' => 'token-menu:menu-link-count',
'token-menu:edit-url' => 'token-menu:edit-url',
'token-node:book' => 0,
'token-node:field_admin_lock' => 0,
'token-node:field_answer' => 0,
......@@ -651,11 +651,11 @@ function ocio_landing_page_strongarm() {
'views_panes-calendar-panel_pane_1' => 'views_panes-calendar-panel_pane_1',
'views_panes-calendar-panel_pane_2' => 'views_panes-calendar-panel_pane_2',
'views_panes-faq-panel_pane_1' => 'views_panes-faq-panel_pane_1',
'views_panes-leadership_listing-panel_pane_1' => 'views_panes-leadership_listing-panel_pane_1',
'views_panes-ocio_news_archive-titles_pane' => 'views_panes-ocio_news_archive-titles_pane',
'views_panes-ocio_news_archive-teasers_pane' => 'views_panes-ocio_news_archive-teasers_pane',
'views_panes-ocio_news_archive-trio_pane' => 'views_panes-ocio_news_archive-trio_pane',
'views_panes-ocio_twitter-panel_pane_1' => 'views_panes-ocio_twitter-panel_pane_1',
'views_panes-leadership_listing-panel_pane_1' => 'views_panes-leadership_listing-panel_pane_1',
'views_panes-ocio_twitter-panel_pane_1' => 0,
'views_panes-panopoly_taxonomy-taxonomy_content' => 0,
'views_panes-panopoly_widgets_general_content-list_of_content' => 0,
'views_panes-panopoly_widgets_general_content-piece_of_content' => 0,
......
profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
+ 25
− 8
View file @ 7b186278
......@@ -585,8 +585,6 @@ function ocio_permissions_user_default_permissions() {
'name' => 'administer news feeds',
'roles' => array(
'administrator' => 'administrator',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
'module' => 'aggregator',
);
......@@ -726,7 +724,9 @@ function ocio_permissions_user_default_permissions() {
// Exported permission: 'administer panelizer taxonomy_term ocio_tags defaults'.
$permissions['administer panelizer taxonomy_term ocio_tags defaults'] = array(
'name' => 'administer panelizer taxonomy_term ocio_tags defaults',
'roles' => array(),
'roles' => array(
'administrator' => 'administrator',
),
'module' => 'panelizer',
);
......@@ -796,21 +796,27 @@ function ocio_permissions_user_default_permissions() {
// Exported permission: 'administer panelizer taxonomy_term wcm_file_tags defaults'.
$permissions['administer panelizer taxonomy_term wcm_file_tags defaults'] = array(
'name' => 'administer panelizer taxonomy_term wcm_file_tags defaults',
'roles' => array(),
'roles' => array(
'administrator' => 'administrator',
),
'module' => 'panelizer',
);
// Exported permission: 'administer panelizer taxonomy_term wcm_user_contact_group defaults'.
$permissions['administer panelizer taxonomy_term wcm_user_contact_group defaults'] = array(
'name' => 'administer panelizer taxonomy_term wcm_user_contact_group defaults',
'roles' => array(),
'roles' => array(
'administrator' => 'administrator',
),
'module' => 'panelizer',
);
// Exported permission: 'administer panelizer taxonomy_term wcm_user_leadership_group defaults'.
$permissions['administer panelizer taxonomy_term wcm_user_leadership_group defaults'] = array(
'name' => 'administer panelizer taxonomy_term wcm_user_leadership_group defaults',
'roles' => array(),
'roles' => array(
'administrator' => 'administrator',
),
'module' => 'panelizer',
);
......@@ -1160,7 +1166,10 @@ function ocio_permissions_user_default_permissions() {
'name' => 'create article content',
'roles' => array(
'administrator' => 'administrator',
'authenticated user' => 'authenticated user',
'contributor' => 'contributor',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
'module' => 'node',
);
......@@ -1366,6 +1375,7 @@ function ocio_permissions_user_default_permissions() {
'name' => 'create ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
......@@ -1527,6 +1537,7 @@ function ocio_permissions_user_default_permissions() {
'name' => 'delete any ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
......@@ -1783,6 +1794,7 @@ function ocio_permissions_user_default_permissions() {
'name' => 'delete own ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
......@@ -2086,6 +2098,7 @@ function ocio_permissions_user_default_permissions() {
'name' => 'edit any ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
......@@ -2249,7 +2262,10 @@ function ocio_permissions_user_default_permissions() {
'name' => 'edit own article content',
'roles' => array(
'administrator' => 'administrator',
'authenticated user' => 'authenticated user',
'contributor' => 'contributor',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
'module' => 'node',
);
......@@ -2347,6 +2363,7 @@ function ocio_permissions_user_default_permissions() {
'name' => 'edit own ocio_landing_page content',
'roles' => array(
'administrator' => 'administrator',
'editor' => 'editor',
'site builder' => 'site builder',
'site manager' => 'site manager',
),
......
profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
+ 3
− 3
View file @ 7b186278
......@@ -84,10 +84,10 @@ function wcm_user_profile_ds_layout_settings_info() {
8 => 'field_display_on_contact_page',
9 => 'field_contact_group',
10 => 'field_display_in_leadership_list',
11 => 'field_leadership_group',
12 => 'field_leadership_group',
),
'footer' => array(
12 => 'wysiwyg',
11 => 'wysiwyg',
13 => 'timezone',
14 => 'field_bio',
),
......@@ -107,8 +107,8 @@ function wcm_user_profile_ds_layout_settings_info() {
'field_display_on_contact_page' => 'right',
'field_contact_group' => 'right',
'field_display_in_leadership_list' => 'right',
'field_leadership_group' => 'right',
'wysiwyg' => 'footer',
'field_leadership_group' => 'right',
'timezone' => 'footer',
'field_bio' => 'footer',
'_add_existing_field' => 'hidden',
......
profiles/wcm_base/wcm_base.info
+ 0
− 1
View file @ 7b186278
......@@ -86,7 +86,6 @@ dependencies[] = uuid
; Custom
dependencies[] = ocio_accessibility
dependencies[] = ocio_admin_menu
dependencies[] = ocio_aggregator
dependencies[] = ocio_basic_page
dependencies[] = ocio_book
dependencies[] = ocio_buckeye_alert
......
profiles/wcm_base/wcm_base.make
+ 0
− 6
View file @ 7b186278
......@@ -110,12 +110,6 @@ projects[ocio_admin_menu][download][type] = "git"
projects[ocio_admin_menu][download][url] = git@code.osu.edu:ocio_odee_web/ocio_admin_menu.git
projects[ocio_admin_menu][download][branch] = 7.x-1.x
projects[ocio_aggregator][type] = module
projects[ocio_aggregator][subdir] = custom
projects[ocio_aggregator][download][type] = "git"
projects[ocio_aggregator][download][url] = git@code.osu.edu:ocio_odee_web/ocio_aggregator.git
projects[ocio_aggregator][download][branch] = 7.x-1.x
projects[ocio_basic_page][type] = module
projects[ocio_basic_page][subdir] = custom
projects[ocio_basic_page][download][type] = "git"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment