FDSU-1851: Merging in faculty colours.

uw_virtual_site_homepage.features.field_base.inc

@@ -300,5 +300,40 @@ function uw_virtual_site_homepage_field_default_field_bases() {
     'type' => 'text_with_summary',
   );
 
+  // Exported field_base: 'field_uw_theme_settings'
+  $field_bases['field_uw_theme_settings'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_uw_theme_settings',
+    'foreign keys' => array(),
+    'indexes' => array(
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'list',
+    'settings' => array(
+      'allowed_values' => array(
+        'default' => 'University of Waterloo',
+        'ahs' => 'Applied Health Science',
+        'arts' => 'Arts',
+        'engineering' => 'Engineering',
+        'environment' => 'Environment',
+        'math' => 'Math',
+        'science' => 'Science',
+        'cgc' => 'Conrad Grebel University College',
+        'ren' => 'Renison University College',
+        'stj' => 'St. Jerome\'s University',
+        'stp' => 'St. Paul\'s University College',
+      ),
+      'allowed_values_function' => '',
+    ),
+    'translatable' => 0,
+    'type' => 'list_text',
+  );
+
   return $field_bases;
 }

uw_virtual_site_homepage.features.field_instance.inc

@@ -287,8 +287,6 @@ function uw_virtual_site_homepage_field_default_field_instances() {
       ),
       'type' => 'text_textfield',
       'weight' => 4,
-<<<<<<< HEAD
-=======
     ),
   );
 
@@ -774,6 +772,79 @@ function uw_virtual_site_homepage_field_default_field_instances() {
       ),
       'type' => 'text_textarea_with_summary',
       'weight' => 3,
+<<<<<<< HEAD
+=======
+    ),
+  );
+
+  // Exported field_instance: 'node-uw_virtual_site_homepage-field_uw_theme_settings'
+  $field_instances['node-uw_virtual_site_homepage-field_uw_theme_settings'] = array(
+    'bundle' => 'uw_virtual_site_homepage',
+    'default_value' => array(
+      0 => array(
+        'value' => 'default',
+      ),
+    ),
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'list',
+        'settings' => array(),
+        'type' => 'list_default',
+        'weight' => 11,
+      ),
+      'links' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'no_image_teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'sidebar_teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'slide_teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'title' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_uw_theme_settings',
+    'label' => 'Theme settings',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 1,
     ),
   );
 
@@ -906,10 +977,13 @@ function uw_virtual_site_homepage_field_default_field_instances() {
         'weight' => 0,
       ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'label' => 'hidden',
+        'module' => 'vsite_vocab',
+        'settings' => array(
+          'concatenate' => 1,
+        ),
+        'type' => 'og_vocab',
+        'weight' => 10,
       ),
       'title' => array(
         'label' => 'above',
@@ -956,6 +1030,7 @@ function uw_virtual_site_homepage_field_default_field_instances() {
   t('Profile image');
   t('Provide banner images for virtual site homepages on Scholar at Waterloo sites.');
   t('Site description');
+  t('Theme settings');
 
   return $field_instances;
 }

uw_virtual_site_homepage.info

 name = UW Virtual Site Homepage
 description = UW virtual site homepage settings
-core = 7.x
 package = uWaterloo Content Types
 project = uw_virtual_site_homepage
 dependencies[] = ctools
 dependencies[] = eim
 dependencies[] = features
 dependencies[] = image
+dependencies[] = list
 dependencies[] = media
 dependencies[] = menu
 dependencies[] = node
@@ -32,6 +32,7 @@ features[field_base][] = field_uw_phone_number
 features[field_base][] = field_uw_profile_image
 features[field_base][] = field_uw_site_description
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_credentials
+features[field_base][] = field_uw_theme_settings
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_email_homepage
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_extension
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_faculty
@@ -41,6 +42,7 @@ features[field_instance][] = node-uw_virtual_site_homepage-field_uw_office_locat
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_phone_number
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_profile_image
 features[field_instance][] = node-uw_virtual_site_homepage-field_uw_site_description
+features[field_instance][] = node-uw_virtual_site_homepage-field_uw_theme_settings
 features[field_instance][] = node-uw_virtual_site_homepage-og_group_ref
 features[field_instance][] = node-uw_virtual_site_homepage-og_vocabulary
 features[node][] = uw_virtual_site_homepage