From 2c2308b7830e24409c6f4a52b52a616803b1a515 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 5 Mar 2016 20:04:19 +0100 Subject: [PATCH] Cleanup form - Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !) - Fix HTML syntax in client_parameters - Add developer link in baggy menu - Fix space between link in material footer --- .../CoreBundle/Controller/DeveloperController.php | 2 +- src/Wallabag/CoreBundle/Form/Type/ClientType.php | 2 +- .../views/themes/baggy/Developer/client.html.twig | 10 +++++----- .../themes/baggy/Developer/client_parameters.html.twig | 2 -- .../views/themes/baggy/Developer/howto_app.html.twig | 2 +- .../views/themes/baggy/Developer/index.html.twig | 1 - .../Resources/views/themes/baggy/layout.html.twig | 1 + .../views/themes/material/Developer/client.html.twig | 10 +++++----- .../material/Developer/client_parameters.html.twig | 2 -- .../themes/material/Developer/howto_app.html.twig | 2 +- .../views/themes/material/Developer/index.html.twig | 1 - .../Resources/views/themes/material/layout.html.twig | 1 + 12 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php index 4688aeef..30cc8beb 100644 --- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php +++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php @@ -35,7 +35,7 @@ class DeveloperController extends Controller $clientForm->handleRequest($request); if ($clientForm->isValid()) { - $client->setAllowedGrantTypes(array('token', 'authorization_code','password')); + $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password')); $em->persist($client); $em->flush(); diff --git a/src/Wallabag/CoreBundle/Form/Type/ClientType.php b/src/Wallabag/CoreBundle/Form/Type/ClientType.php index 79feae65..cb6b5e65 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ClientType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ClientType.php @@ -15,7 +15,7 @@ class ClientType extends AbstractType { $builder ->add('redirect_uris', UrlType::class, array('required' => true)) - ->add('save', SubmitType::class) + ->add('save', SubmitType::class, array('label' => 'Create new client')) ; $builder->get('redirect_uris') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig index 061f4631..5cbe1c39 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig @@ -8,20 +8,20 @@
-

{% trans %}You will create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}

+

{% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}

{{ form_start(form) }} {{ form_errors(form) }} +
{{ form_label(form.redirect_uris) }} {{ form_errors(form.redirect_uris) }} {{ form_widget(form.redirect_uris) }}
- {% trans %}Back{% endtrans %} - + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + + {{ form_rest(form) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig index 8e3966b9..a2a28d50 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig @@ -17,8 +17,6 @@ {% trans %}Back{% endtrans %} {% trans %}Read the howto "Create my first application"{% endtrans %} - - diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig index 497bb308..88788776 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig @@ -58,5 +58,5 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13 - + {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig index b983883f..87dd4a5f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig @@ -28,5 +28,4 @@ - {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 84604762..7f098066 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -56,6 +56,7 @@ {% endif %}
  • {% trans %}import{% endtrans %}
  • {% trans %}howto{% endtrans %}
    • +
  • {% trans %}Developer{% endtrans %}
  • {% trans %}about{% endtrans %}
  • {% trans %}logout{% endtrans %}
    • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig index 061f4631..5cbe1c39 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig @@ -8,20 +8,20 @@
    -

    {% trans %}You will create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}

    +

    {% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}

    {{ form_start(form) }} {{ form_errors(form) }} +
    {{ form_label(form.redirect_uris) }} {{ form_errors(form.redirect_uris) }} {{ form_widget(form.redirect_uris) }}
    - {% trans %}Back{% endtrans %} - + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + + {{ form_rest(form) }}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig index 8e3966b9..a2a28d50 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig @@ -17,8 +17,6 @@ {% trans %}Back{% endtrans %} {% trans %}Read the howto "Create my first application"{% endtrans %} - - diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig index 497bb308..88788776 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig @@ -58,5 +58,5 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13 - + {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig index b983883f..87dd4a5f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig @@ -28,5 +28,4 @@ - {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 46aab5dc..82bd9a1d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -117,6 +117,7 @@

    {% trans %}powered by{% endtrans %} wallabag

    {% trans %}About{% endtrans %} {% trans %}Developer{% endtrans %} +  -  -- 2.41.0