moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #588 from mariroz/dev 

fix of bug with default theme constant
This commit is contained in:
Nicolas Lœuillet 2014-03-30 20:04:55 +02:00
parent 1d0995bb8e 3345c9dc39
commit d6d8a045e6
6 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
themes/baggy/_head.twig
View File

@ -7,9 +7,9 @@
<link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
<script src="{{ poche_url }}themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
<script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script>
<script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
<script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
<script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/saveLink.js"></script>
<script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
<script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>

6
themes/baggy/js/autoClose.js
View File

@ -1,6 +0,0 @@
$(document).ready(function() {
current_url = window.location.href
if (current_url.match("&closewin=true")) {
window.close();
}
});

1
themes/baggy/js/jquery-2.0.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
themes/courgette/_top.twig
View File

@ -1,6 +1,6 @@
<header>
<h1>
{% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="wallabag logo" />{% endblock %}
{% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{theme}}/img/logo.svg" alt="wallabag logo" />{% endblock %}
{% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a>
{% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a>
{% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a>

2
themes/courgette/_view.twig
View File

@ -23,7 +23,7 @@
{{ content | raw }}
</article>
</div>
<script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
<script type="text/javascript">
$(document).ready(function() {

2
themes/default/view.twig
View File

@ -31,7 +31,7 @@
</article>
{{ block('tags') }}
</div>
<script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
<script type="text/javascript">
$(document).ready(function() {