From 08718c01e4b8b35fe75b1e04534e028dd26c8c53 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Mar 2014 11:26:48 +0200 Subject: [PATCH] problem with resources and localhost url fix --- themes/baggy/_display-mode.twig | 2 +- themes/baggy/_head.twig | 30 +++++++++++++++--------------- themes/baggy/_top.twig | 2 +- themes/baggy/edit-tags.twig | 6 +++--- themes/baggy/view.twig | 2 +- themes/courgette/_head.twig | 18 +++++++++--------- themes/courgette/_top.twig | 2 +- themes/courgette/_view.twig | 2 +- themes/courgette/home.twig | 4 ++-- themes/courgette/tags.twig | 2 +- themes/default/_head.twig | 26 +++++++++++++------------- themes/default/_sorting.twig | 4 ++-- themes/default/_top.twig | 2 +- themes/default/edit-tags.twig | 6 +++--- themes/default/tags.twig | 2 +- themes/default/view.twig | 2 +- 16 files changed, 56 insertions(+), 56 deletions(-) mode change 100644 => 100755 themes/baggy/_top.twig mode change 100644 => 100755 themes/baggy/view.twig mode change 100644 => 100755 themes/courgette/tags.twig mode change 100644 => 100755 themes/default/_head.twig mode change 100644 => 100755 themes/default/_top.twig mode change 100644 => 100755 themes/default/view.twig diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig index 31f7658..382dd5f 100755 --- a/themes/baggy/_display-mode.twig +++ b/themes/baggy/_display-mode.twig @@ -1,5 +1,5 @@
- {% trans + {% trans
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index acc9fa3..968ea1f 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig old mode 100644 new mode 100755 index d3e35aa..a31c092 --- a/themes/baggy/_top.twig +++ b/themes/baggy/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 65ac996..2113e96 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -5,9 +5,9 @@ {% endblock %} {% block content %} - - - + + +

{{ entry.title|raw }} diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig old mode 100644 new mode 100755 index 092be04..ffb512a --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -29,7 +29,7 @@ {{ content | raw }}

- + - + diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 2a2de21..4d2dbb2 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% elseif view == 'fav' %}{{ block('logo') }} Favoris {% elseif view == 'archive' %}{{ block('logo') }} Archive {% else %}{{ block('logo') }} diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index e80829e..5aa201d 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig @@ -23,7 +23,7 @@ {{ content | raw }} - + - - - + + + + + + + + + + + + + diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index 4f2fceb..dfa5cfe 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %}
    -
  • {% trans {% trans "by date" %} {% trans
  • -
  • {% trans {% trans "by title" %} {% trans
  • +
  • {% trans {% trans "by date" %} {% trans
  • +
  • {% trans {% trans "by title" %} {% trans
{% endif %} diff --git a/themes/default/_top.twig b/themes/default/_top.twig old mode 100644 new mode 100755 index c6e41b2..45806f0 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index cd6bc66..bd498d2 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -5,9 +5,9 @@ {% endblock %} {% block content %} - - - + + +
diff --git a/themes/default/tags.twig b/themes/default/tags.twig index cc19601..e5be748 100755 --- a/themes/default/tags.twig +++ b/themes/default/tags.twig @@ -6,7 +6,7 @@ {% block content %}
{% for tag in tags %} - {{ tag.value }} ({{ tag.entriescount }}) {% if token != '' %}{% endif %} + {{ tag.value }} ({{ tag.entriescount }}) {% if token != '' %}{% endif %}
{% if loop.index == '%d'|format(loop.length/2 + 0.5) %} diff --git a/themes/default/view.twig b/themes/default/view.twig old mode 100644 new mode 100755 index 2be0c33..a6e2a33 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -31,7 +31,7 @@ {{ block('tags') }}
- +