aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views/themes
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2019-06-12 21:36:00 +0200
committerGitHub <noreply@github.com>2019-06-12 21:36:00 +0200
commit1009b286c9b6186856c884948e5d7f1c334a7ac1 (patch)
tree8db345468210b404dc163ff4caec18eff6c3b6a8 /src/Wallabag/CoreBundle/Resources/views/themes
parent76cc8ca26f82ededc4f6088653877539af1809bc (diff)
parenteeae34375d41a5c30c60c1ad47fe8beffd9d4f3d (diff)
downloadwallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.tar.gz
wallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.tar.zst
wallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.zip
Merge pull request #3995 from wallabag/feature/config-display-login
Display login in config / user
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig7
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig9
2 files changed, 15 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index a1caf242..eba4539f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -118,7 +118,6 @@
118 {% else %} 118 {% else %}
119 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a> 119 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a>
120 {% endif %} 120 {% endif %}
121
122 </div> 121 </div>
123 </fieldset> 122 </fieldset>
124 123
@@ -151,6 +150,12 @@
151 150
152 {{ form_start(form.user) }} 151 {{ form_start(form.user) }}
153 {{ form_errors(form.user) }} 152 {{ form_errors(form.user) }}
153 <fieldset class="w500p inline">
154 <div class="row">
155 <label>{{ 'config.form_user.login_label'|trans }}</label>
156 {{ app.user.username }}
157 </div>
158 </fieldset>
154 159
155 <fieldset class="w500p inline"> 160 <fieldset class="w500p inline">
156 <div class="row"> 161 <div class="row">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a48c9e28..990546e8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -182,6 +182,15 @@
182 {{ form_errors(form.user) }} 182 {{ form_errors(form.user) }}
183 183
184 <div class="row"> 184 <div class="row">
185 <div class="col s12">
186 <h6 class="grey-text">{{ 'config.form_user.login_label'|trans }}</h6>
187 <div>
188 {{ app.user.username }}
189 </div>
190 </div>
191 </div>
192
193 <div class="row">
185 <div class="input-field col s12"> 194 <div class="input-field col s12">
186 {{ form_label(form.user.name) }} 195 {{ form_label(form.user.name) }}
187 {{ form_errors(form.user.name) }} 196 {{ form_errors(form.user.name) }}