From d9025a960170bcb30ab5265f514b6d315326d73e Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 12 Dec 2016 14:42:06 +0100
Subject: [PATCH] changes create/edit mode buttons [fixes SCI-777]

---
 .../stylesheets/sample_types_groups.scss      | 27 +++----------
 app/views/sample_groups/_edit.html.erb        | 33 +++++++--------
 app/views/sample_groups/index.html.erb        | 40 +++++++++----------
 app/views/sample_types/_edit.html.erb         | 26 ++++++------
 app/views/sample_types/index.html.erb         | 33 +++++++++------
 config/locales/en.yml                         |  1 +
 6 files changed, 74 insertions(+), 86 deletions(-)

diff --git a/app/assets/stylesheets/sample_types_groups.scss b/app/assets/stylesheets/sample_types_groups.scss
index 3131cb6c0..c6b41fc7c 100644
--- a/app/assets/stylesheets/sample_types_groups.scss
+++ b/app/assets/stylesheets/sample_types_groups.scss
@@ -26,13 +26,16 @@
 
     #remove {
       margin-left: 5px;
-      margin-top: 10px;
     }
   }
 
+  .form-inline .form-group,
+  .form-inline .form-control {
+    width: 100%;
+  }
+
   #name-input {
     padding: 5px;
-    width: 203px;
   }
 
   .new-resource-form {
@@ -87,26 +90,6 @@
       color: $color-black;
     }
   }
-
-  .sample-group-controls {
-
-    .edit {
-      margin-top: 3px;
-    }
-
-    .delete {
-      margin-top: 3px;
-    }
-  }
-
-  .sample-group-submit {
-    display: inline-block;
-    vertical-align: top;
-
-    #submit {
-      margin-top: 8px;
-    }
-  }
 }
 
 #new_sample_group .color-picker {
diff --git a/app/views/sample_groups/_edit.html.erb b/app/views/sample_groups/_edit.html.erb
index 36b1a45b5..5a3582159 100644
--- a/app/views/sample_groups/_edit.html.erb
+++ b/app/views/sample_groups/_edit.html.erb
@@ -4,28 +4,23 @@
                                                           sample_group)%>"
     data-color="<%= sample_group.color %>">
   <div class="row">
-    <div class="col-xs-6">
   <%= form_for [organization, sample_group], html: { class: 'form-inline' }, remote: true do |f| %>
-    <div class="form-group">
-      <%= f.text_field :name, value: sample_group.name , class: 'form-control' %>
-      <span class="edit-confirm glyphicon glyphicon-ok"></span>
-      <span class="abort glyphicon glyphicon-remove"
-            data-element="<%= organization_sample_group_sample_group_element_path(organization,
-                                                                                  sample_group) %>"></span>
+    <div class="col-xs-8">
+      <div class="form-group">
+        <%= f.text_field :name, value: sample_group.name , class: 'form-control' %>
+      </div>
+    </div>
+    <div class="col-xs-4 text-right">
+      <button type="button"
+              class="edit-confirm btn btn-primary"><%= t('general.edit') %></button>
+      <button type="button"
+              class="abort btn btn-default"
+              data-element="<%=
+                organization_sample_group_sample_group_element_path(organization,
+                                                                    sample_group) %>">
+        <%= t('general.cancel') %></button>
     </div>
   <% end %>
     </div>
-    <div class="col-xs-6 text-right">
-      <span class="pull-right sample-group-controls">
-        <span class="color-picker">
-          <%= bootstrap_form_for [organization, sample_group], remote: true do |f| %>
-            <%= f.color_picker_select :color,
-                                      Constants::TAG_COLORS,
-                                      class: 'edit-sample-group-color' %>
-          <% end %>
-        </span>
-        <span class="delete glyphicon glyphicon-trash"></span>
-      </span>
-    </div>
   </div>
 </li>
diff --git a/app/views/sample_groups/index.html.erb b/app/views/sample_groups/index.html.erb
index 0362ab91b..964ec7df8 100644
--- a/app/views/sample_groups/index.html.erb
+++ b/app/views/sample_groups/index.html.erb
@@ -27,27 +27,25 @@
       <ul class="list-unstyled sample_types_groups_list"
           id="sample_groups_list">
         <li class="new-resource-form">
-          <%= bootstrap_form_for SampleGroup.new,
-                                 remote: true,
-                                 html: { class: 'form-inline' },
-                                 url: organization_sample_groups_path(current_organization) do |f| %>
-
-            <%= f.text_field :name,
-                             id: 'name-input',
-                             class: 'form-control',
-                             hide_label: true %>
-            <div class="sample-group-submit">
-              <span id="submit" class="glyphicon glyphicon-ok"></span>
-            </div>
-            <span class="pull-right sample-group-controls">
-              <span class="color-picker">
-                  <%= f.color_picker_select :color,
-                                            Constants::TAG_COLORS,
-                                            class: 'new-sample-group-color' %>
-              </span>
-              <span id="remove" class="glyphicon glyphicon-trash"></span>
-            </span>
-          <% end %>
+          <div class="row">
+            <%= bootstrap_form_for SampleGroup.new,
+                                   remote: true,
+                                   html: { class: 'form-inline' },
+                                   url: organization_sample_groups_path(current_organization) do |f| %>
+              <div class="col-xs-8">
+              <%= f.text_field :name,
+                               id: 'name-input',
+                               class: 'form-control',
+                               hide_label: true %>
+              </div>
+              <div class="col-xs-4 text-right">
+                <button id="submit"
+                        class="btn btn-primary"><%= t('general.create') %></button>
+                <button id="remove"
+                        class="btn btn-default"><%= t('general.cancel') %></button>
+              </div>
+            <% end %>
+          </div>
         </li>
         <% @sample_groups.sorted.each do |sample_group| %>
         <%= render partial: 'sample_group',
diff --git a/app/views/sample_types/_edit.html.erb b/app/views/sample_types/_edit.html.erb
index d32595fa5..9fb455a2c 100644
--- a/app/views/sample_types/_edit.html.erb
+++ b/app/views/sample_types/_edit.html.erb
@@ -3,20 +3,22 @@
       organization_sample_type_destroy_confirmation_path(organization, sample_type)
     %>">
   <div class="row">
-    <div class="col-xs-6">
   <%= form_for [organization, sample_type], html: { class: 'form-inline' }, remote: true do |f| %>
-    <div class="form-group">
-      <%= f.text_field :name, value: sample_type.name , class: 'form-control' %>
-      <span class="edit-confirm glyphicon glyphicon-ok"></span>
-      <span class="abort glyphicon glyphicon-remove"
-            data-element="<%=
-              organization_sample_type_sample_type_element_path(organization,
-                                                                sample_type) %>"></span>
+    <div class="col-xs-8">
+      <div class="form-group">
+        <%= f.text_field :name, value: sample_type.name , class: 'form-control' %>
+      </div>
+    </div>
+    <div class="col-xs-4 text-right">
+      <button type="button"
+              class="edit-confirm btn btn-primary"><%= t('general.edit') %></button>
+      <button type="button"
+              class="abort btn btn-default"
+              data-element="<%=
+                organization_sample_type_sample_type_element_path(organization,
+                                                                  sample_type) %>">
+            <%= t('general.cancel') %></button>
     </div>
   <% end %>
-    </div>
-    <div class="col-xs-6 text-right">
-      <span class="delete glyphicon glyphicon-trash"></span>
-    </div>
   </div>
 </li>
diff --git a/app/views/sample_types/index.html.erb b/app/views/sample_types/index.html.erb
index 4f0da5c58..ffdee588d 100644
--- a/app/views/sample_types/index.html.erb
+++ b/app/views/sample_types/index.html.erb
@@ -26,18 +26,27 @@
       <ul class="list-unstyled sample_types_groups_list"
           id="sample_types_list">
         <li class="new-resource-form">
-          <%= form_for SampleType.new,
-                                 remote: true,
-                                 html: { class: 'form-inline' },
-                                 url: organization_sample_types_path(current_organization) do |f| %>
-            <div class="form-group">
-              <%= f.text_field :name, id: 'name-input', class: 'form-control' %>
-              <span id="submit" class="glyphicon glyphicon-ok"></span>
-            </div>
-            <span class="pull-right">
-              <span id="remove" class="glyphicon glyphicon-trash"></span>
-            </span>
-          <% end %>
+          <div class="row">
+              <%= form_for SampleType.new,
+                                     remote: true,
+                                     html: { class: 'form-inline' },
+                                     url: organization_sample_types_path(current_organization) do |f| %>
+
+              <div class="col-xs-8">
+                <div class="form-group">
+                  <%= f.text_field :name, id: 'name-input', class: 'form-control' %>
+                </div>
+              </div>
+              <div class="text-right col-md-4">
+                <button type="button"
+                        id="submit"
+                        class="btn btn-primary"><%= t('general.create') %></button>
+                <button type="button"
+                        id="remove"
+                        class="btn btn-default"><%= t('general.cancel') %></button>
+              </div>
+            <% end %>
+          </div>
         </li>
         <% @sample_types.sorted.each do |sample_type| %>
           <%= render partial: 'sample_type',
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7289a9ae4..c57551a25 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1444,6 +1444,7 @@ en:
     edit: "Edit"
     cancel: "Cancel"
     close: "Close"
+    create: 'Create'
     check_all: "Check all"
     no_comments: "No comments!"
     more_comments: "More comments"