scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #133 from mlorb/ml_sci_415

Browse source 
minimize buttons on mobile phone [SCI-415]
This commit is contained in:
mlorb 2016-09-06 11:26:32 +02:00 committed by GitHub
commit f0e28b90a0
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
position: 'left' position: 'left'
} do %> } do %>
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
<%= t('experiments.canvas.canvas_edit') %> <span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span>
<% end %> <% end %>
<% end %> <% end %>
<!-- pexperiment actions --> <!-- pexperiment actions -->
@ -32,7 +32,7 @@
</span> </span>
<% end %> <% end %>
<div class="toolbarButtons"> <div class="toolbarButtons">
<%= t('experiments.canvas.zoom') %> <span class="hidden-xs"><%=t 'experiments.canvas.zoom' %></span>
<div id="zoom-level-buttons" class=" <%= 'btn-group' if can_edit_canvas(@experiment) && can_create_experiment(@project) %>" data-toggle="buttons"> <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 %> <%=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> <span class="glyphicon glyphicon-th-large" aria-hidden="true" ></span>
@ -53,7 +53,7 @@
id: 'new-experiment', id: 'new-experiment',
class: "btn btn-primary pull-right" do %> class: "btn btn-primary pull-right" do %>
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<%= t('experiments.new.create') %> <span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>

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

@ -20,7 +20,7 @@
position: 'left' position: 'left'
} do %> } do %>
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<%= t('experiments.new.create') %> <span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %> <% end %>
</div> </div>
</div> </div>

3
app/views/protocols/_steps.html.erb
View file

@ -2,7 +2,8 @@
<div class="pull-right" style="margin: 20px 15px 0 0;"> <div class="pull-right" style="margin: 20px 15px 0 0;">
<% if can_create_step_in_protocol(@protocol) %> <% if can_create_step_in_protocol(@protocol) %>
<a class="btn btn-primary" data-action="new-step" href="<%= new_protocol_step_path(protocol_id: @protocol.id, format: :json) %>" data-remote="true"> <a class="btn btn-primary" data-action="new-step" href="<%= new_protocol_step_path(protocol_id: @protocol.id, format: :json) %>" data-remote="true">
<%= t("protocols.steps.new_step") %> <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "protocols.steps.new_step" %></span>
</a> </a>
<% end %> <% end %>
<a class="btn btn-greyed" data-action="collapse-steps"> <a class="btn btn-greyed" data-action="collapse-steps">