diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
commit | 44d35257e805856b4913c63fcbed3c0acb64bae8 (patch) | |
tree | 11e9d276c34b1b287706cb61182bdc71729661e2 /themes/courgette | |
parent | af8292c1de1886cd975d79f0f42df40e0bd1c5bd (diff) | |
parent | cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b (diff) | |
download | wallabag-1.8.0.tar.gz wallabag-1.8.0.tar.zst wallabag-1.8.0.zip |
Merge branch 'dev'1.8.0
Diffstat (limited to 'themes/courgette')
-rwxr-xr-x | themes/courgette/_menu.twig | 2 | ||||
-rwxr-xr-x | themes/courgette/_view.twig | 2 | ||||
-rwxr-xr-x | themes/courgette/config.twig | 6 | ||||
-rwxr-xr-x | themes/courgette/home.twig | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/themes/courgette/_menu.twig b/themes/courgette/_menu.twig index 5e737299..0e37660a 100755 --- a/themes/courgette/_menu.twig +++ b/themes/courgette/_menu.twig | |||
@@ -1,6 +1,6 @@ | |||
1 | <div id="menuContainer"> | 1 | <div id="menuContainer"> |
2 | <ul id="links"> | 2 | <ul id="links"> |
3 | <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li> | 3 | <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "unread" %}</a></li> |
4 | <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li> | 4 | <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li> |
5 | <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li> | 5 | <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li> |
6 | <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li> | 6 | <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li> |
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index 25479a3d..c5c916c0 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig | |||
@@ -12,7 +12,7 @@ | |||
12 | {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %} | 12 | {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %} |
13 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} | 13 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} |
14 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %} | 14 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %} |
15 | <li><a href="./?epub&method=id&id={{ entry.id|e }}" title="Generate epub file">EPUB</a></li> | 15 | <li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li> |
16 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li> | 16 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li> |
17 | </ul> | 17 | </ul> |
18 | </div> | 18 | </div> |
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 9ab58461..c4933794 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig | |||
@@ -97,6 +97,10 @@ | |||
97 | <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> | 97 | <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> |
98 | <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> | 98 | <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> |
99 | </div> | 99 | </div> |
100 | <div class="row"> | ||
101 | <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label> | ||
102 | <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> | ||
103 | </div> | ||
100 | <div class="row mts txtcenter"> | 104 | <div class="row mts txtcenter"> |
101 | <button type="submit">{% trans "Send" %}</button> | 105 | <button type="submit">{% trans "Send" %}</button> |
102 | </div> | 106 | </div> |
@@ -116,6 +120,6 @@ | |||
116 | </div> | 120 | </div> |
117 | </form> | 121 | </form> |
118 | {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> | 122 | {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> |
119 | {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} | 123 | {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %} |
120 | </div> | 124 | </div> |
121 | {% endblock %} | 125 | {% endblock %} |
diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig index 401f3f20..811298eb 100755 --- a/themes/courgette/home.twig +++ b/themes/courgette/home.twig | |||
@@ -53,9 +53,9 @@ | |||
53 | 53 | ||
54 | {{ block('pager') }} | 54 | {{ block('pager') }} |
55 | 55 | ||
56 | {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&method=tag&tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> | 56 | {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&method=tag&value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> |
57 | {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&method=search&search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> | 57 | {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&method=search&value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> |
58 | {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&method=category&category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} | 58 | {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&method=category&value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} |
59 | 59 | ||
60 | {% endif %} | 60 | {% endif %} |
61 | 61 | ||