mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-23 07:08:09 +00:00
Code Issues Projects Releases Wiki Activity

fix little problems and bring previous features to all themes

Browse source
This commit is contained in:
Thomas Citharel 2015-03-13 17:08:14 +01:00
parent f76dab12c9
commit ae27d0ffca
4 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inc/poche/Poche.class.php
View file

@ -523,7 +523,7 @@ class Poche
$this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
$tpl_vars['page_links'] = $page_links; $tpl_vars['page_links'] = $page_links;
$tpl_vars['nb_results'] = $count; $tpl_vars['nb_results'] = $count;
$tpl_vars['search_term'] = $search; $tpl_vars['searchterm'] = $search;
} }
break; break;
case 'view': case 'view':

12
themes/baggy/home.twig
View file

@ -21,7 +21,7 @@
{% elseif view == 'fav' %}{% trans "No articles favourited" %} {% elseif view == 'fav' %}{% trans "No articles favourited" %}
{% elseif view == 'archive' %}{% trans "No articles marked as read" %} {% elseif view == 'archive' %}{% trans "No articles marked as read" %}
{% elseif view == 'tags' %}{% trans "No articles with this tag found" %} {% elseif view == 'tags' %}{% trans "No articles with this tag found" %}
{% elseif search_term is defined %} {% trans %}No articles found for « {{ search_term }} »{% endtrans %} {% elseif searchterm is defined %} {% trans %}No articles found for « {{ searchterm }} »{% endtrans %}
{% else %}{% trans "No articles found" %}{% endif %} {% else %}{% trans "No articles found" %}{% endif %}
</p></div> </p></div>
{% else %} {% else %}
@ -41,8 +41,8 @@
{{ nb_results }} {% trans "articles marked as read" %} {{ nb_results }} {% trans "articles marked as read" %}
{% elseif view == 'tag' %} {% elseif view == 'tag' %}
{{ nb_results }} {% trans "articles with this tag" %} {{ nb_results }} {% trans "articles with this tag" %}
{% elseif search_term is defined %}{{ nb_results }} {% elseif searchterm is defined %}
{% trans %}articles found for « {{ search_term }} »{% endtrans %} {{ nb_results }} {% trans %}articles found for « {{ searchterm }} »{% endtrans %}
{% else %} {% else %}
{{ nb_results }} {% trans "articles" %} {{ nb_results }} {% trans "articles" %}
{% endif %} {% endif %}
@ -58,7 +58,7 @@
{% elseif view == 'fav' %}{% trans "Just one article favourited" %} {% elseif view == 'fav' %}{% trans "Just one article favourited" %}
{% elseif view == 'archive' %}{% trans "One article marked as read" %} {% elseif view == 'archive' %}{% trans "One article marked as read" %}
{% elseif view == 'tag' %}{% trans "One article with this tag" %} {% elseif view == 'tag' %}{% trans "One article with this tag" %}
{% elseif search_term is defined %}{% trans %}Only one result found for « {{ search_term }} »{% endtrans %} {% elseif searchterm is defined %}{% trans %}Only one result found for « {{ searchterm }} »{% endtrans %}
{% else %}{% trans "One article found" %}{% endif %}</div> {% else %}{% trans "One article found" %}{% endif %}</div>
</div> </div>
{% endif %} {% endif %}
@ -91,20 +91,20 @@
{% 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 %} {% 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 %}
{% if entries is not empty %}
{% if tag %} {% if tag %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% elseif searchterm is defined %} {% elseif searchterm is defined %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% else %} {% else %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% 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 %} {% 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 %}
{% endif %} {% endif %}
{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

2
themes/default/css/style.css
View file

@ -151,7 +151,7 @@ a:visited {
text-indent: -9999px; text-indent: -9999px;
} }
.random { .icon-random {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;

39
themes/default/home.twig
View file

@ -25,22 +25,47 @@
<h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3> <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
{% endif %} {% endif %}
{% if entries is empty %} {% if entries is empty%}
<div class="messages warning"><p>{% trans "No articles found." %}</p></div> {% if view == 'home' %}<div class="messages success"><p>{% trans "No articles unread. Good job !" %}
{% elseif view == 'fav' %}<div class="messages warning"><p>{% trans "No articles favourited" %}
{% elseif view == 'archive' %}<div class="messages warning"><p>{% trans "No articles marked as read" %}
{% elseif view == 'tags' %}<div class="messages warning"><p>{% trans "No articles with this tag found" %}
{% elseif searchterm is defined %}<div class="messages warning"><p>{% trans %}No articles found for « {{ searchterm }} »{% endtrans %}
{% else %}<div class="messages warning"><p>{% trans "No articles found" %}{% endif %}
</p></div>
{% else %} {% else %}
{% block pager %} {% block pager %}
{% if nb_results > 1 %} {% if nb_results > 1 %}
<div class="results"> <div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} <div class="nb-results">
<a class="random" href="?action=random"><span>{% trans "random" %}</span></a></div> {% if view == 'home' %}
{{ nb_results }} {% trans "articles unread" %}
{% elseif view == 'fav' %}
{{ nb_results }} {% trans "articles favourited" %}
{% elseif view == 'archive' %}
{{ nb_results }} {% trans "articles marked as read" %}
{% elseif view == 'tag' %}
{{ nb_results }} {% trans "articles with this tag" %}
{% elseif searchterm is defined %}{{ nb_results }}
{% trans %}articles found for « {{ searchterm }} »{% endtrans %}
{% else %}
{{ nb_results }} {% trans "articles" %}
{% endif %}
{% if view == 'home' or view == 'fav' or view == 'archive' %}
<a href="?action=random&amp;view={{ view }}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
</div>
{{ page_links | raw }} {{ page_links | raw }}
</div> </div>
{% elseif nb_results == 1 %} {% elseif nb_results == 1 %}
{% if searchterm is defined %}
<div class="results"> <div class="results">
<div class="nb-results">{% trans "Only one result found for " %} « {{ searchterm }} »</div> <div class="nb-results">
{% if view == 'home' %}{% trans "Only one article unread. Way to go !" %}
{% elseif view == 'fav' %}{% trans "Just one article favourited" %}
{% elseif view == 'archive' %}{% trans "One article marked as read" %}
{% elseif view == 'tag' %}{% trans "One article with this tag" %}
{% elseif searchterm is defined %}{% trans %}Only one result found for « {{ searchterm }} »{% endtrans %}
{% else %}{% trans "One article found" %}{% endif %}</div>
</div> </div>
{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% for entry in entries %} {% for entry in entries %}