Improved setup workflow - added missed autofocus attributes

modxcms · Jun 27, 2019 · e98caa9 · e98caa9
1 parent 84a5770
commit e98caa9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/_build/templates/default/sass/installer.scss b/_build/templates/default/sass/installer.scss
@@ -704,13 +704,13 @@ header {
             }
 
             .ok {
-                color: $green;
-                font-weight: 700;
+                color: darken($green, 25%);
+                font-weight: 500;
             }
 
             .notok {
-                color: $red;
-                font-weight: 700;
+                color: darken($red, 25%);
+                font-weight: 500;
             }
 
         }

diff --git a/setup/templates/complete.tpl b/setup/templates/complete.tpl
@@ -16,13 +16,12 @@
 
 <div class="setup_navbar complete">
     <label>
-        <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.login}" autofocus="autofocus" />
+        <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.login}" autofocus="autofocus">
     </label>
     <br />
     <span class="cleanup">
         <input type="checkbox" value="1" id="cleanup" name="cleanup"{if $cleanup} checked="checked"{/if} />
-        <label for="cleanup"></label>
-        <span class="cleanup_text">{$_lang.delete_setup_dir}</span>
+        <label for="cleanup"><span class="cleanup_text">{$_lang.delete_setup_dir}</span></label>
     </span>
 </div>
 </form>
diff --git a/setup/templates/install.tpl b/setup/templates/install.tpl
@@ -10,10 +10,10 @@
     </div>
     <div class="setup_navbar">
         {if $failed}
-            <input type="button" onclick="MODx.go('install');" value="{$_lang.retry} &#xf021;" id="modx-next" class="button" />
-            <input type="button" onclick="MODx.go('summary');" value="&#xf053; {$_lang.back}" id="modx-back" class="button" />
+            <input type="button" onclick="MODx.go('install');" value="{$_lang.retry} &#xf021;" id="modx-next" class="button">
+            <input type="button" onclick="MODx.go('summary');" value="&#xf053; {$_lang.back}" id="modx-back" class="button">
         {else}
-            <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.next} &#xf054;" autofocus="autofocus" />
+            <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.next} &#xf054;" autofocus="autofocus">
         {/if}
     </div>
 </form>
diff --git a/setup/templates/language.tpl b/setup/templates/language.tpl
@@ -58,7 +58,7 @@
     </script>
 
     <div class="setup_navbar">
-        <input type="submit" name="proceed" id="modx-next" class="button" value="{$_lang.next} &#xf054;" />
+        <input type="submit" name="proceed" id="modx-next" class="button" value="{$_lang.next} &#xf054;" autofocus="autofocus">
     </div>
 
 </form>
diff --git a/setup/templates/options.tpl b/setup/templates/options.tpl
@@ -144,7 +144,7 @@
     </div>
 
     <div class="setup_navbar">
-        <input type="button" onclick="MODx.go('welcome');" value="&#xf053; {$_lang.back}" id="modx-back" class="button" />
-        <input type="submit" name="proceed" value="{$_lang.next} &#xf054;" id="modx-next" class="button" />
+        <input type="button" onclick="MODx.go('welcome');" value="&#xf053; {$_lang.back}" id="modx-back" class="button">
+        <input type="submit" name="proceed" value="{$_lang.next} &#xf054;" id="modx-next" class="button" autofocus="autofocus">
     </div>
 </form>
diff --git a/setup/templates/summary.tpl b/setup/templates/summary.tpl
@@ -14,10 +14,10 @@
 
     <div class="setup_navbar">
         {if $failed}
-            <input type="button" onclick="MODx.go('summary');" value="&#xf021; {$_lang.retry}" id="modx-next" class="button" />
+            <input type="button" onclick="MODx.go('summary');" value="&#xf021; {$_lang.retry}" id="modx-next" class="button">
         {else}
-            <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.install} &#xf019;" autofocus="autofocus" />
+            <input type="submit" id="modx-next" class="button" name="proceed" value="{$_lang.install} &#xf054;" autofocus="autofocus">
         {/if}
-        <input type="button" onclick="MODx.go('{$back}');" value="&#xf053; {$_lang.back}" id="modx-back" class="button" />
+        <input type="button" onclick="MODx.go('{$back}');" value="&#xf053; {$_lang.back}" id="modx-back" class="button">
     </div>
 </form>
diff --git a/setup/templates/welcome.tpl b/setup/templates/welcome.tpl
@@ -24,7 +24,7 @@
     </div>
 
     <div class="setup_navbar">
-       <input type="button" onclick="MODx.go('language');" value="&#xf053; {$_lang.back}" id="modx-back" class="button" />
-       <input type="submit" name="proceed" value="{$_lang.next} &#xf054;" id="modx-next" class="button" autofocus="autofocus" />
+       <input type="button" onclick="MODx.go('language');" value="&#xf053; {$_lang.back}" id="modx-back" class="button">
+       <input type="submit" name="proceed" value="{$_lang.next} &#xf054;" id="modx-next" class="button" autofocus="autofocus">
     </div>
 </form>