CS

author: Jeremy <jeremy.benoist@gmail.com> 2015-01-31 19:09:34 +0100
committer: Jeremy <jeremy.benoist@gmail.com> 2015-01-31 19:12:49 +0100
commit: 7df80cb32ca9b7d0fe452320ddc3563a1e373e2f (patch)
tree: c07eb79213d471aa33c49ef4e5819e41cc12f242 /src/Wallabag/CoreBundle/Resources
parent: 1990517b2263a080946853ed697a6d687262ae80 (diff)
download: wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.tar.gz
wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.tar.zst
wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.zip
27 files changed, 33 insertions, 38 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing.yml b/src/Wallabag/CoreBundle/Resources/config/routing.yml
index 327d49d8..ec1d23cc 100644
--- a/src/Wallabag/CoreBundle/Resources/config/routing.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/routing.yml
@@ -1,3 +1,3 @@
 _wllbg:
    resource: "@WallabagCoreBundle/Controller/EntryController.php"
-    type:     annotation
-\ No newline at end of file
+    type:     annotation
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml b/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
index c876adfb..d3af6b72 100644
--- a/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
@@ -1,4 +1,4 @@
 entries:
  type: rest
  resource:     "WallabagCoreBundle:WallabagRest"
-  name_prefix:  api_
-\ No newline at end of file
+  name_prefix:  api_
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.xml b/src/Wallabag/CoreBundle/Resources/config/services.xml
index d5bc5cca..859665ca 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.xml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.xml
@@ -25,5 +25,3 @@
    </services>
 </container>
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 78dfa7c0..edb15d55 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -101,4 +101,4 @@
            });
        });
    </script>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index df6926a0..b6de7d23 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -8,4 +8,4 @@
 {% block content %}
    {{ form(form) }}
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index 0585ecca..b8d3c7b6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -30,11 +30,11 @@
    <p>{% trans %}wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted.{% endtrans %}</p>
    <h2>{% trans %}Getting help{% endtrans %}</h2>
-    
    <dl>
        <dt>{% trans %}Documentation{% endtrans %}</dt>
        <dd><a href="https://doc.wallabag.org/">Online documentation</a></dd>
-        
        <dt>{% trans %}Support{% endtrans %}</dt>
        <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
    </dl>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
index d432909a..fd662c19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
@@ -1,3 +1,3 @@
        <script type="text/javascript">
          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
-        </script>
-\ No newline at end of file
+        </script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
index c897a97e..26411da9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
@@ -1,3 +1,3 @@
        <footer class="w600p center mt3 mb3 smaller txtright">
            <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
-        </footer>
-\ No newline at end of file
+        </footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index 7ef79a2f..f123183b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
@@ -37,4 +37,3 @@
        <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
        <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
        <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
index 3065ce44..2e3b6d08 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
@@ -12,4 +12,3 @@
                <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
                <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
            </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
index 6031f489..c5c07d49 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
@@ -160,7 +160,7 @@
                </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>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
index 4078fbb0..ae3f086c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
@@ -28,4 +28,4 @@
        </div>
 {% include '_footer.twig' %}
    </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
index 58290e9c..d4eb46d2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
@@ -17,7 +17,7 @@
                                                <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">
-                                                
                                                <div class="col">
                                                        <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>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
index 61996353..c7e2f66e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
@@ -1,3 +1,3 @@
        <script type="text/javascript">
          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
-        </script>
-\ No newline at end of file
+        </script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
index 213a4aca..25539f6b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
@@ -1,4 +1,4 @@
        <footer class="w600p center mt3 mb3 smaller txtright">
            <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
-        </footer>
-\ No newline at end of file
+        </footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
index c59b7a15..63a2d3e2 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
@@ -2,7 +2,7 @@
 <!--
  $(document).ready(function() {
        $("body").css("cursor", "wait");
-        
    setTimeout(function(){
      window.location = './?import';
    }, {{ import.delay }} );
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
index eedf84f1..83fa3717 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
@@ -11,4 +11,3 @@
            </ul>
            {% include '_pocheit-form.twig' %}
            {% include '_search-form.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
index 679aa098..b8481494 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
@@ -1 +1 @@
-                {{ messages | raw }}
-\ No newline at end of file
+                {{ messages | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
index 0cf6097a..70f97356 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
@@ -1,4 +1,4 @@
-<div id="search-form" class="messages info">                    
+<div id="search-form" class="messages info">
 <form method="get" action="index.php">
    <p>
                <input type="hidden" name="view" value="search"></input>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/default/about.twig
index 50ffd8ef..7ddb19d6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/about.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/about.twig
@@ -70,5 +70,5 @@
        <dt>PHPePub</dt>
        <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd>
-    </dl> 
+    </dl>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/default/config.twig
index b7d91937..6769da74 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/config.twig
@@ -45,7 +45,7 @@
              {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
            </p>
            {% endif %}
-            
            <h2>{% trans "Change your theme" %}</h2>
            <form method="post" action="?updatetheme" name="changethemeform">
                <fieldset class="w500p inline">
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/default/export.twig
index 4adb9540..18a98a87 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/export.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/export.twig
@@ -1 +1 @@
-{{ export }}
-\ No newline at end of file
+{{ export }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
index dfebc3ea..d32395a2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
@@ -28,4 +28,4 @@
        </div>
 {% include '_footer.twig' %}
    </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
index e5be748e..47359ed1 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
@@ -15,4 +15,4 @@
    {% endfor %}
  </div>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/default/view.twig
index 8f3a26c3..154de1e4 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/view.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/view.twig
@@ -42,7 +42,7 @@
        <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
        <script type="text/javascript">
        $(document).ready(function() {
-        
                        // toggle read property of current article
                        $('#markAsRead').click(function(){
                                $("body").css("cursor", "wait");
@@ -50,11 +50,11 @@
                                            function( data ) {
                                        if ( data == '1' ) {
                                                if ( $('#markAsRead').hasClass("archive-off") ) {
-                                                        $('#markAsRead').removeClass("archive-off");    
+                                                        $('#markAsRead').removeClass("archive-off");
                                                        $('#markAsRead').addClass("archive");
                                                }
                                                else {
-                                                        $('#markAsRead').removeClass("archive");        
+                                                        $('#markAsRead').removeClass("archive");
                                                        $('#markAsRead').addClass("archive-off");
                                                }
                                        }
@@ -64,7 +64,7 @@
                                      });
                                            $("body").css("cursor", "auto");
                                          });
-                                          
                                          // toggle favorite property of current article
                        $('#setFav').click(function(){
                                $("body").css("cursor", "wait");
@@ -72,11 +72,11 @@
                                            function( data ) {
                                        if ( data == '1' ) {
                                                if ( $('#setFav').hasClass("fav-off") ) {
-                                                        $('#setFav').removeClass("fav-off");    
+                                                        $('#setFav').removeClass("fav-off");
                                                        $('#setFav').addClass("fav");
                                                }
                                                else {
-                                                        $('#setFav').removeClass("fav");        
+                                                        $('#setFav').removeClass("fav");
                                                        $('#setFav').addClass("fav-off");
                                                }
                                        }
@@ -86,8 +86,8 @@
                                      });
                                            $("body").css("cursor", "auto");
                                          });
-        
-                                                // set percent of read on startup       
+                                                // set percent of read on startup
                        if ( $(document).height() <= $(window).innerHeight() ) {
                          pp = 100;
                        }
@@ -95,7 +95,7 @@
                                pp = 0;
                        }
                        $('#readLeftPercent').text( pp + '%' );
-                        
            $(window).scroll(function(e){
                var scrollTop = $(window).scrollTop();
@@ -103,7 +103,7 @@
                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 + '%' );
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
index 9c39ea9f..d1aacc47 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
@@ -23,4 +23,4 @@
        </div>
        {% include "WallabagCoreBundle::_footer.html.twig" %}
    </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index 1f1753a4..f062672c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -30,4 +30,4 @@
    </div>
    {% include "WallabagCoreBundle::_footer.html.twig" %}
    </body>
-</html>
-\ No newline at end of file
+</html>
author	Jeremy <jeremy.benoist@gmail.com>	2015-01-31 19:09:34 +0100
committer	Jeremy <jeremy.benoist@gmail.com>	2015-01-31 19:12:49 +0100
commit	7df80cb32ca9b7d0fe452320ddc3563a1e373e2f (patch)
tree	c07eb79213d471aa33c49ef4e5819e41cc12f242 /src/Wallabag/CoreBundle/Resources
parent	1990517b2263a080946853ed697a6d687262ae80 (diff)
download	wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.tar.gz wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.tar.zst wallabag-7df80cb32ca9b7d0fe452320ddc3563a1e373e2f.zip