Ordered Cancel button left, Save button right

access-ci-org · Dec 15, 2022 · 66b7f31 · 66b7f31
1 parent c982bd4
commit 66b7f31
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.1.0 20221215 JP
+  - Ordered Cancel button left, Save button right
+
 v2.0.2 20221206 JP
   - Improve logging
 

diff --git a/Operations_ServiceIndex_Django/templates/account/logout.html b/Operations_ServiceIndex_Django/templates/account/logout.html
@@ -19,9 +19,8 @@
                     {% if redirect_field_value %}
                         <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
                     {% endif %}
-                    <button class="primaryAction btn btn-access-auth" type="submit">{% trans "LOGOUT OF ACCESS CI" %}</button>
-
                     <a class="btn btn-secondary" href="{% url 'services:index' %}"  role="button">Back</a>
+                    <button class="primaryAction btn btn-access-auth" type="submit">{% trans "LOGOUT OF ACCESS CI" %}</button>
                 </form>
             </div><!-- div card-body -->
         </div><!-- div card -->

diff --git a/Operations_ServiceIndex_Django/templates/services/add_event.html b/Operations_ServiceIndex_Django/templates/services/add_event.html
@@ -49,10 +49,10 @@
 
     <div class="row mt-4">
         <div class="col-sm-2">
-            <input class="btn btn-primary" type="submit" value="Save" />
+            <a class="btn btn-secondary" href="{% url 'services:events' %}" role="button">Cancel</a>
         </div>
         <div class="col-sm-2">
-            <a class="btn btn-secondary" href="{% url 'services:events' %}" role="button">Cancel</a>
+            <input class="btn btn-primary" type="submit" value="Save" />
         </div>
     </div>
 

diff --git a/Operations_ServiceIndex_Django/templates/services/edit_staff.html b/Operations_ServiceIndex_Django/templates/services/edit_staff.html
@@ -49,10 +49,10 @@
 
     <div class="row mt-4">
         <div class="col-sm-2">
-            <input class="btn btn-primary" type="submit" value="Save" />
+            <a class="btn btn-secondary" href="{% url 'services:people' %}" role="button">Cancel</a>
         </div>
         <div class="col-sm-2">
-            <a class="btn btn-secondary" href="{% url 'services:people' %}" role="button">Cancel</a>
+            <input class="btn btn-primary" type="submit" value="Save" />
         </div>
     </div>
 

diff --git a/Operations_ServiceIndex_Django/templates/services/service.html b/Operations_ServiceIndex_Django/templates/services/service.html
@@ -367,14 +367,14 @@
 
     <div class="row mt-4">
         <div class="col-2">
-        {% if service_id == 0 %}
-            <input class="btn btn-primary" type="submit" value="Add Service" />
-        {% else %}
-            <input class="btn btn-primary" type="submit" value="Save" />
-        {% endif %}
+            <a class="btn btn-secondary" href="{% url 'services:index' %}" role="button">Cancel</a>
         </div>
         <div class="col-2">
-            <a class="btn btn-secondary" href="{% url 'services:index' %}" role="button">Cancel</a>
+            {% if service_id == 0 %}
+            <input class="btn btn-primary" type="submit" value="Add Service" />
+            {% else %}
+            <input class="btn btn-primary" type="submit" value="Save" />
+            {% endif %}
         </div>
     </div> <!-- row -->
 

diff --git a/Operations_ServiceIndex_Django/templates/services/update_event.html b/Operations_ServiceIndex_Django/templates/services/update_event.html
@@ -71,10 +71,10 @@ <h3>{{ hes.host.hostname }}</h3>
 
     <div class="row mt-4">
         <div class="col-sm-2">
-            <input class="btn btn-primary" type="submit" value="Save" />
+            <a class="btn btn-secondary" href="{% url 'services:event' hes.event.id %}" role="button">Cancel</a>
         </div>
         <div class="col-sm-2">
-            <a class="btn btn-secondary" href="{% url 'services:event' hes.event.id %}" role="button">Cancel</a>
+            <input class="btn btn-primary" type="submit" value="Save" />
         </div>
     </div>
 

diff --git a/Operations_ServiceIndex_Django/templates/socialaccount/login.html b/Operations_ServiceIndex_Django/templates/socialaccount/login.html
@@ -13,12 +13,11 @@
             <div class="card-header"><p class="lead">Login required</p></div>
             <div class="card-body">
                 <form method="POST">
-                {% csrf_token %}
-                {% if redirect_field_value %}
-                    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
-                {% endif %}
-                <button class="primaryAction btn btn-access-auth" type="submit">{% trans "Login to ACCESS CI" %}</button>
-
+                    {% csrf_token %}
+                    {% if redirect_field_value %}
+                        <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+                    {% endif %}
+                    <button class="primaryAction btn btn-access-auth" type="submit">{% trans "Login to ACCESS CI" %}</button>
                 </form>
             </div><!-- div card-body -->
         </div><!-- div card -->