diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
7 files changed, 197 insertions, 56 deletions
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 @@ | |||
1 | _wllbg: | 1 | entry: |
2 | resource: "@WallabagCoreBundle/Controller/EntryController.php" | 2 | resource: "@WallabagCoreBundle/Controller/EntryController.php" |
3 | type: annotation | 3 | type: annotation |
4 | |||
5 | config: | ||
6 | resource: "@WallabagCoreBundle/Controller/ConfigController.php" | ||
7 | 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..051dafd6 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig | |||
@@ -0,0 +1,137 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Config{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block menu %} | ||
6 | {% include "WallabagCoreBundle::_menu.html.twig" %} | ||
7 | {% endblock %} | ||
8 | |||
9 | {% block content %} | ||
10 | <h2>{% trans %}Wallabag configuration{% endtrans %}</h2> | ||
11 | |||
12 | <form action="{{ path('config') }}" method="post" {{ form_enctype(configForm) }}> | ||
13 | {{ form_errors(configForm) }} | ||
14 | |||
15 | <fieldset class="w500p inline"> | ||
16 | <div class="row"> | ||
17 | {{ form_label(configForm.theme) }} | ||
18 | {{ form_errors(configForm.theme) }} | ||
19 | {{ form_widget(configForm.theme) }} | ||
20 | </div> | ||
21 | </fieldset> | ||
22 | |||
23 | <fieldset class="w500p inline"> | ||
24 | <div class="row"> | ||
25 | {{ form_label(configForm.items_per_page) }} | ||
26 | {{ form_errors(configForm.items_per_page) }} | ||
27 | {{ form_widget(configForm.items_per_page) }} | ||
28 | </div> | ||
29 | </fieldset> | ||
30 | |||
31 | <fieldset class="w500p inline"> | ||
32 | <div class="row"> | ||
33 | {{ form_label(configForm.language) }} | ||
34 | {{ form_errors(configForm.language) }} | ||
35 | {{ form_widget(configForm.language) }} | ||
36 | </div> | ||
37 | </fieldset> | ||
38 | |||
39 | {{ form_rest(configForm) }} | ||
40 | </form> | ||
41 | |||
42 | <h2>{% trans %}User information{% endtrans %}</h2> | ||
43 | |||
44 | <form action="{{ path('config') }}" method="post" {{ form_enctype(userForm) }}> | ||
45 | {{ form_errors(userForm) }} | ||
46 | |||
47 | <fieldset class="w500p inline"> | ||
48 | <div class="row"> | ||
49 | {{ form_label(userForm.username) }} | ||
50 | {{ form_errors(userForm.username) }} | ||
51 | {{ form_widget(userForm.username) }} | ||
52 | </div> | ||
53 | </fieldset> | ||
54 | |||
55 | <fieldset class="w500p inline"> | ||
56 | <div class="row"> | ||
57 | {{ form_label(userForm.name) }} | ||
58 | {{ form_errors(userForm.name) }} | ||
59 | {{ form_widget(userForm.name) }} | ||
60 | </div> | ||
61 | </fieldset> | ||
62 | |||
63 | <fieldset class="w500p inline"> | ||
64 | <div class="row"> | ||
65 | {{ form_label(userForm.email) }} | ||
66 | {{ form_errors(userForm.email) }} | ||
67 | {{ form_widget(userForm.email) }} | ||
68 | </div> | ||
69 | </fieldset> | ||
70 | |||
71 | {{ form_rest(userForm) }} | ||
72 | </form> | ||
73 | |||
74 | <h2>{% trans %}Change your password{% endtrans %}</h2> | ||
75 | |||
76 | <form action="{{ path('config') }}" method="post" {{ form_enctype(pwdForm) }}> | ||
77 | {{ form_errors(pwdForm) }} | ||
78 | |||
79 | <fieldset class="w500p inline"> | ||
80 | <div class="row"> | ||
81 | {{ form_label(pwdForm.old_password) }} | ||
82 | {{ form_errors(pwdForm.old_password) }} | ||
83 | {{ form_widget(pwdForm.old_password) }} | ||
84 | </div> | ||
85 | </fieldset> | ||
86 | |||
87 | <fieldset class="w500p inline"> | ||
88 | <div class="row"> | ||
89 | {{ form_label(pwdForm.new_password.first) }} | ||
90 | {{ form_errors(pwdForm.new_password.first) }} | ||
91 | {{ form_widget(pwdForm.new_password.first) }} | ||
92 | </div> | ||
93 | </fieldset> | ||
94 | |||
95 | <fieldset class="w500p inline"> | ||
96 | <div class="row"> | ||
97 | {{ form_label(pwdForm.new_password.second) }} | ||
98 | {{ form_errors(pwdForm.new_password.second) }} | ||
99 | {{ form_widget(pwdForm.new_password.second) }} | ||
100 | </div> | ||
101 | </fieldset> | ||
102 | |||
103 | {{ form_rest(pwdForm) }} | ||
104 | </form> | ||
105 | |||
106 | <h2>{% trans %}Add a user{% endtrans %}</h2> | ||
107 | |||
108 | <form action="{{ path('config') }}" method="post" {{ form_enctype(newUserForm) }}> | ||
109 | {{ form_errors(newUserForm) }} | ||
110 | |||
111 | <fieldset class="w500p inline"> | ||
112 | <div class="row"> | ||
113 | {{ form_label(newUserForm.username) }} | ||
114 | {{ form_errors(newUserForm.username) }} | ||
115 | {{ form_widget(newUserForm.username) }} | ||
116 | </div> | ||
117 | </fieldset> | ||
118 | |||
119 | <fieldset class="w500p inline"> | ||
120 | <div class="row"> | ||
121 | {{ form_label(newUserForm.password) }} | ||
122 | {{ form_errors(newUserForm.password) }} | ||
123 | {{ form_widget(newUserForm.password) }} | ||
124 | </div> | ||
125 | </fieldset> | ||
126 | |||
127 | <fieldset class="w500p inline"> | ||
128 | <div class="row"> | ||
129 | {{ form_label(newUserForm.email) }} | ||
130 | {{ form_errors(newUserForm.email) }} | ||
131 | {{ form_widget(newUserForm.email) }} | ||
132 | </div> | ||
133 | </fieldset> | ||
134 | |||
135 | {{ form_rest(newUserForm) }} | ||
136 | </form> | ||
137 | {% endblock %} | ||
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 @@ | |||
1 | <footer class="w600p center mt3 mb3 smaller txtright"> | 1 | <footer class="w600p center mt3 mb3 smaller txtright"> |
2 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> | 2 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> |
3 | </footer> | 3 | </footer> |
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 @@ | |||
1 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152"> | 1 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152"> |
2 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152"> | 2 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152"> |
3 | 3 | ||
4 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144"> | 4 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144"> |
5 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144"> | 5 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144"> |
6 | 6 | ||
7 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120"> | 7 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120"> |
8 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120"> | 8 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120"> |
9 | 9 | ||
10 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114"> | 10 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114"> |
11 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114"> | 11 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114"> |
12 | 12 | ||
13 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76"> | 13 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76"> |
14 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76"> | 14 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76"> |
15 | 15 | ||
16 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72"> | 16 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72"> |
17 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72"> | 17 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72"> |
18 | 18 | ||
19 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57"> | 19 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57"> |
20 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57"> | 20 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57"> |
21 | 21 | ||
22 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}"> | 22 | <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}"> |
23 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}"> | 23 | <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}"> |
24 | 24 | ||
25 | <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}"> | 25 | <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}"> |
26 | 26 | ||
27 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all"> | 27 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all"> |
28 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all"> | 28 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all"> |
29 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all"> | 29 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all"> |
30 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all"> | 30 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all"> |
31 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print"> | 31 | <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print"> |
32 | 32 | ||
33 | <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script> | 33 | <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script> |
34 | <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script> | 34 | <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script> |
35 | <script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script> | 35 | <script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script> |
36 | <script src="{{ asset('themes/baggy/js/init.js') }}"></script> | 36 | <script src="{{ asset('themes/baggy/js/init.js') }}"></script> |
37 | <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script> | 37 | <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script> |
38 | <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script> | 38 | <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script> |
39 | <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script> | 39 | <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script> |
40 | <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script> | 40 | <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script> |
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 @@ | |||
1 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> | 1 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> |
2 | <ul id="links" class="links"> | 2 | <ul id="links" class="links"> |
3 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | 3 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> |
4 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | 4 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> |
5 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | 5 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> |
6 | <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li> | 6 | <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li> |
7 | <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> | 7 | <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> |
8 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | 8 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> |
9 | {% include "WallabagCoreBundle::_search_form.html.twig" %} | 9 | {% include "WallabagCoreBundle::_search_form.html.twig" %} |
10 | </li> | 10 | </li> |
11 | <li><a href="?view=config">{% trans %}config{% endtrans %}</a></li> | 11 | <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> |
12 | <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li> | 12 | <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li> |
13 | <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | 13 | <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> |
14 | </ul> | 14 | </ul> |
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 @@ | |||
1 | <div id="search-form" class="messages info popup-form"> | 1 | <div id="search-form" class="messages info popup-form"> |
2 | <form method="get" action="index.php"> | 2 | <form method="get" action="index.php"> |
3 | <h2>{% trans %}Search{% endtrans %}</h2> | 3 | <h2>{% trans %}Search{% endtrans %}</h2> |
4 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | 4 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> |
5 | <input type="hidden" name="view" value="search"></input> | 5 | <input type="hidden" name="view" value="search"></input> |
6 | <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br> | 6 | <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br> |
7 | <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input> | 7 | <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input> |
8 | </form> | 8 | </form> |
9 | </div> | 9 | </div> |
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 @@ | |||
1 | <header class="w600p center mbm"> | 1 | <header class="w600p center mbm"> |
2 | <h1> | 2 | <h1> |
3 | {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %} | 3 | {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %} |
4 | </h1> | 4 | </h1> |
5 | </header> | 5 | </header> |