From 9119bf7e9a2f22e0fefd47dd4a64660690a1b512 Mon Sep 17 00:00:00 2001
From: Rhilip <rhilipruan@gmail.com>
Date: Mon, 22 Jul 2019 16:04:37 +0800
Subject: [PATCH] perf(captcha): simple captcha input

---
 apps/views/auth/login.php     | 15 +--------------
 apps/views/auth/recover.php   | 15 +--------------
 apps/views/auth/register.php  | 30 +++++++-----------------------
 apps/views/layout/captcha.php | 24 +++++++++++++++++++++---
 apps/views/links/apply.php    | 15 +--------------
 5 files changed, 31 insertions(+), 68 deletions(-)

diff --git a/apps/views/auth/login.php b/apps/views/auth/login.php
index 6ad131a..16b7a33 100644
--- a/apps/views/auth/login.php
+++ b/apps/views/auth/login.php
@@ -59,20 +59,7 @@
                         <div class="help-block">Your 2FA code, leave it blank if you haven't enable 2FA.</div>
                     </div>
 
-                    <div class="form-group">
-                        <label for="captcha">Captcha</label>
-                        <div class="row">
-                            <div class="col-md-4">
-                                <div class="input-group">
-                                    <span class="input-group-addon"><span class="fas fa-sync-alt fa-fw"></span></span>
-                                    <input type="text" class="form-control" id="captcha" name="captcha" maxlength="6" required
-                                           placeholder="" autocomplete="off">
-                                </div>
-                                <div class="help-block">Case insensitive.</div>
-                            </div>
-                            <?= $this->insert('layout/captcha') ?>
-                        </div>
-                    </div>
+                    <?= $this->insert('layout/captcha') ?>
 
                     <fieldset>
                         <legend><a href="#adv_option" data-toggle="collapse" class="btn btn-link">Advanced Options</a></legend>
diff --git a/apps/views/auth/recover.php b/apps/views/auth/recover.php
index 4da859a..3a9ea86 100644
--- a/apps/views/auth/recover.php
+++ b/apps/views/auth/recover.php
@@ -30,20 +30,7 @@
                             <div class="help-block">The Email when your sign account.</div>
                         </div>
 
-                        <div class="form-group">
-                            <label for="captcha">Captcha</label>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="input-group">
-                                        <span class="input-group-addon"><span class="fas fa-sync-alt fa-fw"></span></span>
-                                        <input type="text" class="form-control" id="captcha" name="captcha" maxlength="6"
-                                               required autocomplete="off">
-                                    </div>
-                                    <div class="help-block">Case insensitive.</div>
-                                </div>
-                                <?= $this->insert('layout/captcha') ?>
-                            </div>
-                        </div>
+                        <?= $this->insert('layout/captcha') ?>
 
                         <div class="text-center">
                             <button type="submit" value="Register" class="btn btn-primary">Recover it !!</button>
diff --git a/apps/views/auth/register.php b/apps/views/auth/register.php
index 79f8235..52ac7db 100644
--- a/apps/views/auth/register.php
+++ b/apps/views/auth/register.php
@@ -107,34 +107,18 @@
                                 </div>
                                 <?php endif; ?>
 
-                                <div class="form-group">
-                                    <label for="captcha">Captcha</label>
-                                    <div class="row">
-                                        <div class="col-md-4">
-                                            <div class="input-group">
-                                                <span class="input-group-addon"><span class="fas fa-sync-alt fa-fw"></span></span>
-                                                <input type="text" class="form-control" id="captcha" name="captcha" maxlength="6"
-                                                       required autocomplete="off">
-                                            </div>
-                                            <div class="help-block">Case insensitive.</div>
-                                        </div>
-                                        <?= $this->insert('layout/captcha') ?>
-                                    </div>
-                                </div>
+                                <?= $this->insert('layout/captcha') ?>
 
                                 <div class="form-group">
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" name="verify_tos" id="verify_tos" value="yes" title=""> Accept Our TOS and AOP
-                                        </label>
+                                    <div class="switch">
+                                        <input type="checkbox" name="verify_tos" id="verify_tos" value="1" title="">
+                                        <label for="verify_tos">Accept Our TOS and AOP</label>
                                     </div>
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" name="verify_age" id="verify_age" value="yes" title=""> I am at least 13 years old.
-                                        </label>
+                                    <div class="switch">
+                                        <input type="checkbox" name="verify_age" id="verify_age" value="1" title="">
+                                        <label for="verify_age">I am at least 13 years old.</label>
                                     </div>
                                 </div>
-
                                 <div class="text-center">
                                     <button type="submit" value="Register" class="btn btn-primary">Register</button>
                                 </div>
diff --git a/apps/views/layout/captcha.php b/apps/views/layout/captcha.php
index 3151a79..09b843d 100644
--- a/apps/views/layout/captcha.php
+++ b/apps/views/layout/captcha.php
@@ -4,9 +4,27 @@
  * User: Rhilip
  * Date: 2019/3/9
  * Time: 16:49
+ *
+ *
  */
+
+$inline = $inline ?? false;
 ?>
-<div class="col captcha_img_load">
-    <img class="captcha_img" src="/static/pic/captcha_dummy.png" alt="Captcha Image"
-         data-toggle="tooltip" data-placement="right" title="Click to Refresh">
+
+<div class="form-group">
+    <label for="captcha" class="<?= $inline ? 'col-sm-2 ' : '' ?>required">Captcha</label>
+    <div class="row">
+        <div class="col-xs-6 col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon"><span class="fas fa-sync-alt fa-fw"></span></span>
+                <input type="text" class="form-control" id="captcha" name="captcha" maxlength="6"
+                       required autocomplete="off">
+            </div>
+            <div class="help-block">Case insensitive.</div>
+        </div>
+        <div class="col captcha_img_load">
+            <img class="captcha_img" src="/static/pic/captcha_dummy.png" alt="Captcha Image"
+                 data-toggle="tooltip" data-placement="right" title="Click to Refresh">
+        </div>
+    </div>
 </div>
diff --git a/apps/views/links/apply.php b/apps/views/links/apply.php
index 589183b..8908e55 100644
--- a/apps/views/links/apply.php
+++ b/apps/views/links/apply.php
@@ -77,20 +77,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label for="captcha" class="col-sm-2 required">Captcha</label>
-                        <div class="row">
-                            <div class="col-md-4">
-                                <div class="input-group">
-                                    <span class="input-group-addon"><span class="fas fa-sync-alt fa-fw"></span></span>
-                                    <input type="text" class="form-control" id="captcha" name="captcha" maxlength="6" required
-                                           placeholder="" autocomplete="off">
-                                </div>
-                                <div class="help-block">Case insensitive.</div>
-                            </div>
-                            <?= $this->insert('layout/captcha') ?>
-                        </div>
-                    </div>
+                    <?= $this->insert('layout/captcha', ['inline' => true]) ?>
 
                     <div class="text-center">
                         <button type="submit" class="btn btn-primary">Submit</button>