aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xinc/poche/Poche.class.php2
-rwxr-xr-xthemes/baggy/home.twig12
-rwxr-xr-xthemes/default/css/style.css2
-rwxr-xr-xthemes/default/home.twig39
4 files changed, 40 insertions, 15 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 1a5cbe6c..b27dda6c 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -523,7 +523,7 @@ class Poche
523 $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); 523 $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
524 $tpl_vars['page_links'] = $page_links; 524 $tpl_vars['page_links'] = $page_links;
525 $tpl_vars['nb_results'] = $count; 525 $tpl_vars['nb_results'] = $count;
526 $tpl_vars['search_term'] = $search; 526 $tpl_vars['searchterm'] = $search;
527 } 527 }
528 break; 528 break;
529 case 'view': 529 case 'view':
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 5f097f3f..84fc8e8b 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -21,7 +21,7 @@
21 {% elseif view == 'fav' %}{% trans "No articles favourited" %} 21 {% elseif view == 'fav' %}{% trans "No articles favourited" %}
22 {% elseif view == 'archive' %}{% trans "No articles marked as read" %} 22 {% elseif view == 'archive' %}{% trans "No articles marked as read" %}
23 {% elseif view == 'tags' %}{% trans "No articles with this tag found" %} 23 {% elseif view == 'tags' %}{% trans "No articles with this tag found" %}
24 {% elseif search_term is defined %} {% trans %}No articles found for « {{ search_term }} »{% endtrans %} 24 {% elseif searchterm is defined %} {% trans %}No articles found for « {{ searchterm }} »{% endtrans %}
25 {% else %}{% trans "No articles found" %}{% endif %} 25 {% else %}{% trans "No articles found" %}{% endif %}
26 </p></div> 26 </p></div>
27 {% else %} 27 {% else %}
@@ -41,8 +41,8 @@
41 {{ nb_results }} {% trans "articles marked as read" %} 41 {{ nb_results }} {% trans "articles marked as read" %}
42 {% elseif view == 'tag' %} 42 {% elseif view == 'tag' %}
43 {{ nb_results }} {% trans "articles with this tag" %} 43 {{ nb_results }} {% trans "articles with this tag" %}
44 {% elseif search_term is defined %}{{ nb_results }} 44 {% elseif searchterm is defined %}
45 {% trans %}articles found for « {{ search_term }} »{% endtrans %} 45 {{ nb_results }} {% trans %}articles found for « {{ searchterm }} »{% endtrans %}
46 {% else %} 46 {% else %}
47 {{ nb_results }} {% trans "articles" %} 47 {{ nb_results }} {% trans "articles" %}
48 {% endif %} 48 {% endif %}
@@ -58,7 +58,7 @@
58 {% elseif view == 'fav' %}{% trans "Just one article favourited" %} 58 {% elseif view == 'fav' %}{% trans "Just one article favourited" %}
59 {% elseif view == 'archive' %}{% trans "One article marked as read" %} 59 {% elseif view == 'archive' %}{% trans "One article marked as read" %}
60 {% elseif view == 'tag' %}{% trans "One article with this tag" %} 60 {% elseif view == 'tag' %}{% trans "One article with this tag" %}
61 {% elseif search_term is defined %}{% trans %}Only one result found for « {{ search_term }} »{% endtrans %} 61 {% elseif searchterm is defined %}{% trans %}Only one result found for « {{ searchterm }} »{% endtrans %}
62 {% else %}{% trans "One article found" %}{% endif %}</div> 62 {% else %}{% trans "One article found" %}{% endif %}</div>
63 </div> 63 </div>
64 {% endif %} 64 {% endif %}
@@ -91,20 +91,20 @@
91 91
92 {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %} 92 {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
93 93
94 {% if entries is not empty %}
95 {% if tag %} 94 {% if tag %}
96 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %} 95 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
97 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %} 96 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
98 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %} 97 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %}
98
99 {% elseif searchterm is defined %} 99 {% elseif searchterm is defined %}
100 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %} 100 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %}
101 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %} 101 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %}
102 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %} 102 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %}
103
103 {% else %} 104 {% else %}
104 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %} 105 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %}
105 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %} 106 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %}
106 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %} 107 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %}
107 {% endif %} 108 {% endif %}
108 {% endif %}
109{% endif %} 109{% endif %}
110{% endblock %} 110{% endblock %}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 58d908ee..9a681748 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -151,7 +151,7 @@ a:visited {
151 text-indent: -9999px; 151 text-indent: -9999px;
152} 152}
153 153
154.random { 154.icon-random {
155 display: inline-block; 155 display: inline-block;
156 width: 16px; 156 width: 16px;
157 height: 16px; 157 height: 16px;
diff --git a/themes/default/home.twig b/themes/default/home.twig
index 8fe56397..a320cc7f 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -25,22 +25,47 @@
25 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3> 25 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
26 {% endif %} 26 {% endif %}
27 27
28 {% if entries is empty %} 28 {% if entries is empty%}
29 <div class="messages warning"><p>{% trans "No articles found." %}</p></div> 29 {% if view == 'home' %}<div class="messages success"><p>{% trans "No articles unread. Good job !" %}
30 {% elseif view == 'fav' %}<div class="messages warning"><p>{% trans "No articles favourited" %}
31 {% elseif view == 'archive' %}<div class="messages warning"><p>{% trans "No articles marked as read" %}
32 {% elseif view == 'tags' %}<div class="messages warning"><p>{% trans "No articles with this tag found" %}
33 {% elseif searchterm is defined %}<div class="messages warning"><p>{% trans %}No articles found for « {{ searchterm }} »{% endtrans %}
34 {% else %}<div class="messages warning"><p>{% trans "No articles found" %}{% endif %}
35 </p></div>
30 {% else %} 36 {% else %}
31 {% block pager %} 37 {% block pager %}
32 {% if nb_results > 1 %} 38 {% if nb_results > 1 %}
33 <div class="results"> 39 <div class="results">
34 <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} 40 <div class="nb-results">
35 <a class="random" href="?action=random"><span>{% trans "random" %}</span></a></div> 41 {% if view == 'home' %}
42 {{ nb_results }} {% trans "articles unread" %}
43 {% elseif view == 'fav' %}
44 {{ nb_results }} {% trans "articles favourited" %}
45 {% elseif view == 'archive' %}
46 {{ nb_results }} {% trans "articles marked as read" %}
47 {% elseif view == 'tag' %}
48 {{ nb_results }} {% trans "articles with this tag" %}
49 {% elseif searchterm is defined %}{{ nb_results }}
50 {% trans %}articles found for « {{ searchterm }} »{% endtrans %}
51 {% else %}
52 {{ nb_results }} {% trans "articles" %}
53 {% endif %}
54 {% if view == 'home' or view == 'fav' or view == 'archive' %}
55 <a href="?action=random&amp;view={{ view }}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
56 </div>
36 {{ page_links | raw }} 57 {{ page_links | raw }}
37 </div> 58 </div>
38 {% elseif nb_results == 1 %} 59 {% elseif nb_results == 1 %}
39 {% if searchterm is defined %}
40 <div class="results"> 60 <div class="results">
41 <div class="nb-results">{% trans "Only one result found for " %} « {{ searchterm }} »</div> 61 <div class="nb-results">
62 {% if view == 'home' %}{% trans "Only one article unread. Way to go !" %}
63 {% elseif view == 'fav' %}{% trans "Just one article favourited" %}
64 {% elseif view == 'archive' %}{% trans "One article marked as read" %}
65 {% elseif view == 'tag' %}{% trans "One article with this tag" %}
66 {% elseif searchterm is defined %}{% trans %}Only one result found for « {{ searchterm }} »{% endtrans %}
67 {% else %}{% trans "One article found" %}{% endif %}</div>
42 </div> 68 </div>
43 {% endif %}
44 {% endif %} 69 {% endif %}
45 {% endblock %} 70 {% endblock %}
46 {% for entry in entries %} 71 {% for entry in entries %}