From 0558d49e2654e2f50f49813f42f88110fac39943 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 24 Aug 2016 13:50:25 +0200
Subject: [PATCH 1/2] buttons update on experiment overview

---
 app/views/experiments/canvas.html.erb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb
index fe217fe8a..bf6be7f51 100644
--- a/app/views/experiments/canvas.html.erb
+++ b/app/views/experiments/canvas.html.erb
@@ -3,6 +3,14 @@
 <%= render partial: "shared/secondary_navigation" %>
 
 <div id="diagram-buttons" data-intro="<%=t ('tutorial.canvas_click_edit_workflow_html') %>" data-step="5" data-position="left">
+  <% if can_create_experiment(@project) && @experiment.active? %>
+    <%= link_to t('experiments.new.create'),
+                  new_project_experiment_url(@project),
+                  remote: true,
+                  type: "button",
+                  id: 'new-experiment',
+                  class: "btn btn-primary" %>
+  <% end %>
   <% if can_edit_canvas(@experiment) %>
     <%=link_to t('experiments.canvas.canvas_edit'),
                   canvas_edit_experiment_url(@experiment),
@@ -12,14 +20,6 @@
                   class: "ajax btn btn-default",
                   "data-action" => "edit" %>
   <% end %>
-  <% if can_create_experiment(@project) && @experiment.active? %>
-    <%= link_to t('experiments.new.create'),
-                  new_project_experiment_url(@project),
-                  remote: true,
-                  type: "button",
-                  id: 'new-experiment',
-                  class: "btn btn-primary" %>
-  <% end %>
   <!-- pexperiment actions -->
   <% if can_edit_experiment(@experiment) || can_archive_experiment(@experiment) %>
     <span class="dropdown">

From 2a897432e1f3fc645f5320b67952cfdb4007f55e Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 24 Aug 2016 17:00:27 +0200
Subject: [PATCH 2/2] update buttons on canvas view

---
 app/views/experiments/canvas.html.erb | 60 +++++++++++++++------------
 app/views/projects/show.html.erb      | 10 +++--
 config/locales/en.yml                 |  1 +
 3 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb
index bf6be7f51..0141c06f5 100644
--- a/app/views/experiments/canvas.html.erb
+++ b/app/views/experiments/canvas.html.erb
@@ -3,22 +3,17 @@
 <%= render partial: "shared/secondary_navigation" %>
 
 <div id="diagram-buttons" data-intro="<%=t ('tutorial.canvas_click_edit_workflow_html') %>" data-step="5" data-position="left">
-  <% if can_create_experiment(@project) && @experiment.active? %>
-    <%= link_to t('experiments.new.create'),
-                  new_project_experiment_url(@project),
-                  remote: true,
-                  type: "button",
-                  id: 'new-experiment',
-                  class: "btn btn-primary" %>
-  <% end %>
+
   <% if can_edit_canvas(@experiment) %>
-    <%=link_to t('experiments.canvas.canvas_edit'),
-                  canvas_edit_experiment_url(@experiment),
-                  remote: true,
-                  type: "button",
-                  id: "edit-canvas-button",
-                  class: "ajax btn btn-default",
-                  "data-action" => "edit" %>
+    <%=link_to canvas_edit_experiment_url(@experiment),
+          remote: true,
+          type: "button",
+          id: "edit-canvas-button",
+          class: "ajax btn btn-default",
+          "data-action" => "edit" do %>
+            <span class="glyphicon glyphicon-pencil"></span>
+            <%= t('experiments.canvas.canvas_edit') %>
+          <% end %>
   <% end %>
   <!-- pexperiment actions -->
   <% if can_edit_experiment(@experiment) || can_archive_experiment(@experiment) %>
@@ -32,18 +27,31 @@
                           locals: { project: @project, experiment: @experiment } %>
     </span>
   <% end %>
-
-  <div id="zoom-level-buttons" class="btn-group <%= 'pull-right' if can_edit_canvas(@experiment) && can_create_experiment(@project)  %>" data-toggle="buttons">
-    <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %>
-      <span class="glyphicon glyphicon-th-large" aria-hidden="true" ></span>
-    <% end %>
-    <%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "medium_zoom" do %>
-      <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
-    <% end %>
-    <%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "small_zoom" do %>
-      <span class="glyphicon glyphicon-th" aria-hidden="true"></span>
-    <% end %>
+  <div class="toolbarButtons">
+    <%= t('experiments.canvas.zoom') %>
+    <div id="zoom-level-buttons" class=" <%= 'btn-group' if can_edit_canvas(@experiment) && can_create_experiment(@project)  %>" data-toggle="buttons">
+      <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %>
+        <span class="glyphicon glyphicon-th-large" aria-hidden="true" ></span>
+      <% end %>
+      <%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "medium_zoom" do %>
+        <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
+      <% end %>
+      <%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "small_zoom" do %>
+        <span class="glyphicon glyphicon-th" aria-hidden="true"></span>
+      <% end %>
+    </div>
   </div>
+
+  <% if can_create_experiment(@project) && @experiment.active? %>
+    <%= link_to new_project_experiment_url(@project),
+        remote: true,
+        type: "button",
+        id: 'new-experiment',
+        class: "btn btn-primary pull-right" do %>
+          <span class="glyphicon glyphicon-plus"></span>
+          <%= t('experiments.new.create') %>
+        <% end %>
+  <% end %>
 </div>
 
 <div id="canvas-container" data-project-id="<%= @project.id %>"
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b9f24ab66..af4810edc 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -6,13 +6,15 @@
   <div class="col-sm-12">
       <% if can_create_experiment(@project) %>
       <div class="row">
-        <div class="col-sm-4 col-sm-offset-4">
-          <%= link_to t('experiments.new.create'),
-                        new_project_experiment_url(@project),
+        <div class="col-sm-12">
+          <%= link_to new_project_experiment_url(@project), 
                         remote: true,
                         type: "button",
                         id: 'new-experiment',
-                        class: "btn btn-primary center-btn" %>
+                        class: "btn btn-primary pull-right" do %>
+            <span class="glyphicon glyphicon-plus"></span>
+            <%= t('experiments.new.create') %>
+          <% end %>
         </div>
       </div>
       <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 01ee8da62..5057aea78 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -636,6 +636,7 @@ en:
       actions: 'Actions'
       head_title: "%{project} | Overview"
       canvas_edit: "Edit experiment"
+      zoom: "Zoom: "
       modal_manage_tags:
         head_title: "Manage tags for"
         subtitle: "Showing tags of task %{module}"