From 08718c01e4b8b35fe75b1e04534e028dd26c8c53 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 28 Mar 2014 11:26:48 +0200
Subject: problem with resources and localhost url fix

---
 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 +-
 6 files changed, 21 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 themes/default/_head.twig
 mode change 100644 => 100755 themes/default/_top.twig
 mode change 100644 => 100755 themes/default/view.twig

(limited to 'themes/default')

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
old mode 100644
new mode 100755
index 96a6ab33..ffbfc22e
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,13 +1,13 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/default/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/default/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/default/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/default/img/apple-touch-icon-precomposed.png">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/knacss.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/style.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/print.css" media="print">
-        <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/default/js/closeMessage.js"></script>
-        <script src="{{ poche_url }}/themes/default/js/saveLink.js"></script>
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/default/img/favicon.ico" />
+        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/default/img/apple-touch-icon-144x144-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/default/img/apple-touch-icon-72x72-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/default/img/apple-touch-icon-precomposed.png">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print">
+        <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/default/js/closeMessage.js"></script>
+        <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 @@
 {% if entries|length > 1 %}
   <ul id="sort">
-      <li><a href="./?sort=ia&amp;view={{ view }}&amp;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&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-      <li><a href="./?sort=ta&amp;view={{ view }}&amp;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&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+      <li><a href="./?sort=ia&amp;view={{ view }}&amp;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&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+      <li><a href="./?sort=ta&amp;view={{ view }}&amp;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&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
   </ul>
 {% endif %}
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
old mode 100644
new mode 100755
index c6e41b2f..45806f01
--- a/themes/default/_top.twig
+++ b/themes/default/_top.twig
@@ -1,6 +1,6 @@
         <header class="w600p center mbm">
             <h1>
-                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}/themes/baggy/img/logo-other_themes.png" alt="wallabag logo" />{% endblock %}
+                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}themes/baggy/img/logo-other_themes.png" alt="wallabag logo" />{% endblock %}
                 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
                 {% endif %}
             </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 @@
 {% endblock %}
 {% block content %}
 
-<script src="{{ poche_url }}/themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
-<script src="{{ poche_url }}/themes/default/js/autoCompleteTags.js"></script>
-<link rel="stylesheet" href="{{ poche_url }}/themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
+<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
+<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
 
 <div id="article">
   <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 @@
 {% block content %}
   <div class="two-column">
     {% for tag in tags %}
-      <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a>  ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %}
+      <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a>  ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %}
       <br>
 
       {% 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 2be0c33c..a6e2a33a
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -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/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
 
-- 
cgit v1.2.3