Uniform buttons across all edit and xml partials, working cancel buttons

.version

@@ -1 +1 @@
-2.5.8
+2.5.9

app/views/collections/edit.html.haml

@@ -10,5 +10,7 @@
   = bootstrap_fields_for :collection do |c|
     = c.text_field :title, value: @collection['title']
     = c.text_area :description, rows: 10, value: @collection['description']
-  = f.button :submit, class: "btn btn-primary my-3"
+  .well.p-3.my-3.rounded-3
+    = f.button :submit, class: "btn btn-success"
+    = link_to "Cancel", collection_path(params[:id]), class: "btn btn-warning"
 

app/views/communities/edit.html.haml

@@ -11,4 +11,6 @@
   = bootstrap_fields_for :community do |c|
     = c.text_field :title, value: @community['title']
     = c.text_area :description, rows: 10, value: @community['description']
-  = f.button :submit, class: "btn btn-primary my-3"
+  .well.p-3.my-3.rounded-3
+    = f.button :submit, class: "btn btn-success"
+    = link_to "Cancel", community_path(params[:id]), class: "btn btn-warning"

app/views/xml/editor.html.haml

@@ -27,5 +27,5 @@
       .well.p-3.my-3.rounded-3
         %input#validate_button.btn.btn-primary{:name => "commit", :type => "submit", :value => "Validate + Preview", remote: true}/
         %input#save_button.btn.btn-success{"data-disable-with" => "Please wait...", :name => "commit", :type => "submit", :value => "Save", :formaction => xml_update_path}/
-        %a.btn.btn-warning{"data-toggle" => "modal", :href => "#cancelEditModal"}
+        %a.btn.btn-warning{"data-toggle" => "modal", :href => public_send("#{@klass.downcase}_path", @resource['id'])}
           Cancel