Skip to content

Commit

Permalink
Merge branch '11.x' of https://github.com/SU-SWS/stanford_profile int…
Browse files Browse the repository at this point in the history
…o 11.x
  • Loading branch information
pookmish committed Oct 16, 2024
2 parents da6b181 + 5fec035 commit 3780bb1
Show file tree
Hide file tree
Showing 20 changed files with 150 additions and 751 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# SOE Profile

11.4.5
-------------------------------------------------------------------------------
- Remove edit links in views (#821)
- D8CORE-7564: removed decanter link and replaced with identity guide (#822)
- D8CORE-7517 | update event subtitle heading (#816)
- D8Core-7515: adding a few additional "Site Type" options

11.4.4
-------------------------------------------------------------------------------
- Updated image_effects module for compatibility with imagemagic 4.0.0.
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
"drupal/next": "^1.2",
"drupal/nobots": "^1.0",
"drupal/node_revision_delete": "^2.0@RC",
"drupal/page_cache_query_ignore": "^2.2",
"drupal/page_manager": "^4.0@beta",
"drupal/paragraphs": "^1.11",
"drupal/paragraphs_edit": "^3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies:
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_key
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_search
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_ui
- field.field.config_pages.stanford_basic_site_settings.su_site_created
- field.field.config_pages.stanford_basic_site_settings.su_site_dropdowns
- field.field.config_pages.stanford_basic_site_settings.su_site_email
- field.field.config_pages.stanford_basic_site_settings.su_site_home
Expand All @@ -35,9 +36,11 @@ dependencies:
- change_labels
- conditional_fields
- cshs
- field_formatter_class
- field_group
- file
- link
- readonly_field_widget
- text
third_party_settings:
field_group:
Expand Down Expand Up @@ -248,6 +251,42 @@ content:
settings:
display_label: true
third_party_settings: { }
su_site_created:
type: readonly_field_widget
weight: 1
region: content
settings:
label: above
formatter_type: timestamp
formatter_settings:
timestamp:
date_format: html_date
custom_date_format: ''
timezone: ''
tooltip:
date_format: long
custom_date_format: ''
time_diff:
enabled: false
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
refresh: 60
description: ''
formatter_third_party_settings:
empty_fields:
handler: ''
field_formatter_class:
class: ''
field_label:
label_value: ''
label_tag: ''
show_description: false
third_party_settings:
field_formatter_class:
class: ''
change_labels:
field_label_overwrite: ''
su_site_dropdowns:
type: boolean_checkbox
weight: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies:
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_key
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_search
- field.field.config_pages.stanford_basic_site_settings.su_site_algolia_ui
- field.field.config_pages.stanford_basic_site_settings.su_site_created
- field.field.config_pages.stanford_basic_site_settings.su_site_dropdowns
- field.field.config_pages.stanford_basic_site_settings.su_site_email
- field.field.config_pages.stanford_basic_site_settings.su_site_home
Expand Down Expand Up @@ -150,6 +151,25 @@ content:
third_party_settings: { }
weight: 23
region: content
su_site_created:
type: timestamp
label: above
settings:
date_format: medium
custom_date_format: ''
timezone: ''
tooltip:
date_format: long
custom_date_format: ''
time_diff:
enabled: false
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
refresh: 60
third_party_settings: { }
weight: 26
region: content
su_site_dropdowns:
type: boolean
label: above
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ default_value:
default_value_callback: ''
settings:
markup:
value: "<div><p><img alt=\"\" src=\"https://su-sws.github.io/stanford_basic/src/assets/img/lockup-example.png\" /></p>\r\n\r\n<p><a href=\"https://decanter.stanford.edu/component/identity-lockup/\">Decanter Lockup Component</a></p>\r\n\r\n<p>This lockup will appear in the top left corner of the website's main header.</p>\r\n</div>"
value: "<div><p><img alt=\"\" src=\"https://su-sws.github.io/stanford_basic/src/assets/img/lockup-example.png\" /></p>\r\n\r\n<p>These lockup options are only available on Stanford Basic. Users of the Minimally Branded or Faculty themes should use the default lockup. To determine which lockup is right for your official unity, consult the <a href=\"https://identity.stanford.edu/component/identity-lockup/\">Stanford Identity Guide.</a></p>\r\n\r\n<p>This lockup will appear in the top left corner of the website's main header. Separate settings for the lockup at the bottom of your site can be found in the <a href=\"/admin/config/system/local-footer\">Local Footer settings</a> and will not be affected by changes you make here.</p>\r\n</div>"
format: stanford_html
field_type: markup
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: 1e49df54-32d6-4f5b-a5ec-e16691ef2bd4
langcode: en
status: true
dependencies:
config:
- config_pages.type.stanford_basic_site_settings
- field.storage.config_pages.su_site_created
id: config_pages.stanford_basic_site_settings.su_site_created
field_name: su_site_created
entity_type: config_pages
bundle: stanford_basic_site_settings
label: 'Site Created'
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: timestamp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ label: 'Site Type'
description: "What kind of site is this?\r\n"
required: false
translatable: false
default_value: { }
default_value:
-
value: pre_production
default_value_callback: ''
settings: { }
field_type: list_string
18 changes: 18 additions & 0 deletions config/sync/field.storage.config_pages.su_site_created.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
uuid: fe6fd938-d6ff-4a78-afc2-07bb6d493e5b
langcode: en
status: true
dependencies:
module:
- config_pages
id: config_pages.su_site_created
field_name: su_site_created
entity_type: config_pages
type: timestamp
settings: { }
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
9 changes: 9 additions & 0 deletions config/sync/field.storage.config_pages.su_site_type.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ settings:
-
value: service_facility
label: Service/Facility
-
value: internal
label: Internal
-
value: pre_production
label: Pre-Production
-
value: intranet
label: Intranet
-
value: other
label: Other
Expand Down
53 changes: 0 additions & 53 deletions config/sync/views.view.stanford_basic_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,59 +360,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
edit_node:
id: edit_node
table: node
field: edit_node
relationship: none
group_type: group
admin_label: ''
entity_type: node
plugin_id: entity_link_edit
label: ''
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: div
element_class: su-news-edit-article
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
text: 'edit this page'
output_url_as_text: false
absolute: false
pager:
type: some
options:
Expand Down
106 changes: 0 additions & 106 deletions config/sync/views.view.stanford_courses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1262,59 +1262,6 @@ display:
separator: ', '
field_api_classes: 0
plugin_id: field
edit_node:
id: edit_node
table: node
field: edit_node
relationship: none
group_type: group
admin_label: ''
label: ''
exclude: 0
alter:
alter_text: 0
text: ''
make_link: 0
path: ''
absolute: 0
external: false
replace_spaces: 0
path_case: none
trim_whitespace: 0
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: 0
max_length: '0'
word_boundary: 1
ellipsis: 1
more_link: 0
more_link_text: ''
more_link_path: ''
strip_tags: 0
trim: 0
preserve_tags: ''
html: 0
element_type: div
element_class: su-courses-edit-article
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: 1
empty: ''
hide_empty: 0
empty_zero: 0
hide_alter_empty: 1
text: 'Edit this course item'
output_url_as_text: 0
absolute: 0
entity_type: node
plugin_id: entity_link_edit
defaults:
fields: false
pager: false
Expand Down Expand Up @@ -2635,59 +2582,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
edit_node:
id: edit_node
table: node
field: edit_node
relationship: none
group_type: group
admin_label: ''
entity_type: node
plugin_id: entity_link_edit
label: ''
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: div
element_class: su-courses-edit-article
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
text: 'Edit this course item'
output_url_as_text: false
absolute: false
pager:
type: infinite_scroll
options:
Expand Down
Loading

0 comments on commit 3780bb1

Please sign in to comment.