diff --git a/core/modules/forum/templates/forum-icon.html.twig b/core/modules/forum/templates/forum-icon.html.twig index b32b734..80d3b93 100644 --- a/core/modules/forum/templates/forum-icon.html.twig +++ b/core/modules/forum/templates/forum-icon.html.twig @@ -18,15 +18,9 @@ * @ingroup themeable */ #} -{% - set classes = [ - 'icon', - 'topic-status-' ~ icon_status, - ] -%} - +
{% if first_new -%} - + {%- endif %} - {{ icon_title }} + {{ icon_title }}
diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig index 5b41f6a..c68d06b 100644 --- a/core/modules/forum/templates/forum-list.html.twig +++ b/core/modules/forum/templates/forum-list.html.twig @@ -32,7 +32,7 @@ * @ingroup themeable */ #} - +
@@ -43,37 +43,35 @@ {% for child_id, forum in forums %} - + {% if forum.is_container == false %} - - - + + {% endif %} {% endfor %} diff --git a/core/modules/forum/templates/forum-submitted.html.twig b/core/modules/forum/templates/forum-submitted.html.twig index f679363..c0d7cd0 100644 --- a/core/modules/forum/templates/forum-submitted.html.twig +++ b/core/modules/forum/templates/forum-submitted.html.twig @@ -17,7 +17,7 @@ */ #} {% if time %} - {% trans %}By {{ author|passthrough }} {{ time }} ago{% endtrans %} + {% trans %}By {{ author|passthrough }} {{ time }} ago{% endtrans %} {% else %} {{ 'n/a'|t }} {% endif %} diff --git a/core/modules/forum/templates/forums.html.twig b/core/modules/forum/templates/forums.html.twig index 1bb7c05..ca40e32 100644 --- a/core/modules/forum/templates/forums.html.twig +++ b/core/modules/forum/templates/forums.html.twig @@ -17,7 +17,7 @@ */ #} {% if forums_defined %} -
+
{{ forums }} {{ topics }} {{ topics_pager }} diff --git a/core/modules/forum/templates/forum-icon.html.twig b/core/themes/classy/forum/forum-icon.html.twig similarity index 100% copy from core/modules/forum/templates/forum-icon.html.twig copy to core/themes/classy/forum/forum-icon.html.twig diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/themes/classy/forum/forum-list.html.twig similarity index 100% copy from core/modules/forum/templates/forum-list.html.twig copy to core/themes/classy/forum/forum-list.html.twig diff --git a/core/modules/forum/templates/forum-submitted.html.twig b/core/themes/classy/forum/forum-submitted.html.twig similarity index 100% copy from core/modules/forum/templates/forum-submitted.html.twig copy to core/themes/classy/forum/forum-submitted.html.twig diff --git a/core/modules/forum/templates/forums.html.twig b/core/themes/classy/forum/forums.html.twig similarity index 100% copy from core/modules/forum/templates/forums.html.twig copy to core/themes/classy/forum/forums.html.twig
{{ 'Forum'|t }}
{# Enclose the contents of this cell with X divs, where X is the depth this forum resides at. This will allow us to use CSS left-margin for indenting. #} - {% for i in 1..forum.depth if forum.depth > 0 %}
{% endfor %} -
- {{ forum.icon_title }} + {% for i in 1..forum.depth if forum.depth > 0 %}
{% endfor %} +
+ {{ forum.icon_title }}
- + {% if forum.description.value %} -
{{ forum.description.value }}
+
{{ forum.description.value }}
{% endif %} {% for i in 1..forum.depth if forum.depth > 0 %}
{% endfor %}
+ {{ forum.num_topics }} {% if forum.new_topics == true %}
{{ forum.new_text }} {% endif %}
{{ forum.num_posts }}{{ forum.last_reply }}{{ forum.num_posts }}{{ forum.last_reply }}