From 131996d78fa6acab0ff452581b9b62864d9c2363 Mon Sep 17 00:00:00 2001 From: Tim Baumgard Date: Tue, 14 Feb 2017 19:06:24 -0600 Subject: [PATCH 3/9] Renamed the ad_example content type to ad --- modules/ad_ui/ad_ui.drush.inc | 2 +- modules/ad_ui/ad_ui.ds.inc | 42 ++++++++++++------------- modules/ad_ui/ad_ui.features.field_instance.inc | 18 +++++------ modules/ad_ui/ad_ui.features.inc | 4 +-- modules/ad_ui/ad_ui.info | 34 ++++++++++---------- modules/ad_ui/ad_ui.module | 2 +- modules/ad_ui/ad_ui.strongarm.inc | 24 +++++++------- modules/ad_ui/ad_ui.views_default.inc | 8 ++--- 8 files changed, 67 insertions(+), 67 deletions(-) diff --git a/modules/ad_ui/ad_ui.drush.inc b/modules/ad_ui/ad_ui.drush.inc index 47ca8fe..4828fcc 100644 --- a/modules/ad_ui/ad_ui.drush.inc +++ b/modules/ad_ui/ad_ui.drush.inc @@ -132,7 +132,7 @@ function _ad_ui_install_ads() { $n++; $image_path = drupal_get_path('module', 'ad_ui') . '/images/' . $image; $ad = entity_create('node', array( - 'type' => 'ad_example', + 'type' => 'ad', 'status' => 1, 'created' => REQUEST_TIME, 'changed' => REQUEST_TIME, diff --git a/modules/ad_ui/ad_ui.ds.inc b/modules/ad_ui/ad_ui.ds.inc index 1e48e5c..e615e6f 100644 --- a/modules/ad_ui/ad_ui.ds.inc +++ b/modules/ad_ui/ad_ui.ds.inc @@ -12,9 +12,9 @@ function ad_ui_ds_field_settings_info() { $ds_fieldsetting = new stdClass(); $ds_fieldsetting->api_version = 1; - $ds_fieldsetting->id = 'node|ad_example|default'; + $ds_fieldsetting->id = 'node|ad|default'; $ds_fieldsetting->entity_type = 'node'; - $ds_fieldsetting->bundle = 'ad_example'; + $ds_fieldsetting->bundle = 'ad'; $ds_fieldsetting->view_mode = 'default'; $ds_fieldsetting->settings = array( 'title' => array( @@ -38,13 +38,13 @@ function ad_ui_ds_field_settings_info() { 'format' => 'ds_time_ago', ), ); - $export['node|ad_example|default'] = $ds_fieldsetting; + $export['node|ad|default'] = $ds_fieldsetting; $ds_fieldsetting = new stdClass(); $ds_fieldsetting->api_version = 1; - $ds_fieldsetting->id = 'node|ad_example|example_advertisement'; + $ds_fieldsetting->id = 'node|ad|example_advertisement'; $ds_fieldsetting->entity_type = 'node'; - $ds_fieldsetting->bundle = 'ad_example'; + $ds_fieldsetting->bundle = 'ad'; $ds_fieldsetting->view_mode = 'example_advertisement'; $ds_fieldsetting->settings = array( 'title' => array( @@ -58,13 +58,13 @@ function ad_ui_ds_field_settings_info() { ), ), ); - $export['node|ad_example|example_advertisement'] = $ds_fieldsetting; + $export['node|ad|example_advertisement'] = $ds_fieldsetting; $ds_fieldsetting = new stdClass(); $ds_fieldsetting->api_version = 1; - $ds_fieldsetting->id = 'node|ad_example|full'; + $ds_fieldsetting->id = 'node|ad|full'; $ds_fieldsetting->entity_type = 'node'; - $ds_fieldsetting->bundle = 'ad_example'; + $ds_fieldsetting->bundle = 'ad'; $ds_fieldsetting->view_mode = 'full'; $ds_fieldsetting->settings = array( 'ad_total_clicks' => array( @@ -98,7 +98,7 @@ function ad_ui_ds_field_settings_info() { 'format' => 'ds_time_ago', ), ); - $export['node|ad_example|full'] = $ds_fieldsetting; + $export['node|ad|full'] = $ds_fieldsetting; return $export; } @@ -144,9 +144,9 @@ function ad_ui_ds_layout_settings_info() { $ds_layout = new stdClass(); $ds_layout->api_version = 1; - $ds_layout->id = 'node|ad_example|default'; + $ds_layout->id = 'node|ad|default'; $ds_layout->entity_type = 'node'; - $ds_layout->bundle = 'ad_example'; + $ds_layout->bundle = 'ad'; $ds_layout->view_mode = 'default'; $ds_layout->layout = 'ds_1col'; $ds_layout->settings = array( @@ -180,13 +180,13 @@ function ad_ui_ds_layout_settings_info() { 'layout_link_attribute' => '', 'layout_link_custom' => '', ); - $export['node|ad_example|default'] = $ds_layout; + $export['node|ad|default'] = $ds_layout; $ds_layout = new stdClass(); $ds_layout->api_version = 1; - $ds_layout->id = 'node|ad_example|example_advertisement_display'; + $ds_layout->id = 'node|ad|example_advertisement_display'; $ds_layout->entity_type = 'node'; - $ds_layout->bundle = 'ad_example'; + $ds_layout->bundle = 'ad'; $ds_layout->view_mode = 'example_advertisement_display'; $ds_layout->layout = 'ds_1col'; $ds_layout->settings = array( @@ -208,13 +208,13 @@ function ad_ui_ds_layout_settings_info() { 'layout_link_attribute' => '', 'layout_link_custom' => '', ); - $export['node|ad_example|example_advertisement_display'] = $ds_layout; + $export['node|ad|example_advertisement_display'] = $ds_layout; $ds_layout = new stdClass(); $ds_layout->api_version = 1; - $ds_layout->id = 'node|ad_example|example_advertisement_preview'; + $ds_layout->id = 'node|ad|example_advertisement_preview'; $ds_layout->entity_type = 'node'; - $ds_layout->bundle = 'ad_example'; + $ds_layout->bundle = 'ad'; $ds_layout->view_mode = 'example_advertisement_preview'; $ds_layout->layout = 'ds_1col'; $ds_layout->settings = array( @@ -236,13 +236,13 @@ function ad_ui_ds_layout_settings_info() { 'layout_link_attribute' => '', 'layout_link_custom' => '', ); - $export['node|ad_example|example_advertisement_preview'] = $ds_layout; + $export['node|ad|example_advertisement_preview'] = $ds_layout; $ds_layout = new stdClass(); $ds_layout->api_version = 1; - $ds_layout->id = 'node|ad_example|full'; + $ds_layout->id = 'node|ad|full'; $ds_layout->entity_type = 'node'; - $ds_layout->bundle = 'ad_example'; + $ds_layout->bundle = 'ad'; $ds_layout->view_mode = 'full'; $ds_layout->layout = 'ds_1col'; $ds_layout->settings = array( @@ -280,7 +280,7 @@ function ad_ui_ds_layout_settings_info() { 'layout_link_attribute' => '', 'layout_link_custom' => '', ); - $export['node|ad_example|full'] = $ds_layout; + $export['node|ad|full'] = $ds_layout; return $export; } diff --git a/modules/ad_ui/ad_ui.features.field_instance.inc b/modules/ad_ui/ad_ui.features.field_instance.inc index 0ed71ce..40f579c 100644 --- a/modules/ad_ui/ad_ui.features.field_instance.inc +++ b/modules/ad_ui/ad_ui.features.field_instance.inc @@ -10,9 +10,9 @@ function ad_ui_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'node-ad_example-field_ad_image' - $field_instances['node-ad_example-field_ad_image'] = array( - 'bundle' => 'ad_example', + // Exported field_instance: 'node-ad-field_ad_image' + $field_instances['node-ad-field_ad_image'] = array( + 'bundle' => 'ad', 'deleted' => 0, 'description' => '', 'display' => array( @@ -95,9 +95,9 @@ function ad_ui_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_example-field_ad_link' - $field_instances['node-ad_example-field_ad_link'] = array( - 'bundle' => 'ad_example', + // Exported field_instance: 'node-ad-field_ad_link' + $field_instances['node-ad-field_ad_link'] = array( + 'bundle' => 'ad', 'default_value' => NULL, 'deleted' => 0, 'description' => '', @@ -178,9 +178,9 @@ function ad_ui_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_example-field_ad_size' - $field_instances['node-ad_example-field_ad_size'] = array( - 'bundle' => 'ad_example', + // Exported field_instance: 'node-ad-field_ad_size' + $field_instances['node-ad-field_ad_size'] = array( + 'bundle' => 'ad', 'default_value' => NULL, 'deleted' => 0, 'description' => '', diff --git a/modules/ad_ui/ad_ui.features.inc b/modules/ad_ui/ad_ui.features.inc index 2c2069b..b001923 100644 --- a/modules/ad_ui/ad_ui.features.inc +++ b/modules/ad_ui/ad_ui.features.inc @@ -28,8 +28,8 @@ function ad_ui_views_api($module = NULL, $api = NULL) { */ function ad_ui_node_info() { $items = array( - 'ad_example' => array( - 'name' => t('Ad Example'), + 'ad' => array( + 'name' => t('Advertisement'), 'base' => 'node_content', 'description' => '', 'has_title' => '1', diff --git a/modules/ad_ui/ad_ui.info b/modules/ad_ui/ad_ui.info index 6af45dd..05b4e79 100644 --- a/modules/ad_ui/ad_ui.info +++ b/modules/ad_ui/ad_ui.info @@ -21,25 +21,25 @@ dependencies[] = views features[ctools][] = ds:ds:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[ds_field_settings][] = node|ad_example|default -features[ds_field_settings][] = node|ad_example|example_advertisement -features[ds_field_settings][] = node|ad_example|full +features[ds_field_settings][] = node|ad|default +features[ds_field_settings][] = node|ad|example_advertisement +features[ds_field_settings][] = node|ad|full features[ds_fields][] = ad_total_clicks features[ds_fields][] = ad_total_impressions -features[ds_layout_settings][] = node|ad_example|default -features[ds_layout_settings][] = node|ad_example|example_advertisement_display -features[ds_layout_settings][] = node|ad_example|example_advertisement_preview -features[ds_layout_settings][] = node|ad_example|full +features[ds_layout_settings][] = node|ad|default +features[ds_layout_settings][] = node|ad|example_advertisement_display +features[ds_layout_settings][] = node|ad|example_advertisement_preview +features[ds_layout_settings][] = node|ad|full features[ds_view_modes][] = example_advertisement_display features[ds_view_modes][] = example_advertisement_preview features[features_api][] = api:2 features[field_base][] = field_ad_image features[field_base][] = field_ad_link features[field_base][] = field_ad_size -features[field_instance][] = node-ad_example-field_ad_image -features[field_instance][] = node-ad_example-field_ad_link -features[field_instance][] = node-ad_example-field_ad_size -features[node][] = ad_example +features[field_instance][] = node-ad-field_ad_image +features[field_instance][] = node-ad-field_ad_link +features[field_instance][] = node-ad-field_ad_size +features[node][] = ad features[taxonomy][] = advertisement_size features[user_permission][] = create ad_example content features[user_permission][] = delete any ad_example content @@ -49,12 +49,12 @@ features[user_permission][] = edit own ad_example content features[user_role][] = adsadmin features[user_role][] = advertiser features[variable][] = field_bundle_settings_advertisement__ad_image -features[variable][] = field_bundle_settings_node__ad_example -features[variable][] = menu_options_ad_example -features[variable][] = menu_parent_ad_example -features[variable][] = node_options_ad_example -features[variable][] = node_preview_ad_example -features[variable][] = node_submitted_ad_example +features[variable][] = field_bundle_settings_node__ad +features[variable][] = menu_options_ad +features[variable][] = menu_parent_ad +features[variable][] = node_options_ad +features[variable][] = node_preview_ad +features[variable][] = node_submitted_ad features[views_view][] = ad_example_administration features[views_view][] = ad_example_display mtime = 1423422600 diff --git a/modules/ad_ui/ad_ui.module b/modules/ad_ui/ad_ui.module index 4edb3f1..ca7772e 100644 --- a/modules/ad_ui/ad_ui.module +++ b/modules/ad_ui/ad_ui.module @@ -52,7 +52,7 @@ function ad_ui_block_view($delta = '') { */ function ad_ui_ad_info() { return array( - 'ad_example' => array( + 'ad' => array( // Field used to store the destination. It can be a textfield or a link. 'link_field' => 'field_ad_link', // The view used to query the nodes. diff --git a/modules/ad_ui/ad_ui.strongarm.inc b/modules/ad_ui/ad_ui.strongarm.inc index b6e5d58..89eec3b 100644 --- a/modules/ad_ui/ad_ui.strongarm.inc +++ b/modules/ad_ui/ad_ui.strongarm.inc @@ -36,7 +36,7 @@ function ad_ui_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'field_bundle_settings_node__ad_example'; + $strongarm->name = 'field_bundle_settings_node__ad'; $strongarm->value = array( 'view_modes' => array( 'example_advertisement' => array( @@ -73,44 +73,44 @@ function ad_ui_strongarm() { 'display' => array(), ), ); - $export['field_bundle_settings_node__ad_example'] = $strongarm; + $export['field_bundle_settings_node__ad'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'menu_options_ad_example'; + $strongarm->name = 'menu_options_ad'; $strongarm->value = array(); - $export['menu_options_ad_example'] = $strongarm; + $export['menu_options_ad'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'menu_parent_ad_example'; + $strongarm->name = 'menu_parent_ad'; $strongarm->value = 'main-menu:0'; - $export['menu_parent_ad_example'] = $strongarm; + $export['menu_parent_ad'] = $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_ad_example'; + $strongarm->name = 'node_options_ad'; $strongarm->value = array( 0 => 'status', ); - $export['node_options_ad_example'] = $strongarm; + $export['node_options_ad'] = $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_preview_ad_example'; + $strongarm->name = 'node_preview_ad'; $strongarm->value = '1'; - $export['node_preview_ad_example'] = $strongarm; + $export['node_preview_ad'] = $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_submitted_ad_example'; + $strongarm->name = 'node_submitted_ad'; $strongarm->value = 1; - $export['node_submitted_ad_example'] = $strongarm; + $export['node_submitted_ad'] = $strongarm; return $export; } diff --git a/modules/ad_ui/ad_ui.views_default.inc b/modules/ad_ui/ad_ui.views_default.inc index 1729ea8..25acc5d 100644 --- a/modules/ad_ui/ad_ui.views_default.inc +++ b/modules/ad_ui/ad_ui.views_default.inc @@ -261,7 +261,7 @@ function ad_ui_views_default_views() { $handler->display->display_options['filters']['type']['table'] = 'node'; $handler->display->display_options['filters']['type']['field'] = 'type'; $handler->display->display_options['filters']['type']['value'] = array( - 'ad_example' => 'ad_example', + 'ad' => 'ad', ); /* Filter criterion: Content: Ad size (field_ad_size) */ $handler->display->display_options['filters']['field_ad_size_tid']['id'] = 'field_ad_size_tid'; @@ -375,7 +375,7 @@ function ad_ui_views_default_views() { $handler->display->display_options['filters']['type']['table'] = 'node'; $handler->display->display_options['filters']['type']['field'] = 'type'; $handler->display->display_options['filters']['type']['value'] = array( - 'ad_example' => 'ad_example', + 'ad' => 'ad', ); /* Filter criterion: Content: Ad size (field_ad_size) */ $handler->display->display_options['filters']['field_ad_size_tid']['id'] = 'field_ad_size_tid'; @@ -403,7 +403,7 @@ function ad_ui_views_default_views() { $handler->display->display_options['filters']['type']['table'] = 'node'; $handler->display->display_options['filters']['type']['field'] = 'type'; $handler->display->display_options['filters']['type']['value'] = array( - 'ad_example' => 'ad_example', + 'ad' => 'ad', ); /* Filter criterion: Content: Ad size (field_ad_size) */ $handler->display->display_options['filters']['field_ad_size_tid']['id'] = 'field_ad_size_tid'; @@ -431,7 +431,7 @@ function ad_ui_views_default_views() { $handler->display->display_options['filters']['type']['table'] = 'node'; $handler->display->display_options['filters']['type']['field'] = 'type'; $handler->display->display_options['filters']['type']['value'] = array( - 'ad_example' => 'ad_example', + 'ad' => 'ad', ); /* Filter criterion: Content: Ad size (field_ad_size) */ $handler->display->display_options['filters']['field_ad_size_tid']['id'] = 'field_ad_size_tid'; -- 2.11.1