composer.phar
db/poche.sqlite
inc/poche/config.inc.php
-inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
\ No newline at end of file
+inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
+.vagrant
\ No newline at end of file
--- /dev/null
+
+$script_sqlite = <<SCRIPT
+apt-get update
+apt-get install -y apache2 php5 php5-sqlite php5-xdebug
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+$script_mysql = <<SCRIPT
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y apache2 php5 php5-mysql php5-xdebug mysql-server mysql-client
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+service mysql restart
+echo "create database wallabag;" | mysql -u root
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+$script_postgres = <<SCRIPT
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y apache2 php5 php5-pgsql php5-xdebug postgresql postgresql-contrib
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+service postgresql restart
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+Vagrant.configure("2") do |config|
+
+ config.vm.define "sqlite" do |m|
+ m.vm.box = "ubuntu/trusty64"
+ m.vm.provision "shell", inline: $script_sqlite
+ m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+ end
+
+ config.vm.define "mysql" do |m|
+ m.vm.box = "ubuntu/trusty64"
+ m.vm.provision "shell", inline: $script_mysql
+ m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+ end
+
+ config.vm.define "postgres" do |m|
+ m.vm.box = "ubuntu/trusty64"
+ m.vm.provision "shell", inline: $script_postgres
+ m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+ end
+
+ config.vm.define "debian7" do |m|
+ m.vm.box = "chef/debian-7.6"
+ m.vm.provision "shell", inline: $script_sqlite
+ m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+ end
+
+ config.vm.define "debian6" do |m|
+ m.vm.box = "chef/debian-6.0.10"
+ m.vm.provision "shell", inline: $script_sqlite
+ m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+ end
+
+ config.vm.network :forwarded_port, guest: 80, host: 8003
+ #config.vm.network "public_network", :bridge => "en0: Wi-Fi (AirPort)"
+end
var $msgId;\r
var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' );\r
var $msgClass = 'messages';\r
- var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>X</a>\n%s</div>\n";\r
+ var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>×</a>\n%s</div>\n";\r
var $msgBefore = '<p>';\r
var $msgAfter = "</p>\n";\r
\r
<li><label for="mysql_server">Server</label> <input type="text" placeholder="localhost" id="mysql_server" name="mysql_server" /></li>
<li><label for="mysql_database">Database</label> <input type="text" placeholder="wallabag" id="mysql_database" name="mysql_database" /></li>
<li><label for="mysql_user">User</label> <input type="text" placeholder="user" id="mysql_user" name="mysql_user" /></li>
- <li><label for="mysql_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li>
+ <li><label for="mysql_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li>
</ul>
</li>
<li>
<li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
<li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
<li><label for="pg_user">User</label> <input type="text" placeholder="user" id="pg_user" name="pg_user" /></li>
- <li><label for="pg_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
+ <li><label for="pg_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
</ul>
</li>
</ul>
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"
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 fil in appropriate JSON or HTML format."
+
msgid ""
"Please execute the import script locally as it can take a very long time."
msgstr ""
+
+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."
"Please execute the import script locally as it can take a very long time."
+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 "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+
msgid "Import from Pocket"
msgstr "Import from Pocket"
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."
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"
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 <a href=\"#cache\">clear the cache</a> 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."
"Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this "
"link</a> to get all your articles in one ebook (ePub 3 format)."
msgstr ""
-"Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"Click on <a href=\"./?epub&method=all\" title=\"Generate EPUB\">this "
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
msgid ""
"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
"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!"
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"
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 <a href=\"#cache\">clear the cache</a> to check for the latest release."
+
msgid "Feeds"
msgstr "Feeds"
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 "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+
msgid "Import from Pocket"
msgstr "Import from Pocket"
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."
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"
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"
"Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this "
"link</a> to get all your articles in one ebook (ePub 3 format)."
msgstr ""
-"Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"Click on <a href=\"./?epub&method=all\" title=\"Generate EPUB\">this "
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
msgid ""
"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
"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!"
-<div id="bagit-form" class="messages info">
+<div id="bagit-form" class="messages info popup-form">
<form method="get" action="index.php" target="_blank" id="bagit-form-form">
<h2>{% trans "Save a link" %}</h2>
- <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">×</a>
+ <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">×</a>
<input type="hidden" name="autoclose" value="1" />
<input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
<span id="add-link-result"></span>
-<div id="search-form" class="messages info">
+<div id="search-form" class="messages info popup-form">
<form method="get" action="index.php">
- <a href="javascript: void(null);" id="search-form-close" class="popup-close">×</a>
+ <h2>{%trans "Search" %}</h2>
+ <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a>
<input type="hidden" name="view" value="search"></input>
- <label>{% trans "Search" %}</label>: <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
- <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
+ <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
+ <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>
</form>
</div>
{% endblock %}
{% block content %}
<h2>{% trans "Saving articles" %}</h2>
- <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
+ <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
+ <p>
+ <form method="get" action="index.php">
+ <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
+ <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
+ <input type="submit" value="{% trans "bag it!" %}" />
+ </form>
+ </p>
+ <h3>Browser Plugins</h3>
<ul>
- <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
- <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
- <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
- <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
- <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
- <li>
- <form method="get" action="index.php">
- <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
- <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
- <input type="submit" value="{% trans "bag it!" %}" />
- </form>
- </li>
- <li>{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
+ <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
</ul>
-
- <h2>{% trans "Upgrading wallabag" %}</h2>
+ <h3>Mobile Apps</h3>
<ul>
- <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
- <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
- {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+ <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
+ <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
+ <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
</ul>
- <p>{% trans "You can clear cache to check the latest release." %}</p>
+ <h3>{% trans "Bookmarklet" %}</h3>
+ <p>
+ {% trans "Drag & drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
+ </p>
<h2>{% trans "Feeds" %}</h2>
{% if token == '' %}
<li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
<li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
</ul>
- <p>{% trans "Your token:" %} <strong>{{token}}</strong></p>
- <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
- <p>{% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}</p>
+ <p class="more-info">
+ {% trans "Your token:" %} <strong>{{token}}</strong><br>
+ {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
+ {% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}
+ </p>
{% endif %}
<h2>{% trans "Change your theme" %}</h2>
<input type="hidden" name="token" value="{{ token }}">
</form>
+ <h2><a name="import"></a>{% trans "Import" %}</h2>
+ <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
+ <p>{% 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." %}</p>
+ <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
+ <fieldset class="w500p">
+ <div class="row">
+ <label class="col w150p" for="file">{% trans "File:" %}</label>
+ <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
+ </div>
+ <div class="row mts txtcenter">
+ <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+ </div>
+ </fieldset>
+ </form>
+ <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
+ <p class="more-info">{% 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)." %}</p>
+
+ <h2>{% trans "Export your wallabag data" %}</h2>
+ <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
+ <span class="more-info">Data will be exported in a single JSON file.</span></p>
+
+ <h2>{% trans "Fancy an E-Book ?" %}</h2>
+ <p><a href="./?epub&method=all" title="Generate ePub">Download E-Book</a><br>
+ <span class="more-info">{% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
+
+ <h2><a name="cache"></a>{% trans "Cache" %}</h2>
+ <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
+ <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
+
{% if http_auth == 0 %}
<h2>{% trans "Change your password" %}</h2>
<form method="post" action="?config" name="loginform">
</form>
{% endif %}
- <h2>{% trans "Import" %}</h2>
- <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
- <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>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)." %}</p>
- <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
- <fieldset class="w500p">
- <div class="row">
- <label class="col w150p" for="file">{% trans "File:" %}</label>
- <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
- </div>
- <div class="row mts txtcenter">
- <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
- </div>
- </fieldset>
- </form>
- <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-
- <h2>{% trans "Export your wallabag data" %}</h2>
- <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
-
- <h2>{% trans "Fancy an E-Book ?" %}</h2>
- <p>{% trans "Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
- <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
-
- <h2>{% trans "Cache" %}</h2>
- <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
-
<h2>{% trans 'Add user' %}</h2>
- <p>{% trans 'Add a new user :' %}</p>
<form method="post" action="?newuser">
<fieldset class="w500p">
<div class="row">
<input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
</div>
<div class="row mts txtcenter">
- <button type="submit">{% trans "Send" %}</button>
+ <button type="submit">{% trans "Add user" %}</button>
</div>
</fieldset>
</form>
<input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
</div>
<div class="row mts txtcenter">
- <button type="submit">{% trans "Send" %}</button>
+ <button type="submit">{% trans "Delete account" %}</button>
</div>
</form>
- {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+ {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
+ <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+
+ <h2>{% trans "Upgrading wallabag" %}</h2>
+ <ul>
+ <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+ <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+ {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+ </ul>
+ <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
+
{% endblock %}
text-transform: uppercase;
}
-p, li {
+p, li, label {
color: #666;
}
form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
border: 1px solid #999;
padding: 0.5em 1em;
- margin-left: 5px;
min-width: 12em;
color: #666;
}
}
}
-fieldset label {
- min-width: 12.5em;
-}
-
.inline .row {
display: inline-block;
margin-right: 0.5em;
fieldset label {
display: inline-block;
- margin-right: 0.5em;
+ min-width: 12.5em;
color: #666;
}
+label {
+ margin-right: 0.5em;
+}
+
form .row {
margin-bottom: 0.5em;
}
#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;
margin-bottom: 2em;
}
-.estimatedTime a {
+.estimatedTime .reading-time {
color: #999;
font-style: italic;
font-weight: normal;
.entrie h2 {
text-transform: none;
margin-bottom: 0;
+ line-height: 1.2;
}
.entrie h2:after {
2.1 = "save a link" related styles
========================================================================== */
-#bagit-form, #search-form {
+.popup-form {
background: rgba(0,0,0,0.5);
position: absolute;
top: 0;
height: 100%;
width: 100%;
margin: 0;
- margin-top: -30%;
+ margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
padding: 2em;
display: none;
border-left: 1px #EEE solid;
}
-#bagit-form form, #search-form form {
- background: #FFF;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 20;
- border: 10px solid #000;
- width: 400px;
- height: 200px;
- /* margin: -150px 0 0 -300px; */
- padding: 2em;
-}
+ .popup-form form {
+ background: #FFF;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 20;
+ border: 10px solid #000;
+ width: 400px;
+ height: 200px;
+ padding: 2em;
+ }
#bagit-form-form .addurl {
margin-left: 0;
}
-.popup-close {
+.closeMessage,
+.close-button {
background: #000;
color: #FFF;
- font-size: 1.4em;
- line-height: 1.6em;
+ font-size: 1.2em;
+ line-height: 1.6;
width: 1.6em;
height: 1.6em;
text-align: center;
text-decoration: none;
+}
+ .closeMessage:hover,
+ .closeMessage:focus,
+ .close-button:hover,
+ .close-button:focus {
+ background: #999;
+ color: #000;
+ }
+
+.close-button--popup {
display: inline-block;
position: absolute;
top: 0;
right: 0;
+ font-size: 1.4em;
}
- .popup-close:hover {
- background: #999;
- color: #000;
- }
.active-current {
background-color: #999;
font-size: 0.9em;
}
-/* ==========================================================================
- 2.2 = "search for articles" popup div related styles
- ========================================================================== */
-#search-form {
- background: rgba(0,0,0,0.5);
- position: absolute;
- top: 0;
- left: 10em;
- z-index: 20;
- height: 100%;
- width: 100%;
- margin: 0;
- margin-top: -30%;
- padding: 2em;
- display: none;
- border-left: 1px #EEE solid;
-}
-
-#search-form form {
- background: #FFF;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 20;
- border: 10px solid #000;
- width: 400px;
- height: 200px;
- /* margin: -150px 0 0 -300px; */
- padding: 2em;
-}
-
-#submit-search{
-margin-left: 4em;
-margin-top:1em;
-}
-
/* ==========================================================================
3 = Pictos
========================================================================== */
.messages > * { display: inline-block;}
-.closeMessage {
- background: #000;
- color: #FFF;
- padding: 0.2em 0.5em;
- text-decoration: none;
-}
-
- .closeMessage:hover, .closeMessage:focus {
- background: #FFF;
- color: #000;
- }
-
.warning {
/* font-size: 3em;
color: #999;
width: 100%;
}
+.more-info {
+ font-size: 0.85em;
+ line-height: 1.5;
+ color: #aaa;
+}
+
+ .more-info a {
+ color: #aaa;
+ }
+
/* ==========================================================================
5 = Article
========================================================================== */
margin: 0;
}
+#article h1 {
+ text-align: left;
+}
+
#article h2, #article h3, #article h4 {
text-transform: none;
}
height: auto;
padding-top: 3em;
}
+ #links.menu--open {
+ display: block;
+ }
footer {
position: static;
margin-right: 3em;
display: none;
}
- #bagit-form, #search-form {
+ .popup-form, #bagit-form, #search-form {
left: 0;
+ width: 100%;
+ border-left: none;
+ }
+
+ .popup-form form,
+ #bagit-form form,
+ #search-form form {
+ width: 100%;
}
}
<div id="entry-{{ entry.id|e }}" class="entrie">
<h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
{% if entry.content| getReadingTime > 0 %}
- <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
+ <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
{% else %}
- <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
+ <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
{% endif %}
<ul class="tools links">
<li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
{% endfor %}
</div>
{{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% endif %}{% endif %}
+ {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %}
- {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
-{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
+ {% if searchterm is defined %}<p><a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
+{% trans "Tag these results as" %} {{ searchterm }}</p></a>{% endif %}
- {% 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>
- {% 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>
- {% 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 %}
+ {% if tag %}<p><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" %}</p></a>
+ {% elseif search_term is defined %}<p><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" %}</p></a>
+ {% else %}<p><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></p>{% endif %}
{% endif %}
{% endblock %}
========================================================================== */
$("#menu").click(function(){
- $("#links").toggle();
+ $("#links").toggleClass('menu--open');
+ if ($('#content').hasClass('opacity03')) {
+ $('#content').removeClass('opacity03');
+ }
});
/* ==========================================================================
{% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
<div class="row">
<label class="col w150p" for="login">{% trans "Username" %}</label>
- <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
+ <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
</div>
<div class="row">
<label class="col w150p" for="password">{% trans "Password" %}</label>
- <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
+ <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
</div>
<div class="row">
- <label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
+
<div class="col">
- <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3">
+ <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
<small class="inbl">{% trans "(Do not check on public computers)" %}</small>
</div>
</div>
{% endblock %}
{% block content %}
<h2>{% trans "Saving articles" %}</h2>
- <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
+ <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
+ <p>
+ <form method="get" action="index.php">
+ <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
+ <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
+ <input type="submit" value="{% trans "bag it!" %}" />
+ </form>
+ </p>
+ <h3>Browser Plugins</h3>
<ul>
- <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
- <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
- <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
- <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
- <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
- <li>
- <form method="get" action="index.php">
- <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
- <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
- <input type="submit" value="{% trans "bag it!" %}" />
- </form>
- </li>
- <li>{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
+ <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
</ul>
-
- <h2>{% trans "Upgrading wallabag" %}</h2>
+ <h3>Mobile Apps</h3>
<ul>
- <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
- <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>
- {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>{% endif %}
+ <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
+ <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
+ <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
</ul>
+ <h3>{% trans "Bookmarklet" %}</h3>
+ <p>
+ {% trans "Drag & drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
+ </p>
<h2>{% trans "Feeds" %}</h2>
{% if token == '' %}
<li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
<li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
</ul>
- <p>{% trans "Your token:" %} <strong>{{token}}</strong></p>
- <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
- <p>{% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}</p>
+ <p class="more-info">
+ {% trans "Your token:" %} <strong>{{token}}</strong><br>
+ {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
+ {% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}
+ </p>
{% endif %}
<h2>{% trans "Change your theme" %}</h2>
<form method="post" action="?updatetheme" name="changethemeform">
- <fieldset class="w500p">
+ <fieldset class="w500p inline">
<div class="row">
<label class="col w150p" for="theme">{% trans "Theme:" %}</label>
<select class="col" id="theme" name="theme">
<h2>{% trans "Change your language" %}</h2>
<form method="post" action="?updatelanguage" name="changelanguageform">
- <fieldset class="w500p">
+ <fieldset class="w500p inline">
<div class="row">
<label class="col w150p" for="language">{% trans "Language:" %}</label>
<select class="col" id="language" name="language">
<input type="hidden" name="token" value="{{ token }}">
</form>
+ <h2><a name="import"></a>{% trans "Import" %}</h2>
+ <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
+ <p>{% 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." %}</p>
+ <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
+ <fieldset class="w500p">
+ <div class="row">
+ <label class="col w150p" for="file">{% trans "File:" %}</label>
+ <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
+ </div>
+ <div class="row mts txtcenter">
+ <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+ </div>
+ </fieldset>
+ </form>
+ <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
+ <p class="more-info">{% 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)." %}</p>
+
+ <h2>{% trans "Export your wallabag data" %}</h2>
+ <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
+ <span class="more-info">Data will be exported in a single JSON file.</span></p>
+
+ <h2>{% trans "Fancy an E-Book ?" %}</h2>
+ <p><a href="./?epub&method=all" title="Generate ePub">Download E-Book</a><br>
+ <span class="more-info">{% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
+
+ <h2><a name="cache"></a>{% trans "Cache" %}</h2>
+ <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
+ <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
+
{% if http_auth == 0 %}
<h2>{% trans "Change your password" %}</h2>
<form method="post" action="?config" name="loginform">
<input type="hidden" name="token" value="{{ token }}">
</form>
{% endif %}
-
- <h2>{% trans "Import" %}</h2>
- <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
- <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>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)." %}</p>
- <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
- <fieldset class="w500p">
- <div class="row">
- <label class="col w150p" for="file">{% trans "File:" %}</label>
- <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
- </div>
- <div class="row mts txtcenter">
- <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
- </div>
- </fieldset>
- </form>
- <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-
- <h2>{% trans "Export your wallabag data" %}</h2>
- <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
-
- <h2>{% trans "Cache" %}</h2>
- <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
-
- <h2>{% trans "Fancy an E-Book ?" %}</h2>
- <p>{% trans "Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
- <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
<h2>{% trans 'Add user' %}</h2>
- <p>{% trans 'Add a new user :' %}</p>
<form method="post" action="?newuser">
<fieldset class="w500p">
<div class="row">
<label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
- <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
+ <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
</div>
<div class="row">
<label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
- <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
+ <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
</div>
<div class="row">
<label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
<input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
</div>
<div class="row mts txtcenter">
- <button type="submit">{% trans "Send" %}</button>
+ <button type="submit">{% trans "Add user" %}</button>
</div>
</fieldset>
</form>
-
+
<h2>{% trans "Delete account" %}</h2>
{% if not only_user %}<form method="post" action="?deluser">
<p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
<input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
</div>
<div class="row mts txtcenter">
- <button type="submit">{% trans "Send" %}</button>
+ <button type="submit">{% trans "Delete account" %}</button>
</div>
</form>
- {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+ {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
+ <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+
+ <h2>{% trans "Upgrading wallabag" %}</h2>
+ <ul>
+ <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+ <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+ {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+ </ul>
+ <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
+
{% endblock %}
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;
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;*/
}
font-family: "Courier New", Courier, monospace;
border: 1px solid #ddd;
font-size: 0.96em;
-}
\ No newline at end of file
+}
$(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
+});
$('#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
projects / github / wallabag / wallabag.git / commitdiff
