scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-17 14:19:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #384 from mz3944/mz-sci-849

Browse source 
Fixes experiment button not being clicable in project overview page. …
This commit is contained in:
mz3944 2017-01-06 14:26:37 +01:00 • committed by GitHub
commit 1b56e9d07c
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@
<span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span> <span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span>
<% end %> <% end %>
<% end %> <% end %>
<!-- pexperiment actions --> <!-- experiment actions -->
<% if can_edit_experiment(@experiment) || can_archive_experiment(@experiment) %> <% if can_edit_experiment(@experiment) || can_archive_experiment(@experiment) %>
<span class="dropdown"> <span class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="exActionsMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-default dropdown-toggle" type="button" id="exActionsMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

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

@ -8,23 +8,8 @@
data-project-id="<%= @project.id %>"> data-project-id="<%= @project.id %>">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<% if can_create_experiment(@project) %>
<%= link_to new_project_experiment_url(@project),
remote: true,
type: "button",
id: 'new-experiment',
class: 'btn btn-primary pull-right',
data: {
intro: t('tutorial.create_experiment_html'),
step: '4',
position: 'left'
} do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %>
<% end %>
<!-- experiment sort --> <!-- experiment sort -->
<div class="dropdown"> <div class="dropdown pull-left">
<button class="btn btn-default dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-default dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="hidden-xs"><%= t'projects.index.sort' %></span> <span class="hidden-xs"><%= t'projects.index.sort' %></span>
<span class="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span> <span class="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span>
@ -40,6 +25,21 @@
<% end %> <% end %>
</ul> </ul>
</div> </div>
<% if can_create_experiment(@project) %>
<%= link_to new_project_experiment_url(@project),
remote: true,
type: "button",
id: 'new-experiment',
class: 'btn btn-primary pull-right',
data: {
intro: t('tutorial.create_experiment_html'),
step: '4',
position: 'left'
} do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %>
<% end %>
</div> </div>
</div> </div>
<div class="row"> <div class="row">