From 7a577c519ffc254b6ddecd75c9ee84f656d759e1 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 16 Feb 2015 19:09:47 +0100 Subject: Fix indentation in templates --- .../CoreBundle/Resources/views/_footer.html.twig | 6 +-- .../CoreBundle/Resources/views/_head.html.twig | 60 +++++++++++----------- .../CoreBundle/Resources/views/_menu.html.twig | 28 +++++----- .../Resources/views/_search_form.html.twig | 6 +-- .../CoreBundle/Resources/views/_top.html.twig | 10 ++-- 5 files changed, 55 insertions(+), 55 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig index 26411da9..1b5f9a0f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig @@ -1,3 +1,3 @@ - + diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig index 726b4163..3bdbe812 100755 --- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig @@ -1,40 +1,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig index 2e3b6d08..9a3cf053 100644 --- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig @@ -1,14 +1,14 @@ - - + + diff --git a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig index 7eb1b67d..1e6f327d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig @@ -1,9 +1,9 @@ diff --git a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig index 34d925df..9313071d 100755 --- a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig @@ -1,5 +1,5 @@ -
-

- {% block logo %}wallabag logo{% endblock %} -

-
+
+

+ {% block logo %}wallabag logo{% endblock %} +

+
-- cgit v1.2.3 From 4d85d7e9ba676bd5ac3428976ce9227f460eb542 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 16 Feb 2015 21:28:49 +0100 Subject: Implement simple config --- .../CoreBundle/Resources/config/routing.yml | 6 +++- .../Resources/views/Config/index.html.twig | 41 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/routing.yml b/src/Wallabag/CoreBundle/Resources/config/routing.yml index ec1d23cc..f3502e15 100644 --- a/src/Wallabag/CoreBundle/Resources/config/routing.yml +++ b/src/Wallabag/CoreBundle/Resources/config/routing.yml @@ -1,3 +1,7 @@ -_wllbg: +entry: resource: "@WallabagCoreBundle/Controller/EntryController.php" type: annotation + +config: + resource: "@WallabagCoreBundle/Controller/ConfigController.php" + type: annotation diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig new file mode 100644 index 00000000..9c04ff20 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -0,0 +1,41 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Config{% endtrans %}{% endblock %} + +{% block menu %} + {% include "WallabagCoreBundle::_menu.html.twig" %} +{% endblock %} + +{% block content %} +

Basic config

+ +
+ {{ form_errors(form) }} + +
+
+ {{ form_label(form.theme) }} + {{ form_errors(form.theme) }} + {{ form_widget(form.theme) }} +
+
+ +
+
+ {{ form_label(form.items_per_page) }} + {{ form_errors(form.items_per_page) }} + {{ form_widget(form.items_per_page) }} +
+
+ +
+
+ {{ form_label(form.language) }} + {{ form_errors(form.language) }} + {{ form_widget(form.language) }} +
+
+ + {{ form_rest(form) }} +
+{% endblock %} -- cgit v1.2.3 From d9085c63e35bb708f560722fff5f4f5ad322c27b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 17 Feb 2015 21:03:23 +0100 Subject: Handle password change --- .../Resources/views/Config/index.html.twig | 58 +++++++++++++++++----- 1 file changed, 45 insertions(+), 13 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index 9c04ff20..94145177 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -7,35 +7,67 @@ {% endblock %} {% block content %} -

Basic config

+

{% trans %}Basic config{% endtrans %}

-
- {{ form_errors(form) }} + + {{ form_errors(configForm) }}
- {{ form_label(form.theme) }} - {{ form_errors(form.theme) }} - {{ form_widget(form.theme) }} + {{ form_label(configForm.theme) }} + {{ form_errors(configForm.theme) }} + {{ form_widget(configForm.theme) }}
- {{ form_label(form.items_per_page) }} - {{ form_errors(form.items_per_page) }} - {{ form_widget(form.items_per_page) }} + {{ form_label(configForm.items_per_page) }} + {{ form_errors(configForm.items_per_page) }} + {{ form_widget(configForm.items_per_page) }}
- {{ form_label(form.language) }} - {{ form_errors(form.language) }} - {{ form_widget(form.language) }} + {{ form_label(configForm.language) }} + {{ form_errors(configForm.language) }} + {{ form_widget(configForm.language) }}
- {{ form_rest(form) }} + {{ form_rest(configForm) }} +
+ +

{% trans %}Change your password{% endtrans %}

+ +
+ {{ form_errors(pwdForm) }} + +
+
+ {{ form_label(pwdForm.old_password) }} + {{ form_errors(pwdForm.old_password) }} + {{ form_widget(pwdForm.old_password) }} +
+
+ +
+
+ {{ form_label(pwdForm.new_password.first) }} + {{ form_errors(pwdForm.new_password.first) }} + {{ form_widget(pwdForm.new_password.first) }} +
+
+ +
+
+ {{ form_label(pwdForm.new_password.second) }} + {{ form_errors(pwdForm.new_password.second) }} + {{ form_widget(pwdForm.new_password.second) }} +
+
+ + {{ form_rest(pwdForm) }}
{% endblock %} -- cgit v1.2.3 From c0d9eba07f40a52bdfcfca3e7a926163b17d83ab Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 17 Feb 2015 22:45:20 +0100 Subject: Updating logged in user (email, name, etc ..) --- .../Resources/views/Config/index.html.twig | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index 94145177..7a45ec1f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -

{% trans %}Basic config{% endtrans %}

+

{% trans %}Wallabag configuration{% endtrans %}

{{ form_errors(configForm) }} @@ -39,6 +39,38 @@ {{ form_rest(configForm) }}
+

{% trans %}User information{% endtrans %}

+ +
+ {{ form_errors(userForm) }} + +
+
+ {{ form_label(userForm.username) }} + {{ form_errors(userForm.username) }} + {{ form_widget(userForm.username) }} +
+
+ +
+
+ {{ form_label(userForm.name) }} + {{ form_errors(userForm.name) }} + {{ form_widget(userForm.name) }} +
+
+ +
+
+ {{ form_label(userForm.email) }} + {{ form_errors(userForm.email) }} + {{ form_widget(userForm.email) }} +
+
+ + {{ form_rest(userForm) }} +
+

{% trans %}Change your password{% endtrans %}

-- cgit v1.2.3 From e4977b8a866f84f65f08c55c050a62f40170fdbf Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 22 Feb 2015 09:30:25 +0100 Subject: Adding new user --- .../Resources/views/Config/index.html.twig | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index 7a45ec1f..051dafd6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -102,4 +102,36 @@ {{ form_rest(pwdForm) }} + +

{% trans %}Add a user{% endtrans %}

+ +
+ {{ form_errors(newUserForm) }} + +
+
+ {{ form_label(newUserForm.username) }} + {{ form_errors(newUserForm.username) }} + {{ form_widget(newUserForm.username) }} +
+
+ +
+
+ {{ form_label(newUserForm.password) }} + {{ form_errors(newUserForm.password) }} + {{ form_widget(newUserForm.password) }} +
+
+ +
+
+ {{ form_label(newUserForm.email) }} + {{ form_errors(newUserForm.email) }} + {{ form_widget(newUserForm.email) }} +
+
+ + {{ form_rest(newUserForm) }} +
{% endblock %} -- cgit v1.2.3