Merge pull request #11 from AndreasEngelmark/development

Merge prior to deploy on 2022-05-19

Author: AndreasEngelmark

config/sync/core.entity_view_display.comment.os2loop_post_comment.default.yml

@@ -15,33 +15,38 @@ targetEntityType: comment
 bundle: os2loop_post_comment
 mode: default
 content:
-  flag_os2loop_upvote_upvote_button:
+  flag_os2loop_upvote_correct_answer:
     weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
-  links:
+  flag_os2loop_upvote_upvote_button:
     weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
+  links:
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   os2loop_comment_anonymous_author:
     type: list_default
-    weight: 2
+    weight: 3
     region: content
     label: hidden
     settings: {  }
     third_party_settings: {  }
   os2loop_post_comment:
-    weight: 3
+    weight: 4
     label: hidden
     settings: {  }
     third_party_settings: {  }
     type: text_default
     region: content
   os2loop_post_comment_media:
     type: entity_reference_entity_id
-    weight: 4
+    weight: 5
     region: content
     label: above
     settings: {  }
@@ -50,6 +55,5 @@ 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

config/sync/core.entity_view_display.comment.os2loop_post_comment.list_display.yml

@@ -9,28 +9,25 @@ dependencies:
     - field.field.comment.os2loop_post_comment.os2loop_post_comment
     - field.field.comment.os2loop_post_comment.os2loop_post_comment_media
   module:
-    - options
     - text
 id: comment.os2loop_post_comment.list_display
 targetEntityType: comment
 bundle: os2loop_post_comment
 mode: list_display
 content:
-  flag_os2loop_upvote_upvote_button:
-    weight: 0
+  flag_os2loop_upvote_correct_answer:
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
-  links:
-    weight: 1
+  flag_os2loop_upvote_upvote_button:
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
-  os2loop_comment_anonymous_author:
-    type: list_default
+  links:
     weight: 2
     region: content
-    label: hidden
     settings: {  }
     third_party_settings: {  }
   os2loop_post_comment:
@@ -40,17 +37,11 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
-  os2loop_post_comment_media:
-    type: entity_reference_entity_id
-    weight: 4
-    region: content
-    label: above
-    settings: {  }
-    third_party_settings: {  }
 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
+  os2loop_comment_anonymous_author: true
+  os2loop_post_comment_media: true
+  search_api_excerpt: true

web/profiles/custom/os2loop/modules/os2loop_subscriptions/templates/os2loop-subscriptions-user.html.twig

@@ -9,7 +9,7 @@
   {{ drupal_view('os2loop_subscriptions_node', 'block_1') }}
 </div>
 
-<h2 class="h4 my-30">{{ 'Taxonomy term subscriptions'|t }}</h2>
+<h2 class="h4 mt-60 mb-30">{{ 'Taxonomy term subscriptions'|t }}</h2>
 <div class="os2loop-subscription-term">
   {{ drupal_view('os2loop_subscription_term', 'block_1') }}
 </div>

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/custom-index.scss

@@ -52,3 +52,4 @@
 
 @import "pages/user-questions.scss";
 @import "pages/user-subscriptions.scss";
+@import "pages/user-replies.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/pages/user-replies.scss

@@ -0,0 +1,22 @@
+.user-replies {
+	.content-wrapper {
+		@extend .block-primary-white, .p-30;
+
+		.views-rows-container {
+			@extend .block-primary-gray, .p-30, .mt-30;
+		}
+
+		.views-row {
+			@extend .block-secondary-white, .py-20, .px-30;
+
+			+ .views-row {
+				@extend .mt-20;
+			}
+
+			// TODO: move this to bootstrap-custom
+			.list-group-item {
+				@extend .p-0;
+			}
+		}
+	}
+}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig

@@ -67,34 +67,30 @@
  */
 #}
 
-{% set node_value = commented_entity.os2loop_question_content.value is defined ? commented_entity.os2loop_question_content.value : commented_entity.os2loop_post_content.value %}
+{% set comment_title = commented_entity.label %}
 {% set comment_value = elements['#comment'].os2loop_question_answer.value is defined ? elements['#comment'].os2loop_question_answer.value : elements['#comment'].os2loop_post_comment.value %}
-{% set node_value_truncated = node_value|length > 200 ? true : false %}
+{% set comment_title_truncated = comment_title|length > 90 ? true : false %}
 {% set comment_value_truncated = comment_value|length > 200 ? true : false %}
 <div class="list-group">
-  <article class="list-group-item mb-2 bg-light border-top">
+  <article class="list-group-item">
     <div class="small">
       <span>{{ 'Created'|t }}</span>: {{ created }}
     </div>
-    <div>
-      {% if node_value_truncated %}
-        {{ node_value|truncate(200, true)|raw }}
-        <span>...</span>
+    <div class="h5 mt-10 mb-0">
+      {% if comment_title_truncated %}
+        {{ comment_title|truncate(90, true, '...')|raw }}
       {% else %}
-        {{ node_value|raw }}
+        {{ comment_title|raw }}
       {% endif %}
     </div>
-    <div class="d-flex">
-      <h3 class="h6">
-        <a href="{{ path('entity.comment.canonical', {'comment': comment.id}) }}#comment-{{ comment.id }}">
-          {% if comment_value_truncated %}
-            {{ comment_value|truncate(200, true)|raw }}
-            <span>...</span>
-          {% else %}
-            {{ comment_value|raw }}
-          {% endif %}
-        </a>
-      </h3>
+    <div class="d-flex mt-10 mb-0">
+      <a href="{{ path('entity.comment.canonical', {'comment': comment.id}) }}#comment-{{ comment.id }}" class="link-unstyled">
+        {% if comment_value_truncated %}
+          {{ comment_value|truncate(200, true, '...')|raw }}
+        {% else %}
+          {{ comment_value|raw }}
+        {% endif %}
+      </a>
     </div>
   </article>
 </div>

web/profiles/custom/os2loop/themes/os2loop_theme/templates/views/views-view-field--os2loop-user-answers--comment-type.html.twig

@@ -24,8 +24,8 @@
 {% set comment_type = row._entity.comment_type.target_id %}
 
 {% if comment_type == 'os2loop_question_answer' %}
-  {{ 'My answers on questions'|t }}
+  {{ 'Answers to questions'|t }}
 {% else %}
-  {{ 'My comments to posts'|t }}
+  {{ 'Comments to posts'|t }}
 {% endif %}
 

web/profiles/custom/os2loop/translations/translations.da.po

@@ -28932,11 +28932,11 @@ msgid_plural "@count media items remaining."
 msgstr[0] "Maks. 1 fil kan vedhæftes"
 msgstr[1] "Maks. @count filer kan vedhæftes"
 
-msgid "My answers on questions"
-msgstr "Mine svar på spørgsmål"
+msgid "Answers to questions"
+msgstr "Svar på spørgsmål"
 
-msgid "My comments to posts"
-msgstr "Mine kommentarer på indlæg"
+msgid "Comments to posts"
+msgstr "Kommentarer på indlæg"
 
 msgid "contact editorial office"
 msgstr "Kontakt redaktionen"