From 36a733af8dee1de5a0f81f1efe70e96a435b6a17 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 27 Feb 2014 16:11:37 +0200
Subject: some baggy theme fixes and enhancement: issue #479

---
 themes/baggy/home.twig | 4 ++++
 1 file changed, 4 insertions(+)
 mode change 100644 => 100755 themes/baggy/home.twig

(limited to 'themes/baggy/home.twig')

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
old mode 100644
new mode 100755
index 4f9db063..5262c05b
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -18,6 +18,10 @@
             {% if entries is empty %}
             <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
             {% else %}
+                 <div>
+                     {% include '_display-mode.twig' %}
+                     {% include '_sorting.twig' %}
+                 </div>
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-- 
cgit v1.2.3


From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 28 Feb 2014 13:08:11 +0200
Subject: effect of block rebuilding on next page removed, issue #479

---
 themes/baggy/home.twig | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'themes/baggy/home.twig')

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 5262c05b..a935b034 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -12,45 +12,45 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-            {% if tag %}
-                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
-            {% endif %}
-            {% if entries is empty %}
-            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
-            {% else %}
-                 <div>
-                     {% include '_display-mode.twig' %}
-                     {% include '_sorting.twig' %}
-                 </div>
-                {% block pager %}
-                    {% if nb_results > 1 %}
-                <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-                        {{ page_links | raw }}
-                </div>
-                    {% endif %}
-                {% endblock %}
-            <div class="list-entries">
-                    {% for entry in entries %}
-                <div id="entry-{{ entry.id|e }}" class="entrie">
-                    <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-                    {% if entry.content| getReadingTime > 0 %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
-                    {% else %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
-                    {% endif %}
-                    <ul class="tools links">
-                        <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
-                        <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-                        <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                        <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                    </ul>
-                    <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-                </div>
+						{% if tag %}
+								<h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
+						{% endif %}
+						{% if entries is empty %}
+						<div class="messages warning"><p>{% trans "No articles found." %}</p></div>
+						{% else %}
+								<div>
+										{% include '_display-mode.twig' %}
+										{% include '_sorting.twig' %}
+								</div>
+								{% block pager %}
+										{% if nb_results > 1 %}
+								<div class="results">
+										<div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+												{{ page_links | raw }}
+								</div>
+										{% endif %}
+								{% endblock %}
+						<div class="list-entries">
+										{% for entry in entries %}
+								<div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
+										<h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
+										{% if entry.content| getReadingTime > 0 %}
+												<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
+										{% else %}
+												<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
+										{% endif %}
+										<ul class="tools links">
+												<li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
+												<li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+												<li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+												<li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
+										</ul>
+										<p>{{ entry.content|striptags|slice(0, 300) }}...</p>
+								</div>
 
-                {% endfor %}
-            </div>
-            {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
-            {% endif %}
-            {{ block('pager') }}
+								{% endfor %}
+						</div>
+						{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
+						{% endif %}
+						{{ block('pager') }}
 {% endblock %}
-- 
cgit v1.2.3


From fc52df0677cf0477d348a7b71627ea0c2232c2c3 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 28 Feb 2014 13:13:30 +0200
Subject: effect of block rebuilding on next page removed, issue #479

---
 themes/baggy/home.twig | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'themes/baggy/home.twig')

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index a935b034..7bc0472d 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -12,45 +12,45 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-						{% if tag %}
-								<h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
-						{% endif %}
-						{% if entries is empty %}
-						<div class="messages warning"><p>{% trans "No articles found." %}</p></div>
-						{% else %}
-								<div>
-										{% include '_display-mode.twig' %}
-										{% include '_sorting.twig' %}
-								</div>
-								{% block pager %}
-										{% if nb_results > 1 %}
-								<div class="results">
-										<div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-												{{ page_links | raw }}
-								</div>
-										{% endif %}
-								{% endblock %}
-						<div class="list-entries">
-										{% for entry in entries %}
-								<div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
-										<h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-										{% if entry.content| getReadingTime > 0 %}
-												<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
-										{% else %}
-												<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
-										{% endif %}
-										<ul class="tools links">
-												<li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
-												<li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-												<li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-												<li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
-										</ul>
-										<p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-								</div>
+            {% if tag %}
+                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
+            {% endif %}
+            {% if entries is empty %}
+            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
+            {% else %}
+                 <div>
+                     {% include '_display-mode.twig' %}
+                     {% include '_sorting.twig' %}
+                 </div>
+                {% block pager %}
+                    {% if nb_results > 1 %}
+                <div class="results">
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                        {{ page_links | raw }}
+                </div>
+                    {% endif %}
+                {% endblock %}
+            <div class="list-entries">
+                    {% for entry in entries %}
+                <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
+                    <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
+                    {% if entry.content| getReadingTime > 0 %}
+                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
+                    {% else %}
+                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
+                    {% endif %}
+                    <ul class="tools links">
+                        <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
+                        <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+                        <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+                        <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
+                    </ul>
+                    <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
+                </div>
 
-								{% endfor %}
-						</div>
-						{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
-						{% endif %}
-						{{ block('pager') }}
+                {% endfor %}
+            </div>
+            {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
+            {% endif %}
+            {{ block('pager') }}
 {% endblock %}
-- 
cgit v1.2.3


From 4744cb0e1df8ee7c1cd10c9fbd67caec73051024 Mon Sep 17 00:00:00 2001
From: Thomas LEBEAU <thomas.lebeau@g-nova.fr>
Date: Sat, 8 Mar 2014 13:47:15 +0100
Subject: bagit link + overlay save link + listmode

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

(limited to 'themes/baggy/home.twig')

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 7bc0472d..e34897fa 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -30,7 +30,7 @@
                 </div>
                     {% endif %}
                 {% endblock %}
-            <div class="list-entries">
+            <div id="list-entries" class="list-entries">
                     {% for entry in entries %}
                 <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
                     <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-- 
cgit v1.2.3


From d967a1fa14237648fc63c44f6a28c9c077b3e1bc Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Wed, 2 Apr 2014 17:44:47 +0200
Subject: Important fixes for search engine (thx @mariroz)

So sorry for the mess... :(
* search only in users' own articles
* sanitized what is searched
* display what is searched
* pagination, sorting available when searching
* use existing function to query db
* bad encoding caracters fixed
* link to JQuery into default theme, no longer in each theme
* some spaces instead of tabs
---
 themes/baggy/home.twig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'themes/baggy/home.twig')

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index e34897fa..5dd91307 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -25,9 +25,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
             <div id="list-entries" class="list-entries">
-- 
cgit v1.2.3