scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-28 19:24:10 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #96 from mlorb/ml_sci_369

Browse source 
buttons update on experiment overview [SCI-369]
This commit is contained in:
mlorb 2016-08-25 08:54:16 +02:00 committed by GitHub
commit 0a066f436f
3 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/views/experiments/canvas.html.erb
View file

@ -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_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" %>
<% 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" %>
<%=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 %>"

10
app/views/projects/show.html.erb
View file

@ -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 %>

1
config/locales/en.yml
View file

@ -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}"