commit 22aba4f5f293ead5a17f510eef60f46318920d6a Author: Jesse Hofmann-Smith Date: Thu Apr 21 16:37:44 2011 -0700 removed unneccesary dependencies, updated dr_blog feature diff --git a/dr_base/dr-base.css b/dr_base/dr-base.css index c5ce34c..789342f 100644 --- a/dr_base/dr-base.css +++ b/dr_base/dr-base.css @@ -177,10 +177,3 @@ dl.dr-base-profile-team-info dd { font-size: 1.5em; font-weight: bold; } - -/* Profile/team edit form */ -div#edit-field-captain-location-0-delete-location-wrapper, -div#edit-field-location-0-delete-location-wrapper { - display: none; -} - diff --git a/dr_blog/dr_blog.features.inc b/dr_blog/dr_blog.features.inc index fd91e24..e32e84e 100644 --- a/dr_blog/dr_blog.features.inc +++ b/dr_blog/dr_blog.features.inc @@ -15,21 +15,10 @@ function dr_blog_ctools_plugin_api() { */ function dr_blog_node_info() { $items = array( - 'admin_blog_post' => array( - 'name' => t('Admin Blog Post'), + 'blog_post' => array( + 'name' => t('Blog Post'), 'module' => 'features', - 'description' => t('Blog posts written by Donor Rally administrators.'), - 'has_title' => '1', - 'title_label' => t('Title'), - 'has_body' => '1', - 'body_label' => t('Body'), - 'min_word_count' => '0', - 'help' => '', - ), - 'team_blog_post' => array( - 'name' => t('Team Blog Post'), - 'module' => 'features', - 'description' => t('Blog posts written by Team Coordinators.'), + 'description' => '', 'has_title' => '1', 'title_label' => t('Title'), 'has_body' => '1', @@ -40,12 +29,3 @@ function dr_blog_node_info() { ); return $items; } - -/** - * Implementation of hook_views_api(). - */ -function dr_blog_views_api() { - return array( - 'api' => '2', - ); -} diff --git a/dr_blog/dr_blog.features.user_permission.inc b/dr_blog/dr_blog.features.user_permission.inc index 906d396..402d1a2 100644 --- a/dr_blog/dr_blog.features.user_permission.inc +++ b/dr_blog/dr_blog.features.user_permission.inc @@ -6,74 +6,5 @@ function dr_blog_user_default_permissions() { $permissions = array(); - // Exported permission: create team_blog_post content - $permissions['create team_blog_post content'] = array( - 'name' => 'create team_blog_post content', - 'roles' => array( - '0' => 'authenticated user', - ), - ); - - // Exported permission: delete any team_blog_post content - $permissions['delete any team_blog_post content'] = array( - 'name' => 'delete any team_blog_post content', - 'roles' => array( - '0' => 'administrator', - ), - ); - - // Exported permission: delete own admin_blog_post content - $permissions['delete own admin_blog_post content'] = array( - 'name' => 'delete own admin_blog_post content', - 'roles' => array( - '0' => 'administrator', - '1' => 'campaign coordinator', - ), - ); - - // Exported permission: delete own team_blog_post content - $permissions['delete own team_blog_post content'] = array( - 'name' => 'delete own team_blog_post content', - 'roles' => array( - '0' => 'administrator', - '1' => 'authenticated user', - ), - ); - - // Exported permission: edit any admin_blog_post content - $permissions['edit any admin_blog_post content'] = array( - 'name' => 'edit any admin_blog_post content', - 'roles' => array( - '0' => 'administrator', - '1' => 'campaign coordinator', - ), - ); - - // Exported permission: edit any team_blog_post content - $permissions['edit any team_blog_post content'] = array( - 'name' => 'edit any team_blog_post content', - 'roles' => array( - '0' => 'administrator', - '1' => 'campaign coordinator', - ), - ); - - // Exported permission: edit own admin_blog_post content - $permissions['edit own admin_blog_post content'] = array( - 'name' => 'edit own admin_blog_post content', - 'roles' => array( - '0' => 'administrator', - '1' => 'campaign coordinator', - ), - ); - - // Exported permission: edit own team_blog_post content - $permissions['edit own team_blog_post content'] = array( - 'name' => 'edit own team_blog_post content', - 'roles' => array( - '0' => 'authenticated user', - ), - ); - return $permissions; } diff --git a/dr_blog/dr_blog.info b/dr_blog/dr_blog.info index 32ddbcc..a71f245 100644 --- a/dr_blog/dr_blog.info +++ b/dr_blog/dr_blog.info @@ -1,29 +1,14 @@ core = "6.x" dependencies[] = "dr_base" dependencies[] = "features" -dependencies[] = "location" dependencies[] = "strongarm" dependencies[] = "views" -dependencies[] = "views_or" -description = "Allows team captains to write blog entries on their team landing pages" +description = "Blog content type and configurations." features[ctools][] = "strongarm:strongarm:1" -features[node][] = "admin_blog_post" -features[node][] = "team_blog_post" -features[user_permission][] = "create team_blog_post content" -features[user_permission][] = "delete any team_blog_post content" -features[user_permission][] = "delete own admin_blog_post content" -features[user_permission][] = "delete own team_blog_post content" -features[user_permission][] = "edit any admin_blog_post content" -features[user_permission][] = "edit any team_blog_post content" -features[user_permission][] = "edit own admin_blog_post content" -features[user_permission][] = "edit own team_blog_post content" -features[variable][] = "node_options_team_blog_post" -features[variable][] = "pathauto_node_admin_blog_post_pattern" -features[variable][] = "pathauto_node_team_blog_post_pattern" -features[views][] = "team_blog" -features[views_api][] = "api:2" -name = "Donor Rally Team Blog" +features[node][] = "blog_post" +features[variable][] = "node_options_blog_post" +name = "Donor Rally Blog" package = "Features" -project = donor_rally_features +project = "dr_blog" project status url = "http://code.opensourcery.com/fserver" -version = "6.x-1.0-alpha1" +version = "6.x-2.0-dev" diff --git a/dr_blog/dr_blog.strongarm.inc b/dr_blog/dr_blog.strongarm.inc index 7194ce4..0fb7f5c 100644 --- a/dr_blog/dr_blog.strongarm.inc +++ b/dr_blog/dr_blog.strongarm.inc @@ -8,25 +8,11 @@ function dr_blog_strongarm() { $strongarm = new stdClass; $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'node_options_team_blog_post'; + $strongarm->name = 'node_options_blog_post'; $strongarm->value = array( 0 => 'status', ); - $export['node_options_team_blog_post'] = $strongarm; - $strongarm = new stdClass; - $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ - $strongarm->api_version = 1; - $strongarm->name = 'pathauto_node_admin_blog_post_pattern'; - $strongarm->value = 'administrator-posts/[title-raw]'; - - $export['pathauto_node_admin_blog_post_pattern'] = $strongarm; - $strongarm = new stdClass; - $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ - $strongarm->api_version = 1; - $strongarm->name = 'pathauto_node_team_blog_post_pattern'; - $strongarm->value = 'team-posts/[title-raw]'; - - $export['pathauto_node_team_blog_post_pattern'] = $strongarm; + $export['node_options_blog_post'] = $strongarm; return $export; } diff --git a/dr_inkind/dr_inkind.info b/dr_inkind/dr_inkind.info index bb68d9e..c077feb 100644 --- a/dr_inkind/dr_inkind.info +++ b/dr_inkind/dr_inkind.info @@ -6,7 +6,6 @@ dependencies[] = "dr_base_team" dependencies[] = "features" dependencies[] = "fieldgroup" dependencies[] = "imagefield" -dependencies[] = "location_cck" dependencies[] = "number" dependencies[] = "strongarm" dependencies[] = "text" diff --git a/dr_team_io/dr_team_io.info b/dr_team_io/dr_team_io.info index 606f298..0e717f9 100644 --- a/dr_team_io/dr_team_io.info +++ b/dr_team_io/dr_team_io.info @@ -1,7 +1,6 @@ core = "6.x" dependencies[] = "content" dependencies[] = "dr_base" -dependencies[] = "location" dependencies[] = "views_bonus_export" description = "Import/export functionality for team totals" features[views][] = "team_export"