Merge pull request #712 from wallabag/dev1.7.0

1.7, call me "Premium version"

8 files changed, 144 insertions, 21 deletions

diff --git a/themes/default/_search-form.twig b/themes/default/_search-form.twig
index 74f420d0..33bea20d 100644..100755
--- a/themes/default/_search-form.twig
+++ b/themes/default/_search-form.twig
@@ -7,17 +7,3 @@
     </p>
 </form>
 </div>
-<script type="text/javascript">
-    $(document).ready(function() {
-
-        $("#search-form").hide();
-
-        $("#search").click(function(){
-            $("#search-form").toggle();
-            $("#search").toggleClass("current");
-            $("#search-arrow").toggleClass("arrow-down");
-        });
-
-
-    });
-</script>
\ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index bb39dea2..160f6046 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -126,4 +126,41 @@
 
             <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&amp;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' %}">
+                </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" %}">
+                </div>
+                <div class="row mts txtcenter">
+                    <button type="submit">{% trans "Send" %}</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>
+            <fieldset class="w500p">
+                <div class="row">
+                    <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
+                    <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
+                </div>
+            <div class="row mts txtcenter">
+                <button type="submit">{% trans "Send" %}</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." %}</p>{% endif %}
 {% endblock %}
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 9dc7c0b0..889a9f5c 100644..100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -52,4 +52,8 @@ a.link span {
 
 a.bad-display span {
     background-image: url('../img/default/bad-display.png');
+}
+
+a.print span {
+                background-image: url('../img/default/print.png');
 }
\ No newline at end of file
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index e536ac6b..e58ef81a 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -331,7 +331,8 @@ a.email span,
 a.delete span,
 a.link span,
 a.bad-display span,
-a.reading-time span {
+a.reading-time span,
+a.print span {
     background-repeat: no-repeat;
 }
 
@@ -383,8 +384,8 @@ a#bagit-form-close {
   background-color: #000;
   color: #fff;
   padding: 0 4px 1px 3px;
-  font-weight: bold;
-  font-size: 0.7em;
+  font-weight: bold; 
+  font-size: 0.7em; 
   border-radius: 4px;
 }
 .add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
@@ -393,6 +394,23 @@ a#bagit-form-close {
 .add-to-wallabag-link-after:visited {
   color: #999;
 }
+a.add-to-wallabag-link-after {
+    visibility: hidden;
+    position: absolute;
+    opacity: 0;
+    transition-duration: 2s;
+    transition-timing-function: ease-out;
+}
+#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
+    opacity: 1;
+    visibility: visible;
+    transition-duration: .3s;
+    transition-timing-function: ease-in;
+}
+a.add-to-wallabag-link-after:after {
+     content: "w";
+}
+
 
 #add-link-result {
   display: inline;
@@ -402,3 +420,13 @@ a#bagit-form-close {
 .opacity03 {
   /*opacity: 0.3;*/
 }
+
+#readLeftPercent {
+                display: inline-block;
+    /* Show textual content */
+    overflow: visible;
+    text-align: left;
+    text-indent: 0;
+                color: black;
+                width: 50px;
+}
\ No newline at end of file
diff --git a/themes/default/home.twig b/themes/default/home.twig
index d6cb98e8..e6c781f5 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -55,7 +55,14 @@
                 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
             </div>
                 {% endfor %}
-            {% endif %}
+
             {{ 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 tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ 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&amp;method=search&amp;search={{ 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&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
+            
+            {% endif %}
 {% endblock %}
diff --git a/themes/default/img/default/print.png b/themes/default/img/default/print.png
new file mode 100755
index 00000000..83d6445b
--- /dev/null
+++ b/themes/default/img/default/print.png
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index bee453c0..6dbce97e 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -88,7 +88,7 @@ $.fn.ready(function() {
    ========================================================================== */
 
   $("article a[href^='http']").after(function() {
-    return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\">w</a> ";
+    return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\"></a> ";
   });
 
   $(".add-to-wallabag-link-after").click(function(event){
diff --git a/themes/default/view.twig b/themes/default/view.twig
index cc491c77..b7d48c00 100755
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -7,14 +7,17 @@
                 <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li>
                 <li><a href="#top" title="{% trans "Back to top" %}" class="tool top"><span>{% trans "Back to top" %}</span></a></li>
                 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                <li><a title="{% trans "Mark as read" %}" class="tool {% 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>
-                <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "Toggle favorite" %}</span></a></li>
+                <li><a title="{% trans "Mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li>
+                <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li>
                 <li><a title="{% trans "Delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %}
+                {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
+                <li><a href="./?epub&amp;method=id&amp;id={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
+                {% if constant('SHOW_READPERCENT') == 1 %}<li><div id="readLeftPercent">0%</div></li>{% endif %}
             </ul>
         </div>
         <div id="article">
@@ -34,6 +37,60 @@
         <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
+        
+                        // toggle read property of current article
+                        $('#markAsRead').click(function(){
+                                $("body").css("cursor", "wait");
+                                            $.ajax( { url: './?action=toggle_archive&id={{ entry.id|e }}' }).done(
+                                            function( data ) {
+                                        if ( data == '1' ) {
+                                                if ( $('#markAsRead').hasClass("archive-off") ) {
+                                                        $('#markAsRead').removeClass("archive-off");    
+                                                        $('#markAsRead').addClass("archive");
+                                                }
+                                                else {
+                                                        $('#markAsRead').removeClass("archive");        
+                                                        $('#markAsRead').addClass("archive-off");
+                                                }
+                                        }
+                                        else {
+                                          alert('Error! Pls check if you are logged in.');
+                                        }
+                                      });
+                                            $("body").css("cursor", "auto");
+                                          });
+                                          
+                                          // toggle favorite property of current article
+                        $('#setFav').click(function(){
+                                $("body").css("cursor", "wait");
+                                            $.ajax( { url: './?action=toggle_fav&id={{ entry.id|e }}' }).done(
+                                            function( data ) {
+                                        if ( data == '1' ) {
+                                                if ( $('#setFav').hasClass("fav-off") ) {
+                                                        $('#setFav').removeClass("fav-off");    
+                                                        $('#setFav').addClass("fav");
+                                                }
+                                                else {
+                                                        $('#setFav').removeClass("fav");        
+                                                        $('#setFav').addClass("fav-off");
+                                                }
+                                        }
+                                        else {
+                                          alert('Error! Pls check if you are logged in.');
+                                        }
+                                      });
+                                            $("body").css("cursor", "auto");
+                                          });
+        
+                                                // set percent of read on startup       
+                        if ( $(document).height() <= $(window).innerHeight() ) {
+                          pp = 100;
+                        }
+                        else {
+                                pp = 0;
+                        }
+                        $('#readLeftPercent').text( pp + '%' );
+                        
 
             $(window).scroll(function(e){
                 var scrollTop = $(window).scrollTop();
@@ -41,6 +98,10 @@
                 var scrollPercent = (scrollTop) / (docHeight);
                 var scrollPercentRounded = Math.round(scrollPercent*100)/100;
                 savePercent({{ entry.id|e }}, scrollPercentRounded);
+                
+                // change percent of read on scroll
+                pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() ));
+                $('#readLeftPercent').text( pp + '%' );
             });
 
             retrievePercent({{ entry.id|e }});