diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-02-25 17:27:51 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-02-25 17:27:51 +0100 |
| commit | 9fad46bd0e448b312b426370770d967831e3c7f5 (patch) | |
| tree | 3525b25f04e6bacab1028e8da7caf72d68e03049 /themes/default | |
| parent | 92fc97eeb3cbda0f7cee9b670c30bbf6b23b9e39 (diff) | |
| parent | dcc73856a900a98b2b1efd5292eea6f662924884 (diff) | |
| download | wallabag-9fad46bd0e448b312b426370770d967831e3c7f5.tar.gz wallabag-9fad46bd0e448b312b426370770d967831e3c7f5.tar.zst wallabag-9fad46bd0e448b312b426370770d967831e3c7f5.zip | |
Merge pull request #495 from mariroz/dev
fix of global $http visibility, issues #493, #494
Diffstat (limited to 'themes/default')
| -rw-r--r-- | themes/default/_bookmarklet.twig | 2 | ||||
| -rw-r--r-- | themes/default/_top.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig index 2e3071ad..61996353 100644 --- a/themes/default/_bookmarklet.twig +++ b/themes/default/_bookmarklet.twig | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | <script type="text/javascript"> | 1 | <script type="text/javascript"> |
| 2 | top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>poche it !</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>" | 2 | top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>" |
| 3 | </script> \ No newline at end of file | 3 | </script> \ No newline at end of file |
diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 0711acdc..c6e41b2f 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <header class="w600p center mbm"> | 1 | <header class="w600p center mbm"> |
| 2 | <h1> | 2 | <h1> |
| 3 | {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}/themes/baggy/img/logo-other_themes.png" alt="logo poche" />{% endblock %} | 3 | {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}/themes/baggy/img/logo-other_themes.png" alt="wallabag logo" />{% endblock %} |
| 4 | {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a> | 4 | {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a> |
| 5 | {% endif %} | 5 | {% endif %} |
| 6 | </h1> | 6 | </h1> |