diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-03-30 20:04:55 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-03-30 20:04:55 +0200 |
| commit | d6d8a045e6a16525807453f0d1229f5bdc307dd0 (patch) | |
| tree | cf86097fe06850437dda5ad8d6a8fe3c33e48b7b /themes/courgette | |
| parent | 1d0995bb8e09503ad01a877bfef74ef6c29b0dab (diff) | |
| parent | 3345c9dc3935e00fb07760b68a94081d211d4c36 (diff) | |
| download | wallabag-d6d8a045e6a16525807453f0d1229f5bdc307dd0.tar.gz wallabag-d6d8a045e6a16525807453f0d1229f5bdc307dd0.tar.zst wallabag-d6d8a045e6a16525807453f0d1229f5bdc307dd0.zip | |
Merge pull request #588 from mariroz/dev
fix of bug with default theme constant
Diffstat (limited to 'themes/courgette')
| -rwxr-xr-x | themes/courgette/_top.twig | 2 | ||||
| -rwxr-xr-x | themes/courgette/_view.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 4d2dbb21..2d41db17 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <header> | 1 | <header> |
| 2 | <h1> | 2 | <h1> |
| 3 | {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="wallabag logo" />{% endblock %} | 3 | {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{theme}}/img/logo.svg" alt="wallabag logo" />{% endblock %} |
| 4 | {% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a> | 4 | {% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a> |
| 5 | {% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a> | 5 | {% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a> |
| 6 | {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a> | 6 | {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a> |
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index 5aa201d4..9f9ea4f6 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | {{ content | raw }} | 23 | {{ content | raw }} |
| 24 | </article> | 24 | </article> |
| 25 | </div> | 25 | </div> |
| 26 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> | 26 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> |
| 27 | <script type="text/javascript"> | 27 | <script type="text/javascript"> |
| 28 | $(document).ready(function() { | 28 | $(document).ready(function() { |
| 29 | 29 | ||