From 0be82dedb6397efe96a0de4147f28b9378e478db Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 15:26:33 -0400 Subject: [PATCH 1/6] Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 14309 -> 14309 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 10 +++++----- locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 14312 -> 14312 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 1e2f42957d0e6219402eeb53bc2eaa4b2c0d9e6e..9193b6e727f95273cffb30dc757a5656b0bd876b 100644 GIT binary patch delta 91 zcmaEw|1^KY5j7UqfKaE&T0-U!Myim>WOMa!2t*?`~Z%~9i0FG delta 30 mcmaEw|1^KY5w*!`LdBEK)x#%$5Xxo@nH(dmy;)V`06zfLLkt=K diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 5d3914523..05832d0b7 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -599,8 +599,8 @@ msgid "" "Click on this " "link to get all your articles in one ebook (ePub 3 format)." msgstr "" -"Click on this " -"link to get all your articles in one ebook (ePub 3 format)." +"Click on this " +"link to get all your articles in one ebook (EPUB 3 format)." msgid "" "This can take a while and can even fail if you have too many " @@ -610,13 +610,13 @@ msgstr "" "articles, depending on your server configuration." msgid "Download the articles from this tag in an epub" -msgstr "Download the articles from this tag in an epub" +msgstr "Download the articles from this tag in an EPUB" msgid "Download the articles from this search in an epub" -msgstr "Download the articles from this search in an epub" +msgstr "Download the articles from this search in an EPUB" msgid "Download the articles from this category in an epub" -msgstr "Download the articles from this category in an epub" +msgstr "Download the articles from this category in an EPUB" #~ msgid "poche it!" #~ msgstr "poche it!" diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo index fe59bd5227365f8c752d9651288632a24d75b8ae..91b9b5d09e4078daef8b5a41d0092514b210fd83 100644 GIT binary patch delta 76 zcmaEn{~~|GaWxj#fKaE&r`60M3^w&{2qRHlQLs2Qu_!r1Au~@QF;4-k4k*f3l9-Mp KwE3I*Cw>4F&>CO> delta 24 gcmaEn{~~|Gaka^6LdBD<)Wau#5X#>CNBs>y0GL1vrT_o{ diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po index e8ca8f03a..c2ae0ae4c 100644 --- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po +++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po @@ -599,8 +599,8 @@ msgid "" "Click on this " "link to get all your articles in one ebook (ePub 3 format)." msgstr "" -"Click on this " -"link to get all your articles in one ebook (ePub 3 format)." +"Click on this " +"link to get all your articles in one ebook (EPUB 3 format)." msgid "" "This can take a while and can even fail if you have too many " @@ -610,13 +610,13 @@ msgstr "" "articles, depending on your server configuration." msgid "Download the articles from this tag in an epub" -msgstr "Download the articles from this tag in an epub" +msgstr "Download the articles from this tag in an EPUB" msgid "Download the articles from this search in an epub" -msgstr "Download the articles from this search in an epub" +msgstr "Download the articles from this search in an EPUB" msgid "Download the articles from this category in an epub" -msgstr "Download the articles from this category in an epub" +msgstr "Download the articles from this category in an EPUB" #~ msgid "poche it!" #~ msgstr "poche it!" From 063a2fadaa6bb797673a882b5ca5697edec0a3aa Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 2 Nov 2014 10:30:13 -0500 Subject: [PATCH 2/6] Removing spaces before colons on config screen --- themes/baggy/config.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 3523cd084..d4958ccb2 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 "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 "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." %}

    From cc1f78a83d731fe0e325fbe4079aebec64f5f043 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 2 Nov 2014 13:37:44 -0500 Subject: [PATCH 3/6] Many small UI changes/fixes to Baggy theme and English translation files. May need review. --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 14309 -> 15691 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 30 ++++++ locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 14312 -> 15782 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 35 +++++- themes/baggy/config.twig | 111 +++++++++----------- themes/baggy/css/main.css | 23 +++- themes/baggy/home.twig | 16 +-- 7 files changed, 140 insertions(+), 75 deletions(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 9193b6e727f95273cffb30dc757a5656b0bd876b..12fef6c83ac8417903986dad6385c37ad0a381db 100644 GIT binary patch literal 15691 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 A$p8QV delta 4273 zcmYk;2~bs49LMqVgg^2*!m_a zc%5N8Lt2yY5Mx{}WB$2QN7*8b2?iIo!w^iy6imkg?1&Y}pV`kx6Fh^B@jQm(M;L|Q zpl)4{ImTG#7LD#4=oe{B43^;?xC)!$dTfC;j;|qq<^w*$@G>sIYuE~B&SXQ4c&MNs&rMT3u{mnIf?4vf^+<1)cHT6rtBuF#BNU3 z)U-#9crZ4_X{h^^p&n!fCSna*8p(S!_%j#z$j7UghnWmRBb<$@z*3|yQ;nL#T5OJQ zq1MPJ7>bur*L{aUSdY5y2I{;po+1gG$5MZltSbk!h~F;G>~DAWzd+sRvPDBD{*0P}zfeye z!Nlr#E7TlzK#e2|wK#h^`(uznnF&aB&0N$PT8paGR#b(mQRiJmRqh(bMv6yU@uw-VJr1zNqs@qDnsw zBlZ4Ibq>r$UAP2w;#$;ewi(sI0aOPkP^CSEsdx^P@fS?QSP#>My-<}Jj|DgznO$=M z`OPzR7-!M=n+DY~ZYEZ%Jqxuc`=dH4L{(rc>d7af&YR(UUycXaUxX@sH-4uZ)&yp; zKNoesBdA6CHhQrhEvji+QGYGA?x<4bVvdWq0X5?742yG34Qiz4F&*nsH*A~af1tsr zIUbFwSP|;J#i%)-gBrj}%)zQ8>aW-0TMlTkw4`o#U>fQNBn$P!k>gm1nv$nbQ)S@- zT#CG@ra8k3!4%Z>osn5FeJ~Tppl{$W|Dr}3%rI36FY3m|@*!s94;YFG7E4_t@}eFj8+Bn0sv;v$9ZW;b zVF~K|g{Ze-BdWy5kb9bQn1nx}em5eSAKfnj^>RJc9_&|RwBG-3X$9@!=0!frdm`9KSSN94)q|7GW`D-C85sCLyBl7q6TE62C@g$ z&vA^xv#9ScW>A04;Z+WJuo*9@N|}y&fKjLin}J&GrKks7hbrwRRK<2W$M<3w`-hz4 zucPksChGhzQKi3vk@#yS_16Jcmj4NxqE3uOosfX)pbM(w9;njxLDr?o#S|<-t?JF_ z#dD~ssly={)YbpnKMW(-FGl_=VdhyhRJtl`jT8dZTSs0Xb>o%e_HeaJoj z-~Mpa1D!&>u2+%1O;9)g{kmf+`-3qVOECeh9W*pYZ=f45AV2-)DKeQ%BdWk!64+j) zF@y9c9-_+ZAgn(#o#@8e=8;!OHQ7j}kYb{NEGE1aRzvwVv7^!6OSGwU$4Ngjj_7?2 zY%>E5)D#7_CunH#Xhbf5ez)Xg72AiyZf$7UqM_{>!+VoCw_TK6Vb0XUQZonCRUNY=>y< zBeCRlQb@KFt%bm*---p~C}H}|qvRp-0I4NCiPlD78$!dH$cKJ*wH1)8hL-;+G6TtsS<_?)" +msgstr "(?)" + msgid "Import from Pocket" msgstr "Import from Pocket" @@ -176,12 +194,18 @@ msgstr "to download your database." msgid "to export your wallabag data." msgstr "to export your wallabag data." +msgid "Export JSON" +msgstr "Export JSON" + msgid "Cache" msgstr "Cache" msgid "to delete cache." msgstr "to delete cache." +msgid "Delete Cache" +msgstr "Delete Cache" + msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." @@ -417,6 +441,9 @@ msgstr "by filling this field" msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" +msgid "Drag & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" + msgid "your version" msgstr "your version" @@ -435,6 +462,9 @@ msgstr "latest dev version" msgid "a more recent development version is available." msgstr "A more recent development version is available." +msgid "You can clear cache to check the latest release." +msgstr "You can clear the cache to check for the latest release." + msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Please execute the import script locally, it can take a very long time." diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo index 91b9b5d09e4078daef8b5a41d0092514b210fd83..a09b4f37252b5d2571996f2a9547cfe713e4b68f 100644 GIT binary patch literal 15782 zcmeI23$$ESdB?Yah|vH71`yGcE93!p=H`Wv$%{O0LLecR92%4?F`t1u0@)fUk#dJkFS-;4G*r-wydRgM7UKu7Ydf1@Ihr zGki0A622Bb1CNH!!4u$59gjNR7+zscg?ir*oB_{;H^2+v$?z#im(24}@BcAWeLsV5 zhcl^kF)YA^(1%6%F}MIe2Gx(BLbd0A;B0s}jhqEfhw8_2sP~-*)vhvBzf-99T?6&} zP44^_sCL~8RnKoix@NutPlSI7d6jt{E`|RKUk8^`SoN=lYS%WX=XOGhm^RdV-tVs8 z1XccSsPTOeN)O+L8o$4T(!&wFbS69vs=h@~?HK0kG`JJ0Ki5IM=R`?pZ~_-Cko9L|aKbP_xUo(5%COQ7u+l%7_@!{G?jbE8n@LU=lCLFw(|Q1*5^ zyc&KT*5KN=WcA+<8DjHgD1Cez(nRw#)cF1g(lm3*DOtOgK=tojsQNcT>0!iOufP)L z4XAoQ2S?!}P!^N+0(@ zOu{@0WnWK2>F*gRy*&q2?szZL=O9!&*Flxv1XcgVP~)}}s=hL$%Vq*fueU;t$Nlgf z@G;1r`2k<3%Dj%o4Z_o)`g0Lf|LRchNula_ue<+IsCqsJJ@`#HAN~mH{j+ddYF7cO z{v}ZDy9lcN7endmJ??rP%AYjc^>L_r-Un6wRw%vS4K=?WaOaOgJ@*Z$a!%C?i|{mf37iA3hSJlg;a2zv#N^D;6q4UN17gZ%8I*o6hMHd~ zl%3uH^`6_H`hOQxyFUX}?m>6|tMK!jKLMrp@zb3>z$KhN3RT}vpzQNV8aEd%gqWh) z0X05*q4abkT>l!@5qJdW->2|3@Sh-EHZ?k{{(gWj+5JOM_5LGNyJj+Y8s}5tQE)C) z{R^PReFaoMM&Md_8PvSE2g+Xl2EG>l8~&eQhmojrh<7JTntx2&G#5;p4G)t;lF`hNnHp3a7E zfEPl&?_E&sNum0EBh>po0`>fz?)=kG?Rp5Ro`<3I@)VT4d>^WxFTkbn*g|HH=R@^- zD^$CxP|vlX^mZ-Odv1jq?>nK&KL|B%9*1v)&q9XE{0lrC&Z5&Z;c}?@&WCE(PKZgF z6skX;bk{!xH*)?k+yD>92p)nLz@y>Mp!6{lC8{5Dq4cyI%0AA6va3ts>)=kP=K^>* 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 SFW3v(@8-G%zVhtk(Ek7&?xh|8 diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po index c2ae0ae4c..25c3aa262 100644 --- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po +++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po @@ -37,6 +37,12 @@ msgstr "Read the documentation" msgid "download the extension" msgstr "Download the extension" +msgid "Firefox Add-On" +msgstr "Firefox Add-On" + +msgid "Chrome Extension" +msgstr "Chrome Extension" + msgid "via F-Droid" msgstr "via F-Droid" @@ -79,6 +85,9 @@ msgstr "Latest dev version" msgid "A more recent development version is available." msgstr "A more recent development version is available." +msgid "You can clear cache to check the latest release." +msgstr "You can clear the cache to check for the latest release." + msgid "Feeds" msgstr "Feeds" @@ -140,14 +149,26 @@ msgstr "Repeat your new password:" msgid "Import" msgstr "Import" +msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." +msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any file in appropriate JSON or HTML format." + msgid "" "Please execute the import script locally as it can take a very long time." msgstr "" "Please execute the import script locally as it can take a very long time." +msgid "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." +msgstr "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." + +msgid "You can click here to fetch content for articles with no content." +msgstr "Fetch content for articles with no content" + msgid "More info in the official documentation:" msgstr "More info in the official documentation:" +msgid "(?)" +msgstr "(?)" + msgid "Import from Pocket" msgstr "Import from Pocket" @@ -176,12 +197,18 @@ msgstr "to download your database." msgid "to export your wallabag data." msgstr "to export your wallabag data." +msgid "Export JSON" +msgstr "Export JSON" + msgid "Cache" msgstr "Cache" msgid "to delete cache." msgstr "to delete cache." +msgid "Delete Cache" +msgstr "Delete Cache" + msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." @@ -417,6 +444,9 @@ msgstr "by filling this field" msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" +msgid "Drag & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" + msgid "your version" msgstr "your version" @@ -576,14 +606,13 @@ msgid "Type here your password" msgstr "Enter your password" msgid "You are the only user, you cannot delete your own account." -msgstr "You are the only user, you cannot delete your own account." +msgstr "You cannot delete your account because you are the only user." msgid "" "To completely remove wallabag, delete the wallabag folder on your web server " "(and eventual databases)." msgstr "" -"To completely remove wallabag, delete the wallabag folder on your web server " -"(and eventual databases)." +"To completely remove wallabag, delete the wallabag folder and database(s) from your web server." msgid "Enter your search here" msgstr "Enter your search here" diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index d4958ccb2..3dd382700 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 "Export your wallabag data" %}

    -

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

    - -

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

    -

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

    +

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

    {% 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 "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 %} diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index ce3148606..f77021aab 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 03de6b9b7..dec848f23 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 %} From ac8b064f478376d75d0f23266c39aa237269b374 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 09:11:25 -0500 Subject: [PATCH 4/6] Restoring change password section in config --- themes/baggy/config.twig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 3dd382700..2fd5ce287 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' %}

    From 94888d5fd424af1330e7bd01d017b7629293cb2b Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 09:13:42 -0500 Subject: [PATCH 5/6] Removing title text from bookmarklet --- themes/baggy/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 2fd5ce287..2b967cd4a 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" %}

    From efd0a9f5f11c85fc216f2c8f05b377e7f8680a12 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 12:06:44 -0500 Subject: [PATCH 6/6] Applying changes to config.twig to default theme as well --- themes/default/config.twig | 129 ++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/themes/default/config.twig b/themes/default/config.twig index 36b66e884..082e179f5 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 %}