diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
5 files changed, 9 insertions, 94 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 0f88901a..a1a9a136 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -43,7 +43,7 @@ | |||
43 | {% block scripts %} | 43 | {% block scripts %} |
44 | {% endblock %} | 44 | {% endblock %} |
45 | 45 | ||
46 | <title>wallabag - {% block title %}{% endblock %}</title> | 46 | <title>{% block title %}{% endblock %} – wallabag</title> |
47 | {% endblock %} | 47 | {% endblock %} |
48 | </head> | 48 | </head> |
49 | 49 | ||
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 dd4f7b00..ff7ef73a 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 | |||
@@ -302,46 +302,4 @@ | |||
302 | </table> | 302 | </table> |
303 | </div> | 303 | </div> |
304 | </div> | 304 | </div> |
305 | |||
306 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
307 | <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> | ||
308 | |||
309 | {{ form_start(form.new_user) }} | ||
310 | {{ form_errors(form.new_user) }} | ||
311 | |||
312 | <fieldset class="w500p inline"> | ||
313 | <div class="row"> | ||
314 | {{ form_label(form.new_user.username) }} | ||
315 | {{ form_errors(form.new_user.username) }} | ||
316 | {{ form_widget(form.new_user.username) }} | ||
317 | </div> | ||
318 | </fieldset> | ||
319 | |||
320 | <fieldset class="w500p inline"> | ||
321 | <div class="row"> | ||
322 | {{ form_label(form.new_user.plainPassword.first) }} | ||
323 | {{ form_errors(form.new_user.plainPassword.first) }} | ||
324 | {{ form_widget(form.new_user.plainPassword.first) }} | ||
325 | </div> | ||
326 | </fieldset> | ||
327 | |||
328 | <fieldset class="w500p inline"> | ||
329 | <div class="row"> | ||
330 | {{ form_label(form.new_user.plainPassword.second) }} | ||
331 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
332 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
333 | </div> | ||
334 | </fieldset> | ||
335 | |||
336 | <fieldset class="w500p inline"> | ||
337 | <div class="row"> | ||
338 | {{ form_label(form.new_user.email) }} | ||
339 | {{ form_errors(form.new_user.email) }} | ||
340 | {{ form_widget(form.new_user.email) }} | ||
341 | </div> | ||
342 | </fieldset> | ||
343 | |||
344 | {{ form_rest(form.new_user) }} | ||
345 | {% endif %} | ||
346 | </form> | ||
347 | {% endblock %} | 305 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 4fd4d317..30fd0d85 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -42,6 +42,7 @@ | |||
42 | </li>--> | 42 | </li>--> |
43 | <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> | 43 | <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> |
44 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 44 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
45 | <li><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> | ||
45 | <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> | 46 | <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> |
46 | {% endif %} | 47 | {% endif %} |
47 | <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> | 48 | <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> |
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 650a3ae2..270c077f 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 | |||
@@ -16,9 +16,6 @@ | |||
16 | <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
19 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
20 | <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li> | ||
21 | {% endif %} | ||
22 | </ul> | 19 | </ul> |
23 | </div> | 20 | </div> |
24 | 21 | ||
@@ -157,11 +154,9 @@ | |||
157 | <div class="row"> | 154 | <div class="row"> |
158 | <div class="input-field col s12"> | 155 | <div class="input-field col s12"> |
159 | {{ 'config.form_user.two_factor_description'|trans }} | 156 | {{ 'config.form_user.two_factor_description'|trans }} |
160 | </div> | ||
161 | </div> | ||
162 | 157 | ||
163 | <div class="row"> | 158 | <br /> |
164 | <div class="input-field col s12"> | 159 | |
165 | {{ form_widget(form.user.twoFactorAuthentication) }} | 160 | {{ form_widget(form.user.twoFactorAuthentication) }} |
166 | {{ form_label(form.user.twoFactorAuthentication) }} | 161 | {{ form_label(form.user.twoFactorAuthentication) }} |
167 | {{ form_errors(form.user.twoFactorAuthentication) }} | 162 | {{ form_errors(form.user.twoFactorAuthentication) }} |
@@ -339,49 +334,6 @@ | |||
339 | </div> | 334 | </div> |
340 | </div> | 335 | </div> |
341 | </div> | 336 | </div> |
342 | |||
343 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
344 | <div id="set6" class="col s12"> | ||
345 | {{ form_start(form.new_user) }} | ||
346 | {{ form_errors(form.new_user) }} | ||
347 | |||
348 | <div class="row"> | ||
349 | <div class="input-field col s12"> | ||
350 | {{ form_label(form.new_user.username) }} | ||
351 | {{ form_errors(form.new_user.username) }} | ||
352 | {{ form_widget(form.new_user.username) }} | ||
353 | </div> | ||
354 | </div> | ||
355 | |||
356 | <div class="row"> | ||
357 | <div class="input-field col s12"> | ||
358 | {{ form_label(form.new_user.plainPassword.first) }} | ||
359 | {{ form_errors(form.new_user.plainPassword.first) }} | ||
360 | {{ form_widget(form.new_user.plainPassword.first) }} | ||
361 | </div> | ||
362 | </div> | ||
363 | |||
364 | <div class="row"> | ||
365 | <div class="input-field col s12"> | ||
366 | {{ form_label(form.new_user.plainPassword.second) }} | ||
367 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
368 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
369 | </div> | ||
370 | </div> | ||
371 | |||
372 | <div class="row"> | ||
373 | <div class="input-field col s12"> | ||
374 | {{ form_label(form.new_user.email) }} | ||
375 | {{ form_errors(form.new_user.email) }} | ||
376 | {{ form_widget(form.new_user.email) }} | ||
377 | </div> | ||
378 | </div> | ||
379 | |||
380 | {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
381 | {{ form_rest(form.new_user) }} | ||
382 | </form> | ||
383 | </div> | ||
384 | {% endif %} | ||
385 | </div> | 337 | </div> |
386 | 338 | ||
387 | </div> | 339 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index b2d77c2e..c7d6d70d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -45,7 +45,7 @@ | |||
45 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> | 45 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> |
46 | <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a> | 46 | <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a> |
47 | </li> | 47 | </li> |
48 | <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"> | 48 | <li class="bold {% if currentRoute == 'all' %}active{% endif %}"> |
49 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> | 49 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> |
50 | </li> | 50 | </li> |
51 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> | 51 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> |
@@ -55,6 +55,10 @@ | |||
55 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> | 55 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> |
56 | </li> | 56 | </li> |
57 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 57 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
58 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> | ||
59 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> | ||
60 | </li> | ||
61 | |||
58 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> | 62 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> |
59 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> | 63 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> |
60 | </li> | 64 | </li> |