mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-25 17:24:51 +08:00
set flask icon to experiment [fixes SCI-330]
This commit is contained in:
parent
da735a51f4
commit
ca0ba1403d
7 changed files with 14 additions and 8 deletions
4
Gemfile
4
Gemfile
|
@ -11,6 +11,8 @@ gem 'bootstrap-sass', '~> 3.3.5'
|
|||
gem 'sass-rails', '~> 5.0'
|
||||
gem 'bootstrap_form'
|
||||
gem 'yomu'
|
||||
gem 'font-awesome-rails', '~> 4.6'
|
||||
|
||||
# JS datetime library, requirement of datetime picker
|
||||
gem 'momentjs-rails', '>= 2.9.0'
|
||||
# JS datetime picker
|
||||
|
@ -52,7 +54,7 @@ gem 'aws-sdk', '~> 2.2.8'
|
|||
gem 'aws-sdk-v1'
|
||||
gem 'delayed_job_active_record'
|
||||
gem 'devise-async'
|
||||
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
|
||||
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
|
||||
|
||||
group :development, :test do
|
||||
gem 'byebug'
|
||||
|
|
|
@ -110,6 +110,8 @@ GEM
|
|||
i18n (~> 0.5)
|
||||
figaro (1.1.1)
|
||||
thor (~> 0.14)
|
||||
font-awesome-rails (4.6.3.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
hammerjs-rails (2.0.4)
|
||||
|
@ -305,6 +307,7 @@ DEPENDENCIES
|
|||
devise_invitable
|
||||
faker
|
||||
figaro
|
||||
font-awesome-rails (~> 4.6)
|
||||
hammerjs-rails
|
||||
i18n-js (>= 3.0.0.rc11)
|
||||
introjs-rails
|
||||
|
|
|
@ -16,4 +16,5 @@
|
|||
@import "bootstrap-tagsinput-typeahead";
|
||||
@import "handsontable.full.min";
|
||||
@import "extend/bootstrap";
|
||||
@import "font-awesome";
|
||||
@import "themes/scinote";
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
data-type="experiment"
|
||||
data-id="<%= experiment.id %>"
|
||||
data-modal-title="<%=t "projects.reports.elements.modals.experiment_contents.head_title",
|
||||
experiment: experiment.name %>" data-name="<%= name %>" data-icon-class="glyphicon-filter">
|
||||
experiment: experiment.name %>" data-name="<%= name %>" data-icon-class="fa fa-flask">
|
||||
<div class="report-element-header">
|
||||
<div class="row">
|
||||
<div class="pull-left user-time">
|
||||
|
@ -20,7 +20,7 @@
|
|||
<div class="row">
|
||||
<div class="pull-left experiment-name">
|
||||
<h4>
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'flask' %>
|
||||
<%= name %></h4>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
>
|
||||
<a href="?<%= {category: 'experiments', q: @search_query, utf8: '✓'}.to_query %>">
|
||||
<span class="badge pull-right"><%= @experiment_search_count %></span>
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'flask' %>
|
||||
<%= t'Experiments' %>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<% results.each do |experiment| %>
|
||||
<h5>
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'flask' %>
|
||||
<%= render partial: "search/results/partials/experiment_text.html.erb",
|
||||
locals: { experiment: experiment, query: search_query } %>
|
||||
</h5>
|
||||
|
|
|
@ -40,16 +40,16 @@
|
|||
<% if experiment_page? || module_page? %>
|
||||
<% if !module_page? %>
|
||||
<li class="active">
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'fa-flask' %>
|
||||
</li>
|
||||
<% else %>
|
||||
<li>
|
||||
<% if can_view_experiment(@experiment) %>
|
||||
<%= link_to canvas_experiment_path(@experiment) do %>
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'fa-flask' %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<span class="glyphicon glyphicon-filter"></span>
|
||||
<%= fa_icon 'fa-flask' %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in a new issue