From f687c7b315efdcab5449ea9b0a05a3b140a408ad Mon Sep 17 00:00:00 2001 From: Eliseu Amaro Date: Wed, 21 Jul 2021 00:17:05 +0100 Subject: [PATCH] [TWIG][CSS] Found solution to show details content by default in desktop view. However, post_form is being rendered multiple times, it was already rendered in the Posting Component. Needs to be fixed. --- public/assets/css/base.css | 12 +++ templates/base.html.twig | 27 ++++- templates/sidepanel/left/left.html.twig | 125 +++++++++++----------- templates/sidepanel/right/right.html.twig | 98 ++++++++--------- 4 files changed, 144 insertions(+), 118 deletions(-) diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 44219c7ffc..4b37b1c325 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -207,4 +207,16 @@ details[open] > div { opacity: unset; transform: none; } +} + +/* SIDE PANELS OPEN BY DEFAULT ON DESKTOP */ +@media (min-width: 900px) { + .panel-mobile { + display: none; + } +} +@media (max-width: 900px) { + .panel-desktop { + display: none; + } } \ No newline at end of file diff --git a/templates/base.html.twig b/templates/base.html.twig index 82c3542d4c..641298fa1b 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -40,15 +40,34 @@ {% endblock header %}
- {% block leftpanel %} - {% endblock leftpanel %} +
+ + {{ icon('menu', 'icon icon-left') | raw }} +
+ {{ block("leftpanel", "stdgrid.html.twig") }} +
+ +
+ {{ block("leftpanel", "stdgrid.html.twig") }} +
+
+ {% block nav %}{% endblock %} {% block body %}{% endblock %} {% block javascripts %}{% endblock javascripts %} - {% block rightpanel %} - {% endblock rightpanel %} +
+ + {{ icon('drop', 'icon icon-right') | raw }} +
+ {{ block("rightpanel", "stdgrid.html.twig") }} +
+ +
+ {{ block("rightpanel", "stdgrid.html.twig") }} +
+
diff --git a/templates/sidepanel/left/left.html.twig b/templates/sidepanel/left/left.html.twig index 36a052eb8c..d41e8a1d5b 100644 --- a/templates/sidepanel/left/left.html.twig +++ b/templates/sidepanel/left/left.html.twig @@ -1,71 +1,66 @@ -
- - {{ icon('menu', 'icon icon-left') | raw }} - {% if app.user %} -
-
-
-
- {% for extra in profile_extras %} - {% include '/'~ extra.name ~ '/view.html.twig' with {'vars': extra.vars} only %} - {% endfor %} - - Your avatar. - - -
- {{ user_nickname }} -
- {% if user_tags %} - {% for tag in user_tags %} - #{{ tag }} - {% endfor %} - {% else %} - {{ '(No tags)' | trans }} - {% endif %} -
-
- {{ user_followers }} {{ 'Followers' | trans }} - {{ user_followed }} {{ 'Followed' | trans }} -
-
- -
- Messages - Replies - {% for link in handle_event('InsertLeftPanelLink', user_nickname) %} - {{ link | raw }} +{% if app.user %} +
+
+
+
+ {% for extra in profile_extras %} + {% include '/'~ extra.name ~ '/view.html.twig' with {'vars': extra.vars} only %} {% endfor %} - Settings - Logout -
-
- FAQ - TOS - Privacy - Source - Version + + Your avatar. + + +
+ {{ user_nickname }} +
+ {% if user_tags %} + {% for tag in user_tags %} + #{{ tag }} + {% endfor %} + {% else %} + {{ '(No tags)' | trans }} + {% endif %} +
+
+ {{ user_followers }} {{ 'Followers' | trans }} + {{ user_followed }} {{ 'Followed' | trans }} +
+
+
+ Messages + Replies + {% for link in handle_event('InsertLeftPanelLink', user_nickname) %} + {{ link | raw }} + {% endfor %} + Settings + Logout +
+
+ FAQ + TOS + Privacy + Source + Version
- {% else %} -
-
-
- Login - Register -
-
- FAQ - TOS - Privacy - Source - Version -
+
+{% else %} +
+
+
+ Login + Register +
+
+ FAQ + TOS + Privacy + Source + Version
- {% endif %} -
- + +{% endif %} diff --git a/templates/sidepanel/right/right.html.twig b/templates/sidepanel/right/right.html.twig index 76e2ca2a15..b814e5da52 100644 --- a/templates/sidepanel/right/right.html.twig +++ b/templates/sidepanel/right/right.html.twig @@ -1,58 +1,58 @@ -
- {{ icon('drop', 'icon icon-right') | raw }} -
- {% if post_form is defined %} - {{ form_start(post_form) }} -
-
-
- {{ form_label(post_form.to) }} +
+ + {% if post_form is defined %} + {{ post_form }} + + {#{{ form_start(post_form) }} +
+
+
+ {{ form_label(post_form.to) }} +
+
+ {{ form_widget(post_form.to) }} +
+
+
+
+
+ {{ form_row(post_form.visibility) }}
-
- {{ form_widget(post_form.to) }} +
+ {% for tab in tabs %} + {{ tab['title'] }} + {% endfor %}
-
-
-
- {{ form_row(post_form.visibility) }} -
-
- {% for tab in tabs %} - {{ tab['title'] }} - {% endfor %} -
+
+
+ {{ form_row(post_form.content) }}
-
-
- {{ form_row(post_form.content) }} -
+
+
+
+ {{ form_widget(post_form.attachments) }} +
-
-
- {{ form_widget(post_form.attachments) }} - -
-
- {{ form_row(post_form.post) }} -
+
+ {{ form_row(post_form.post) }}
- {{ form_end(post_form) }} - {% endif %} +
+ {{ form_end(post_form) }}#} + {% endif %} - {% set current_path = app.request.get('_route') %} - {% if right_panel_vars is defined %} - {% for block in handle_event('AppendRightPanelBlock', {'path': current_path, 'vars': right_panel_vars}) %} - {{ block | raw }} - {% endfor %} - {% else %} - {% for block in handle_event('AppendRightPanelBlock', {'path': current_path}) %} - {{ block | raw }} - {% endfor %} - {% endif %} -
-
\ No newline at end of file + {% set current_path = app.request.get('_route') %} + {% if right_panel_vars is defined %} + {% for block in handle_event('AppendRightPanelBlock', {'path': current_path, 'vars': right_panel_vars}) %} + {{ block | raw }} + {% endfor %} + {% else %} + {% for block in handle_event('AppendRightPanelBlock', {'path': current_path}) %} + {{ block | raw }} + {% endfor %} + {% endif %} +