diff options
author | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-03-28 11:26:48 +0200 |
---|---|---|
committer | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-03-28 11:26:48 +0200 |
commit | 08718c01e4b8b35fe75b1e04534e028dd26c8c53 (patch) | |
tree | bf9ce3532aebbd8f1d0611de63ba97fd75b73c88 | |
parent | b152f2b6ba73fbb3e4fb8d4c3b0d69fddad8f9d8 (diff) | |
download | wallabag-08718c01e4b8b35fe75b1e04534e028dd26c8c53.tar.gz wallabag-08718c01e4b8b35fe75b1e04534e028dd26c8c53.tar.zst wallabag-08718c01e4b8b35fe75b1e04534e028dd26c8c53.zip |
problem with resources and localhost url fix
-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 | ||||
-rwxr-xr-x | themes/courgette/_head.twig | 18 | ||||
-rwxr-xr-x | themes/courgette/_top.twig | 2 | ||||
-rwxr-xr-x | themes/courgette/_view.twig | 2 | ||||
-rwxr-xr-x | themes/courgette/home.twig | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/courgette/tags.twig | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/default/_head.twig | 26 | ||||
-rwxr-xr-x | themes/default/_sorting.twig | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/default/_top.twig | 2 | ||||
-rwxr-xr-x | themes/default/edit-tags.twig | 6 | ||||
-rwxr-xr-x | themes/default/tags.twig | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/default/view.twig | 2 |
16 files changed, 56 insertions, 56 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 | ||
diff --git a/themes/courgette/_head.twig b/themes/courgette/_head.twig index 57b40f41..059936d9 100755 --- a/themes/courgette/_head.twig +++ b/themes/courgette/_head.twig | |||
@@ -1,11 +1,11 @@ | |||
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/font.css" media="all"> | 5 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all"> |
6 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/style.css" media="all"> | 6 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/style.css" media="all"> |
7 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/messages.css" media="all"> | 7 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> |
8 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print"> | 8 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> |
9 | <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> | 9 | <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> |
10 | <script src="//codeorigin.jquery.com/jquery-2.0.3.min.js"></script> | 10 | <script src="//codeorigin.jquery.com/jquery-2.0.3.min.js"></script> |
11 | <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script> | 11 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> |
diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 2a2de211..4d2dbb21 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/{{ constant('DEFAULT_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 e80829ef..5aa201d4 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/{{ constant('DEFAULT_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 | ||
diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig index 416cfa43..5b229ce9 100755 --- a/themes/courgette/home.twig +++ b/themes/courgette/home.twig | |||
@@ -14,8 +14,8 @@ | |||
14 | {% block precontent %} | 14 | {% block precontent %} |
15 | {% if entries|length > 1 %} | 15 | {% if entries|length > 1 %} |
16 | <ul id="sort"> | 16 | <ul id="sort"> |
17 | <li><a href="./?sort=ia&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> | 17 | <li><a href="./?sort=ia&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> |
18 | <li><a href="./?sort=ta&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> | 18 | <li><a href="./?sort=ta&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> |
19 | </ul> | 19 | </ul> |
20 | {% endif %} | 20 | {% endif %} |
21 | {% endblock %} | 21 | {% endblock %} |
diff --git a/themes/courgette/tags.twig b/themes/courgette/tags.twig index 9dfdab52..b11dce28 100644..100755 --- a/themes/courgette/tags.twig +++ b/themes/courgette/tags.twig | |||
@@ -4,5 +4,5 @@ | |||
4 | {% include '_menu.twig' %} | 4 | {% include '_menu.twig' %} |
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | {% for tag in tags %}<a class="tag" href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %} | 7 | {% for tag in tags %}<a class="tag" href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %} |
8 | {% endblock %} \ No newline at end of file | 8 | {% endblock %} \ No newline at end of file |
diff --git a/themes/default/_head.twig b/themes/default/_head.twig index 96a6ab33..ffbfc22e 100644..100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig | |||
@@ -1,13 +1,13 @@ | |||
1 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/default/img/favicon.ico" /> | 1 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/default/img/favicon.ico" /> |
2 | <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/default/img/apple-touch-icon-144x144-precomposed.png"> | 2 | <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/default/img/apple-touch-icon-144x144-precomposed.png"> |
3 | <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/default/img/apple-touch-icon-72x72-precomposed.png"> | 3 | <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/default/img/apple-touch-icon-72x72-precomposed.png"> |
4 | <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/default/img/apple-touch-icon-precomposed.png"> | 4 | <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/default/img/apple-touch-icon-precomposed.png"> |
5 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/knacss.css" media="all"> | 5 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all"> |
6 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/style.css" media="all"> | 6 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all"> |
7 | <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> | 7 | <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> |
8 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/messages.css" media="all"> | 8 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all"> |
9 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/print.css" media="print"> | 9 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print"> |
10 | <script src="{{ poche_url }}/themes/default/js/jquery-2.0.3.min.js"></script> | 10 | <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script> |
11 | <script src="{{ poche_url }}/themes/default/js/autoClose.js"></script> | 11 | <script src="{{ poche_url }}themes/default/js/autoClose.js"></script> |
12 | <script src="{{ poche_url }}/themes/default/js/closeMessage.js"></script> | 12 | <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script> |
13 | <script src="{{ poche_url }}/themes/default/js/saveLink.js"></script> | 13 | <script src="{{ poche_url }}themes/default/js/saveLink.js"></script> |
diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index 4f2fceb0..dfa5cfe4 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig | |||
@@ -1,6 +1,6 @@ | |||
1 | {% if entries|length > 1 %} | 1 | {% if entries|length > 1 %} |
2 | <ul id="sort"> | 2 | <ul id="sort"> |
3 | <li><a href="./?sort=ia&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> | 3 | <li><a href="./?sort=ia&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> |
4 | <li><a href="./?sort=ta&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> | 4 | <li><a href="./?sort=ta&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}&id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> |
5 | </ul> | 5 | </ul> |
6 | {% endif %} | 6 | {% endif %} |
diff --git a/themes/default/_top.twig b/themes/default/_top.twig index c6e41b2f..45806f01 100644..100755 --- 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="wallabag logo" />{% 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> |
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index cd6bc66f..bd498d26 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/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 | <header class="mbm"> | 13 | <header class="mbm"> |
diff --git a/themes/default/tags.twig b/themes/default/tags.twig index cc196010..e5be748e 100755 --- a/themes/default/tags.twig +++ b/themes/default/tags.twig | |||
@@ -6,7 +6,7 @@ | |||
6 | {% block content %} | 6 | {% block content %} |
7 | <div class="two-column"> | 7 | <div class="two-column"> |
8 | {% for tag in tags %} | 8 | {% for tag in tags %} |
9 | <a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} | 9 | <a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} |
10 | <br> | 10 | <br> |
11 | 11 | ||
12 | {% if loop.index == '%d'|format(loop.length/2 + 0.5) %} | 12 | {% if loop.index == '%d'|format(loop.length/2 + 0.5) %} |
diff --git a/themes/default/view.twig b/themes/default/view.twig index 2be0c33c..a6e2a33a 100644..100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig | |||
@@ -31,7 +31,7 @@ | |||
31 | </article> | 31 | </article> |
32 | {{ block('tags') }} | 32 | {{ block('tags') }} |
33 | </div> | 33 | </div> |
34 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> | 34 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> |
35 | <script type="text/javascript"> | 35 | <script type="text/javascript"> |
36 | $(document).ready(function() { | 36 | $(document).ready(function() { |
37 | 37 | ||