Merge pull request #538 from Cadasta/bugfix/#525

Fix #525: "Next" button is default in wizard steps
Cadasta · Aug 9, 2016 · a455a5f · a455a5f
2 parents 2ca9ca0 + e597df7
commit a455a5f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/cadasta/core/static/css/main.css b/cadasta/core/static/css/main.css
diff --git a/cadasta/core/static/css/wizard.scss b/cadasta/core/static/css/wizard.scss
@@ -119,7 +119,7 @@
   .col-md-8.map {
     padding-left: 0;
   }
-  h1 { 
+  h1 {
     color: $brand-darkblue;
     text-shadow: none;
     margin: 14px auto;
@@ -162,16 +162,17 @@
       text-align: right;
       padding: 20px 30px;
       .btn {
+        float: right;
         min-width: 160px !important;
-        margin-right: 20px;
+        margin-left: 20px;
         margin-bottom: 10px;
-        &:last-child {
-          margin-right: 0;
+        &:first-child {
+          margin-left: 0;
         }
       }
       .btn-link {
         min-width: 60px !important;
       }
     }
   }
-}
+}
diff --git a/cadasta/templates/organization/project_add_details.html b/cadasta/templates/organization/project_add_details.html
@@ -128,14 +128,14 @@ <h3>3. Contacts</h3>
 {% endblock %}
 
 {% block step_content_buttons %}
-<button class="btn btn-default btn-details-previous" type="submit" name="wizard_goto_step" value="{{ wizard.steps.prev }}">
-  <span class="glyphicon glyphicon-triangle-left"></span>
-  {% trans "Previous" %}
-</button>
 <button class="btn btn-primary" type="submit">
   {% trans 'Next' %}
   <span class="glyphicon glyphicon-triangle-right"></span>
 </button>
+<button class="btn btn-default btn-details-previous" type="submit" name="wizard_goto_step" value="{{ wizard.steps.prev }}">
+  <span class="glyphicon glyphicon-triangle-left"></span>
+  {% trans "Previous" %}
+</button>
 {% endblock %}
 
 

diff --git a/cadasta/templates/organization/project_add_permissions.html b/cadasta/templates/organization/project_add_permissions.html
@@ -53,14 +53,14 @@
 {% endblock %}
 
 {% block step_content_buttons %}
-<button class="btn btn-default" type="submit" name="wizard_goto_step" value="{{ wizard.steps.prev }}">
-  <span class="glyphicon glyphicon-triangle-left"></span>
-  {% trans "Previous" %}
-</button>
 <button class="btn btn-primary" type="submit">
   {% trans 'Next' %}
   <span class="glyphicon glyphicon-triangle-right"></span>
 </button>
+<button class="btn btn-default" type="submit" name="wizard_goto_step" value="{{ wizard.steps.prev }}">
+  <span class="glyphicon glyphicon-triangle-left"></span>
+  {% trans "Previous" %}
+</button>
 {% endblock %}