scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-30 17:04:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

changed the icons as per last comment in jira issue

Browse source
This commit is contained in:
Zanz2 2018-08-14 13:26:48 +02:00
parent 54caa772d9
commit 45a4c1c598
10 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/sitewide/drag_n_drop.js.erb
View file

@ -270,7 +270,7 @@
function _uploadedAssetPreview(asset, i) {
var html = '<div class="panel panel-default panel-step-attachment-new">';
html += '<div class="panel-heading">';
html += '<span class="glyphicon glyphicon-file"></span>';
html += '<span class="fas fa-paperclip"></span>';
html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>';
html += '<div class="pull-right">';
html += '<a data-item-id="' + i + '" href="#">';
@ -442,7 +442,7 @@
function _uploadedAssetPreview(asset, i) {
var html = '<div class="panel panel-default panel-result-attachment-new">';
html += '<div class="panel-heading">';
html += '<span class="glyphicon glyphicon-file"></span>';
html += '<span class="fas fa-paperclip"></span>';
html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>';
html += '<div class="pull-right">';
html += '<a data-item-id="' + i + '" href="#">';

2
app/views/my_modules/archive/_result.html.erb
View file

@ -39,7 +39,7 @@
<% if result.asset.is_image? %>
<span class="glyphicon glyphicon-picture"></span>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<% end %>
<% elsif result.is_text %>
<span class="glyphicon glyphicon-asterisk"></span>

4
app/views/my_modules/protocols/_protocol_buttons.html.erb
View file

@ -17,12 +17,12 @@
<% if can_manage_protocol_in_module?(@protocol) %>
<li>
<a class="btn-open-file" href="#" data-action="load-from-file" data-import-url="<%= load_from_file_protocol_path(@protocol, format: :json) %>">
<span class="glyphicon glyphicon-file"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
<span class="fas fa-paperclip"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
<input type="file" value="" accept=".eln" data-turbolinks="false">
</a>
</li>
<% else %>
<li class="disabled"><a href="#"><span class="glyphicon glyphicon-file"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %></a></li>
<li class="disabled"><a href="#"><span class="fas fa-paperclip"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %></a></li>
<% end %>
</ul>
</div>

6
app/views/protocols/index.html.erb
View file

@ -57,7 +57,7 @@
<ul class="dropdown-menu">
<li>
<a class="btn-link-alt btn-default-link btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<span class="hidden-xs"><%= t("protocols.index.import_alt") %></span>
<input type="file" value="" accept=".eln" data-role="import-file-input"
data-team-id="<%= @current_team.id %>"
@ -67,7 +67,7 @@
</li>
<li>
<%= link_to "#modal-import-json-protocol", "data-toggle" => "modal" do %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<span class="hidden-xs"><%= t("protocols.index.import_json") %></span>
<% end %>
</li>
@ -81,7 +81,7 @@
<div class="btn-group" role="group">
<a class="btn btn-default" data-action="archive" data-url="<%= archive_protocols_path %>">
<span class="glyphicon glyphicon-briefcase"></span>
<span class="fas fa-archive"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.archive_action") %></span>
</a>
</div>

4
app/views/reports/new/_report_navigation.html.erb
View file

@ -21,7 +21,7 @@
<div class="form-group">
<%= hidden_field_tag "html", "" %>
<%= link_to "", class: "btn btn-default", remote: true, id: "get-report-pdf" do %>
<span class="glyphicon glyphicon-save-file"></span>
<span class="fas fa-upload"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_pdf" %></span>
<% end %>
</div>
@ -30,6 +30,8 @@
<button
onclick="$('#savePDFtoInventory').modal('show')"
class="btn btn-default">
<span class="fas fa-save">
</span>
<%=t 'projects.reports.new.save_PDF_to_inventory'%>
</button>

2
app/views/search/index.html.erb
View file

@ -182,7 +182,7 @@
match_case: @search_case, utf8: '✓',
search_id: @search_id}.to_query %>">
<span class="badge pull-right"><%= @asset_search_count %></span>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<%= t'Assets' %>
</a>
</li>

2
app/views/search/results/_assets.html.erb
View file

@ -6,7 +6,7 @@
<% if wopi_file?(asset) %>
<%= file_extension_icon(asset) %>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<% end %>
<% end %>
<%= render partial: "search/results/partials/asset_text.html.erb", locals: { asset: asset, query: search_query } %>

2
app/views/search/results/_results.html.erb
View file

@ -8,7 +8,7 @@
<% if result.asset.is_image? %>
<span class="glyphicon glyphicon-picture"></span>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<% end %>
<% end %>
<%= render partial: "search/results/partials/result_text.html.erb", locals: { result: result, query: search_query, target: nil } %>

2
app/views/steps/_empty_step.html.erb
View file

@ -14,7 +14,7 @@
id="new-step-assets-tab"
onClick="dragNdropAssetsInit('steps')">
<a href="#new-step-assets" data-toggle="tab" data-no-turbolink="true">
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<%= t("protocols.steps.new.tab_assets") %>
</a>
</li>

2
app/views/steps/_form_assets.html.erb
View file

@ -1,6 +1,6 @@
<div class="panel panel-default panel-step-attachment">
<div class="panel-heading">
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-paperclip"></span>
<%= t("protocols.steps.new.asset_panel_title") %>
<div class="pull-right">
<% unless ff.object.file.exists? && ff.object.locked? %>