aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 00:33:03 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 00:33:03 +0300
commit0e7cf1fc502e6d01f3059cb821420485bcb4614a (patch)
tree75b8fd64105efc45ac89df67733265c8c9ebf698 /src
parentbac5a3455295971e60b027740a6b6ee1367742cf (diff)
parent80127e4fb1ce02825e9b2b985882b348e6f25ac2 (diff)
downloadwallabag-0e7cf1fc502e6d01f3059cb821420485bcb4614a.tar.gz
wallabag-0e7cf1fc502e6d01f3059cb821420485bcb4614a.tar.zst
wallabag-0e7cf1fc502e6d01f3059cb821420485bcb4614a.zip
Merge remote-tracking branch 'origin/v2' into v2_material
Diffstat (limited to 'src')
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig91
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig13
2 files changed, 52 insertions, 52 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index af682c1f..8c6269ec 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
@@ -6,51 +6,52 @@
6 6
7 <div class="row"> 7 <div class="row">
8 <div class="col s12"> 8 <div class="col s12">
9 <div class="card-panel"> 9 <div class="card-panel settings">
10 10
11 <h2>{% trans %}About wallabag{% endtrans %}</h2> 11 <div class="row">
12 12 <div class="div_tabs col s12">
13 <dl> 13 <ul class="tabs">
14 <dt>{% trans %}Project website{% endtrans %}</dt> 14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Who is behind wallabag{% endtrans %}</a></li>
15 <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> 15 <li class="tab col s3"><a href="#set2">{% trans %}Getting help{% endtrans %}</a></li>
16 16 <li class="tab col s3"><a href="#set3">{% trans %}Helping wallabag{% endtrans %}</a></li>
17 <dt>{% trans %}Main developer{% endtrans %}</dt> 17 </ul>
18 <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd> 18 </div>
19 19
20 <dt>{% trans %}Contributors ♥:{% endtrans %}</dt> 20 <div id="set1" class="col s12">
21 <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dd> 21 <dt>{% trans %}Developed by{% endtrans %}</dt>
22 22 <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd>
23 <dt>{% trans %}Bug reports{% endtrans %}</dt> 23 <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</a></dd>
24 <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd> 24 <dd>Jérémy Besnoit — <a href="http://wildtrip.net">{% trans %}website{% endtrans %}</a></dd>
25 25 <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dt>
26 <dt>{% trans %}License{% endtrans %}</dt> 26 <dt>{% trans %}Project website{% endtrans %}</dt>
27 <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd> 27 <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
28 28 <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
29 <dt>{% trans %}Version{% endtrans %}</dt> 29 <dt>{% trans %}Version{% endtrans %}: {{ version }}</dt>
30 <dd>{{ version }}</dd> 30 </div>
31 </dl> 31
32 32 <div id="set2" class="col s12">
33 <p>{% trans %}wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted.{% endtrans %}</p> 33 <dl>
34 34 <dt>{% trans %}Documentation{% endtrans %}</dt>
35 <h2>{% trans %}Getting help{% endtrans %}</h2> 35 <dd><a href="https://doc.wallabag.org/en">english</a></dd>
36 36 <dd><a href="https://doc.wallabag.org/fr">français</a></dd>
37 <dl> 37 <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
38 <dt>{% trans %}Documentation{% endtrans %}</dt> 38
39 <dd><a href="https://doc.wallabag.org/">Online documentation</a></dd> 39 <dt>{% trans %}Bug reports{% endtrans %}</dt>
40 40 <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd>
41 <dt>{% trans %}Support{% endtrans %}</dt> 41 </dl>
42 <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd> 42 </div>
43 </dl> 43
44 44 <div id="set3" class="col s12">
45 <h2>{% trans %}Helping wallabag{% endtrans %}</h2> 45 <dl>
46 46 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt>
47 <p>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</p> 47 <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd>
48 48 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
49 <dl> 49
50 <dt><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dt> 50 <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd>
51 51 </dl>
52 <dt><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dt> 52 </div>
53 </dl> 53
54 </div>
54 55
55 </div> 56 </div>
56 </div> 57 </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 88b6c6b7..554865d7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -50,11 +50,8 @@
50 <div class="nav-wrapper nav-panels"> 50 <div class="nav-wrapper nav-panels">
51 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> 51 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
52 <div class="left action"> 52 <div class="left action">
53 {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %} 53 {% block title %}
54 {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %} 54 {% endblock %}
55 {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
56 {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
57 {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
58 </div> 55 </div>
59 <div class="input-field nav-panel-buttom"> 56 <div class="input-field nav-panel-buttom">
60 <ul> 57 <ul>
@@ -99,15 +96,17 @@
99 <div class="col l4 offset-l2 s12"> 96 <div class="col l4 offset-l2 s12">
100 <h5 class="white-text">{% trans %}Social{% endtrans %}</h5> 97 <h5 class="white-text">{% trans %}Social{% endtrans %}</h5>
101 <ul> 98 <ul>
102 <li><a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp">Twitter</a></li> 99 <li><a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp">twitter</a></li>
100 <li><a target="_blank" class="grey-text text-lighten-3" href="https://framasphere.org/u/wallabag">diaspora*</a></li>
103 <li><a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts">Google+</a></li> 101 <li><a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts">Google+</a></li>
102 <li><a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag">Facebook</a></li>
104 </ul> 103 </ul>
105 </div> 104 </div>
106 </div> 105 </div>
107 </div> 106 </div>
108 <div class="footer-copyright"> 107 <div class="footer-copyright">
109 <div class="container"> 108 <div class="container">
110 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="http://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> 109 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
111 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a> 110 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a>
112 </div> 111 </div>
113 </div> 112 </div>