diff --git a/modules/features/openchurch_defaults/openchurch_defaults.context.inc b/modules/features/openchurch_defaults/openchurch_defaults.context.inc index d96e044..96c05bc 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.context.inc +++ b/modules/features/openchurch_defaults/openchurch_defaults.context.inc @@ -92,5 +92,56 @@ function openchurch_defaults_context_default_contexts() { t('global'); $export['openchurch-all-sitewide'] = $context; + $context = new stdClass(); + $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ + $context->api_version = 3; + $context->name = 'openchurch-dashboard'; + $context->description = 'Administrative dashboard'; + $context->tag = 'dashboard'; + $context->conditions = array( + 'path' => array( + 'values' => array( + 'admin/dashboard' => 'admin/dashboard', + ), + ), + ); + $context->reactions = array( + 'block' => array( + 'blocks' => array( + 'node-recent' => array( + 'module' => 'node', + 'delta' => 'recent', + 'region' => 'dashboard_main', + 'weight' => '-10', + ), + 'menu-menu-openchurch-new-content' => array( + 'module' => 'menu', + 'delta' => 'menu-openchurch-new-content', + 'region' => 'dashboard_sidebar', + 'weight' => '-9', + ), + 'search-form' => array( + 'module' => 'search', + 'delta' => 'form', + 'region' => 'dashboard_sidebar', + 'weight' => '0', + ), + 'menu-menu-openchurch-admin-links' => array( + 'module' => 'menu', + 'delta' => 'menu-openchurch-admin-links', + 'region' => 'dashboard_sidebar', + 'weight' => '-10', + ), + ), + ), + ); + $context->condition_mode = 1; + + // Translatables + // Included for use with string extractors like potx. + t('Administrative dashboard'); + t('dashboard'); + $export['openchurch-dashboard'] = $context; + return $export; } diff --git a/modules/features/openchurch_defaults/openchurch_defaults.features.inc b/modules/features/openchurch_defaults/openchurch_defaults.features.inc index cfd7d48..da6e7a7 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.features.inc +++ b/modules/features/openchurch_defaults/openchurch_defaults.features.inc @@ -8,24 +8,14 @@ * Implements hook_ctools_plugin_api(). */ function openchurch_defaults_ctools_plugin_api() { - list($module, $api) = func_get_args(); - if ($module == "context" && $api == "context") { - return array("version" => "3"); - } - list($module, $api) = func_get_args(); - if ($module == "strongarm" && $api == "strongarm") { - return array("version" => "1"); - } + return array("version" => "1"); } /** * Implements hook_views_api(). */ function openchurch_defaults_views_api() { - list($module, $api) = func_get_args(); - if ($module == "views" && $api == "views_default") { - return array("version" => "3.0"); - } + return array("version" => "3.0"); } /** diff --git a/modules/features/openchurch_defaults/openchurch_defaults.features.menu_custom.inc b/modules/features/openchurch_defaults/openchurch_defaults.features.menu_custom.inc index dbafe21..05206da 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.features.menu_custom.inc +++ b/modules/features/openchurch_defaults/openchurch_defaults.features.menu_custom.inc @@ -16,6 +16,18 @@ function openchurch_defaults_menu_default_menu_custom() { 'title' => 'Main menu', 'description' => 'The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.', ); + // Exported menu: menu-openchurch-admin-links + $menus['menu-openchurch-admin-links'] = array( + 'menu_name' => 'menu-openchurch-admin-links', + 'title' => 'Admin Quick Links', + 'description' => 'Links to common administrative tasks.', + ); + // Exported menu: menu-openchurch-new-content + $menus['menu-openchurch-new-content'] = array( + 'menu_name' => 'menu-openchurch-new-content', + 'title' => 'Create New Dynamic Content', + 'description' => 'Create content menu for dynamic content types.', + ); // Exported menu: menu-secondary-links $menus['menu-secondary-links'] = array( 'menu_name' => 'menu-secondary-links', @@ -24,6 +36,10 @@ function openchurch_defaults_menu_default_menu_custom() { ); // Translatables // Included for use with string extractors like potx. + t('Admin Quick Links'); + t('Create New Dynamic Content'); + t('Create content menu for dynamic content types.'); + t('Links to common administrative tasks.'); t('Main menu'); t('Secondary Links'); t('Secondary links are often used for pages like legal notices, contact details, and other secondary navigation items that play a lesser role than primary links.'); diff --git a/modules/features/openchurch_defaults/openchurch_defaults.features.menu_links.inc b/modules/features/openchurch_defaults/openchurch_defaults.features.menu_links.inc new file mode 100644 index 0000000..ba464dd --- /dev/null +++ b/modules/features/openchurch_defaults/openchurch_defaults.features.menu_links.inc @@ -0,0 +1,132 @@ + 'menu-openchurch-admin-links', + 'link_path' => 'admin/appearance/settings/openchurch_theme', + 'router_path' => 'admin/appearance/settings/openchurch_theme', + 'link_title' => 'Appearance', + 'options' => array( + 'attributes' => array( + 'title' => 'Adjust site theme settings', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Exported menu link: menu-openchurch-admin-links:admin/apps + $menu_links['menu-openchurch-admin-links:admin/apps'] = array( + 'menu_name' => 'menu-openchurch-admin-links', + 'link_path' => 'admin/apps', + 'router_path' => 'admin/apps', + 'link_title' => 'Apps', + 'options' => array( + 'attributes' => array( + 'title' => 'Enable / Disable Installed Apps', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Exported menu link: menu-openchurch-admin-links:admin/config/system/site-information + $menu_links['menu-openchurch-admin-links:admin/config/system/site-information'] = array( + 'menu_name' => 'menu-openchurch-admin-links', + 'link_path' => 'admin/config/system/site-information', + 'router_path' => 'admin/config/system/site-information', + 'link_title' => 'Site Information', + 'options' => array( + 'attributes' => array( + 'title' => 'Adjust sitewide settings', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Exported menu link: menu-openchurch-admin-links:admin/structure/menu + $menu_links['menu-openchurch-admin-links:admin/structure/menu'] = array( + 'menu_name' => 'menu-openchurch-admin-links', + 'link_path' => 'admin/structure/menu', + 'router_path' => 'admin/structure/menu', + 'link_title' => 'Menus', + 'options' => array( + 'attributes' => array( + 'title' => '', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Exported menu link: menu-openchurch-new-content:node/add/page + $menu_links['menu-openchurch-new-content:node/add/page'] = array( + 'menu_name' => 'menu-openchurch-new-content', + 'link_path' => 'node/add/page', + 'router_path' => 'node/add/page', + 'link_title' => 'Basic Page', + 'options' => array( + 'attributes' => array( + 'title' => 'Use basic pages for your static content, such as an \'About us\' page.', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Exported menu link: menu-openchurch-new-content:node/add/webform + $menu_links['menu-openchurch-new-content:node/add/webform'] = array( + 'menu_name' => 'menu-openchurch-new-content', + 'link_path' => 'node/add/webform', + 'router_path' => 'node/add/webform', + 'link_title' => 'Webform', + 'options' => array( + 'attributes' => array( + 'title' => 'Create a new form or questionnaire accessible to users. Submission results and statistics are recorded and accessible to privileged users.', + ), + ), + 'module' => 'menu', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + ); + // Translatables + // Included for use with string extractors like potx. + t('Appearance'); + t('Apps'); + t('Basic Page'); + t('Menus'); + t('Site Information'); + t('Webform'); + + + return $menu_links; +} diff --git a/modules/features/openchurch_defaults/openchurch_defaults.features.user_permission.inc b/modules/features/openchurch_defaults/openchurch_defaults.features.user_permission.inc index e63e5c0..3929241 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.features.user_permission.inc +++ b/modules/features/openchurch_defaults/openchurch_defaults.features.user_permission.inc @@ -60,16 +60,6 @@ function openchurch_defaults_user_default_permissions() { 'module' => 'dashboard', ); - // Exported permission: access overlay - $permissions['access overlay'] = array( - 'name' => 'access overlay', - 'roles' => array( - 0 => 'administrator', - 1 => 'editor', - ), - 'module' => 'overlay', - ); - // Exported permission: add media from remote sources $permissions['add media from remote sources'] = array( 'name' => 'add media from remote sources', diff --git a/modules/features/openchurch_defaults/openchurch_defaults.info b/modules/features/openchurch_defaults/openchurch_defaults.info index c2d57ac..9570baf 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.info +++ b/modules/features/openchurch_defaults/openchurch_defaults.info @@ -3,8 +3,9 @@ description = "Openchurch default content, menus, etc." core = "7.x" package = "Features" php = "5.2.4" -version = "7.x-1.9-alpha2" +version = "7.x-1.11-beta1" project = "openchurch_defaults" +dependencies[] = "admin_menu" dependencies[] = "block" dependencies[] = "captcha" dependencies[] = "comment" @@ -31,8 +32,9 @@ dependencies[] = "superfish" dependencies[] = "taxonomy" dependencies[] = "views" dependencies[] = "webform" -datestamp = "1332804046" +datestamp = "1347804544" features[context][] = "openchurch-all-sitewide" +features[context][] = "openchurch-dashboard" features[ctools][] = "context:context:3" features[ctools][] = "strongarm:strongarm:1" features[ctools][] = "views:views_default:3.0" @@ -41,7 +43,15 @@ features[field][] = "node-webform-body" features[image][] = "oc_creative_element" features[image][] = "oc_thumb" features[menu_custom][] = "main-menu" +features[menu_custom][] = "menu-openchurch-admin-links" +features[menu_custom][] = "menu-openchurch-new-content" features[menu_custom][] = "menu-secondary-links" +features[menu_links][] = "menu-openchurch-admin-links:admin/appearance/settings/openchurch_theme" +features[menu_links][] = "menu-openchurch-admin-links:admin/apps" +features[menu_links][] = "menu-openchurch-admin-links:admin/config/system/site-information" +features[menu_links][] = "menu-openchurch-admin-links:admin/structure/menu" +features[menu_links][] = "menu-openchurch-new-content:node/add/page" +features[menu_links][] = "menu-openchurch-new-content:node/add/webform" features[node][] = "page" features[node][] = "webform" features[user_permission][] = "access administration menu" @@ -49,7 +59,6 @@ features[user_permission][] = "access all webform results" features[user_permission][] = "access content overview" features[user_permission][] = "access contextual links" features[user_permission][] = "access dashboard" -features[user_permission][] = "access overlay" features[user_permission][] = "add media from remote sources" features[user_permission][] = "administer blocks" features[user_permission][] = "administer comments" diff --git a/modules/features/openchurch_defaults/openchurch_defaults.strongarm.inc b/modules/features/openchurch_defaults/openchurch_defaults.strongarm.inc index 87271a9..c3f08e1 100644 --- a/modules/features/openchurch_defaults/openchurch_defaults.strongarm.inc +++ b/modules/features/openchurch_defaults/openchurch_defaults.strongarm.inc @@ -183,6 +183,24 @@ function openchurch_defaults_strongarm() { 'title' => 'Management', 'name' => 'management', ), + 'menu-admin-quick-links' => array( + 'enabled' => 0, + 'weight' => '0', + 'type' => 'menu', + 'name' => 'menu-admin-quick-links', + ), + 'menu-openchurch-admin-links' => array( + 'enabled' => 0, + 'weight' => '0', + 'type' => 'menu', + 'name' => 'menu-openchurch-admin-links', + ), + 'menu-openchurch-new-content' => array( + 'enabled' => 0, + 'weight' => '0', + 'type' => 'menu', + 'name' => 'menu-openchurch-new-content', + ), 'menu-secondary-links' => array( 'enabled' => 0, 'weight' => '0',