Merge pull request #12 from isubit/development

Merge development into master
isubit · Oct 23, 2017 · 5238d80 · 5238d80
2 parents bd33c1c + 0ef7a28
commit 5238d80
Show file tree

Hide file tree

Showing 12 changed files with 1,284 additions and 215 deletions.
diff --git a/css/blog_blog.css b/css/blog_blog.css
@@ -0,0 +1,5 @@
+.view-display-id-page .views-field-field-lug-blog-author .media {
+    display: table-cell;
+    vertical-align: top;
+    padding-right: 10px;
+}
diff --git a/css/blog_global.css b/css/blog_global.css
@@ -0,0 +1,23 @@
+/* Format "Recent Bloggers" block. */
+
+#block-views-bloggers-block-recent-bloggers .content {
+    padding: 1em;
+}
+
+/* Right align the "View all bloggers" link. */
+#block-views-bloggers-block-recent-bloggers .view-footer p {
+    float: right;
+}
+
+/* Hide the post dates from display */
+#block-views-bloggers-block-recent-bloggers .media-body small {
+    display: none;
+}
+
+#block-views-bloggers-block-recent-bloggers .media-body {
+    vertical-align: middle;
+}
+
+#block-views-bloggers-block-recent-bloggers .views-row {
+    margin-bottom: 1.0em;
+}
diff --git a/css/luggage_blog_author_list_attachment.css b/css/luggage_blog_author_list_attachment.css
@@ -0,0 +1,5 @@
+.view-display-id-blog_author_list_attachment .slides>li img {
+	width: 150px;
+	margin: 0 auto;
+	border-radius: 6px;
+}
diff --git a/css/luggage_blog_person.css b/css/luggage_blog_person.css
@@ -0,0 +1,20 @@
+.view-display-id-person_blog_page_hero_attachment .views-row-1 {
+  min-height: 150px;
+}
+
+.view-display-id-person_blog_page_hero_attachment .views-field-field-people-bio {
+	float: left;
+	width: 75%;
+}
+
+.view-display-id-person_blog_page_hero_attachment .views-field-field-people-image {
+  float: right;
+  width: 25%;
+  text-align: right;
+}
+
+.view-display-id-person_blog_page_hero_attachment .views-field-field-people-image img {
+  height: 170px;
+  width: auto;
+  border-radius: 6px;
+}
diff --git a/luggage_blog.features.field_base.inc b/luggage_blog.features.field_base.inc
@@ -10,64 +10,39 @@
 function luggage_blog_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'field_lug_blog_author'
+  // Exported field_base: 'field_lug_blog_author'.
   $field_bases['field_lug_blog_author'] = array(
     'active' => 1,
-    'cardinality' => 1,
+    'cardinality' => -1,
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_lug_blog_author',
-    'foreign keys' => array(
-      'node' => array(
-        'columns' => array(
-          'target_id' => 'nid',
-        ),
-        'table' => 'node',
-      ),
-    ),
     'indexes' => array(
-      'target_id' => array(
-        0 => 'target_id',
+      'tid' => array(
+        0 => 'tid',
       ),
     ),
     'locked' => 0,
-    'module' => 'entityreference',
+    'module' => 'taxonomy',
     'settings' => array(
-      'handler' => 'base',
-      'handler_settings' => array(
-        'behaviors' => array(
-          'views-select-list' => array(
-            'status' => 0,
-          ),
-        ),
-        'sort' => array(
-          'type' => 'none',
-        ),
-        'target_bundles' => array(
-          'people' => 'people',
+      'allowed_values' => array(
+        0 => array(
+          'vocabulary' => 'aliases',
+          'parent' => 0,
         ),
       ),
-      'target_type' => 'node',
     ),
     'translatable' => 0,
-    'type' => 'entityreference',
+    'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_lug_blog_files'
+  // Exported field_base: 'field_lug_blog_files'.
   $field_bases['field_lug_blog_files'] = array(
     'active' => 1,
     'cardinality' => -1,
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_lug_blog_files',
-    'foreign keys' => array(
-      'fid' => array(
-        'columns' => array(
-          'fid' => 'fid',
-        ),
-        'table' => 'file_managed',
-      ),
-    ),
     'indexes' => array(
       'fid' => array(
         0 => 'fid',
@@ -84,21 +59,13 @@ function luggage_blog_field_default_field_bases() {
     'type' => 'file',
   );
 
-  // Exported field_base: 'field_lug_blog_image'
+  // Exported field_base: 'field_lug_blog_image'.
   $field_bases['field_lug_blog_image'] = array(
     'active' => 1,
     'cardinality' => -1,
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_lug_blog_image',
-    'foreign keys' => array(
-      'fid' => array(
-        'columns' => array(
-          'fid' => 'fid',
-        ),
-        'table' => 'file_managed',
-      ),
-    ),
     'indexes' => array(
       'fid' => array(
         0 => 'fid',

diff --git a/luggage_blog.features.field_instance.inc b/luggage_blog.features.field_instance.inc
@@ -10,7 +10,7 @@
 function luggage_blog_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance: 'node-lug_blog-body'
+  // Exported field_instance: 'node-lug_blog-body'.
   $field_instances['node-lug_blog-body'] = array(
     'bundle' => 'lug_blog',
     'default_value' => NULL,
@@ -75,7 +75,7 @@ function luggage_blog_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-lug_blog-field_category'
+  // Exported field_instance: 'node-lug_blog-field_category'.
   $field_instances['node-lug_blog-field_category'] = array(
     'bundle' => 'lug_blog',
     'default_value' => NULL,
@@ -94,7 +94,7 @@ function luggage_blog_field_default_field_instances() {
         'module' => 'taxonomy',
         'settings' => array(),
         'type' => 'taxonomy_term_reference_link',
-        'weight' => 3,
+        'weight' => 1,
       ),
       'search_index' => array(
         'label' => 'above',
@@ -134,83 +134,68 @@ function luggage_blog_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-lug_blog-field_lug_blog_author'
+  // Exported field_instance: 'node-lug_blog-field_lug_blog_author'.
   $field_instances['node-lug_blog-field_lug_blog_author'] = array(
     'bundle' => 'lug_blog',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => 'Enter the author or authors separated by a comma.',
     'display' => array(
       'default' => array(
-        'label' => 'hidden',
-        'module' => 'entityreference',
-        'settings' => array(
-          'links' => 0,
-          'view_mode' => 'teaser',
-        ),
-        'type' => 'entityreference_entity_view',
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 5,
       ),
       'full' => array(
-        'label' => 'hidden',
-        'module' => 'entityreference',
-        'settings' => array(
-          'links' => 0,
-          'view_mode' => 'teaser',
-        ),
-        'type' => 'entityreference_entity_view',
-        'weight' => 5,
+        'label' => 'above',
+        'module' => 'luggage_aliases',
+        'settings' => array(),
+        'type' => 'author_list',
+        'weight' => 3,
       ),
       'search_index' => array(
-        'label' => 'hidden',
-        'module' => 'entityreference',
-        'settings' => array(
-          'links' => 0,
-          'view_mode' => 'teaser',
-        ),
-        'type' => 'entityreference_entity_view',
-        'weight' => 3,
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_plain',
+        'weight' => 5,
       ),
       'search_result' => array(
-        'label' => 'hidden',
-        'module' => 'entityreference',
-        'settings' => array(
-          'link' => 1,
-        ),
-        'type' => 'entityreference_label',
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
         'weight' => 0,
       ),
       'teaser' => array(
-        'label' => 'hidden',
-        'module' => 'entityreference',
-        'settings' => array(
-          'link' => 1,
-        ),
-        'type' => 'entityreference_label',
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
         'weight' => 0,
       ),
     ),
     'entity_type' => 'node',
     'field_name' => 'field_lug_blog_author',
-    'label' => 'Author',
+    'label' => 'Author(s)',
+    'placeholder' => '',
     'required' => 1,
     'settings' => array(
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 1,
-      'module' => 'entityreference',
+      'active' => 0,
+      'module' => 'taxonomy',
       'settings' => array(
-        'match_operator' => 'CONTAINS',
-        'path' => '',
+        'autocomplete_path' => 'taxonomy/autocomplete',
         'size' => 60,
       ),
-      'type' => 'entityreference_autocomplete',
-      'weight' => 0,
+      'type' => 'taxonomy_autocomplete',
+      'weight' => 1,
     ),
   );
 
-  // Exported field_instance: 'node-lug_blog-field_lug_blog_files'
+  // Exported field_instance: 'node-lug_blog-field_lug_blog_files'.
   $field_instances['node-lug_blog-field_lug_blog_files'] = array(
     'bundle' => 'lug_blog',
     'deleted' => 0,
@@ -226,14 +211,14 @@ function luggage_blog_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 2,
+        'weight' => 5,
       ),
       'search_index' => array(
         'label' => 'above',
         'module' => 'file',
         'settings' => array(),
         'type' => 'file_default',
-        'weight' => 5,
+        'weight' => 4,
       ),
       'search_result' => array(
         'label' => 'above',
@@ -291,7 +276,7 @@ function luggage_blog_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-lug_blog-field_lug_blog_image'
+  // Exported field_instance: 'node-lug_blog-field_lug_blog_image'.
   $field_instances['node-lug_blog-field_lug_blog_image'] = array(
     'bundle' => 'lug_blog',
     'deleted' => 0,
@@ -307,7 +292,7 @@ function luggage_blog_field_default_field_instances() {
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 1,
+        'weight' => 4,
       ),
       'search_index' => array(
         'label' => 'hidden',
@@ -317,7 +302,7 @@ function luggage_blog_field_default_field_instances() {
           'image_style' => '',
         ),
         'type' => 'image',
-        'weight' => 4,
+        'weight' => 3,
       ),
       'search_result' => array(
         'label' => 'hidden',
@@ -380,7 +365,7 @@ function luggage_blog_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-lug_blog-field_tags'
+  // Exported field_instance: 'node-lug_blog-field_tags'.
   $field_instances['node-lug_blog-field_tags'] = array(
     'bundle' => 'lug_blog',
     'default_value' => NULL,
@@ -399,7 +384,7 @@ function luggage_blog_field_default_field_instances() {
         'module' => 'taxonomy',
         'settings' => array(),
         'type' => 'taxonomy_term_reference_link',
-        'weight' => 4,
+        'weight' => 2,
       ),
       'search_index' => array(
         'label' => 'above',
@@ -445,9 +430,10 @@ function luggage_blog_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Author');
+  t('Author(s)');
   t('Body');
   t('Category');
+  t('Enter the author or authors separated by a comma.');
   t('File(s)');
   t('Image(s)');
   t('Tags');

diff --git a/luggage_blog.features.inc b/luggage_blog.features.inc
@@ -8,6 +8,9 @@
  * Implements hook_ctools_plugin_api().
  */
 function luggage_blog_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "flexslider" && $api == "flexslider_default_preset") {
+    return array("version" => "1");
+  }
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }