fixing merge

README.md

@@ -21,7 +21,6 @@ In addition to the Express install profile, Express sites add functionality by e
 * [![Build Status](https://travis-ci.org/CuBoulder/express_localist_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/express_localist_bundle) [Localist Bundle](https://github.com/CuBoulder/express_localist_bundle)
 * [![Build Status](https://travis-ci.org/CuBoulder/express_mathjax_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/express_mathjax_bundle) [Mathjax Bundle](https://github.com/CuBoulder/express_mathjax_bundle)
 * [![Build Status](https://travis-ci.org/CuBoulder/cu_newsletter_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/cu_newsletter_bundle) [Newsletter Bundle](https://github.com/CuBoulder/cu_newsletter_bundle)
-* [![Build Status](https://travis-ci.org/CuBoulder/cu_publications_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/cu_publications_bundle) [Publications Bundle](https://github.com/CuBoulder/cu_publications_bundle)
 * [![Build Status](https://travis-ci.org/CuBoulder/cu_section_page_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/cu_section_page_bundle) [Section Page Bundle](https://github.com/CuBoulder/cu_section_page_bundle)
 * [![Build Status](https://travis-ci.org/CuBoulder/express_responsive_visibility_bundle.svg?branch=master)](https://travis-ci.org/CuBoulder/express_responsive_visibility_bundle) [Responsive_Visibility_Bundle](https://github.com/CuBoulder/express_responsive_visibility_bundle)
 

modules/custom/cu_alumni_class_notes_bundle/cu_alumni_class_notes_bundle.info

@@ -0,0 +1,15 @@
+name = Alumni Class Notes
+core = 7.x
+package = Alumni Class Notes
+description = The Class Note Bundle allows you to create alumni profiles to make it easy for your visitors to view and search for alums by year.
+dependencies[] = cu_class_notes
+bundle_group = addon_bundles
+version = 7.x-1.1
+project = cu_alumni_class_notes_bundle
+project status url = https://github.com/CuBoulder/cu_alumni_class_notes_bundle
+project_demo_url = http://www.colorado.edu/webcentral/node/1502
+
+bundle_roles[] = developer
+bundle_roles[] = administrator
+bundle_roles[] = site_owner
+bundle_roles[] = configuration_manager

modules/custom/cu_alumni_class_notes_bundle/cu_alumni_class_notes_bundle.module

@@ -0,0 +1,62 @@
+<?php
+
+
+/*
+ * Implements hook_secure_permissions
+ *
+ * Adding permissions for collection grid bean
+ */
+function cu_alumni_class_notes_bundle_secure_permissions($role) {
+  $permissions = array(
+    'anonymous user' => array(
+    ),
+    'authenticated user' => array(
+    ),
+    'administrator' => array(
+      'create class_note content',
+      'delete any class_note content',
+      'delete own class_note content',
+      'edit any class_note content',
+      'edit own class_note content',
+    ),
+    'content_editor' => array(
+      'create class_note content',
+      'delete any class_note content',
+      'delete own class_note content',
+      'edit any class_note content',
+      'edit own class_note content',
+    ),
+    'developer' => array(
+      'create class_note content',
+      'delete any class_note content',
+      'delete own class_note content',
+      'edit any class_note content',
+      'edit own class_note content',
+    ),
+    'edit_my_content' => array(
+      'delete own class_note content',
+      'edit own class_note content',
+    ),
+    'edit_only' => array(
+      'edit own class_note content',
+    ),
+    'site_editor' => array(
+      'create class_note content',
+      'delete any class_note content',
+      'delete own class_note content',
+      'edit any class_note content',
+      'edit own class_note content',
+    ),
+    'site_owner' => array(
+      'create class_note content',
+      'delete any class_note content',
+      'delete own class_note content',
+      'edit any class_note content',
+      'edit own class_note content',
+    ),
+  );
+
+  if (isset($permissions[$role])) {
+    return $permissions[$role];
+  }
+}

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/config.rb

@@ -0,0 +1,14 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+css_dir = "css"
+sass_dir = "scss"
+
+output_style = :compact
+
+relative_assets = true
+
+line_comments = false
+color_output = false
+
+cache = false

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/css/cu-class-notes.css

@@ -0,0 +1,17 @@
+.class-note-single p:last-child { margin-bottom: 0; }
+
+.class-note-year a:link, .class-note-year a:visited { font-size: 200%; font-weight: 700; color: #959595; margin-bottom: 10px; }
+
+.class-note-year a:hover, .class-note-year a:focus { color: #333; }
+
+.container-inline .classnotes-view-all { font-size: 85%; display: block; }
+
+.classnotes-filter label, .classnotes-sort label, .classnotes-markup { font-size: 85%; font-weight: 600; }
+
+.class-note-posted-date { font-size: 75%; }
+
+.class-note-single a.edit-link { float: right; }
+
+#cu-class-notes-filter-form .fieldset-wrapper { display: flex; flex-direction: row; flex-wrap: wrap; align-items: center; }
+#cu-class-notes-filter-form .fieldset-wrapper > * { padding: 5px; }
+@media screen and (min-width: 960px) { #cu-class-notes-filter-form .fieldset-wrapper .classnotes-view-all { flex-grow: 1; text-align: right; } }

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/cu_class_notes.features.field_base.inc

@@ -0,0 +1,37 @@
+<?php
+/**
+ * @file
+ * cu_class_notes.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function cu_class_notes_field_default_field_bases() {
+  $field_bases = array();
+
+  // Exported field_base: 'field_class_note_class_year'
+  $field_bases['field_class_note_class_year'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_class_note_class_year',
+    'indexes' => array(
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'list',
+    'settings' => array(
+      'allowed_values' => array(),
+      'allowed_values_function' => '_cu_class_notes_class_years',
+      'allowed_values_php' => '',
+    ),
+    'translatable' => 0,
+    'type' => 'list_integer',
+  );
+
+  return $field_bases;
+}

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/cu_class_notes.features.field_instance.inc

@@ -0,0 +1,103 @@
+<?php
+/**
+ * @file
+ * cu_class_notes.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function cu_class_notes_field_default_field_instances() {
+  $field_instances = array();
+
+  // Exported field_instance: 'node-class_note-body'
+  $field_instances['node-class_note-body'] = array(
+    'bundle' => 'class_note',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(
+          'trim_length' => 600,
+        ),
+        'type' => 'text_summary_or_trimmed',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'body',
+    'label' => 'Body',
+    'required' => FALSE,
+    'settings' => array(
+      'display_summary' => TRUE,
+      'text_processing' => 1,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'module' => 'text',
+      'settings' => array(
+        'rows' => 20,
+        'summary_rows' => 5,
+      ),
+      'type' => 'text_textarea_with_summary',
+      'weight' => 3,
+    ),
+  );
+
+  // Exported field_instance: 'node-class_note-field_class_note_class_year'
+  $field_instances['node-class_note-field_class_note_class_year'] = array(
+    'bundle' => 'class_note',
+    'default_value' => NULL,
+    'default_value_function' => '',
+    'default_value_php' => '',
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'list',
+        'settings' => array(),
+        'type' => 'list_default',
+        'weight' => 1,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'fences_wrapper' => 'no_wrapper',
+    'field_name' => 'field_class_note_class_year',
+    'label' => 'Class Year',
+    'required' => 1,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 4,
+    ),
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Body');
+  t('Class Year');
+
+  return $field_instances;
+}

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/cu_class_notes.features.inc

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @file
+ * cu_class_notes.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function cu_class_notes_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "strongarm" && $api == "strongarm") {
+    return array("version" => "1");
+  }
+}
+
+/**
+ * Implements hook_node_info().
+ */
+function cu_class_notes_node_info() {
+  $items = array(
+    'class_note' => array(
+      'name' => t('Class Note'),
+      'base' => 'node_content',
+      'description' => '',
+      'has_title' => '1',
+      'title_label' => t('Title'),
+      'help' => '',
+    ),
+  );
+  drupal_alter('node_info', $items);
+  return $items;
+}

modules/custom/cu_alumni_class_notes_bundle/cu_class_notes/cu_class_notes.info

@@ -0,0 +1,22 @@
+name = Class Notes
+core = 7.x
+package = Alumni Class Notes
+description = Content type and displays of class note content
+dependencies[] = ctools
+dependencies[] = features
+dependencies[] = list
+dependencies[] = options
+dependencies[] = strongarm
+dependencies[] = text
+features[ctools][] = strongarm:strongarm:1
+features[features_api][] = api:2
+features[field_base][] = field_class_note_class_year
+features[field_instance][] = node-class_note-body
+features[field_instance][] = node-class_note-field_class_note_class_year
+features[node][] = class_note
+features[variable][] = field_bundle_settings_node__class_note
+features[variable][] = menu_options_class_note
+features[variable][] = menu_parent_class_note
+features[variable][] = node_options_class_note
+features[variable][] = node_preview_class_note
+features[variable][] = node_submitted_class_note