diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-11-03 23:01:23 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-03 23:01:23 +0100 |
commit | 217f3ca0b4e2d02d90a6561678ffef5f656ed899 (patch) | |
tree | 0755d030763c849c183605ae8922f616737f46ec | |
parent | 3eba7538a4cbbefcfc5638a68236a4fc5f823138 (diff) | |
parent | 3c133bff4978de20e3f51e1b908790138e97e412 (diff) | |
download | wallabag-217f3ca0b4e2d02d90a6561678ffef5f656ed899.tar.gz wallabag-217f3ca0b4e2d02d90a6561678ffef5f656ed899.tar.zst wallabag-217f3ca0b4e2d02d90a6561678ffef5f656ed899.zip |
Merge pull request #921 from wallabag/about-page
add about page
-rwxr-xr-x | inc/poche/Poche.class.php | 2 | ||||
-rwxr-xr-x | inc/poche/Tools.class.php | 2 | ||||
-rw-r--r-- | themes/baggy/_menu.twig | 1 | ||||
-rwxr-xr-x | themes/baggy/about.twig | 74 | ||||
-rw-r--r-- | themes/default/_menu.twig | 1 | ||||
-rwxr-xr-x | themes/default/about.twig | 74 |
6 files changed, 153 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index ecb2a51f..16235474 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -314,6 +314,8 @@ class Poche | |||
314 | 314 | ||
315 | switch ($view) | 315 | switch ($view) |
316 | { | 316 | { |
317 | case 'about': | ||
318 | break; | ||
317 | case 'config': | 319 | case 'config': |
318 | $dev_infos = $this->_getPocheVersion('dev'); | 320 | $dev_infos = $this->_getPocheVersion('dev'); |
319 | $dev = trim($dev_infos[0]); | 321 | $dev = trim($dev_infos[0]); |
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index beb4f30c..f803e3b5 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
@@ -117,7 +117,7 @@ final class Tools | |||
117 | { | 117 | { |
118 | $views = array( | 118 | $views = array( |
119 | 'install', 'import', 'export', 'config', 'tags', | 119 | 'install', 'import', 'export', 'config', 'tags', |
120 | 'edit-tags', 'view', 'login', 'error' | 120 | 'edit-tags', 'view', 'login', 'error', 'about' |
121 | ); | 121 | ); |
122 | 122 | ||
123 | return (in_array($view, $views) ? $view . '.twig' : 'home.twig'); | 123 | return (in_array($view, $views) ? $view . '.twig' : 'home.twig'); |
diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig index 59b6a46b..8b80f65d 100644 --- a/themes/baggy/_menu.twig +++ b/themes/baggy/_menu.twig | |||
@@ -11,6 +11,7 @@ | |||
11 | {% include '_search-form.twig' %} | 11 | {% include '_search-form.twig' %} |
12 | </li> | 12 | </li> |
13 | <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li> | 13 | <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li> |
14 | <li><a href="./?view=about" {% if view == 'about' %}class="current"{% endif %}>{% trans "about" %}</a></li> | ||
14 | <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li> | 15 | <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li> |
15 | </ul> | 16 | </ul> |
16 | 17 | ||
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig new file mode 100755 index 00000000..ac2fcc8c --- /dev/null +++ b/themes/baggy/about.twig | |||
@@ -0,0 +1,74 @@ | |||
1 | {% extends "layout.twig" %} | ||
2 | |||
3 | {% block title %}{% trans "About" %}{% endblock %} | ||
4 | {% block menu %} | ||
5 | {% include '_menu.twig' %} | ||
6 | {% endblock %} | ||
7 | {% block content %} | ||
8 | <h2>{% trans "About wallabag" %}</h2> | ||
9 | |||
10 | <dl> | ||
11 | <dt>{% trans "Project website" %}</dt> | ||
12 | <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd> | ||
13 | |||
14 | <dt>{% trans "Main developer" %}</dt> | ||
15 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr.fr">{% trans "website" %}</a></dd> | ||
16 | |||
17 | <dt>{% trans "Contributors:" %}</dt> | ||
18 | <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd> | ||
19 | |||
20 | <dt>{% trans "Bug reports" %}</dt> | ||
21 | <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd> | ||
22 | |||
23 | <dt>{% trans "License" %}</dt> | ||
24 | <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd> | ||
25 | |||
26 | <dt>{% trans "Version" %}</dt> | ||
27 | <dd>{{ constant('POCHE') }}</dd> | ||
28 | </dl> | ||
29 | |||
30 | <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." %}</p> | ||
31 | |||
32 | <h2>{% trans "Helping wallabag" %}</h2> | ||
33 | |||
34 | <p>{% trans "wallabag is free and opensource. You can help us:" %}</p> | ||
35 | |||
36 | <dl> | ||
37 | <dt><a href="http://www.wallabag.org">{% trans "via Paypal" %}</a></dt> | ||
38 | |||
39 | <dt><a href="http://www.wallabag.org">{% trans "via Flattr" %}</a></dt> | ||
40 | </dl> | ||
41 | |||
42 | <h2>{% trans "Credits" %}</h2> | ||
43 | <dl> | ||
44 | <dt>PHP Readability</dt> | ||
45 | <dd><a href="https://bitbucket.org/fivefilters/php-readability">https://bitbucket.org/fivefilters/php-readability</a></dd> | ||
46 | |||
47 | <dt>Full Text RSS</dt> | ||
48 | <dd><a href="http://code.fivefilters.org/full-text-rss/src">http://code.fivefilters.org/full-text-rss/src</a></dd> | ||
49 | |||
50 | <dt>logo by Maylis Agniel</dt> | ||
51 | <dd><a href="https://github.com/wallabag/logo">https://github.com/wallabag/logo</a></dd> | ||
52 | |||
53 | <dt>icons</dt> | ||
54 | <dd><a href="http://icomoon.io">http://icomoon.io</a></dd> | ||
55 | |||
56 | <dt>PHP Simple HTML DOM Parser</dt> | ||
57 | <dd><a href="http://simplehtmldom.sourceforge.net/">http://simplehtmldom.sourceforge.net/</a></dd> | ||
58 | |||
59 | <dt>Session</dt> | ||
60 | <dd><a href="https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php">https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php</a></dd> | ||
61 | |||
62 | <dt>Twig</dt> | ||
63 | <dd><a href="http://twig.sensiolabs.org">http://twig.sensiolabs.org</a></dd> | ||
64 | |||
65 | <dt>Flash messages</dt> | ||
66 | <dd><a href="https://github.com/plasticbrain/PHP-Flash-Messages">https://github.com/plasticbrain/PHP-Flash-Messages</a></dd> | ||
67 | |||
68 | <dt>Pagination</dt> | ||
69 | <dd><a href="https://github.com/daveismyname/pagination">https://github.com/daveismyname/pagination</a></dd> | ||
70 | |||
71 | <dt>PHPePub</dt> | ||
72 | <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd> | ||
73 | </dl> | ||
74 | {% endblock %} | ||
diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig index 9b9a6062..eedf84f1 100644 --- a/themes/default/_menu.twig +++ b/themes/default/_menu.twig | |||
@@ -6,6 +6,7 @@ | |||
6 | <li><a href="javascript: void(null);" id="bagit">{% trans "save a link" %}</a><span id="bagit-arrow"></span></li> | 6 | <li><a href="javascript: void(null);" id="bagit">{% trans "save a link" %}</a><span id="bagit-arrow"></span></li> |
7 | <li><a href="javascript: void(null);" id="search">{% trans "search" %}</a><span id="search-arrow"></span></li> | 7 | <li><a href="javascript: void(null);" id="search">{% trans "search" %}</a><span id="search-arrow"></span></li> |
8 | <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li> | 8 | <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li> |
9 | <li><a href="./?view=about" {% if view == 'about' %}class="current"{% endif %}>{% trans "about" %}</a></li> | ||
9 | <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li> | 10 | <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li> |
10 | </ul> | 11 | </ul> |
11 | {% include '_pocheit-form.twig' %} | 12 | {% include '_pocheit-form.twig' %} |
diff --git a/themes/default/about.twig b/themes/default/about.twig new file mode 100755 index 00000000..cd274f26 --- /dev/null +++ b/themes/default/about.twig | |||
@@ -0,0 +1,74 @@ | |||
1 | {% extends "layout.twig" %} | ||
2 | |||
3 | {% block title %}{% trans "About wallabag" %}{% endblock %} | ||
4 | {% block menu %} | ||
5 | {% include '_menu.twig' %} | ||
6 | {% endblock %} | ||
7 | {% block content %} | ||
8 | <h2>{% trans "About wallabag" %}</h2> | ||
9 | |||
10 | <dl> | ||
11 | <dt>{% trans "Project website" %}</dt> | ||
12 | <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd> | ||
13 | |||
14 | <dt>{% trans "Main developer" %}</dt> | ||
15 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr.fr">{% trans "website" %}</a></dd> | ||
16 | |||
17 | <dt>{% trans "Contributors:" %}</dt> | ||
18 | <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd> | ||
19 | |||
20 | <dt>{% trans "Bug reports" %}</dt> | ||
21 | <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd> | ||
22 | |||
23 | <dt>{% trans "License" %}</dt> | ||
24 | <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd> | ||
25 | |||
26 | <dt>{% trans "Version" %}</dt> | ||
27 | <dd>{{ constant('POCHE') }}</dd> | ||
28 | </dl> | ||
29 | |||
30 | <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." %}</p> | ||
31 | |||
32 | <h2>{% trans "Helping wallabag" %}</h2> | ||
33 | |||
34 | <p>{% trans "wallabag is free and opensource. You can help us:" %}</p> | ||
35 | |||
36 | <dl> | ||
37 | <dt><a href="http://www.wallabag.org">{% trans "via Paypal" %}</a></dt> | ||
38 | |||
39 | <dt><a href="http://www.wallabag.org">{% trans "via Flattr" %}</a></dt> | ||
40 | </dl> | ||
41 | |||
42 | <h2>{% trans "Credits" %}</h2> | ||
43 | <dl> | ||
44 | <dt>PHP Readability</dt> | ||
45 | <dd><a href="https://bitbucket.org/fivefilters/php-readability">https://bitbucket.org/fivefilters/php-readability</a></dd> | ||
46 | |||
47 | <dt>Full Text RSS</dt> | ||
48 | <dd><a href="http://code.fivefilters.org/full-text-rss/src">http://code.fivefilters.org/full-text-rss/src</a></dd> | ||
49 | |||
50 | <dt>logo by Maylis Agniel</dt> | ||
51 | <dd><a href="https://github.com/wallabag/logo">https://github.com/wallabag/logo</a></dd> | ||
52 | |||
53 | <dt>icons</dt> | ||
54 | <dd><a href="http://icomoon.io">http://icomoon.io</a></dd> | ||
55 | |||
56 | <dt>PHP Simple HTML DOM Parser</dt> | ||
57 | <dd><a href="http://simplehtmldom.sourceforge.net/">http://simplehtmldom.sourceforge.net/</a></dd> | ||
58 | |||
59 | <dt>Session</dt> | ||
60 | <dd><a href="https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php">https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php</a></dd> | ||
61 | |||
62 | <dt>Twig</dt> | ||
63 | <dd><a href="http://twig.sensiolabs.org">http://twig.sensiolabs.org</a></dd> | ||
64 | |||
65 | <dt>Flash messages</dt> | ||
66 | <dd><a href="https://github.com/plasticbrain/PHP-Flash-Messages">https://github.com/plasticbrain/PHP-Flash-Messages</a></dd> | ||
67 | |||
68 | <dt>Pagination</dt> | ||
69 | <dd><a href="https://github.com/daveismyname/pagination">https://github.com/daveismyname/pagination</a></dd> | ||
70 | |||
71 | <dt>PHPePub</dt> | ||
72 | <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd> | ||
73 | </dl> | ||
74 | {% endblock %} | ||