Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/more minor fixes #188

Merged
merged 8 commits into from
Aug 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,18 @@ targetEntityType: comment
bundle: os2loop_post_comment
mode: default
content:
flag_os2loop_upvote_correct_answer:
weight: 10
region: content
settings: { }
third_party_settings: { }
flag_os2loop_upvote_upvote_button:
weight: 10
weight: 0
region: content
settings: { }
third_party_settings: { }
links:
weight: 100
weight: 1
region: content
settings: { }
third_party_settings: { }
os2loop_post_comment:
weight: 101
weight: 2
label: visually_hidden
settings: { }
third_party_settings: { }
Expand All @@ -38,5 +33,6 @@ hidden:
entity_print_view_epub: true
entity_print_view_pdf: true
entity_print_view_word_docx: true
flag_os2loop_upvote_correct_answer: true
langcode: true
search_api_excerpt: true
14 changes: 12 additions & 2 deletions config/sync/gin.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@ preset_accent_color: blue
preset_focus_color: gin
enable_darkmode: false
classic_toolbar: vertical
icon_default: true
icon_path: ''
icon_default: false
icon_path: profiles/custom/os2loop/admin-home.png
high_contrast_mode: false
show_user_theme_settings: false
third_party_settings:
shortcut:
module_link: true
_core:
default_config_hash: QdiqmcH9tjpstXqCQKv4G4rHYE4HjWLFkVzyqooqEWM
features:
node_user_picture: false
comment_user_picture: true
comment_user_verification: true
favicon: true
favicon:
use_default: true
accent_color: ''
focus_color: ''
icon_upload: ''
4 changes: 1 addition & 3 deletions config/sync/views.view.contact_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- field.storage.user.os2loop_user_phone_number
module:
- user
- views_autosubmit
id: contact_list
label: 'Contact list'
module: views
Expand Down Expand Up @@ -41,7 +40,7 @@ display:
query_comment: ''
query_tags: { }
exposed_form:
type: autosubmit
type: basic
options:
submit_button: Apply
reset_button: false
Expand All @@ -50,7 +49,6 @@ display:
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
autosubmit_hide: false
pager:
type: mini
options:
Expand Down
Binary file added web/profiles/custom/os2loop/admin-home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

// Set user image to icon size.
.user-image img {
max-height: 32px;
max-height: 48px;
max-width: 48px;
font-size: 2em;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% endif %}
</a>
</h2>
<div class="small">{{ 'Posted'|t }}: {{ comment.createdtime|format_date('medium') }}</div>
<div class="small">{{ 'Type'|t }}: {{ commented_entity.type.entity.label }} - {{ 'Posted'|t }}: {{ comment.createdtime|format_date('medium') }}</div>
<div class="search_api_excerpt mb-0">
{{ elements.search_api_excerpt }}
<a href="{{ comment_url }}" class="small">{{ 'os2loop_question_answer' == comment.bundle ? 'View answer in context'|t : 'View comment in context'|t }}</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,30 @@
*/
#}

<div class="card bg-light h-100">
<div class="card-body">
<h2 class="card-title h4">
<a href="{{ url('entity.user.canonical', {'user': user.id}) }}">
{{ user.os2loop_user_given_name.value }} {{ user.os2loop_user_family_name.value }}
</a>
</h2>
<div class="card-text">
<div class="row">
<div class="col-3">
{% if user.os2loop_user_image.value is not empty %}
<div class="rounded-circle bg-white text-center overflow-hidden">
{{ content.os2loop_user_image }}
</div>
{% else %}
<i class="bi bi-person-circle display-2"></i>
{% endif %}
</div>
<div class="col">
<p class="mb-0">{{ user.os2loop_user_job_title.value }}</p>
<p class="mb-0">{{ user.email }}</p>
<p class="mb-0">{{ user.os2loop_user_phone_number.value }}</p>
<p class="mb-0 mt-2">{{ user.os2loop_user_place.value }}</p>
<p class="mb-0">{{ user.os2loop_user_address.value }}</p>
<p class="mb-0">{{ user.os2loop_user_city.value }} {% if user.os2loop_user_city.value %}-{% endif %} {{ user.os2loop_user_postal_code.value }} </p>
</div>
<div class="card-body">
<h2 class="card-title h4">
<a href="{{ url('entity.user.canonical', {'user': user.id}) }}">
{{ user.os2loop_user_given_name.value }} {{ user.os2loop_user_family_name.value }}
</a>
</h2>
<div class="card-text">
<div class="row">
<div class="col-3">
{% if user.os2loop_user_image.value is not empty %}
<div class="rounded-circle bg-white text-center overflow-hidden">
{{ content.os2loop_user_image }}
</div>
{% else %}
<i class="bi bi-person-circle display-2"></i>
{% endif %}
</div>
<div class="col">
<p class="mb-0">{{ user.os2loop_user_job_title.value }}</p>
<p class="mb-0">{{ user.email }}</p>
<p class="mb-0">{{ user.os2loop_user_phone_number.value }}</p>
<p class="mb-0 mt-2">{{ user.os2loop_user_place.value }}</p>
<p class="mb-0">{{ user.os2loop_user_address.value }}</p>
<p class="mb-0">{{ user.os2loop_user_city.value }} {% if user.os2loop_user_city.value %}-{% endif %} {{ user.os2loop_user_postal_code.value }} </p>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="my-3 search-result search-result--node search-result--node--{{ node.bundle }}">
<div class="d-block ml-5">
<h2 class="h5"><a href="{{ url }}">{{ label }}</a></h2>
<div class="small">{{ 'Posted'|t }}: {{ node.createdtime|format_date('medium') }}</div>
<div class="small">{{ 'Type'|t }}: {{ node.type.entity.label }} - {{ 'Posted'|t }}: {{ node.createdtime|format_date('medium') }}</div>
<div class="search_api_excerpt mb-0">{{ elements['#search_api_excerpt']|raw }}</div>
<span class="subject">{{ elements['os2loop_shared_subject'] }}</span>
{% if (node.os2loop_question_answers) %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
{% set file_id = media.field_media_image.value[0].target_id %}
{% endif %}
{% set file = drupal_entity('file', file_id)['#file'] %}
<a href="{{ file_url(file.getFileUri()) }}" class="mb-1 btn btn-sm btn-dark"><i class="bi bi-file-earmark-arrow-down-fill mr-1"></i>{{ file.getFileName() }}</a>
<a href="{{ file_url(file.getFileUri()) }}" target="_blank" class="mb-1 btn btn-sm btn-dark"><i class="bi bi-file-earmark-arrow-down-fill mr-1"></i>{{ file.getFileName() }}</a>
{% endfor %}
{% if multiple %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@

{% for row in rows %}
{% set row_classes = [
'col-md-6 mb-3'
'col-lg-6 mb-3 d-flex'
] %}
<div{{ row.attributes.addClass(row_classes) }}>
{{- row.content -}}
<div class="card bg-light w-100">
{{- row.content -}}
</div>
</div>
{% endfor %}