Merge branch 'feature/ISTWCMS-6305-ebremner-links-block' into '1.1.x'

ISTWCMS-6305: using function to get options for faculty colors

See merge request !103

templates/blocks/block--uw-cbl-links.html.twig

+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ *   - label: The configured label for the block.
+ *   - label_display: The display settings for the label.
+ *   - provider: The module or other provider that provided this block plugin.
+ *   - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
+ *   - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+
+{%
+  set classes = [
+  'block',
+  'block-' ~ configuration.provider|clean_class,
+  'block-' ~ plugin_id|clean_class,
+  'block-' ~ plugin_id|clean_class ~ '__' ~ content['#links']['link_style'],
+]
+%}
+
+{% if in_layout_builder %}
+  {{ attach_library('uw_theme_admin/uw_layout_builder') }}
+{% endif %}
+
+{% if content %}
+  <div{{ attributes.addClass(classes) }}>
+    {% if admin_label %}
+      <div class="uw-admin-label">{{ admin_label }}</div>
+    {% endif %}
+    {{ title_prefix }}
+    {% if label %}
+      {% if heading_level %}
+        <{{ heading_level }}{{ title_attributes }}>{{ label }}</{{ heading_level }}>
+      {% else %}
+        <h2{{ title_attributes }}>{{ label }}</h2>
+      {% endif %}
+    {% endif %}
+    {{ title_suffix }}
+    {% block content %}
+      {{ content }}
+    {% endblock %}
+  </div>
+{% endif %}

uw_fdsu_theme_resp.theme

@@ -278,20 +278,7 @@ function uw_fdsu_theme_resp_form_system_theme_settings_alter(&$form, FormStateIn
     '#type'          => 'select',
     '#default_value' => theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') ? theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') : 'default',
     '#description'   => t("Select a color scheme to use"),
-    '#options' => [
-      'org-default' => t('Black/gold (default)'),
-      'org-art' => t('Orange (Arts)'),
-      'org-eng' => t('Purple (Engineering)'),
-      'org-env' => t('Green (Environment)'),
-      'org-ahs' => t('Teal (Health)'),
-      'org-mat' => t('Pink (Mathematics)'),
-      'org-sci' => t('Blue (Science)'),
-      'org-school' => t('Red (school)'),
-      'org-cgc' => t('Red (Conrad Grebel University College)'),
-      'org-ren' => t('Green (Renison University College)'),
-      'org-stj' => t('Green (St. Jerome’s University)'),
-      'org-stp' => t('Blue (United College)'),
-    ],
+    '#options' => _uw_cfg_common_get_faculty_color_options(),
   ];
 
   // Fieldset for branding options.