aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/_pocheit-form.twig4
-rw-r--r--themes/baggy/_search-form.twig9
-rwxr-xr-xthemes/baggy/config.twig120
-rwxr-xr-xthemes/baggy/css/main.css144
-rwxr-xr-xthemes/baggy/home.twig16
-rwxr-xr-xthemes/baggy/js/init.js5
-rw-r--r--themes/baggy/login.twig8
-rwxr-xr-xthemes/default/config.twig129
-rw-r--r--themes/default/css/messages.css5
-rwxr-xr-xthemes/default/css/style.css11
-rw-r--r--themes/default/js/popupForm.js69
-rwxr-xr-xthemes/default/js/saveLink.js27
12 files changed, 305 insertions, 242 deletions
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 409707f0..bf2ae903 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,7 +1,7 @@
1<div id="bagit-form" class="messages info"> 1<div id="bagit-form" class="messages info popup-form">
2 <form method="get" action="index.php" target="_blank" id="bagit-form-form"> 2 <form method="get" action="index.php" target="_blank" id="bagit-form-form">
3 <h2>{% trans "Save a link" %}</h2> 3 <h2>{% trans "Save a link" %}</h2>
4 <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a> 4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="autoclose" value="1" /> 5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <span id="add-link-result"></span> 7 <span id="add-link-result"></span>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 45660b75..73f7951f 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,8 +1,9 @@
1<div id="search-form" class="messages info"> 1<div id="search-form" class="messages info popup-form">
2<form method="get" action="index.php"> 2<form method="get" action="index.php">
3 <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a> 3 <h2>{%trans "Search" %}</h2>
4 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
4 <input type="hidden" name="view" value="search"></input> 5 <input type="hidden" name="view" value="search"></input>
5 <label>{% trans "Search" %}</label>: <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" /> 6 <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
6 <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input> 7 <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>
7</form> 8</form>
8</div> 9</div>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 3523cd08..2b967cd4 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -6,30 +6,29 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Saving articles" %}</h2> 8 <h2>{% trans "Saving articles" %}</h2>
9 <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <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>
10 <p>
11 <form method="get" action="index.php">
12 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
13 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
14 <input type="submit" value="{% trans "bag it!" %}" />
15 </form>
16 </p>
17 <h3>Browser Plugins</h3>
10 <ul> 18 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
12 <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> 20 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
13 <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>
14 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
15 <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>
16 <li>
17 <form method="get" action="index.php">
18 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
19 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
20 <input type="submit" value="{% trans "bag it!" %}" />
21 </form>
22 </li>
23 <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>
24 </ul> 21 </ul>
25 22 <h3>Mobile Apps</h3>
26 <h2>{% trans "Upgrading wallabag" %}</h2>
27 <ul> 23 <ul>
28 <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li> 24 <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>
29 <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> 25 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
30 {% 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> 26 <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>
31 </ul> 27 </ul>
32 <p>{% trans "You can clear cache to check the latest release." %}</p> 28 <h3>{% trans "Bookmarklet" %}</h3>
29 <p>
30 {% trans "Drag &amp; 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>
31 </p>
33 32
34 <h2>{% trans "Feeds" %}</h2> 33 <h2>{% trans "Feeds" %}</h2>
35 {% if token == '' %} 34 {% if token == '' %}
@@ -40,9 +39,11 @@
40 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li> 39 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
41 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li> 40 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
42 </ul> 41 </ul>
43 <p>{% trans "Your token:" %} <strong>{{token}}</strong></p> 42 <p class="more-info">
44 <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p> 43 {% trans "Your token:" %} <strong>{{token}}</strong><br>
45 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 44 {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
45 {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
46 </p>
46 {% endif %} 47 {% endif %}
47 48
48 <h2>{% trans "Change your theme" %}</h2> 49 <h2>{% trans "Change your theme" %}</h2>
@@ -83,6 +84,35 @@
83 <input type="hidden" name="token" value="{{ token }}"> 84 <input type="hidden" name="token" value="{{ token }}">
84 </form> 85 </form>
85 86
87 <h2><a name="import"></a>{% trans "Import" %}</h2>
88 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
89 <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>
90 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
91 <fieldset class="w500p">
92 <div class="row">
93 <label class="col w150p" for="file">{% trans "File:" %}</label>
94 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
95 </div>
96 <div class="row mts txtcenter">
97 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
98 </div>
99 </fieldset>
100 </form>
101 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
102 <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>
103
104 <h2>{% trans "Export your wallabag data" %}</h2>
105 <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
106 <span class="more-info">Data will be exported in a single JSON file.</span></p>
107
108 <h2>{% trans "Fancy an E-Book ?" %}</h2>
109 <p><a href="./?epub&amp;method=all" title="Generate ePub">Download E-Book</a><br>
110 <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>
111
112 <h2><a name="cache"></a>{% trans "Cache" %}</h2>
113 <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
114 <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
115
86 {% if http_auth == 0 %} 116 {% if http_auth == 0 %}
87 <h2>{% trans "Change your password" %}</h2> 117 <h2>{% trans "Change your password" %}</h2>
88 <form method="post" action="?config" name="loginform"> 118 <form method="post" action="?config" name="loginform">
@@ -104,34 +134,7 @@
104 </form> 134 </form>
105 {% endif %} 135 {% endif %}
106 136
107 <h2>{% trans "Import" %}</h2>
108 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
109 <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>
110 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
111 <fieldset class="w500p">
112 <div class="row">
113 <label class="col w150p" for="file">{% trans "File:" %}</label>
114 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
115 </div>
116 <div class="row mts txtcenter">
117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
118 </div>
119 </fieldset>
120 </form>
121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
122
123 <h2>{% trans "Export your wallabag data" %}</h2>
124 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
125
126 <h2>{% trans "Fancy an E-Book ?" %}</h2>
127 <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
128 <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>
129
130 <h2>{% trans "Cache" %}</h2>
131 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
132
133 <h2>{% trans 'Add user' %}</h2> 137 <h2>{% trans 'Add user' %}</h2>
134 <p>{% trans 'Add a new user :' %}</p>
135 <form method="post" action="?newuser"> 138 <form method="post" action="?newuser">
136 <fieldset class="w500p"> 139 <fieldset class="w500p">
137 <div class="row"> 140 <div class="row">
@@ -147,7 +150,7 @@
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> 150 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
148 </div> 151 </div>
149 <div class="row mts txtcenter"> 152 <div class="row mts txtcenter">
150 <button type="submit">{% trans "Send" %}</button> 153 <button type="submit">{% trans "Add user" %}</button>
151 </div> 154 </div>
152 </fieldset> 155 </fieldset>
153 </form> 156 </form>
@@ -161,9 +164,18 @@
161 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}"> 164 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
162 </div> 165 </div>
163 <div class="row mts txtcenter"> 166 <div class="row mts txtcenter">
164 <button type="submit">{% trans "Send" %}</button> 167 <button type="submit">{% trans "Delete account" %}</button>
165 </div> 168 </div>
166 </form> 169 </form>
167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 170 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %} 171 <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
172
173 <h2>{% trans "Upgrading wallabag" %}</h2>
174 <ul>
175 <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
176 <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>
177 {% 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>
178 </ul>
179 <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
180
169{% endblock %} 181{% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index ce30cb5a..028c8b4e 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -70,7 +70,7 @@ h2, h3, h4 {
70 text-transform: uppercase; 70 text-transform: uppercase;
71} 71}
72 72
73p, li { 73p, li, label {
74 color: #666; 74 color: #666;
75} 75}
76 76
@@ -92,7 +92,6 @@ form fieldset {
92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { 92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
93 border: 1px solid #999; 93 border: 1px solid #999;
94 padding: 0.5em 1em; 94 padding: 0.5em 1em;
95 margin-left: 5px;
96 min-width: 12em; 95 min-width: 12em;
97 color: #666; 96 color: #666;
98} 97}
@@ -105,10 +104,6 @@ form input[type="text"], select, form input[type="password"], form input[type="u
105 } 104 }
106} 105}
107 106
108fieldset label {
109 min-width: 12.5em;
110}
111
112.inline .row { 107.inline .row {
113 display: inline-block; 108 display: inline-block;
114 margin-right: 0.5em; 109 margin-right: 0.5em;
@@ -120,10 +115,14 @@ fieldset label {
120 115
121fieldset label { 116fieldset label {
122 display: inline-block; 117 display: inline-block;
123 margin-right: 0.5em; 118 min-width: 12.5em;
124 color: #666; 119 color: #666;
125} 120}
126 121
122label {
123 margin-right: 0.5em;
124}
125
127form .row { 126form .row {
128 margin-bottom: 0.5em; 127 margin-bottom: 0.5em;
129} 128}
@@ -282,12 +281,12 @@ h2:after {
282#listmode a:hover { 281#listmode a:hover {
283 opacity: 1; 282 opacity: 1;
284} 283}
285.tablemode { 284#listmode.tablemode {
286 background-image: url("../img/baggy/table.png"); 285 background-image: url("../img/baggy/table.png");
287 background-repeat: no-repeat; 286 background-repeat: no-repeat;
288 background-position: bottom; 287 background-position: bottom;
289} 288}
290.listmode { 289#listmode.listmode {
291 background-image: url("../img/baggy/list.png"); 290 background-image: url("../img/baggy/list.png");
292 background-repeat: no-repeat; 291 background-repeat: no-repeat;
293 background-position: bottom; 292 background-position: bottom;
@@ -332,7 +331,7 @@ footer a {
332 margin-bottom: 2em; 331 margin-bottom: 2em;
333} 332}
334 333
335.estimatedTime a { 334.estimatedTime .reading-time {
336 color: #999; 335 color: #999;
337 font-style: italic; 336 font-style: italic;
338 font-weight: normal; 337 font-weight: normal;
@@ -419,6 +418,7 @@ footer a {
419.entrie h2 { 418.entrie h2 {
420 text-transform: none; 419 text-transform: none;
421 margin-bottom: 0; 420 margin-bottom: 0;
421 line-height: 1.2;
422} 422}
423 423
424 .entrie h2:after { 424 .entrie h2:after {
@@ -541,7 +541,7 @@ footer a {
541 2.1 = "save a link" related styles 541 2.1 = "save a link" related styles
542 ========================================================================== */ 542 ========================================================================== */
543 543
544#bagit-form, #search-form { 544.popup-form {
545 background: rgba(0,0,0,0.5); 545 background: rgba(0,0,0,0.5);
546 position: absolute; 546 position: absolute;
547 top: 0; 547 top: 0;
@@ -550,47 +550,54 @@ footer a {
550 height: 100%; 550 height: 100%;
551 width: 100%; 551 width: 100%;
552 margin: 0; 552 margin: 0;
553 margin-top: -30%; 553 margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
554 padding: 2em; 554 padding: 2em;
555 display: none; 555 display: none;
556 border-left: 1px #EEE solid; 556 border-left: 1px #EEE solid;
557} 557}
558 558
559#bagit-form form, #search-form form { 559 .popup-form form {
560 background: #FFF; 560 background: #FFF;
561 position: absolute; 561 position: absolute;
562 top: 0; 562 top: 0;
563 left: 0; 563 left: 0;
564 z-index: 20; 564 z-index: 20;
565 border: 10px solid #000; 565 border: 10px solid #000;
566 width: 400px; 566 width: 400px;
567 height: 200px; 567 height: 200px;
568 /* margin: -150px 0 0 -300px; */ 568 padding: 2em;
569 padding: 2em; 569 }
570}
571 570
572#bagit-form-form .addurl { 571#bagit-form-form .addurl {
573 margin-left: 0; 572 margin-left: 0;
574} 573}
575 574
576.popup-close { 575.closeMessage,
576.close-button {
577 background: #000; 577 background: #000;
578 color: #FFF; 578 color: #FFF;
579 font-size: 1.4em; 579 font-size: 1.2em;
580 line-height: 1.6em; 580 line-height: 1.6;
581 width: 1.6em; 581 width: 1.6em;
582 height: 1.6em; 582 height: 1.6em;
583 text-align: center; 583 text-align: center;
584 text-decoration: none; 584 text-decoration: none;
585}
586 .closeMessage:hover,
587 .closeMessage:focus,
588 .close-button:hover,
589 .close-button:focus {
590 background: #999;
591 color: #000;
592 }
593
594.close-button--popup {
585 display: inline-block; 595 display: inline-block;
586 position: absolute; 596 position: absolute;
587 top: 0; 597 top: 0;
588 right: 0; 598 right: 0;
599 font-size: 1.4em;
589} 600}
590 .popup-close:hover {
591 background: #999;
592 color: #000;
593 }
594 601
595.active-current { 602.active-current {
596 background-color: #999; 603 background-color: #999;
@@ -644,42 +651,6 @@ a.add-to-wallabag-link-after:after {
644} 651}
645 652
646/* ========================================================================== 653/* ==========================================================================
647 2.2 = "search for articles" popup div related styles
648 ========================================================================== */
649#search-form {
650 background: rgba(0,0,0,0.5);
651 position: absolute;
652 top: 0;
653 left: 10em;
654 z-index: 20;
655 height: 100%;
656 width: 100%;
657 margin: 0;
658 margin-top: -30%;
659 padding: 2em;
660 display: none;
661 border-left: 1px #EEE solid;
662}
663
664#search-form form {
665 background: #FFF;
666 position: absolute;
667 top: 0;
668 left: 0;
669 z-index: 20;
670 border: 10px solid #000;
671 width: 400px;
672 height: 200px;
673 /* margin: -150px 0 0 -300px; */
674 padding: 2em;
675}
676
677#submit-search{
678margin-left: 4em;
679margin-top:1em;
680}
681
682/* ==========================================================================
683 3 = Pictos 654 3 = Pictos
684 ========================================================================== */ 655 ========================================================================== */
685 656
@@ -788,18 +759,6 @@ margin-top:1em;
788 759
789.messages > * { display: inline-block;} 760.messages > * { display: inline-block;}
790 761
791.closeMessage {
792 background: #000;
793 color: #FFF;
794 padding: 0.2em 0.5em;
795 text-decoration: none;
796}
797
798 .closeMessage:hover, .closeMessage:focus {
799 background: #FFF;
800 color: #000;
801 }
802
803.warning { 762.warning {
804 /* font-size: 3em; 763 /* font-size: 3em;
805 color: #999; 764 color: #999;
@@ -816,6 +775,16 @@ margin-top:1em;
816 width: 100%; 775 width: 100%;
817} 776}
818 777
778.more-info {
779 font-size: 0.85em;
780 line-height: 1.5;
781 color: #aaa;
782}
783
784 .more-info a {
785 color: #aaa;
786 }
787
819/* ========================================================================== 788/* ==========================================================================
820 5 = Article 789 5 = Article
821 ========================================================================== */ 790 ========================================================================== */
@@ -841,6 +810,10 @@ blockquote {
841 margin: 0; 810 margin: 0;
842} 811}
843 812
813#article h1 {
814 text-align: left;
815}
816
844#article h2, #article h3, #article h4 { 817#article h2, #article h3, #article h4 {
845 text-transform: none; 818 text-transform: none;
846} 819}
@@ -1029,6 +1002,9 @@ pre code {
1029 height: auto; 1002 height: auto;
1030 padding-top: 3em; 1003 padding-top: 3em;
1031 } 1004 }
1005 #links.menu--open {
1006 display: block;
1007 }
1032 footer { 1008 footer {
1033 position: static; 1009 position: static;
1034 margin-right: 3em; 1010 margin-right: 3em;
@@ -1058,8 +1034,16 @@ pre code {
1058 display: none; 1034 display: none;
1059 } 1035 }
1060 1036
1061 #bagit-form, #search-form { 1037 .popup-form, #bagit-form, #search-form {
1062 left: 0; 1038 left: 0;
1039 width: 100%;
1040 border-left: none;
1041 }
1042
1043 .popup-form form,
1044 #bagit-form form,
1045 #search-form form {
1046 width: 100%;
1063 } 1047 }
1064} 1048}
1065 1049
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 @@
41 <div id="entry-{{ entry.id|e }}" class="entrie"> 41 <div id="entry-{{ entry.id|e }}" class="entrie">
42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> 42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
43 {% if entry.content| getReadingTime > 0 %} 43 {% if entry.content| getReadingTime > 0 %}
44 <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> 44 <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
45 {% else %} 45 {% else %}
46 <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> 46 <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} <small class="inferieur">&lt;</small> 1 min</span></div>
47 {% endif %} 47 {% endif %}
48 <ul class="tools links"> 48 <ul class="tools links">
49 <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&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li> 49 <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&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
@@ -57,14 +57,14 @@
57 {% endfor %} 57 {% endfor %}
58 </div> 58 </div>
59 {{ block('pager') }} 59 {{ block('pager') }}
60 {% 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 %} 60 {% 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 %}
61 61
62 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}"> 62 {% if searchterm is defined %}<p><a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
63{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %} 63{% trans "Tag these results as" %} {{ searchterm }}</p></a>{% endif %}
64 64
65 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> 65 {% if tag %}<p><a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</p></a>
66 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> 66 {% elseif search_term is defined %}<p><a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</p></a>
67 {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} 67 {% else %}<p><a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a></p>{% endif %}
68 68
69 {% endif %} 69 {% endif %}
70{% endblock %} 70{% endblock %}
diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js
index 00470fbf..74cbae68 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/js/init.js
@@ -8,7 +8,10 @@ $.fn.ready(function() {
8 ========================================================================== */ 8 ========================================================================== */
9 9
10 $("#menu").click(function(){ 10 $("#menu").click(function(){
11 $("#links").toggle(); 11 $("#links").toggleClass('menu--open');
12 if ($('#content').hasClass('opacity03')) {
13 $('#content').removeClass('opacity03');
14 }
12 }); 15 });
13 16
14 /* ========================================================================== 17 /* ==========================================================================
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 645db376..58290e9c 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -9,17 +9,17 @@
9 {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %} 9 {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
10 <div class="row"> 10 <div class="row">
11 <label class="col w150p" for="login">{% trans "Username" %}</label> 11 <label class="col w150p" for="login">{% trans "Username" %}</label>
12 <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} /> 12 <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
13 </div> 13 </div>
14 14
15 <div class="row"> 15 <div class="row">
16 <label class="col w150p" for="password">{% trans "Password" %}</label> 16 <label class="col w150p" for="password">{% trans "Password" %}</label>
17 <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} /> 17 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
18 </div> 18 </div>
19 <div class="row"> 19 <div class="row">
20 <label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label> 20
21 <div class="col"> 21 <div class="col">
22 <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3"> 22 <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
23 <small class="inbl">{% trans "(Do not check on public computers)" %}</small> 23 <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
24 </div> 24 </div>
25 </div> 25 </div>
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 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Saving articles" %}</h2> 8 <h2>{% trans "Saving articles" %}</h2>
9 <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <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>
10 <p>
11 <form method="get" action="index.php">
12 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
13 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
14 <input type="submit" value="{% trans "bag it!" %}" />
15 </form>
16 </p>
17 <h3>Browser Plugins</h3>
10 <ul> 18 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
12 <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> 20 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
13 <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>
14 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
15 <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>
16 <li>
17 <form method="get" action="index.php">
18 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
19 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
20 <input type="submit" value="{% trans "bag it!" %}" />
21 </form>
22 </li>
23 <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>
24 </ul> 21 </ul>
25 22 <h3>Mobile Apps</h3>
26 <h2>{% trans "Upgrading wallabag" %}</h2>
27 <ul> 23 <ul>
28 <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li> 24 <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>
29 <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> 25 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
30 {% 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 %} 26 <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>
31 </ul> 27 </ul>
28 <h3>{% trans "Bookmarklet" %}</h3>
29 <p>
30 {% trans "Drag &amp; 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>
31 </p>
32 32
33 <h2>{% trans "Feeds" %}</h2> 33 <h2>{% trans "Feeds" %}</h2>
34 {% if token == '' %} 34 {% if token == '' %}
@@ -39,14 +39,16 @@
39 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li> 39 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
40 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li> 40 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
41 </ul> 41 </ul>
42 <p>{% trans "Your token:" %} <strong>{{token}}</strong></p> 42 <p class="more-info">
43 <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p> 43 {% trans "Your token:" %} <strong>{{token}}</strong><br>
44 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 44 {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
45 {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
46 </p>
45 {% endif %} 47 {% endif %}
46 48
47 <h2>{% trans "Change your theme" %}</h2> 49 <h2>{% trans "Change your theme" %}</h2>
48 <form method="post" action="?updatetheme" name="changethemeform"> 50 <form method="post" action="?updatetheme" name="changethemeform">
49 <fieldset class="w500p"> 51 <fieldset class="w500p inline">
50 <div class="row"> 52 <div class="row">
51 <label class="col w150p" for="theme">{% trans "Theme:" %}</label> 53 <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
52 <select class="col" id="theme" name="theme"> 54 <select class="col" id="theme" name="theme">
@@ -65,7 +67,7 @@
65 67
66 <h2>{% trans "Change your language" %}</h2> 68 <h2>{% trans "Change your language" %}</h2>
67 <form method="post" action="?updatelanguage" name="changelanguageform"> 69 <form method="post" action="?updatelanguage" name="changelanguageform">
68 <fieldset class="w500p"> 70 <fieldset class="w500p inline">
69 <div class="row"> 71 <div class="row">
70 <label class="col w150p" for="language">{% trans "Language:" %}</label> 72 <label class="col w150p" for="language">{% trans "Language:" %}</label>
71 <select class="col" id="language" name="language"> 73 <select class="col" id="language" name="language">
@@ -82,6 +84,35 @@
82 <input type="hidden" name="token" value="{{ token }}"> 84 <input type="hidden" name="token" value="{{ token }}">
83 </form> 85 </form>
84 86
87 <h2><a name="import"></a>{% trans "Import" %}</h2>
88 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
89 <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>
90 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
91 <fieldset class="w500p">
92 <div class="row">
93 <label class="col w150p" for="file">{% trans "File:" %}</label>
94 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
95 </div>
96 <div class="row mts txtcenter">
97 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
98 </div>
99 </fieldset>
100 </form>
101 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
102 <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>
103
104 <h2>{% trans "Export your wallabag data" %}</h2>
105 <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
106 <span class="more-info">Data will be exported in a single JSON file.</span></p>
107
108 <h2>{% trans "Fancy an E-Book ?" %}</h2>
109 <p><a href="./?epub&amp;method=all" title="Generate ePub">Download E-Book</a><br>
110 <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>
111
112 <h2><a name="cache"></a>{% trans "Cache" %}</h2>
113 <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
114 <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
115
85 {% if http_auth == 0 %} 116 {% if http_auth == 0 %}
86 <h2>{% trans "Change your password" %}</h2> 117 <h2>{% trans "Change your password" %}</h2>
87 <form method="post" action="?config" name="loginform"> 118 <form method="post" action="?config" name="loginform">
@@ -102,55 +133,28 @@
102 <input type="hidden" name="token" value="{{ token }}"> 133 <input type="hidden" name="token" value="{{ token }}">
103 </form> 134 </form>
104 {% endif %} 135 {% endif %}
105
106 <h2>{% trans "Import" %}</h2>
107 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
108 <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>
109 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
110 <fieldset class="w500p">
111 <div class="row">
112 <label class="col w150p" for="file">{% trans "File:" %}</label>
113 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
114 </div>
115 <div class="row mts txtcenter">
116 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
117 </div>
118 </fieldset>
119 </form>
120 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
121
122 <h2>{% trans "Export your wallabag data" %}</h2>
123 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
124
125 <h2>{% trans "Cache" %}</h2>
126 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
127
128 <h2>{% trans "Fancy an E-Book ?" %}</h2>
129 <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
130 <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>
131 136
132 <h2>{% trans 'Add user' %}</h2> 137 <h2>{% trans 'Add user' %}</h2>
133 <p>{% trans 'Add a new user :' %}</p>
134 <form method="post" action="?newuser"> 138 <form method="post" action="?newuser">
135 <fieldset class="w500p"> 139 <fieldset class="w500p">
136 <div class="row"> 140 <div class="row">
137 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label> 141 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
138 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}"> 142 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
139 </div> 143 </div>
140 <div class="row"> 144 <div class="row">
141 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 145 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
142 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 146 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
143 </div> 147 </div>
144 <div class="row"> 148 <div class="row">
145 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label> 149 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
146 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> 150 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
147 </div> 151 </div>
148 <div class="row mts txtcenter"> 152 <div class="row mts txtcenter">
149 <button type="submit">{% trans "Send" %}</button> 153 <button type="submit">{% trans "Add user" %}</button>
150 </div> 154 </div>
151 </fieldset> 155 </fieldset>
152 </form> 156 </form>
153 157
154 <h2>{% trans "Delete account" %}</h2> 158 <h2>{% trans "Delete account" %}</h2>
155 {% if not only_user %}<form method="post" action="?deluser"> 159 {% if not only_user %}<form method="post" action="?deluser">
156 <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> 160 <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>
@@ -160,9 +164,18 @@
160 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}"> 164 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
161 </div> 165 </div>
162 <div class="row mts txtcenter"> 166 <div class="row mts txtcenter">
163 <button type="submit">{% trans "Send" %}</button> 167 <button type="submit">{% trans "Delete account" %}</button>
164 </div> 168 </div>
165 </form> 169 </form>
166 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 170 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
167 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %} 171 <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
172
173 <h2>{% trans "Upgrading wallabag" %}</h2>
174 <ul>
175 <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
176 <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>
177 {% 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>
178 </ul>
179 <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
180
168{% endblock %} 181{% endblock %}
diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css
index 3ad4e34e..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/css/messages.css
@@ -8,11 +8,6 @@
8 border-radius: 4px; 8 border-radius: 4px;
9} 9}
10 10
11/* Search form message needs a little more width, depending on translations */
12#search-form {
13 width: 420px;
14}
15
16.messages a.closeMessage { 11.messages a.closeMessage {
17 display: none; 12 display: none;
18 float: right; 13 float: right;
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index e254d481..b25373d6 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after {
417 padding-left: 10px; 417 padding-left: 10px;
418} 418}
419 419
420/* ==========================================================================
421 "Search" popup div related styles
422 ========================================================================== */
423
424/* Search form message needs a little more width, depending on translations */
425#search-form {
426 width: 420px;
427}
428
420.opacity03 { 429.opacity03 {
421 /*opacity: 0.3;*/ 430 /*opacity: 0.3;*/
422} 431}
@@ -435,4 +444,4 @@ pre code {
435 font-family: "Courier New", Courier, monospace; 444 font-family: "Courier New", Courier, monospace;
436 border: 1px solid #ddd; 445 border: 1px solid #ddd;
437 font-size: 0.96em; 446 font-size: 0.96em;
438} \ No newline at end of file 447}
diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
index eb6d1ae2..d233e600 100644
--- a/themes/default/js/popupForm.js
+++ b/themes/default/js/popupForm.js
@@ -1,29 +1,72 @@
1$(document).ready(function() { 1$(document).ready(function() {
2 2
3 $("#search-form").hide(); 3 $("#search-form").hide();
4 $("#bagit-form").hide();
4 5
5 function closeSearch() { 6 //---------------------------------------------------------------------------
7 // Toggle the "Search" popup in the sidebar
8 //---------------------------------------------------------------------------
9 function toggleSearch() {
6 $("#search-form").toggle(); 10 $("#search-form").toggle();
7 $("#search").toggleClass("current"); 11 $("#search").toggleClass("current");
12 $("#search").toggleClass("active-current");
8 $("#search-arrow").toggleClass("arrow-down"); 13 $("#search-arrow").toggleClass("arrow-down");
14 if ($("#search").hasClass("current")) {
15 $("#content").addClass("opacity03");
16 } else {
17 $("#content").removeClass("opacity03");
18 }
9 } 19 }
10 20
11 $("#search").click(function(){ 21 //---------------------------------------------------------------------------
12 closeSearch(); 22 // Toggle the "Save a Link" popup in the sidebar
13 // if other popup is already shown 23 //---------------------------------------------------------------------------
14 if ($("#bagit-form").length != 0) { 24 function toggleBagit() {
15 $("#bagit").removeClass("active-current"); 25 $("#bagit-form").toggle();
16 $('#content').removeClass("opacity03"); 26 $("#bagit").toggleClass("current");
17 $("#bagit").removeClass("current"); 27 $("#bagit").toggleClass("active-current");
18 $("#bagit-arrow").removeClass("arrow-down"); 28 $("#bagit-arrow").toggleClass("arrow-down");
19 $("#bagit-form").hide(); 29 if ($("#bagit").hasClass("current")) {
30 $("#content").addClass("opacity03");
31 } else {
32 $("#content").removeClass("opacity03");
20 } 33 }
21 $('#searchfield').focus(); 34 }
35
36 //---------------------------------------------------------------------------
37 // Close all #links popups in the sidebar
38 //---------------------------------------------------------------------------
39 function closePopups() {
40 $("#links .messages").hide();
41 $("#links > li > a").removeClass("active-current");
42 $("#links > li > a").removeClass("current");
43 $("[id$=-arrow]").removeClass("arrow-down");
44 $("#content").removeClass("opacity03");
45 }
46
47 $("#search").click(function(){
48 closePopups();
49 toggleSearch();
50 $("#searchfield").focus();
51 });
52
53 $("#bagit").click(function(){
54 closePopups();
55 toggleBagit();
56 $("#plainurl").focus();
22 }); 57 });
23 58
24 $("#search-form-close").click(function(){ 59 $("#search-form-close").click(function(){
25 closeSearch(); 60 toggleSearch();
26 }); 61 });
27 62
63 $("#bagit-form-close").click(function(){
64 toggleBagit();
65 });
66
67 // $("#").click(function(){
68 // toggleSearch();
69 // });
70
28 71
29}); \ No newline at end of file 72});
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index b52b8a2c..a7acd84c 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -36,18 +36,21 @@ $.fn.ready(function() {
36 $('#plainurl').focus(); 36 $('#plainurl').focus();
37 } 37 }
38 38
39 39 //---------------------------------------------------------------------------
40 $bagit.click(function(){ 40 // These two functions are now taken care of in popupForm.js
41 $bagit.toggleClass("current"); 41 //---------------------------------------------------------------------------
42 $("#bagit-arrow").toggleClass("arrow-down"); 42
43 toggleSaveLinkForm(); 43 // $bagit.click(function(){
44 }); 44 // $bagit.toggleClass("current");
45 45 // $("#bagit-arrow").toggleClass("arrow-down");
46 $("#bagit-form-close").click(function(){ 46 // toggleSaveLinkForm();
47 $bagit.removeClass("current"); 47 // });
48 $("#bagit-arrow").removeClass("arrow-down"); 48
49 toggleSaveLinkForm(); 49 // $("#bagit-form-close").click(function(){
50 }); 50 // $bagit.removeClass("current");
51 // $("#bagit-arrow").removeClass("arrow-down");
52 // toggleSaveLinkForm();
53 // });
51 54
52 55
53 //send "bag it link" form request via ajax 56 //send "bag it link" form request via ajax
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 08:18:59 +0000