diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-04 22:51:12 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-04 22:51:12 +0200 |
commit | 2a1791a4b1c319fc5bbc286d0bc94827fe1feec9 (patch) | |
tree | 482bd3a53a14dca61d806845494034db165b77f7 | |
parent | 63c35580c7d60e2278ee6fe9ba2d4440ff0308d6 (diff) | |
download | wallabag-2a1791a4b1c319fc5bbc286d0bc94827fe1feec9.tar.gz wallabag-2a1791a4b1c319fc5bbc286d0bc94827fe1feec9.tar.zst wallabag-2a1791a4b1c319fc5bbc286d0bc94827fe1feec9.zip |
view of an article
-rw-r--r-- | index.php | 14 | ||||
-rw-r--r-- | tpl/css/style.css | 5 | ||||
-rw-r--r-- | tpl/img/logo.png | bin | 911 -> 454 bytes | |||
-rw-r--r-- | tpl/img/messages/close.png | bin | 662 -> 0 bytes | |||
-rw-r--r-- | tpl/img/messages/cross.png | bin | 655 -> 0 bytes | |||
-rw-r--r-- | tpl/img/messages/help.png | bin | 786 -> 0 bytes | |||
-rw-r--r-- | tpl/img/messages/tick.png | bin | 537 -> 0 bytes | |||
-rw-r--r-- | tpl/img/messages/warning.png | bin | 666 -> 0 bytes | |||
-rw-r--r-- | tpl/view.twig | 4 |
9 files changed, 14 insertions, 9 deletions
@@ -11,13 +11,13 @@ | |||
11 | include dirname(__FILE__).'/inc/poche/config.inc.php'; | 11 | include dirname(__FILE__).'/inc/poche/config.inc.php'; |
12 | 12 | ||
13 | #XSRF protection with token | 13 | #XSRF protection with token |
14 | if (!empty($_POST)) { | 14 | // if (!empty($_POST)) { |
15 | if (!Session::isToken($_POST['token'])) { | 15 | // if (!Session::isToken($_POST['token'])) { |
16 | die(_('Wrong token')); | 16 | // die(_('Wrong token')); |
17 | // TODO remettre le test | 17 | // // TODO remettre le test |
18 | } | 18 | // } |
19 | unset($_SESSION['tokens']); | 19 | // unset($_SESSION['tokens']); |
20 | } | 20 | // } |
21 | 21 | ||
22 | $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; | 22 | $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; |
23 | $view = Tools::checkVar('view'); | 23 | $view = Tools::checkVar('view'); |
diff --git a/tpl/css/style.css b/tpl/css/style.css index d856a354..6b9f6aca 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css | |||
@@ -8,6 +8,10 @@ header { | |||
8 | text-align: center; | 8 | text-align: center; |
9 | } | 9 | } |
10 | 10 | ||
11 | header h1 { | ||
12 | font-size: 1.3em; | ||
13 | } | ||
14 | |||
11 | .bouton { | 15 | .bouton { |
12 | border-radius: 2px; | 16 | border-radius: 2px; |
13 | } | 17 | } |
@@ -16,6 +20,7 @@ header { | |||
16 | padding: 0; | 20 | padding: 0; |
17 | list-style-type: none; | 21 | list-style-type: none; |
18 | text-align: center; | 22 | text-align: center; |
23 | font-size: 0.9em; | ||
19 | } | 24 | } |
20 | 25 | ||
21 | #main ul#links li { | 26 | #main ul#links li { |
diff --git a/tpl/img/logo.png b/tpl/img/logo.png index f917857f..549b8466 100644 --- a/tpl/img/logo.png +++ b/tpl/img/logo.png | |||
Binary files differ | |||
diff --git a/tpl/img/messages/close.png b/tpl/img/messages/close.png deleted file mode 100644 index 731aa018..00000000 --- a/tpl/img/messages/close.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/img/messages/cross.png b/tpl/img/messages/cross.png deleted file mode 100644 index 1514d51a..00000000 --- a/tpl/img/messages/cross.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/img/messages/help.png b/tpl/img/messages/help.png deleted file mode 100644 index 5c870176..00000000 --- a/tpl/img/messages/help.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/img/messages/tick.png b/tpl/img/messages/tick.png deleted file mode 100644 index a9925a06..00000000 --- a/tpl/img/messages/tick.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/img/messages/warning.png b/tpl/img/messages/warning.png deleted file mode 100644 index 628cf2da..00000000 --- a/tpl/img/messages/warning.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/view.twig b/tpl/view.twig index d2ec2071..8ef5cd9c 100644 --- a/tpl/view.twig +++ b/tpl/view.twig | |||
@@ -2,7 +2,7 @@ | |||
2 | {% block title %}{% trans "home" %}{% endblock %} | 2 | {% block title %}{% trans "home" %}{% endblock %} |
3 | 3 | ||
4 | {% block content %} | 4 | {% block content %} |
5 | <div class="w600p"> | 5 | <div id="article" class="w600p"> |
6 | <div class="backhome"> | 6 | <div class="backhome"> |
7 | <a href="./" title="{% trans "back to home" %}">←</a> | 7 | <a href="./" title="{% trans "back to home" %}">←</a> |
8 | </div> | 8 | </div> |
@@ -21,7 +21,7 @@ | |||
21 | </header> | 21 | </header> |
22 | <article> | 22 | <article> |
23 | <div id="readityourselfcontent"> | 23 | <div id="readityourselfcontent"> |
24 | {{ content|striptags }} | 24 | {{ content | raw }} |
25 | </div> | 25 | </div> |
26 | </article> | 26 | </article> |
27 | <div class="vieworiginal txtright small"><a href="{$url}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{% trans "view original" %}</a></div> | 27 | <div class="vieworiginal txtright small"><a href="{$url}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{% trans "view original" %}</a></div> |