Skip to content

Commit

Permalink
Merge pull request #1056 from necyberteam/md-dev
Browse files Browse the repository at this point in the history
Md dev
  • Loading branch information
a-pasquale committed Jan 5, 2024
2 parents b90e9f1 + 8188d2c commit 40d7805
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 19 deletions.
1 change: 1 addition & 0 deletions blt/md/md-1947
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
campuschampions_cyberinfrastructure_org
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ Feature: Feature: test an Affinity Groups page
Given I am logged in as a user with the "authenticated" role
When I am on "/affinity-groups/cloud-computing"
When I follow "Join"
Wait 2 seconds
Then I should see "You have joined this affinity group"
When I follow "Leave"
Then I should see "You have left this affinity group"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ Feature: Feature: test an Affinity Group page
Given I am logged in as a user with the "authenticated" role
When I am on "/affinity-groups/cloud-computing"
When I follow "Join"
Wait 2 seconds
Then I should see "You have joined this affinity group"
And I wait 10 seconds
When I follow "Leave"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ targetEntityType: eventinstance
bundle: default
mode: default
content:
affinity_group:
type: entity_reference_label
label: above
settings:
link: true
third_party_settings: { }
weight: 9
region: content
affinity_group_node_ref:
type: entity_reference_label
label: above
Expand Down Expand Up @@ -66,18 +58,18 @@ content:
label: above
settings: { }
third_party_settings: { }
weight: 10
weight: 9
region: content
location:
type: text_default
label: hidden
label: above
settings: { }
third_party_settings: { }
weight: 6
region: content
registration:
type: link
label: hidden
label: above
settings:
trim_length: 80
url_only: false
Expand All @@ -92,7 +84,7 @@ content:
label: above
settings: { }
third_party_settings: { }
weight: 11
weight: 10
region: content
tags:
type: entity_reference_label
Expand All @@ -111,5 +103,6 @@ content:
weight: 2
region: content
hidden:
affinity_group: true
body: true
event_affiliation: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{#
/**
* @file
* Default theme implementation for a field.
*
* To override output, copy the "field.html.twig" from the templates directory
* to your theme's directory and customize it, just like customizing other
* Drupal templates such as page.html.twig or node.html.twig.
*
* Instead of overriding the theming for all fields, you can also just override
* theming for a subset of fields using
* @link themeable Theme hook suggestions. @endlink For example,
* here are some theme hook suggestions that can be used for a field_foo field
* on an article node type:
* - field--node--field-foo--article.html.twig
* - field--node--field-foo.html.twig
* - field--node--article.html.twig
* - field--field-foo.html.twig
* - field--text-with-summary.html.twig
* - field.html.twig
*
* Available variables:
* - attributes: HTML attributes for the containing element.
* - label_hidden: Whether to show the field label or not.
* - title_attributes: HTML attributes for the title.
* - label: The label for the field.
* - multiple: TRUE if a field can contain multiple items.
* - items: List of all the field items. Each item contains:
* - attributes: List of HTML attributes for each item.
* - content: The field item's content.
* - entity_type: The entity type to which the field belongs.
* - field_name: The name of the field.
* - field_type: The type of the field.
* - label_display: The display settings for the label.
*
* @see template_preprocess_field()
*
* @ingroup themeable
*/
#}
{%
set title_classes = [
label_display == 'visually_hidden' ? 'visually-hidden',
]
%}

<div class="people">
{% if label_hidden %}
{% if multiple %}
<div{{attributes}}>
{% for item in items %}
<div{{item.attributes}}>{{ item.content }}</div>
{% endfor %}
</div>
{% else %}
{% for item in items %}
<div{{attributes.addClass('square-tags')}}>{{ item.content }}</div>
{% endfor %}
{% endif %}
{% else %}
<div{{attributes.addClass('mb-3')}}>
<h3{{title_attributes.addClass(title_classes)}}>{{ label }}</h3>
{% if multiple %}
<div>
{% endif %}
{% for item in items %}
<div{{item.attributes}}>{{ item.content }}</div>
{% endfor %}
{% if multiple %}
</div>
{% endif %}
</div>
{% endif %}
</div>

0 comments on commit 40d7805

Please sign in to comment.