Merge pull request #104 from SURFnet/feature/sms-prove-posession-lini…

…ng-out-buttons Format SMS posession proving form
OpenConext · Jun 14, 2016 · bd42d58 · bd42d58
2 parents 381e442 + 625407d
commit bd42d58
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php
@@ -29,19 +29,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('challenge', 'text', [
             'label' => 'ss.form.ss_verify_sms_challenge.text.challenge',
             'required' => true,
-            'attr' => array(
-                'autofocus' => true,
-            )
+            'attr' => ['autofocus' => true],
+            'label_attr' => ['class' => 'pull-right'],
         ]);
-        $builder->add('verify-challenge', 'submit', [
-            'label' => 'ss.form.ss_verify_sms_challenge.button.verify_challenge',
-            'attr' => [ 'class' => 'btn btn-primary pull-right' ],
-        ]);
-        $builder->add('resend-challenge', 'anchor', [
+        $builder->add('resendChallenge', 'anchor', [
             'label' => 'ss.form.ss_verify_sms_challenge.button.resend_challenge',
             'attr' => [ 'class' => 'btn btn-default' ],
             'route' => 'ss_registration_sms_send_challenge',
         ]);
+        $builder->add('verifyChallenge', 'submit', [
+            'label' => 'ss.form.ss_verify_sms_challenge.button.verify_challenge',
+            'attr' => [ 'class' => 'btn btn-primary pull-right' ],
+        ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)

diff --git a/...pSelfService/SelfServiceBundle/Resources/views/Registration/Sms/provePossession.html.twig b/...pSelfService/SelfServiceBundle/Resources/views/Registration/Sms/provePossession.html.twig
@@ -20,6 +20,26 @@
 
     <hr>
 
-    {{ form(form) }}
+    {{ form_start(form) }}
+    <div class="row">
+        {{ form_errors(form) }}
+        <div class="col-xs-4">
+            {{ form_label(form.challenge) }}
+        </div>
+        <div class="col-xs-8">
+            {{ form_widget(form.challenge) }}
+        </div>
+    </div>
+    <div class="row">&nbsp;</div>
+    <div class="row offset-top">
+        <div class="col-xs-4">&nbsp;</div>
+        <div class="col-xs-4">
+            {{ form_row(form.resendChallenge) }}
+        </div>
+        <div class="col-xs-4">
+            {{ form_row(form.verifyChallenge) }}
+        </div>
+    </div>
+    {{ form_rest(form) }}
 
 {% endblock %}