From 063a2fadaa6bb797673a882b5ca5697edec0a3aa Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 2 Nov 2014 10:30:13 -0500 Subject: Removing spaces before colons on config screen --- themes/baggy/config.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 3523cd08..d4958ccb 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -20,14 +20,14 @@ -
  • {% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} {% trans "bag it!" %}
    • +
  • {% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %}: {% trans "bag it!" %}

    • {% trans "Upgrading wallabag" %}

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

    -- cgit v1.2.3 From cc1f78a83d731fe0e325fbe4079aebec64f5f043 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 2 Nov 2014 13:37:44 -0500 Subject: Many small UI changes/fixes to Baggy theme and English translation files. May need review. --- themes/baggy/config.twig | 107 +++++++++++++++++++++------------------------- themes/baggy/css/main.css | 23 ++++++++-- themes/baggy/home.twig | 16 +++---- 3 files changed, 76 insertions(+), 70 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index d4958ccb..3dd38270 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -6,30 +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 "You can clear cache to check the latest release." %}

    +

    {% trans "Bookmarklet" %}

    +

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

    {% trans "Feeds" %}

    {% if token == '' %} @@ -40,9 +39,11 @@
  • {% 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" %}

    @@ -83,30 +84,9 @@ - {% if http_auth == 0 %} -

    {% trans "Change your password" %}

    -
    -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - - -
    - {% endif %} - -

    {% trans "Import" %}

    +

    {% 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 "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." %}

    @@ -119,19 +99,21 @@

    {% 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 "Click here" %} {% trans "to export your wallabag data." %}

    - +

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

    +

    {% 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." %}

    +

    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 "Click here" %} {% trans "to delete cache." %}

    +

    {% trans "Cache" %}

    +

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

    {% trans 'Add user' %}

    -

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

    @@ -147,7 +129,7 @@
    - +
    @@ -161,9 +143,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 "You can clear cache to check the latest release." %}

    + {% endblock %} diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index ce314860..f77021aa 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -70,7 +70,7 @@ h2, h3, h4 { text-transform: uppercase; } -p, li { +p, li, label { color: #666; } @@ -281,12 +281,12 @@ h2:after { #listmode a:hover { opacity: 1; } -.tablemode { +#listmode.tablemode { background-image: url("../img/baggy/table.png"); background-repeat: no-repeat; background-position: bottom; } -.listmode { +#listmode.listmode { background-image: url("../img/baggy/list.png"); background-repeat: no-repeat; background-position: bottom; @@ -331,7 +331,7 @@ footer a { margin-bottom: 2em; } -.estimatedTime a { +.estimatedTime .reading-time { color: #999; font-style: italic; font-weight: normal; @@ -418,6 +418,7 @@ footer a { .entrie h2 { text-transform: none; margin-bottom: 0; + line-height: 1.2; } .entrie h2:after { @@ -774,6 +775,16 @@ a.add-to-wallabag-link-after:after { width: 100%; } +.more-info { + font-size: 0.85em; + line-height: 1.5; + color: #aaa; +} + + .more-info a { + color: #aaa; + } + /* ========================================================================== 5 = Article ========================================================================== */ @@ -799,6 +810,10 @@ blockquote { margin: 0; } +#article h1 { + text-align: left; +} + #article h2, #article h3, #article h4 { text-transform: none; } diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 03de6b9b..dec848f2 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -41,9 +41,9 @@

    {{ entry.title|raw }}

    {% if entry.content| getReadingTime > 0 %} -
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    +
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    {% else %} -
    {% trans "estimated reading time :" %} < 1 min
    +
    {% trans "estimated reading time :" %} < 1 min
    {% endif %}
    {{ block('pager') }} - {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}{% endif %}{% endif %} + {% if view == 'home' %}{% if nb_results > 1 %}

    {% trans "Mark all the entries as read" %}

    {% endif %}{% endif %} - {% if searchterm is defined %} -{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + {% if searchterm is defined %}

    +{% trans "Tag these results as" %} {{ searchterm }}

    {% 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" %} - {% else %}{% trans "Download the articles from this category in an epub" %}{% 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" %}

    + {% else %}

    {% trans "Download the articles from this category in an epub" %}

    {% endif %} {% endif %} {% endblock %} -- cgit v1.2.3 From ac8b064f478376d75d0f23266c39aa237269b374 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 09:11:25 -0500 Subject: Restoring change password section in config --- themes/baggy/config.twig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 3dd38270..2fd5ce28 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -113,6 +113,27 @@

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

    + {% if http_auth == 0 %} +

    {% trans "Change your password" %}

    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    + {% endif %} +

    {% trans 'Add user' %}

    -- cgit v1.2.3 From 94888d5fd424af1330e7bd01d017b7629293cb2b Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 09:13:42 -0500 Subject: Removing title text from bookmarklet --- themes/baggy/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 2fd5ce28..2b967cd4 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -27,7 +27,7 @@

    {% trans "Bookmarklet" %}

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

    {% trans "Feeds" %}

    -- 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') 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