From 48fb171d7a64dbd1036f9e17cbf4c14304483817 Mon Sep 17 00:00:00 2001 From: tcit Date: Wed, 15 Oct 2014 16:47:38 +0200 Subject: fix for #830 --- themes/default/js/popupForm.js | 8 ++++++++ themes/default/js/saveLink.js | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js index a32e6e70..eb6d1ae2 100644 --- a/themes/default/js/popupForm.js +++ b/themes/default/js/popupForm.js @@ -10,6 +10,14 @@ $(document).ready(function() { $("#search").click(function(){ closeSearch(); + // if other popup is already shown + if ($("#bagit-form").length != 0) { + $("#bagit").removeClass("active-current"); + $('#content').removeClass("opacity03"); + $("#bagit").removeClass("current"); + $("#bagit-arrow").removeClass("arrow-down"); + $("#bagit-form").hide(); + } $('#searchfield').focus(); }); diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js index 6dbce97e..b52b8a2c 100755 --- a/themes/default/js/saveLink.js +++ b/themes/default/js/saveLink.js @@ -13,7 +13,7 @@ $.fn.ready(function() { $bagit.toggleClass("active-current"); - //only if bagiti link is not presented on page + //only if bag-it link is not presented on page if ( $bagit.length === 0 ) { if ( event !== 'undefined' && event ) { $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); @@ -23,6 +23,11 @@ $.fn.ready(function() { } } + if ($("#search-form").length != 0) { + $("#search").removeClass("current"); + $("#search-arrow").removeClass("arrow-down"); + $("#search-form").hide(); + } $bagitForm.toggle(); $('#content').toggleClass("opacity03"); if (url !== 'undefined' && url) { -- cgit v1.2.3 From 7ee1972599f52924151794fe6c933ce69297f7f3 Mon Sep 17 00:00:00 2001 From: tcit Date: Mon, 27 Oct 2014 14:00:47 +0100 Subject: translation fix for #887 and tiny display fix --- themes/default/edit-tags.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'themes/default') diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index bd498d26..89c746ec 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -16,15 +16,15 @@ {% if tags is empty %} -no tags +{% trans "no tags" %} {% endif %}
- - + +

{% trans "Start typing for auto complete." %}
{% trans "You can enter multiple tags, separated by commas." %}

-- cgit v1.2.3 From 1b6e21d7a657c87a48efe02a1191d06682c64829 Mon Sep 17 00:00:00 2001 From: tcit Date: Mon, 27 Oct 2014 15:12:46 +0100 Subject: translation fix finished for #871 and bring add tag from search feature to all themes --- themes/default/_sorting.twig | 4 ++-- themes/default/home.twig | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'themes/default') diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index ce3d38bc..3ce9b949 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %}
    -
  • {% trans {% trans "by date" %} {% trans
    • -
  • {% trans {% trans "by title" %} {% trans
    • +
  • {% trans {% trans "by date" %} {% trans
    • +
  • {% trans {% trans "by title" %} {% trans
{% endif %} diff --git a/themes/default/home.twig b/themes/default/home.twig index 093c2dc5..6bc549e6 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -31,13 +31,13 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if search_term is defined %} + {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ search_term }} »
+
{% trans "Only one result found for " %} « {{ searchterm }} »
{% endif %} {% endif %} @@ -60,8 +60,11 @@ {% if view == 'home' %}{% if nb_results > 1 %}{% trans "mark all the entries as read" %}{% endif %}{% endif %} - {% if tag %}{% trans "Download the articles from this tag in an epub" %} - {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} + {% if searchterm is defined %} +{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + + {% if tag %}{% trans "Download the articles from this tag in an epub" %} + {% elseif searchterm is defined %}{% trans "Download the articles from this search in an epub" %} {% else %}{% trans "Download the articles from this category in an epub" %}{% endif %} {% endif %} -- cgit v1.2.3 From 8519cc796f4815ab1a3da70e081b77599741f975 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 12:31:13 -0400 Subject: Moving search-form style out of messages css and into style.css --- themes/default/css/messages.css | 5 ----- themes/default/css/style.css | 11 ++++++++++- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'themes/default') diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css index 3ad4e34e..46b54795 100644 --- a/themes/default/css/messages.css +++ b/themes/default/css/messages.css @@ -8,11 +8,6 @@ border-radius: 4px; } -/* Search form message needs a little more width, depending on translations */ -#search-form { - width: 420px; -} - .messages a.closeMessage { display: none; float: right; diff --git a/themes/default/css/style.css b/themes/default/css/style.css index e254d481..b25373d6 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after { padding-left: 10px; } +/* ========================================================================== + "Search" popup div related styles + ========================================================================== */ + +/* Search form message needs a little more width, depending on translations */ +#search-form { + width: 420px; +} + .opacity03 { /*opacity: 0.3;*/ } @@ -435,4 +444,4 @@ pre code { font-family: "Courier New", Courier, monospace; border: 1px solid #ddd; font-size: 0.96em; -} \ No newline at end of file +} -- cgit v1.2.3 From ff02fd8aca56a63e8caf3b9f87de8a677dd419e9 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 2 Nov 2014 11:15:36 -0500 Subject: Improving JavaScript for popup forms --- themes/default/js/popupForm.js | 69 ++++++++++++++++++++++++++++++++++-------- themes/default/js/saveLink.js | 27 +++++++++-------- 2 files changed, 71 insertions(+), 25 deletions(-) (limited to 'themes/default') diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js index eb6d1ae2..d233e600 100644 --- a/themes/default/js/popupForm.js +++ b/themes/default/js/popupForm.js @@ -1,29 +1,72 @@ $(document).ready(function() { $("#search-form").hide(); + $("#bagit-form").hide(); - function closeSearch() { + //--------------------------------------------------------------------------- + // Toggle the "Search" popup in the sidebar + //--------------------------------------------------------------------------- + function toggleSearch() { $("#search-form").toggle(); $("#search").toggleClass("current"); + $("#search").toggleClass("active-current"); $("#search-arrow").toggleClass("arrow-down"); + if ($("#search").hasClass("current")) { + $("#content").addClass("opacity03"); + } else { + $("#content").removeClass("opacity03"); + } } - $("#search").click(function(){ - closeSearch(); - // if other popup is already shown - if ($("#bagit-form").length != 0) { - $("#bagit").removeClass("active-current"); - $('#content').removeClass("opacity03"); - $("#bagit").removeClass("current"); - $("#bagit-arrow").removeClass("arrow-down"); - $("#bagit-form").hide(); + //--------------------------------------------------------------------------- + // Toggle the "Save a Link" popup in the sidebar + //--------------------------------------------------------------------------- + function toggleBagit() { + $("#bagit-form").toggle(); + $("#bagit").toggleClass("current"); + $("#bagit").toggleClass("active-current"); + $("#bagit-arrow").toggleClass("arrow-down"); + if ($("#bagit").hasClass("current")) { + $("#content").addClass("opacity03"); + } else { + $("#content").removeClass("opacity03"); } - $('#searchfield').focus(); + } + + //--------------------------------------------------------------------------- + // Close all #links popups in the sidebar + //--------------------------------------------------------------------------- + function closePopups() { + $("#links .messages").hide(); + $("#links > li > a").removeClass("active-current"); + $("#links > li > a").removeClass("current"); + $("[id$=-arrow]").removeClass("arrow-down"); + $("#content").removeClass("opacity03"); + } + + $("#search").click(function(){ + closePopups(); + toggleSearch(); + $("#searchfield").focus(); + }); + + $("#bagit").click(function(){ + closePopups(); + toggleBagit(); + $("#plainurl").focus(); }); $("#search-form-close").click(function(){ - closeSearch(); + toggleSearch(); }); + $("#bagit-form-close").click(function(){ + toggleBagit(); + }); + + // $("#").click(function(){ + // toggleSearch(); + // }); + -}); \ No newline at end of file +}); diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js index b52b8a2c..a7acd84c 100755 --- a/themes/default/js/saveLink.js +++ b/themes/default/js/saveLink.js @@ -36,18 +36,21 @@ $.fn.ready(function() { $('#plainurl').focus(); } - - $bagit.click(function(){ - $bagit.toggleClass("current"); - $("#bagit-arrow").toggleClass("arrow-down"); - toggleSaveLinkForm(); - }); - - $("#bagit-form-close").click(function(){ - $bagit.removeClass("current"); - $("#bagit-arrow").removeClass("arrow-down"); - toggleSaveLinkForm(); - }); + //--------------------------------------------------------------------------- + // These two functions are now taken care of in popupForm.js + //--------------------------------------------------------------------------- + + // $bagit.click(function(){ + // $bagit.toggleClass("current"); + // $("#bagit-arrow").toggleClass("arrow-down"); + // toggleSaveLinkForm(); + // }); + + // $("#bagit-form-close").click(function(){ + // $bagit.removeClass("current"); + // $("#bagit-arrow").removeClass("arrow-down"); + // toggleSaveLinkForm(); + // }); //send "bag it link" form request via ajax -- cgit v1.2.3 From 3c133bff4978de20e3f51e1b908790138e97e412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 3 Nov 2014 07:44:56 +0100 Subject: add about page --- themes/default/_menu.twig | 1 + themes/default/about.twig | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100755 themes/default/about.twig (limited to 'themes/default') diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig index 9b9a6062..eedf84f1 100644 --- a/themes/default/_menu.twig +++ b/themes/default/_menu.twig @@ -6,6 +6,7 @@
  • {% trans "save a link" %}
  • {% trans "search" %}
  • {% trans "config" %}
    • +
  • {% trans "about" %}
  • {% trans "logout" %}
    • {% include '_pocheit-form.twig' %} diff --git a/themes/default/about.twig b/themes/default/about.twig new file mode 100755 index 00000000..cd274f26 --- /dev/null +++ b/themes/default/about.twig @@ -0,0 +1,74 @@ +{% extends "layout.twig" %} + +{% block title %}{% trans "About wallabag" %}{% endblock %} +{% block menu %} +{% include '_menu.twig' %} +{% endblock %} +{% block content %} +

    {% trans "About wallabag" %}

    + +
    +
    {% trans "Project website" %}
    +
    http://www.wallabag.org
    + +
    {% trans "Main developer" %}
    +
    Nicolas Lœuillet — {% trans "website" %}
    + +
    {% trans "Contributors:" %}
    +
    {% trans "on Github" %}
    + +
    {% trans "Bug reports" %}
    +
    {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
    + +
    {% trans "License" %}
    +
    MIT
    + +
    {% trans "Version" %}
    +
    {{ constant('POCHE') }}
    +
    + +

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    + +

    {% trans "Helping wallabag" %}

    + +

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

    + +
    +
    {% trans "via Paypal" %}
    + +
    {% trans "via Flattr" %}
    +
    + +

    {% trans "Credits" %}

    +
    +
    PHP Readability
    +
    https://bitbucket.org/fivefilters/php-readability
    + +
    Full Text RSS
    +
    http://code.fivefilters.org/full-text-rss/src
    + +
    logo by Maylis Agniel
    +
    https://github.com/wallabag/logo
    + +
    icons
    +
    http://icomoon.io
    + +
    PHP Simple HTML DOM Parser
    +
    http://simplehtmldom.sourceforge.net/
    + +
    Session
    +
    https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
    + +
    Twig
    +
    http://twig.sensiolabs.org
    + +
    Flash messages
    +
    https://github.com/plasticbrain/PHP-Flash-Messages
    + +
    Pagination
    +
    https://github.com/daveismyname/pagination
    + +
    PHPePub
    +
    https://github.com/Grandt/PHPePub/
    +
    +{% endblock %} -- cgit v1.2.3 From efd0a9f5f11c85fc216f2c8f05b377e7f8680a12 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 12:06:44 -0500 Subject: Applying changes to config.twig to default theme as well --- themes/default/config.twig | 129 +++++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 58 deletions(-) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index 36b66e88..082e179f 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,29 +6,29 @@ {% endblock %} {% block content %}

    {% trans "Saving articles" %}

    -

    {% trans "There are several ways to save an article:" %} (?)

    +

    {% trans "There are several ways to save an article:" %} {% trans "(?)" %}

    +

    + +
    + + +

    +

    +

    Browser Plugins

    - -

    {% trans "Upgrading wallabag" %}

    +

    Mobile Apps

    +

    {% trans "Bookmarklet" %}

    +

    + {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} +

    {% trans "Feeds" %}

    {% if token == '' %} @@ -39,14 +39,16 @@
  • {% trans "Favorites feed" %}
  • {% trans "Archive feed" %}
    • -

    {% trans "Your token:" %} {{token}}

    -

    {% trans "Your user id:" %} {{user_id}}

    -

    {% trans "You can regenerate your token: generate!." %}

    +

    + {% trans "Your token:" %} {{token}}
    + {% trans "Your user id:" %} {{user_id}}
    + {% trans "You can regenerate your token: generate!." %} +

    {% endif %}

    {% trans "Change your theme" %}

    -
    +
    @@ -82,6 +84,35 @@ +

    {% trans "Import" %}

    +

    {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

    +

    {% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}

    +
    +
    +
    + + +
    +
    + +
    +
    +
    +

    {% trans "You can click here to fetch content for articles with no content." %}

    +

    {% 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" %}
    + Data will be exported in a single JSON file.

    + +

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

    +

    Download E-Book
    + {% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    + +

    {% trans "Cache" %}

    +

    {% trans "Delete Cache" %}
    + Deleting the cache may help with display or other problems.

    + {% if http_auth == 0 %}

    {% trans "Change your password" %}

    @@ -102,55 +133,28 @@
    {% endif %} - -

    {% trans "Import" %}

    -

    {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

    -

    {% trans "Please select export file on your computer and press \"Import\" button below.
    Wallabag will parse your file, insert all URLs and start fetching of articles if required.
    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 "You can click here to fetch content for articles with no content." %}

    - -

    {% trans "Export your wallabag data" %}

    -

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    - -

    {% trans "Cache" %}

    -

    {% trans "Click here" %} {% trans "to delete cache." %}

    - -

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

    -

    {% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} -
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    {% trans 'Add user' %}

    -

    {% trans 'Add a new user :' %}

    - +
    - +
    - +
    - +

    {% trans "Delete account" %}

    {% if not only_user %}

    {% trans "You can delete your account by entering your password and validating." %}
    {% trans "Be careful, data will be erased forever (that is a very long time)." %}

    @@ -160,9 +164,18 @@
    - +
    - {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}
    - {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

    {% endif %} + {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}

    +

    {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

    {% endif %} + +

    {% trans "Upgrading wallabag" %}

    +
      +
    • {% trans "Installed version" %}: {{ constant('POCHE') }}
      • +
    • {% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}{% trans "A more recent stable version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})
      • + {% if constant('DEBUG_POCHE') == 1 %}
    • {% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}{% trans "A more recent development version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}
      • +
    +

    {% trans "You can clear cache to check the latest release." %}

    + {% endblock %} -- cgit v1.2.3 From 62f3e6db75318d2fda6682613fd715240c6b147f Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 5 Nov 2014 11:22:22 -0500 Subject: Fixing URL typo on about page --- themes/default/about.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/about.twig b/themes/default/about.twig index cd274f26..5ca3217c 100755 --- a/themes/default/about.twig +++ b/themes/default/about.twig @@ -12,7 +12,7 @@
    http://www.wallabag.org
    {% trans "Main developer" %}
    -
    Nicolas Lœuillet — {% trans "website" %}
    +
    Nicolas Lœuillet — {% trans "website" %}
    {% trans "Contributors:" %}
    {% trans "on Github" %}
    -- cgit v1.2.3