Merge pull request #1564 from aaronschachter/campaign_video

Campaign video collection

Author: aaronschachter

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.features.field_base.inc

@@ -1009,35 +1009,6 @@ function dosomething_campaign_field_default_field_bases() {
     'type' => 'text_long',
   );
 
-  // Exported field_base: 'field_psa'
-  $field_bases['field_psa'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_psa',
-    'foreign keys' => array(
-      'format' => array(
-        'columns' => array(
-          'format' => 'format',
-        ),
-        'table' => 'filter_format',
-      ),
-    ),
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 255,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
   // Exported field_base: 'field_reportback_confirm_msg'
   $field_bases['field_reportback_confirm_msg'] = array(
     'active' => 1,

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.features.field_instance.inc

@@ -878,7 +878,7 @@ function dosomething_campaign_field_default_field_instances() {
     'bundle' => 'campaign',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => 'If there is no PSA then this image is required.',
+    'description' => 'If there is no video, then this image is required.',
     'display' => array(
       'default' => array(
         'label' => 'above',
@@ -903,8 +903,10 @@ function dosomething_campaign_field_default_field_instances() {
       ),
     ),
     'entity_type' => 'node',
+    'entityconnect_unload_add' => 0,
+    'entityconnect_unload_edit' => 0,
     'field_name' => 'field_image_psa_replacement',
-    'label' => 'PSA Replacement Image',
+    'label' => 'Video Replacement Image',
     'required' => 0,
     'settings' => array(
       'user_register_form' => FALSE,
@@ -1806,52 +1808,6 @@ function dosomething_campaign_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-campaign-field_psa'
-  $field_instances['node-campaign-field_psa'] = array(
-    'bundle' => 'campaign',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => 'The ID of the youtube video <strong> (comes after the ?v=) </strong>',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'module' => 'text',
-        'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 51,
-      ),
-      'pitch' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-      'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
-      ),
-    ),
-    'entity_type' => 'node',
-    'field_name' => 'field_psa',
-    'label' => 'PSA',
-    'required' => 0,
-    'settings' => array(
-      'text_processing' => 0,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'active' => 1,
-      'module' => 'text',
-      'settings' => array(
-        'size' => 60,
-      ),
-      'type' => 'text_textfield',
-      'weight' => 12,
-    ),
-  );
-
   // Exported field_instance: 'node-campaign-field_reportback_confirm_msg'
   $field_instances['node-campaign-field_reportback_confirm_msg'] = array(
     'bundle' => 'campaign',
@@ -2478,6 +2434,53 @@ function dosomething_campaign_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'node-campaign-field_video'
+  $field_instances['node-campaign-field_video'] = array(
+    'bundle' => 'campaign',
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'field_collection',
+        'settings' => array(
+          'add' => 'Add',
+          'delete' => 'Delete',
+          'description' => TRUE,
+          'edit' => 'Edit',
+          'view_mode' => 'full',
+        ),
+        'type' => 'field_collection_view',
+        'weight' => 62,
+      ),
+      'pitch' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_video',
+    'label' => 'Video',
+    'required' => FALSE,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'module' => 'field_collection',
+      'settings' => array(),
+      'type' => 'field_collection_embed',
+      'weight' => 12,
+    ),
+  );
+
   // Exported field_instance: 'node-campaign-field_vips'
   $field_instances['node-campaign-field_vips'] = array(
     'bundle' => 'campaign',
@@ -2558,7 +2561,7 @@ function dosomething_campaign_field_default_field_instances() {
   t('Hype');
   t('If there is a prize to be won, you must include a PDF of the official rules.');
   t('If there is a scholarship, enter the dollar amount here. If there is no scholarship, leave this field blank.');
-  t('If there is no PSA then this image is required.');
+  t('If there is no video, then this image is required.');
   t('If you are not using a fact above, use this field. This is information that shows that the call to action is what to do to solve the issue.
 <br />
 <strong>Limit: 135 characters</strong>');
@@ -2586,8 +2589,6 @@ function dosomething_campaign_field_default_field_instances() {
 <br/>
 <strong> Limit 25 characters. </strong>');
   t('Official Rules');
-  t('PSA');
-  t('PSA Replacement Image');
   t('Primary Action Type');
   t('Primary Cause');
   t('Problem Fact');
@@ -2610,7 +2611,6 @@ function dosomething_campaign_field_default_field_instances() {
   t('Stuff You Need');
   t('Supporting Statement on the Solution');
   t('Tags');
-  t('The ID of the youtube video <strong> (comes after the ?v=) </strong>');
   t('The first thing they need to know. Could be general advice "start planning two weeks in advance" or pointing out the most important thing to do "as you plan, don\'t forget to get permission!".
 <br/>
 <strong> Limit: 135 characters </strong>');
@@ -2658,6 +2658,8 @@ function dosomething_campaign_field_default_field_instances() {
 <br/>
 <strong> Limit 20 characters. </strong>');
   t('VIPs');
+  t('Video');
+  t('Video Replacement Image');
   t('i.e. JEANS collected, SENIOR CITIZENS educated, FLYERS posted. Your responses should not be in all caps though, instead write - Jeans');
   t('i.e. jeans COLLECTED, senior citizens EDUCATED, flyers POSTED. Your responses should not be in all caps though, instead write - Collected');
 

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.field_group.inc

@@ -83,18 +83,18 @@ function dosomething_campaign_field_group_info() {
   $field_group->mode = 'form';
   $field_group->parent_name = '';
   $field_group->data = array(
-    'label' => 'Images',
+    'label' => 'Media',
     'weight' => '8',
     'children' => array(
       0 => 'field_image_campaign_cover',
       1 => 'field_image_psa_replacement',
       2 => 'field_image_reportback_gallery',
       3 => 'field_image_step_gallery',
-      4 => 'field_psa',
+      4 => 'field_video',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
-      'label' => 'Images',
+      'label' => 'Media',
       'instance_settings' => array(
         'required_fields' => 0,
         'classes' => '',
@@ -276,7 +276,6 @@ function dosomething_campaign_field_group_info() {
     'weight' => '8',
     'children' => array(
       0 => 'field_partners',
-      1 => 'field_sponsor',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.info

@@ -8,6 +8,7 @@ dependencies[] = ctools
 dependencies[] = date
 dependencies[] = dosomething_image
 dependencies[] = dosomething_signup
+dependencies[] = dosomething_static_content
 dependencies[] = dosomething_taxonomy
 dependencies[] = entityreference
 dependencies[] = features
@@ -53,7 +54,6 @@ features[field_base][] = field_pre_step_header
 features[field_base][] = field_primary_action_type
 features[field_base][] = field_primary_cause
 features[field_base][] = field_promoting_tips
-features[field_base][] = field_psa
 features[field_base][] = field_reportback_confirm_msg
 features[field_base][] = field_reportback_copy
 features[field_base][] = field_reportback_noun
@@ -116,7 +116,6 @@ features[field_instance][] = node-campaign-field_pre_step_header
 features[field_instance][] = node-campaign-field_primary_action_type
 features[field_instance][] = node-campaign-field_primary_cause
 features[field_instance][] = node-campaign-field_promoting_tips
-features[field_instance][] = node-campaign-field_psa
 features[field_instance][] = node-campaign-field_reportback_confirm_msg
 features[field_instance][] = node-campaign-field_reportback_copy
 features[field_instance][] = node-campaign-field_reportback_noun
@@ -130,6 +129,7 @@ features[field_instance][] = node-campaign-field_step_post
 features[field_instance][] = node-campaign-field_step_pre
 features[field_instance][] = node-campaign-field_tags
 features[field_instance][] = node-campaign-field_time_and_place
+features[field_instance][] = node-campaign-field_video
 features[field_instance][] = node-campaign-field_vips
 features[node][] = campaign
 features[user_permission][] = create campaign content

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.install

@@ -0,0 +1,13 @@
+<?php
+/**
+ * @file
+ * Installation and schema hooks for dosomething_campaign.module.
+ */
+
+
+/**
+ * Deletes field_psa.
+ */
+function dosomething_campaign_update_7001(&$sandbox) {
+  field_delete_field('field_psa');
+}

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.strongarm.inc

@@ -27,6 +27,12 @@ function dosomething_campaign_strongarm() {
         'metatags' => array(
           'weight' => '10',
         ),
+        'redirect' => array(
+          'weight' => '30',
+        ),
+        'xmlsitemap' => array(
+          'weight' => '30',
+        ),
       ),
       'display' => array(),
     ),

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.theme.inc

@@ -212,10 +212,12 @@ function dosomething_campaign_preprocess_action_page(&$vars, &$wrapper) {
     $vars[$fc] = dosomething_campaign_get_field_collection_values($wrapper, 'field_' . $fc);
   }
 
-  $psa = $wrapper->field_psa->value();
-  if (isset($psa)) {
-    $vars['psa'] = '<iframe id="ytplayer" type="text/html" width="640" height="390"
-     src="http://youtube.com/embed/' . $psa . '?wmode=transparent"' . 'frameborder="0"/>';
+  if (!empty($vars['field_video'])) {
+    $vars['psa'] = theme('dosomething_video_embed', array(
+      'field' => $wrapper->field_video->value(),
+      'width' => 640,
+      'height' => 390,
+    ));
   }
   else {
     if (isset($vars['field_image_psa_replacement'][0])) {

lib/modules/dosomething/dosomething_helpers/dosomething_helpers.theme.inc

@@ -36,6 +36,9 @@ function _dosomething_helpers_insert_after_first_element(&$a, $element) {
   }
 }
 
+/**
+ * Implements hook_theme().
+ */
 function dosomething_helpers_theme($existing, $type, $theme, $path) {
   return array(
     'dosomething_video_embed' => array(
@@ -48,6 +51,9 @@ function dosomething_helpers_theme($existing, $type, $theme, $path) {
   );
 }
 
+/**
+ * Theme callback for dosomething_video_embed.
+ */
 function theme_dosomething_video_embed($variables) {
   $output = '<iframe';
   $output .= " width=\"{$variables['width']}\"";

lib/modules/dosomething/dosomething_static_content/dosomething_static_content.features.field_instance.inc

@@ -242,7 +242,7 @@ function dosomething_static_content_field_default_field_instances() {
     'bundle' => 'field_video',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => 'The ID of the Youtube video <strong> (comes after the ?v=) </strong>',
     'display' => array(
       'default' => array(
         'label' => 'above',
@@ -825,6 +825,7 @@ function dosomething_static_content_field_default_field_instances() {
   t('Intro Title');
   t('Provider');
   t('Subtitle');
+  t('The ID of the Youtube video <strong> (comes after the ?v=) </strong>');
   t('Video');
   t('Video ID');
 

lib/modules/dosomething/dosomething_static_content/dosomething_static_content.install

@@ -0,0 +1,12 @@
+<?php
+/**
+ * @file
+ * Installation and schema hooks for dosomething_static_content.module.
+ */
+
+/**
+ * Deletes field_cta_button_text.
+ */
+function dosomething_static_content_update_7001(&$sandbox) {
+  field_delete_field('field_cta_button_text');
+}