Speaker profile tweaks

config/core.entity_view_display.node.speaker.default.yml

@@ -28,23 +28,16 @@ content:
     third_party_settings: {  }
     region: content
   field_drupal_org_handle:
-    weight: 5
+    weight: 4
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
-  field_email_address:
-    weight: 3
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    type: email_mailto
-    region: content
   field_organisation:
     weight: 2
-    label: hidden
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -60,7 +53,7 @@ content:
     type: image
     region: content
   field_twitter_handle:
-    weight: 4
+    weight: 3
     label: inline
     settings:
       link_to_entity: false
@@ -68,4 +61,5 @@ content:
     type: string
     region: content
 hidden:
+  field_email_address: true
   links: true

config/core.entity_view_display.node.speaker.speaker_profile.yml

@@ -38,7 +38,7 @@ content:
     region: content
   field_organisation:
     weight: 2
-    label: hidden
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }

config/pathauto.pattern.general_content.yml

@@ -0,0 +1,24 @@
+uuid: e87e5b5c-f50a-43b3-b448-18a6d12d45b4
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: general_content
+label: 'General content'
+type: 'canonical_entities:node'
+pattern: '[node:content-type]/[node:title]'
+selection_criteria:
+  ff6298b2-6b2c-4374-945f-45f55f7f3252:
+    id: node_type
+    bundles:
+      session: session
+      speaker: speaker
+      sponsor: sponsor
+    negate: false
+    context_mapping:
+      node: node
+    uuid: ff6298b2-6b2c-4374-945f-45f55f7f3252
+selection_logic: and
+weight: -5
+relationships: {  }

config/views.view.speaker_profiles.yml

@@ -3,13 +3,13 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_mode.node.speaker_profile
     - field.storage.node.body
     - field.storage.node.field_drupal_org_handle
     - field.storage.node.field_organisation
     - field.storage.node.field_profile_picture
     - field.storage.node.field_twitter_handle
     - image.style.speaker_profile_large
-    - image.style.speaker_profile_small
     - node.type.speaker
   module:
     - image
@@ -63,7 +63,10 @@ display:
       style:
         type: default
       row:
-        type: fields
+        type: 'entity:node'
+        options:
+          relationship: none
+          view_mode: speaker_profile
       fields:
         title:
           id: title

web/themes/dcb2017/css/style.css

@@ -20,7 +20,8 @@ h3 {
   font-size: 1.6em; }
 
 h1, h2, h3, h4 {
-  font-weight: 600; }
+  font-weight: 600;
+  margin-bottom: 0.4em; }
 
 h1, h2 {
   text-transform: uppercase; }
@@ -383,4 +384,15 @@ nav.menu--main {
   .node--type-speaker .profile-info {
     padding-left: 9em; } }
 
+.node--type-speaker.node--view-mode-speaker-profile {
+  margin-bottom: 2em; }
+
+.speaker-twitter {
+  background: url("../images/twitter-1.png") no-repeat left center transparent;
+  padding: 0 10px 0 20px; }
+
+.speaker-drupal {
+  background: url("../images/drop-1.png") no-repeat left center transparent;
+  padding: 0 10px 0 20px; }
+
 /*# sourceMappingURL=style.css.map */

web/themes/dcb2017/sass/_global.scss

@@ -27,6 +27,7 @@ h3 {
 
 h1, h2, h3, h4 {
   font-weight: 600;
+  margin-bottom: 0.4em
 }
 
 h1, h2 {

web/themes/dcb2017/sass/content/_speaker.scss

@@ -14,4 +14,18 @@
       padding-left: 9em;
     }
   }
+
+  &.node--view-mode-speaker-profile {
+    margin-bottom: 2em;
+  }
+}
+
+.speaker-twitter {
+  background: url('../images/twitter-1.png') no-repeat left center transparent;
+  padding: 0 10px 0 20px;
+}
+
+.speaker-drupal {
+  background: url('../images/drop-1.png') no-repeat left center transparent;
+  padding: 0 10px 0 20px;
 }

web/themes/dcb2017/templates/content/node--speaker.html.twig

@@ -104,6 +104,7 @@
           <span class="speaker-drupal"><a href="https://www.drupal.org/u/{{ node.field_drupal_org_handle.value }}">{{ node.field_drupal_org_handle.value }}</a></span>
         {% endif %}
       </div>
+      {{ content.field_organisation }}
       {{ content.body }}
     </div>
   </div>