From e4b650be46a1f6f502ae9e516962e08d8022af51 Mon Sep 17 00:00:00 2001 From: Eliseu Amaro Date: Fri, 17 Sep 2021 20:33:02 +0100 Subject: [PATCH] [PLUGINS][Settings] Removed unused templates. Directory plugin templates now using actual templates. Notification settings using details element now. --- .../templates/directory/actor.html.twig | 64 ++++----- .../templates/directory/actors.html.twig | 122 ++---------------- .../templates/directory/group.html.twig | 10 +- .../templates/directory/groups.html.twig | 122 ++---------------- public/assets/css/base.css | 59 +++++---- public/assets/css/network/public.css | 0 public/assets/css/poll/poll.css | 0 public/assets/css/replies/replies.css | 27 ---- public/assets/css/reset.css | 12 +- public/assets/css/security/security.css | 0 public/assets/css/settings/settings.css | 4 + templates/actor/view.html.twig | 55 ++++++++ templates/network/public.html.twig | 5 - templates/settings/notifications.html.twig | 38 +++--- 14 files changed, 192 insertions(+), 326 deletions(-) delete mode 100644 public/assets/css/network/public.css delete mode 100644 public/assets/css/poll/poll.css delete mode 100644 public/assets/css/replies/replies.css delete mode 100644 public/assets/css/security/security.css create mode 100644 templates/actor/view.html.twig diff --git a/plugins/Directory/templates/directory/actor.html.twig b/plugins/Directory/templates/directory/actor.html.twig index 9cf2b332ff..e7f564c569 100644 --- a/plugins/Directory/templates/directory/actor.html.twig +++ b/plugins/Directory/templates/directory/actor.html.twig @@ -1,31 +1,37 @@ -
-
-
- {% set nickname = actor.getNickname() %} -
- {{ nickname }}'s avatar -
-
- {{ nickname }} - {% set actor_tags = actor.getSelfTags() %} -
- {% if actor_tags %} - {% for tag in actor_tags %} - #{{ tag }} - {% endfor %} - {% else %} - {{ '(No tags)' | trans }} - {% endif %} -
-
-
- {% set actor_bio = actor.getBio() %} -
- {% if actor_bio %} -

{{ actor_bio }}

- {% else %} -

{{ '(No bio)' | trans }}

- {% endif %} +{% extends 'stdgrid.html.twig' %} + +{% set nickname = note.getActorNickname() %} + +{% block title %}{{ nickname }}'s profile{% endblock %} + +{% block body %} +
+
+ {{ nickname }}'s avatar{{ nickname }} +
+ +
+ {% set actor_tags = actor.getSelfTags() %} + +
+ {% if actor_tags %} + {% for tag in actor_tags %} + #{{ tag }} + {% endfor %} + {% else %} + {{ '(No tags)' | trans }} + {% endif %}
-
+ + {% set actor_bio = actor.getBio() %} +
+ {% if actor_bio %} +

{{ actor_bio }}

+ {% else %} +

{{ '(No bio)' | trans }}

+ {% endif %} +
+ + +{% endblock body %} \ No newline at end of file diff --git a/plugins/Directory/templates/directory/actors.html.twig b/plugins/Directory/templates/directory/actors.html.twig index 50e5b1ef13..de1705d82f 100644 --- a/plugins/Directory/templates/directory/actors.html.twig +++ b/plugins/Directory/templates/directory/actors.html.twig @@ -1,119 +1,17 @@ {% extends 'stdgrid.html.twig' %} -{% block meta %} - {{ parent() }} -{% endblock %} - {% block title %}Actors{% endblock %} -{% block stylesheets %} - {{ parent() }} - - - - -{% endblock %} - -{% block header %} - {{ parent() }} -{% endblock %} - -{% block left %} - {{ parent() }} -{% endblock %} - {% block body %} -
- {% if post_form is defined %} - {{ form_start(post_form) }} -
-
-
- {{ form_label(post_form.to) }} -
-
- {{ form_widget(post_form.to) }} -
-
-
-
-
- {{ form_row(post_form.visibility) }} -
-
- {% for tab in tabs %} - {{ tab['title'] }} - {% endfor %} -
-
-
-
- {{ form_row(post_form.content) }} -
-
-
-
- {{ form_widget(post_form.attachments) }} - -
-
- {{ form_row(post_form.post) }} -
-
-
-
- {{ form_end(post_form) }} +
+
+ {% if actors is defined and actors is not empty %} + {% for actor in actors %} + {% include 'directory/actor.html.twig' with {'actor': actor, 'have_user': have_user} only %} + {% endfor %} + {% else %} +

{% trans %}No actors here.{% endtrans %}

{% endif %} -
- -
- -
-
- {% if actors is defined and actors is not empty %} - {% for actor in actors %} - {% include 'directory/actor.html.twig' with {'actor': actor, 'have_user': have_user} only %} - {% endfor %} - {% else %} -

{% trans %}No actors here.{% endtrans %}

- {% endif %} -
-
-
-
-{% endblock body %} - -{% block javascripts %}{% endblock %} +
+{% endblock body %} \ No newline at end of file diff --git a/plugins/Directory/templates/directory/group.html.twig b/plugins/Directory/templates/directory/group.html.twig index 2206334e95..d84b0537ae 100644 --- a/plugins/Directory/templates/directory/group.html.twig +++ b/plugins/Directory/templates/directory/group.html.twig @@ -1,8 +1,15 @@ +{% extends 'stdgrid.html.twig' %} + +{% set nickname = group.getNickname() %} + +{% block title %}{{ nickname }}'s page{% endblock %} + +{% block body %}
- {% set nickname = group.getNickname() %} +
{{ nickname }}'s logo
@@ -21,3 +28,4 @@
+{% endblock body %} diff --git a/plugins/Directory/templates/directory/groups.html.twig b/plugins/Directory/templates/directory/groups.html.twig index 1fe9137333..75a02dc595 100644 --- a/plugins/Directory/templates/directory/groups.html.twig +++ b/plugins/Directory/templates/directory/groups.html.twig @@ -1,117 +1,17 @@ {% extends 'stdgrid.html.twig' %} -{% block meta %} - {{ parent() }} -{% endblock %} - -{% block title %}Actors{% endblock %} - -{% block stylesheets %} - {{ parent() }} - - - - -{% endblock %} - -{% block header %} - {{ parent() }} -{% endblock %} - -{% block left %} - {{ parent() }} -{% endblock %} +{% block title %}Groups{% endblock %} {% block body %} -
- {% if post_form is defined %} - {{ form_start(post_form) }} -
-
-
- {{ form_label(post_form.to) }} -
-
- {{ form_widget(post_form.to) }} -
-
-
-
-
- {{ form_row(post_form.visibility) }} -
-
- {% for tab in tabs %} - {{ tab['title'] }} - {% endfor %} -
-
-
-
- {{ form_row(post_form.content) }} -
-
-
-
- {{ form_widget(post_form.attachments) }} - -
-
- {{ form_row(post_form.post) }} -
-
-
-
- {{ form_end(post_form) }} - {% endif %} -
- -
- -
-
- {% if groups is defined and groups is not empty %} - {% for group in groups %} - {% include 'directory/group.html.twig' with {'group': group, 'have_user': have_user} only %} - {% endfor %} - {% else %} -

{% trans %}No groups here.{% endtrans %}

- {% endif %} -
-
-
+
+
+ {% if groups is defined and groups is not empty %} + {% for group in groups %} + {% include 'directory/group.html.twig' with {'group': group, 'have_user': have_user} only %} + {% endfor %} + {% else %} +

{% trans %}No groups here.{% endtrans %}

+ {% endif %}
-{% endblock body %} - -{% block javascripts %}{% endblock %} +{% endblock body %} \ No newline at end of file diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 37ca8bbdc1..19136865d7 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -13,7 +13,7 @@ html { } *:focus { - -webkit-box-shadow:inset 0 0 0 3px var(--bg3); + -webkit-box-shadow: inset 0 0 0 3px var(--bg3); -moz-box-shadow: inset 0 0 0 3px var(--bg3); box-shadow: inset 0 0 0 3px var(--bg3); } @@ -62,14 +62,15 @@ html { } body:after { - content:""; + content: ""; position: fixed; - top:0; - bottom:0; - left:0; - right:0; - z-index:-1; - background-image: url(data:image/png;base64,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);url(data:image/png;base64,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); + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: -1; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAALEklEQVRoQ13ajdEMXRCG4Z0I2ASIgAiIgAiI4BUBERABERABERABERABEfjm7vqurS5b9ZrdmXP69H8/3eN48uTJ9dmzZ5dHjx5d3r17d/n27dt8//Hjx1x71r2PHz9e/vz5c3n+/Pnl9evXlw8fPlxevHgxa379+jXP2vPgwYNZf9Kda/uj29rWRaffb9++va1rX/Sice/evVl3d3c3NB4/fjz3v379Ovu619+rV68ufdrbs+MkfH3z5s0cGPE29qBP91vYxp716ZCnT5/O7763D9MxYf+XL19uAnY/AVqfcP3ueUK3/9OnT3OlhISOTuvipbXt65riuvYsYfF+/Pz589oBLXj48OFcY8xhMdDGNnz//n2EeP/+/TzvL032Z59rzCVsioipvkejw1sfjc1UzPdJmJ4nWOf2Sfsnnzf+opFgWSrviO7x+/fvazdfvnx5c5U20nIH9rvNfVrb5oj0vb/W9OGSuUACJGgM0G40rYnR1rQ2rXdG63seYwnU75TXs87rs6/tS7HROU4Gr2krLUT0FGwe9skaMRFxccFare95CujA7jN9h33+/HkYiHb3OywrpZCeJ0jX9ouBPENsdq/1mO+MFBZv0ehZfGXJhD5Oqa4Y6GbCtKmHTCsIIySQE4Sb0CoXiyFuwt8TrMP7LcYEeWtZXBxxXwqIn+4RjgUp/Dg1c6WlJCwrpd02/P379+bfaS5CgotlErq1tNyBPSveWCrm+stN7t+/P9baGa393UtxXI5rppye4avnrCSjtn8EkTpjIGZlHpaQCGImRvvrXsx0L/fZbhNDhM4lEyjBxJLATqvSfsz24aJdE2bzwKKtS6FcretxHnSlxQjHXAdxM3UiwlwmgjuzxWzP7KFd6TlrskrW7+CE3ZZUv9Bpj0yVJRMql4zXhOsPrVz7OLV53Zmkxf2OmbQYk/K4LKIwMXPu0jOJgiskmOzGv7lOz9Iq+mOO/7OSdCuRxE9Mx09CJWyKxGtKmGAXOC2IsJTa73xU2ux3a2OidbkgS5XB8uMY7t5xHLcULinEKGv1PS1ThuSQxncgpwgekwIpJB6yaOe2flwLM2k1wghJAgnD5H23jsZjoj1SZ7/TosLHHbqvsncVa5IMYViGUkCcLJgiOicvSch4GIucD8a1+Ks4SLgESeugROsICTpEPIKquEAWH7ndjiFZjjZjCkbbdSzmCJZyU4qk0v3Ol2w6fyo7F2mBLMN/EyLf5DrFwU6Ffc9vW4O4uEiomEwhux6o3ml3F77WSDTFR7wAmMVD63lGv0GryVpnrbjGjEqbyeArmugAJuWzAr71qmv3+p3mFFSBmTDA3oY2QKnq374d+LKoNC1bylziebIWM/M7MJnGIpLVEizp037M5iYbokjVYH97EnIHaHukUZAcfkoRWSHFto7SFNJ+5xGKreqf4Mf549phbcz/FbiI9mlxBDY8b23P0zKN6ztkI5rtOStzHW67+x9+r89JQcoC/hJcshHTCTmVvcYqZvlbh2h+BLf0F+MdkMaLB+aVpnsOwcakal3AtzZ67etgjGSBPpopKFxFl6lSZEx3NpgvS3bmWESfwKyapYju2OlA2umapvtLgKy5Xa9De5YWU0TukmAJqCMFQboHFIozzRxsJsEkMJeP74SIl+Pk7QpyazOzUATB97Sn48taUqF8T6MJrhNkYUUvRtHUAkSz7/l9DGuHCZgy9CbtDcQWX/oh3jMwvoLYgxbsljWGZBcgMEa5hj1dY6AAjPmUoIBGD9QRA1yK67FG91mF0PHQfbWmc4DK6MlgnXucUl9hlh7mJuCxfgF0gXC1qFKjig2Gdz9t5ucyUHv0MwnqrFwyZUjDept+Q7jdA0W0tly8NdE+zn8m2PsAh9KiNJzLlW7TehpOcLUjoRNUv9J9sRWT4Ik0vBNDiol2gse4wFexMcsjuoqV3b8M1ipr8fV/Jx1ci3ZBb01Pvi1lA4Yqsz49BcByCmLCaadThGKZYNFMEZjXMshqWZNn6Osn/Z4HT6sbMQEFYugJ4B61AmyQ0QjGf3WLHZqWDTNixt6ughmGgmi13ryAG6ptenYZsXMGxsNDpiUKkfTahpijWUKDElwis0crBvX+4gnscZY0bEIiQ6blFAifdWYal0nVrs6EAwdr5Vpqgk0RFR9cRovbpphharMwlTwrbUScsGC/fsVwAzzvKmuZunQ1pBDQ0ZL+2xMPpeRBvw3opLuIJakurvsxzaR9L/1i2nAOrImgtNo9wdz93eqmuPbqSdQNww6pHwaDFtQ5KMEkNAEHNILGu6FvU5khpncWoe0slcZMH01MuBvAJ3Vzg/ZlcU0VzAaHtV5WNHqSRSuaFKnggi4jiOqr4wItzLXEDouk6ay2fZk1zbY27G6thmv3GRAu9L0H2QmRIqX16LV+owjxV6a7dYhaVTPaNu0+pO/FR36eVgA29Udby11SCgXIRlnTgMIoFDJOmGio7tHlfhIBBWchluyMCfYKorSKQV1b5us7c+5mBqQGNGU6PQPNw0Nyfwzw/WhQxA52mpYo9sQlRRZDJRl1ZLBWgsToQOFz8qH3NniQaaBb5t5pMCbaF/MsZZ6sU9yBuzOTHj7ms+ZOEGYJpjbxAs9pwsTRcRK6Ngjr00PIts0GdgLfXEmQY66r1w0gStreg++ed4644BIJvyF8tKReBRcq1ovklloDaGTqCKn+natCmAkIae5UnNUUSZbTwVGErFZsqBd5ALcFW4DGLALHZRGtwU7Xu87Fc4JPY5UgXCpN9ZFpuAY4kMYiuocUUqE4aL/alAUUxK4Gfq2JYT0K+GJ0FK0ELr2KFfUFGm7P7Y1Vcy1Q2vAA1pHyZAjpuXwOVntHot50FXO6ve55rUAR8FPCgDbQQ89gtL7Hh2FHSocNDUSmH4G1VEuNzn5nuEc2NAWi6x+g4OhoiDrQW6WsIYGYsogrbpMbCmhYC4ogiPkYdCDDjWslkYMyVYRjoEV9wGqMdA/iJWTM5Y58XNCzBPeTsTRhYA0EDJxCDoYQeibu2e+UpwUfGG+KmPQGAyaHeodMHZMqLnCY0Ht6oms0GTSJSRCv8lKSOONCBh6dB/YbCmrOvAZEp+d6+unZVXEvebxRKsBbqKKCzllB/653gZ0SNqY3Gm6/1wd6Fi7JginANKb1RkkpJP7sp2jQvrP6TPrVM8eg4NWZ8WcgUD8Bggg8pk/TiidaezqikqsFZrgynfag352dRQ3t9oAOGrm9xgg0epXAtZT+tGZ4F8O0v3sUVV2MyWiSxx4RyY4KnTVGPKo1T4h20D7EER+mNRq9fuv1J2uVKWKe6xjYGcMw+4bk+Wsaj2j7Wc4smJUx7QVRzHM19YvWewYNSAYmOdulOheGSwntG6yVmWOsTWWP3RSxUotN5wVmjESw9fl0VomBaGh1pWttc3tilgIIai7w7xwsRmNcW6CbFTMw3/yHgR0H0l+ajaj3g6CA4YFXazHUIdyT+1GOObJegrDgjezl3Yp2QYxSVPe1AEZICYXf49T4gEYve9og0GKmDxyVcLStyvPRrEKohEyAnlFSDAGDrEdoTKtDGj1746E1Olix1VX2unWIBVPaj5iKbNKxq7dmy3QyYu3tkA0GDQfMlTVcNK/+KKR8Pm2DLCk4XvasmMKKuZRlkDEdIoYNAWAew4c02YH8URLIAlKk4QJclIUlBz23/how3c2Ynl9MmrCo/Ls3ASINSeJnYsTAKyIaG6Cuq8lIWhNsCadeKH5AZ+sJm1YJyd/zdfMACQQ4lFr1K/AYi2v+tA/RjtZ/gmYSyGeJd7wAAAAASUVORK5CYII=); + url(data:image/png;base64,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); opacity: 21%; filter: grayscale(100%); } @@ -130,11 +131,9 @@ hr { /* CHECKERBOARD BACKGROUND FOR TRANSPARENT IMAGES */ .note img { - background: - repeating-conic-gradient( - #ffffff66 0deg 90deg, - #ffffff33 0deg 180deg) - 0 0/40px 40px round; + background: repeating-conic-gradient( + #ffffff66 0deg 90deg, + #ffffff33 0deg 180deg) 0 0/40px 40px round; } @@ -250,6 +249,7 @@ hr { flex-direction: column; font-size: var(--small-size); } + #replyform textarea { width: 100%; resize: vertical; @@ -264,6 +264,7 @@ hr { .notes hr { margin-top: 5px; } + .h-entry a { text-decoration: underline; } @@ -283,6 +284,7 @@ hr { border-radius: var(--unit-size); border: solid 2px var(--bg2); } + .note-wrapper { width: 100%; height: inherit; @@ -291,6 +293,7 @@ hr { .note-sidebar { padding: var(--unit-size); } + .note-sidebar * { display: flex; flex-direction: column; @@ -364,12 +367,14 @@ hr { -moz-mask-image: url("../icons/heart.svg") !important; mask-image: url("../icons/heart.svg") !important; } + .reply-button-container { -webkit-mask-image: url("../icons/reply.svg") !important; -o-mask-image: url("../icons/reply.svg") !important; -moz-mask-image: url("../icons/reply.svg") !important; mask-image: url("../icons/reply.svg") !important; } + .repeat-button-container { -webkit-mask-image: url("../icons/repeat.svg") !important; -o-mask-image: url("../icons/repeat.svg") !important; @@ -433,6 +438,7 @@ hr { color: var(--white); } + .section-widget-padded { padding: var(--unit-size); } @@ -467,6 +473,7 @@ hr { background-color: var(--translucent); } + .section-title-details[open] svg { transform: rotate(180deg); animation: var(--fade-out) @@ -513,12 +520,14 @@ hr { margin-top: 5px; margin-bottom: 10px; } + .help-text { font-style: italic; font-size: var(--small-size); margin-top: 5px; margin-bottom: 10px; } + .help-block > .list-unstyled, .alert, .alert-danger { @@ -559,18 +568,18 @@ label, button { select, button, textarea, -input { +input:not([type=checkbox], [type=radio]) { font-size: inherit !important; - position: relative; color: var(--white); padding: 4px 8px; - border: 2px solid var(--bg2) !important; - border-radius: var(--unit-size) !important; + border: 2px solid var(--bg2); + border-radius: var(--unit-size); background-color: var(--translucent); } + button { background: var(--bg-button); - padding: 5px 10px; + padding: 4px 8px; } select { @@ -595,7 +604,6 @@ input[type=checkbox] { background-color: var(--bg2) !important; background-size: cover; margin-right: 2px; - vertical-align: top; -webkit-mask-image: url("../icons/check-off.svg") !important; -o-mask-image: url("../icons/check-off.svg") !important; @@ -616,8 +624,8 @@ textarea:hover, textarea:focus, button:hover, button:focus, -input:hover, -input:focus, +input:hover :not([type=checkbox], [type=radio]), +input:focus :not([type=checkbox], [type=radio]), select:hover, select:focus { color: var(--white) !important; @@ -626,9 +634,12 @@ select:focus { box-shadow: inset 0px 0px 0px 2px var(--bg3) !important; } - +/* checkbox and radio */ +input[type=radio]:hover, +input[type=radio]:focus, input[type=checkbox]:hover, input[type=checkbox]:focus { + color: var(--white) !important; background-color: var(--bg3) !important; } @@ -648,6 +659,8 @@ input[type=checkbox]:checked { input[type=file] { font-family: var(--main-font) !important; font-weight: normal !important; + padding: unset !important; + background: var(--bg-button); border: 2px solid var(--bg2); border-radius: var(--unit-size); @@ -763,7 +776,7 @@ input[type=file] { @media only screen -and (min-width : 1200px) { +and (min-width: 1200px) { .panel .panel-content { width: 25rem; diff --git a/public/assets/css/network/public.css b/public/assets/css/network/public.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/assets/css/poll/poll.css b/public/assets/css/poll/poll.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/assets/css/replies/replies.css b/public/assets/css/replies/replies.css deleted file mode 100644 index dbea2b7a15..0000000000 --- a/public/assets/css/replies/replies.css +++ /dev/null @@ -1,27 +0,0 @@ -.main { - font-size: var(--medium-size); - border: none !important; -} - -.note { - margin-bottom: 0 !important; -} - -#save { - display: flex; -} - -#save div:nth-of-type(1) { - padding: var(--unit-size); -} - -#save div:nth-of-type(1) textarea { - padding: var(--unit-size); - border-radius: var(--unit-size); - background-color: var(--bg1); - font-size: var(--unit-size); - width: 100%; - box-sizing: border-box; -} - -#save div:nth-of-type(2) diff --git a/public/assets/css/reset.css b/public/assets/css/reset.css index f5a1eb730b..d299364748 100644 --- a/public/assets/css/reset.css +++ b/public/assets/css/reset.css @@ -43,6 +43,7 @@ details summary > * { margin: unset; padding: unset; } + details > summary { list-style: none; } @@ -100,13 +101,16 @@ p { font-weight: 400; margin: unset; } + p:first-line { padding-left: var(--small-size); } + p:first-line { margin-top: 0; margin-bottom: 10px; } + p:not(:first-line) { margin-top: 10px; margin-bottom: 10px; @@ -135,6 +139,7 @@ button { float: right !important; align-self: end !important; } + input { cursor: text !important; } @@ -144,11 +149,13 @@ input { all: unset; padding: 5px 10px; } + button, select, input:not([type=text]) { cursor: pointer !important; } + input:not([type=button], [type=color], [type=checkbox], [type=radio]) { cursor: auto !important; } @@ -159,12 +166,11 @@ input:not([type=button], [type=color], [type=checkbox], [type=radio]) { } input[type=checkbox] { - all: unset; - - display: inline-block; + display: inline-flex; width: 1em; height: 1em; } + input[type=radio] { all: unset; cursor: pointer !important; diff --git a/public/assets/css/security/security.css b/public/assets/css/security/security.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/assets/css/settings/settings.css b/public/assets/css/settings/settings.css index 8977726f36..ee37107120 100644 --- a/public/assets/css/settings/settings.css +++ b/public/assets/css/settings/settings.css @@ -104,6 +104,10 @@ .section-title-settings summary { padding: var(--unit-size) var(--small-size); } +.section-title-settings summary h3:first-letter, +.section-title-settings summary em:first-letter { + text-transform: uppercase; +} .section-title-settings summary:focus .icon-details-open, .section-title-settings summary:hover .icon-details-open { diff --git a/templates/actor/view.html.twig b/templates/actor/view.html.twig new file mode 100644 index 0000000000..c0937fdf0d --- /dev/null +++ b/templates/actor/view.html.twig @@ -0,0 +1,55 @@ +{% extends 'stdgrid.html.twig' %} + +{% set id = gsactor.id %} +{% set nick = gsactor.nickname %} + +{# TODO: how to get avatar in here? Tags and rest of profile info? #} +{% set avatar = gsactor.nickname %} + +{% block title %}{{ nick }}'s profile{% endblock %} + +{% block body %} +
+
+ {{ nick }}'s avatar{{ nick }} +
+ {# + +
+ + {% set actor_tags = actor.getSelfTags() %} + +
+ {% if actor_tags %} + {% for tag in actor_tags %} + #{{ tag }} + {% endfor %} + {% else %} + {{ '(No tags)' | trans }} + {% endif %} +
+
+ + {% set actor_bio = actor.getBio() %} +
+ {% if actor_bio %} +

{{ actor_bio }}

+ {% else %} +

{{ '(No bio)' | trans }}

+ {% endif %} +
#} +
+ +
+
+ {% if notes is defined and notes is not empty %} + {% for conversation in notes %} + {% include '/note/view.html.twig' with {'note': conversation['note'], 'have_user': have_user, 'replies': conversation['replies']} only %} +
+ {% endfor %} + {% else %} +

{% trans %}No notes here.{% endtrans %}

+ {% endif %} +
+
+{% endblock body %} \ No newline at end of file diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig index 39e79fd860..18b05cbc64 100644 --- a/templates/network/public.html.twig +++ b/templates/network/public.html.twig @@ -2,11 +2,6 @@ {% block title %}{{ 'Welcome! - Public Timeline' | trans }}{% endblock %} -{% block stylesheets %} - {{ parent() }} - -{% endblock %} - {% block body %} {# Backwards compatibility with hAtom 0.1 #}
diff --git a/templates/settings/notifications.html.twig b/templates/settings/notifications.html.twig index 600e3b84df..70f14f787b 100644 --- a/templates/settings/notifications.html.twig +++ b/templates/settings/notifications.html.twig @@ -1,17 +1,25 @@ {% block form_notify %} -
-
-
    - {% for transport, form_transport in tabbed_forms_notify %} - - -
    - {{ form(form_transport) }} -
    - {% endfor %} -
-
+
+ + + +
{% endblock %} \ No newline at end of file