From b692691d7ddc1fa0e1ef1f7888dfd65f70677e27 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 1 Mar 2015 22:11:35 +0100 Subject: update jquery to version 2.1.3 --- themes/default/_head.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/_head.twig b/themes/default/_head.twig index 277e3833..91a555cb 100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -29,7 +29,7 @@ - + -- cgit v1.2.3 From 059a3380341c439e1debb4921bbf023a3b424a4b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 2 Mar 2015 00:15:49 +0100 Subject: implement #1123 --- themes/default/css/style-default.css | 12 ++++++++++++ themes/default/view.twig | 3 +++ 2 files changed, 15 insertions(+) (limited to 'themes/default') diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index da8703f2..8b18320d 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -1,7 +1,19 @@ a.back span { + background-image: url('../img/default/home.png'); +} + +a.previous span { background-image: url('../img/default/left.png'); } +a.next span { + background-image: url('../img/default/right.png'); +} + +a.archiveandnext span { + background-image: url('../img/default/forward.png'); +} + a.top span { background-image: url('../img/default/top.png'); } diff --git a/themes/default/view.twig b/themes/default/view.twig index 44cbf41b..0d4ec174 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -5,10 +5,12 @@ {% include '_pocheit-form.twig' %}
-- cgit v1.2.3 From 210a2ddaf0bfb32993375c194acbca5e12750c8d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 2 Mar 2015 19:00:57 +0100 Subject: forgotten pictures --- themes/default/img/default/forward.png | Bin 0 -> 287 bytes themes/default/img/default/home.png | Bin 0 -> 329 bytes themes/default/img/default/right.png | Bin 0 -> 198 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/default/img/default/forward.png create mode 100644 themes/default/img/default/home.png create mode 100644 themes/default/img/default/right.png (limited to 'themes/default') diff --git a/themes/default/img/default/forward.png b/themes/default/img/default/forward.png new file mode 100644 index 00000000..c2a22e38 Binary files /dev/null and b/themes/default/img/default/forward.png differ diff --git a/themes/default/img/default/home.png b/themes/default/img/default/home.png new file mode 100644 index 00000000..f0089166 Binary files /dev/null and b/themes/default/img/default/home.png differ diff --git a/themes/default/img/default/right.png b/themes/default/img/default/right.png new file mode 100644 index 00000000..845995dc Binary files /dev/null and b/themes/default/img/default/right.png differ -- cgit v1.2.3 From 00dc7622fbb25458f82b8d81dffae6f843dadece Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 7 Mar 2015 22:52:03 +0100 Subject: change system for #1123 and keyboard arrows shortcuts --- themes/default/_head.twig | 1 + themes/default/view.twig | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/_head.twig b/themes/default/_head.twig index 91a555cb..f3c9d886 100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -33,4 +33,5 @@ + diff --git a/themes/default/view.twig b/themes/default/view.twig index 0d4ec174..9c9d1561 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -5,7 +5,7 @@ {% include '_pocheit-form.twig' %}
@@ -125,5 +125,6 @@ $('#article_toolbar .tool.top').parent().hide(); } }); + navigateKeyboard('?view=view&id={{ navigate.nextid|e }}','?view=view&id={{ navigate.previousid|e }}'); {% endblock %} -- cgit v1.2.3 From c34a8956e1cd07498457f3211898e8de6d794de3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 7 Mar 2015 23:59:27 +0100 Subject: implement swipe gestures on mobile to go to next and previous articles --- themes/default/_head.twig | 1 + themes/default/view.twig | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'themes/default') diff --git a/themes/default/_head.twig b/themes/default/_head.twig index f3c9d886..ce1bbdcc 100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -30,6 +30,7 @@ + diff --git a/themes/default/view.twig b/themes/default/view.twig index 9c9d1561..57d25965 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -125,6 +125,17 @@ $('#article_toolbar .tool.top').parent().hide(); } }); + + // Use left and right arrow to navigate on with keyboard navigateKeyboard('?view=view&id={{ navigate.nextid|e }}','?view=view&id={{ navigate.previousid|e }}'); + + // swipe to right or left on mobile to navigate + $('article').on("swiperight", function(){ + goLeft('?view=view&id={{ navigate.nextid|e }}'); + }); + $('article').on("swipeleft", function(){ + goRight('?view=view&id={{ navigate.previousid|e }}'); + }); + {% endblock %} -- cgit v1.2.3 From ab87a7fe6934b5fa0f06964c67a27826774126b4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 8 Mar 2015 14:47:22 +0100 Subject: tag cloud is present, #1122 is implemented --- themes/default/css/style.css | 30 ++++++++++++++++++++++++++++++ themes/default/edit-tags.twig | 5 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/css/style.css b/themes/default/css/style.css index a122dc54..58d908ee 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -455,3 +455,33 @@ pre code { border: 1px solid #ddd; font-size: 0.96em; } + +/* ========================================================================== + Tags-related styles + ========================================================================== */ + +.suggestedtag { + padding: 4px; + cursor: pointer; + display: inline-block; +} + +#tagcloud .smallesttag { + font-size: x-small; +} + +#tagcloud .smalltag { + font-size: small; +} + +#tagcloud .mediumtag { + font-size:medium; +} + +#tagcloud .largetag { + font-size:large; +} + +#tagcloud .largesttag { + font-size:larger; +} diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index c29427e0..61cc94f1 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -19,7 +19,7 @@ {% trans "no tags" %} {% endif %}
    -{% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %} +{% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
@@ -30,6 +30,7 @@ {% trans "You can enter multiple tags, separated by commas." %}

-
+All existing tags : +
    {% for eachtag in alltags %}
  • {{ eachtag.value }}
    • {% endfor %}
« {% trans "return to article" %} {% endblock %} -- cgit v1.2.3 From ae27d0ffca1c3a381226fed42adea66c3971fdde Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Mar 2015 17:08:14 +0100 Subject: fix little problems and bring previous features to all themes --- themes/default/css/style.css | 2 +- themes/default/home.twig | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) (limited to 'themes/default') 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 { text-indent: -9999px; } -.random { +.icon-random { display: inline-block; width: 16px; 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 @@

{% trans "Tag" %}: {{ tag.value }}

{% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

+ {% if entries is empty%} + {% if view == 'home' %}

{% trans "No articles unread. Good job !" %} + {% elseif view == 'fav' %}

{% trans "No articles favourited" %} + {% elseif view == 'archive' %}

{% trans "No articles marked as read" %} + {% elseif view == 'tags' %}

{% trans "No articles with this tag found" %} + {% elseif searchterm is defined %}

{% trans %}No articles found for « {{ searchterm }} »{% endtrans %} + {% else %}

{% trans "No articles found" %}{% endif %} +

{% else %} {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} - {% trans "random" %}
+
+ {% 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' %} + {% trans "random" %}{% endif %} +
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ searchterm }} »
+
+ {% 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 %}
- {% endif %} {% endif %} {% endblock %} {% for entry in entries %} -- cgit v1.2.3 From 92659b8e7fd6f006ca037a512831152025ad8933 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Mar 2015 22:48:54 +0100 Subject: many translations improved and corrected --- themes/default/about.twig | 12 +++++++++++- themes/default/config.twig | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/about.twig b/themes/default/about.twig index bab9b5eb..e0776d9c 100755 --- a/themes/default/about.twig +++ b/themes/default/about.twig @@ -20,7 +20,7 @@
{% trans "on Github" %}
{% trans "Bug reports" %}
-
{% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
+
{% trans "On our support website" %}{% trans " or " %}{% trans "on Github" %}
{% trans "License" %}
MIT
@@ -29,6 +29,16 @@
{{ constant('POCHE') }}
+

{% trans "Getting help" %}

+ +
+
{% trans "Documentation" %}
+
{% trans %}Offline documentation and online documentation (up to date){% endtrans %}
+ +
{% trans "Support" %}
+
http://support.wallabag.org/
+
+

{% trans "Helping wallabag" %}

{% trans "wallabag is free and opensource. You can help us:" %}

diff --git a/themes/default/config.twig b/themes/default/config.twig index 6302a6a3..09e40e75 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -102,7 +102,7 @@

{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}

{% trans "Export your wallabag data" %}

-

{% trans "Export JSON" %}
+

{% trans "JSON export" %}
Data will be exported in a single JSON file.

{% trans "Fancy an E-Book ?" %}

-- cgit v1.2.3 From 7f8f8271e49a2834a87012ea838099c8b46cf63f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Mar 2015 00:22:11 +0100 Subject: redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring --- themes/default/css/style-default.css | 3 ++- themes/default/img/default/shaarli.png | Bin 729 -> 0 bytes 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 themes/default/img/default/shaarli.png (limited to 'themes/default') diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 8b18320d..7530efbb 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -43,7 +43,8 @@ a.twitter span { } a.shaarli span { - background-image: url('../img/default/shaarli.png'); + background-image: url('../../_global/img/icons/shaarli.png'); + background-size: 16px 16px; } a.flattr span { diff --git a/themes/default/img/default/shaarli.png b/themes/default/img/default/shaarli.png deleted file mode 100644 index 1eb30f60..00000000 Binary files a/themes/default/img/default/shaarli.png and /dev/null differ -- cgit v1.2.3 From 47424de64ed1fcb7bd5d848314581bccb11a15bb Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 18 Mar 2015 22:42:26 +0100 Subject: git fix #1159 and bring icons to all themes (dirty icons) --- themes/default/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/view.twig b/themes/default/view.twig index 57d25965..0010d18f 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -21,7 +21,7 @@ {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numFlattrs }}
    • {% endif %}{% endif %} {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %} - {% if constant('RELOAD_ARTICLE') == 1 %}
  • {% trans "Reload article" %}
    • {% endif %}} + {% if constant('RELOAD_ARTICLE') == 1 %}
  • {% trans "Reload article" %}
    • {% endif %} {% if constant('EPUB') == 1 %}
  • EPUB
    • {% endif %} {% if constant('MOBI') == 1 %}
  • MOBI
    • {% endif %} {% if constant('PDF') == 1 %}
  • PDF
    • {% endif %} -- cgit v1.2.3 From 727c35d8096c7690f66f2a815af3e8cabae00399 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 12 May 2015 16:05:57 +0200 Subject: bring to all themes social services and link them to new doc --- themes/default/_head.twig | 30 ++++++++++++++++++++++++++++++ themes/default/config.twig | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/_head.twig b/themes/default/_head.twig index ce1bbdcc..e3841c77 100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -36,3 +36,33 @@ + + + + \ No newline at end of file diff --git a/themes/default/config.twig b/themes/default/config.twig index 09e40e75..e39826c3 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -16,7 +16,8 @@

    Browser Plugins

    Mobile Apps

    -- cgit v1.2.3 From 12b97d67573042a66b8bf7a84f60df861a5d8632 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 25 May 2015 20:41:39 +0200 Subject: hide article until import is finished --- themes/default/_import.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'themes/default') diff --git a/themes/default/_import.twig b/themes/default/_import.twig index c59b7a15..079203a2 100755 --- a/themes/default/_import.twig +++ b/themes/default/_import.twig @@ -2,11 +2,13 @@
    -- cgit v1.2.3 From 6056aaf0769e59944b2d77a3b294f5098a731c3e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 27 Jul 2015 21:50:28 +0200 Subject: fix #1237, display a message instead of button when connections are not through https --- themes/default/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index e39826c3..24e3e570 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -17,7 +17,7 @@

    Browser Plugins

    Mobile Apps

    -- cgit v1.2.3