Merge e35c5be into 10a95b5

changelog.md

@@ -117,6 +117,9 @@ including the `reopen_episode_modal.html` template and the url/view at `template
 
 * Adds a `get_absolute_url()` method to `Patient` and `Episode
 
+* Adds `btn-cancel`, `btn-save` and `btn-delete` classes to the respective form buttons.
+
+* Moves the cancel button by default to be left of the save button.
 
 * Renames the (undocumented, internal) Angular service `FieldTranslater` to `FieldTranslator`
 

opal/core/pathway/templates/pathway/partial/cancel_button.html

@@ -1 +1 @@
-<a class="btn btn-lg" ng-click="pathway.cancel()">Cancel</a>
+<a class="btn btn-lg btn-cancel" ng-click="pathway.cancel()">Cancel</a>

opal/core/pathway/templates/pathway/partial/save_button.html

@@ -1,5 +1,5 @@
 <button
-  class="btn btn-lg btn-primary"
+  class="btn btn-lg btn-primary btn-save"
   ng-click="form.$valid && pathway.finish(editing)"
   check-form="form"
 >

opal/templates/base_templates/modal_base.html

@@ -21,32 +21,32 @@ <h3>
   {% if not single %}
       {% block modal_delete %}
         <span class="float-left" ng-show="editingMode()">
-            <button class="btn btn-secondary" ng-click="delete('delete')">
+            <button class="btn btn-secondary btn-delete" ng-click="delete('delete')">
               <i class="fa fa-trash-o"></i>
                 Delete
              </button>
          </span>
       {% endblock %}
   {% endif %}
-
+  {% block modal_cancel %}
+  <button class="btn btn-cancel" ng-click="cancel()">Cancel</button>
+  {% endblock %}
   {% block modal_save %}
 
   <span ng-show="form">
-    <button check-form="form" class="btn btn-primary" ng-click="form.$valid && save('save')">
+    <button check-form="form" class="btn btn-primary btn-save" ng-click="form.$valid && save('save')">
       <i class="fa fa-save"></i> Save
     </button>
   </span>
   <span ng-hide="form">
-    <button class="btn btn-primary" ng-click="save('save')">
+    <button class="btn btn-primary btn-save" ng-click="save('save')">
       <i class="fa fa-save"></i> Save
     </button>
   </span>
 
 
   {% endblock %}
-  {% block modal_cancel %}
-  <button class="btn" ng-click="cancel()">Cancel</button>
-  {% endblock %}
+
   {% if column.get_modal_footer_template %}
     {% include column.get_modal_footer_template %}
   {% endif %}