From 7df80cb32ca9b7d0fe452320ddc3563a1e373e2f Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 31 Jan 2015 19:09:34 +0100 Subject: CS --- src/Wallabag/CoreBundle/Resources/config/routing.yml | 2 +- .../CoreBundle/Resources/config/routing_rest.yml | 2 +- .../CoreBundle/Resources/config/services.xml | 2 -- .../CoreBundle/Resources/views/Entry/entry.html.twig | 2 +- .../CoreBundle/Resources/views/Entry/new.html.twig | 2 +- .../Resources/views/Static/about.html.twig | 4 ++-- .../Resources/views/_bookmarklet.html.twig | 2 +- .../CoreBundle/Resources/views/_footer.html.twig | 2 +- .../CoreBundle/Resources/views/_head.html.twig | 1 - .../CoreBundle/Resources/views/_menu.html.twig | 1 - .../CoreBundle/Resources/views/baggy/config.twig | 2 +- .../Resources/views/baggy/layout-login.twig | 2 +- .../CoreBundle/Resources/views/baggy/login.twig | 2 +- .../Resources/views/default/_bookmarklet.twig | 2 +- .../CoreBundle/Resources/views/default/_footer.twig | 2 +- .../CoreBundle/Resources/views/default/_import.twig | 2 +- .../CoreBundle/Resources/views/default/_menu.twig | 1 - .../Resources/views/default/_messages.twig | 2 +- .../Resources/views/default/_search-form.twig | 2 +- .../CoreBundle/Resources/views/default/about.twig | 2 +- .../CoreBundle/Resources/views/default/config.twig | 2 +- .../CoreBundle/Resources/views/default/export.twig | 2 +- .../CoreBundle/Resources/views/default/layout.twig | 2 +- .../CoreBundle/Resources/views/default/tags.twig | 2 +- .../CoreBundle/Resources/views/default/view.twig | 20 ++++++++++---------- .../Resources/views/layout-login.html.twig | 2 +- .../CoreBundle/Resources/views/layout.html.twig | 2 +- 27 files changed, 33 insertions(+), 38 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') 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 @@ - - 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 @@ }); }); -{% 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 @@

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

{% trans %}Getting help{% endtrans %}

- +
{% trans %}Documentation{% endtrans %}
Online documentation
- +
{% trans %}Support{% endtrans %}
http://support.wallabag.org/
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 @@ \ No newline at end of file + 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 @@ \ No newline at end of file + 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 @@ - 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 @@
  • {% trans %}about{% endtrans %}
  • {% trans %}logout{% endtrans %}
  • - 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 @@ - +

    {% trans "Delete account" %}

    {% if not only_user %}

    {% trans "You can delete your account by entering your password and validating." %}
    {% trans "Be careful, data will be erased forever (that is a very long time)." %}

    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 @@ {% include '_footer.twig' %} - \ No newline at end of file + 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 @@
    - +

    {% trans "(Do not check on public computers)" %} 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 @@ \ No newline at end of file + 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 @@

    {% trans "powered by" %} wallabag

    {% if constant('DEBUG_POCHE') == 1 %}

    {% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}

    {% endif %} -
    \ No newline at end of file + 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 @@