From e68348f6271fab591960902feebe167d01e15468 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 27 Mar 2014 18:21:30 +0200
Subject: wallabag a link in wallabag now in default theme, issue #505

---
 themes/default/view.twig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'themes/default/view.twig')

diff --git a/themes/default/view.twig b/themes/default/view.twig
index 916abe0d..2be0c33c 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -1,6 +1,7 @@
 {% extends "layout.twig" %}
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
 {% block content %}
+        {% include '_pocheit-form.twig' %}
         <div id="article_toolbar">
             <ul>
                 <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li>
@@ -55,3 +56,4 @@
         });
         </script>
 {% endblock %}
+
-- 
cgit v1.2.3


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/view.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 themes/default/view.twig

(limited to 'themes/default/view.twig')

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


From 3345c9dc3935e00fb07760b68a94081d211d4c36 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 28 Mar 2014 21:19:08 +0200
Subject: fix of bug with default theme constant

---
 themes/default/view.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default/view.twig')

diff --git a/themes/default/view.twig b/themes/default/view.twig
index a6e2a33a..cc491c77 100755
--- 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/{{theme}}/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
 
-- 
cgit v1.2.3