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

diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
index 4688aeefcd01839d2f435c18684d49adb822fadf..30cc8bebd8e0c3dea8243327f4e79b11e218fdfa 100644 (file)
--- 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 79feae65863145e17af160b570c8d26cb738bc2e..cb6b5e65b13d49987fb3735645f71bdc71fe70c6 100644 (file)
--- 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 061f46312bd22178c718add5ab13302f62c50c0b..5cbe1c3915569226f1c09288747c68e4bb8bc696 100644 (file)
--- 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 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}You will create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}</p>
+                <p>{% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}</p>
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
+
                 <div class="input-field col s12">
                     {{ form_label(form.redirect_uris) }}
                     {{ form_errors(form.redirect_uris) }}
                     {{ form_widget(form.redirect_uris) }}
                 </div>
-                <div class="hidden">{{ form_rest(form) }}</div>
 
                 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
-                <button class="btn waves-effect waves-light" type="submit" name="action">
-                    {% trans %}Create new client{% endtrans %}
-                </button>
+                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+
+                {{ form_rest(form) }}
             </div>
 
         </div>

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 8e3966b9a847f9319fd4f4657b97120926f41f55..a2a28d508bc5f4b01e696d6114f49196936d5484 100644 (file)
--- 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 @@
                 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
                 <a href="{{ path('howto-firstapp') }}" class="btn waves-effect waves-light">{% trans %}Read the howto "Create my first application"{% endtrans %}</a>
             </div>
-            </div>
-
         </div>
     </div>
 </div>

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 497bb3085fe6add288084cb433cdeb022a9d88aa..88788776797d9a034e114d952169e53367d943de 100644 (file)
--- 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
         </div>
     </div>
 </div>
-    <script src="{{ asset('bundles/wallabagcore/themes/_global/js/prism.js') }}"></script>
+<script src="{{ asset('bundles/wallabagcore/themes/_global/js/prism.js') }}"></script>
 {% 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 b983883fa4f9007816be90185ce90163395057fc..87dd4a5fe6f27202c852444ba371b0c152d6d85d 100644 (file)
--- 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 @@
     </div>
 </div>
 
-
 {% 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 84604762dd8e3ab411b733a04145f5cecf18931b..7f0980660298d4f170a985746550eaa0c1a180df 100644 (file)
--- 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 %}
         <li><a href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li>
         <li><a href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
+        <li><a href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}</a></li>
         <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
         <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
     </ul>

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 061f46312bd22178c718add5ab13302f62c50c0b..5cbe1c3915569226f1c09288747c68e4bb8bc696 100644 (file)
--- 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 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}You will create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}</p>
+                <p>{% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application:{% endtrans %}</p>
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
+
                 <div class="input-field col s12">
                     {{ form_label(form.redirect_uris) }}
                     {{ form_errors(form.redirect_uris) }}
                     {{ form_widget(form.redirect_uris) }}
                 </div>
-                <div class="hidden">{{ form_rest(form) }}</div>
 
                 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
-                <button class="btn waves-effect waves-light" type="submit" name="action">
-                    {% trans %}Create new client{% endtrans %}
-                </button>
+                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+
+                {{ form_rest(form) }}
             </div>
 
         </div>

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 8e3966b9a847f9319fd4f4657b97120926f41f55..a2a28d508bc5f4b01e696d6114f49196936d5484 100644 (file)
--- 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 @@
                 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
                 <a href="{{ path('howto-firstapp') }}" class="btn waves-effect waves-light">{% trans %}Read the howto "Create my first application"{% endtrans %}</a>
             </div>
-            </div>
-
         </div>
     </div>
 </div>

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 497bb3085fe6add288084cb433cdeb022a9d88aa..88788776797d9a034e114d952169e53367d943de 100644 (file)
--- 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
         </div>
     </div>
 </div>
-    <script src="{{ asset('bundles/wallabagcore/themes/_global/js/prism.js') }}"></script>
+<script src="{{ asset('bundles/wallabagcore/themes/_global/js/prism.js') }}"></script>
 {% 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 b983883fa4f9007816be90185ce90163395057fc..87dd4a5fe6f27202c852444ba371b0c152d6d85d 100644 (file)
--- 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 @@
     </div>
 </div>
 
-
 {% 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 46aab5dcacf35dd8414494f6b03b11b83de3fd7e..82bd9a1d0bf4eaa95501b3c7a7c560fa309e2f05 100644 (file)
--- 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 @@
                 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
                 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
                 <a class="grey-text text-lighten-4 right" href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}
+                &nbsp;-&nbsp;
             </div>
         </div>
     </footer>