diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-03-28 10:30:51 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-03-28 10:30:51 +0100 |
commit | cdada41505e77722f86334844d557128e6f4af4f (patch) | |
tree | bf9ce3532aebbd8f1d0611de63ba97fd75b73c88 /themes/baggy | |
parent | b152f2b6ba73fbb3e4fb8d4c3b0d69fddad8f9d8 (diff) | |
parent | 08718c01e4b8b35fe75b1e04534e028dd26c8c53 (diff) | |
download | wallabag-cdada41505e77722f86334844d557128e6f4af4f.tar.gz wallabag-cdada41505e77722f86334844d557128e6f4af4f.tar.zst wallabag-cdada41505e77722f86334844d557128e6f4af4f.zip |
Merge pull request #587 from mariroz/dev
problem with resources and localhost url fix
Diffstat (limited to 'themes/baggy')
-rwxr-xr-x | themes/baggy/_display-mode.twig | 2 | ||||
-rwxr-xr-x | themes/baggy/_head.twig | 30 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/baggy/_top.twig | 2 | ||||
-rwxr-xr-x | themes/baggy/edit-tags.twig | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/baggy/view.twig | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig index 31f76581..382dd5f1 100755 --- a/themes/baggy/_display-mode.twig +++ b/themes/baggy/_display-mode.twig | |||
@@ -1,5 +1,5 @@ | |||
1 | <div id="display-mode"> | 1 | <div id="display-mode"> |
2 | <a href="javascript: void(null);" id="listmode" class="listmode"> | 2 | <a href="javascript: void(null);" id="listmode" class="listmode"> |
3 | <img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/blank.png" alt="{% trans "toggle view mode" %}" title="{% trans "toggle view mode" %}" width="16" height="16"> | 3 | <img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/blank.png" alt="{% trans "toggle view mode" %}" title="{% trans "toggle view mode" %}" width="16" height="16"> |
4 | </a> | 4 | </a> |
5 | </div> | 5 | </div> |
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index acc9fa3d..968ea1f6 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig | |||
@@ -1,15 +1,15 @@ | |||
1 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/{{theme}}/img/favicon.ico" /> | 1 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" /> |
2 | <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> | 2 | <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> |
3 | <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> | 3 | <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> |
4 | <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png"> | 4 | <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png"> |
5 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all"> | 5 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all"> |
6 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all"> | 6 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all"> |
7 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all"> | 7 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all"> |
8 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/messages.css" media="all"> | 8 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> |
9 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print"> | 9 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> |
10 | <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script> | 10 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery-2.0.3.min.js"></script> |
11 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script> | 11 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script> |
12 | <script src="{{ poche_url }}/themes/{{theme}}/js/jquery.cookie.js"></script> | 12 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> |
13 | <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script> | 13 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> |
14 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/saveLink.js"></script> | 14 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/saveLink.js"></script> |
15 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script> | 15 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script> |
diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig index d3e35aa3..a31c0925 100644..100755 --- a/themes/baggy/_top.twig +++ b/themes/baggy/_top.twig | |||
@@ -1,6 +1,6 @@ | |||
1 | <header class="w600p center mbm"> | 1 | <header class="w600p center mbm"> |
2 | <h1 class="logo"> | 2 | <h1 class="logo"> |
3 | {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}/themes/{{theme}}/img/logo-w.png" alt="wallabag logo" />{% endblock %} | 3 | {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}themes/{{theme}}/img/logo-w.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> |
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 65ac996a..2113e964 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig | |||
@@ -5,9 +5,9 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | 7 | ||
8 | <script src="{{ poche_url }}/themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> | 8 | <script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> |
9 | <script src="{{ poche_url }}/themes/default/js/autoCompleteTags.js"></script> | 9 | <script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script> |
10 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> | 10 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> |
11 | 11 | ||
12 | <div id="article"> | 12 | <div id="article"> |
13 | <h2>{{ entry.title|raw }}</21> | 13 | <h2>{{ entry.title|raw }}</21> |
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 092be04e..ffb512a3 100644..100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig | |||
@@ -29,7 +29,7 @@ | |||
29 | {{ content | raw }} | 29 | {{ content | raw }} |
30 | </article> | 30 | </article> |
31 | </div> | 31 | </div> |
32 | <script src="{{ poche_url }}/themes/{{theme}}/js/restoreScroll.js"></script> | 32 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> |
33 | <script type="text/javascript"> | 33 | <script type="text/javascript"> |
34 | $(document).ready(function() { | 34 | $(document).ready(function() { |
35 | 35 | ||