scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change icons throughout the rest of application [SCI-2445]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-07-09 13:13:44 +02:00
parent 54caa772d9
commit 6669beaf0e
120 changed files with 321 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/application.js.erb
View file

@ -209,21 +209,21 @@ var HelperModule = (function(){
}
helpers.flashAlertMsg = function(message, type) {
var alertType, glyphSign;
var alertType, fasSign;
$('#notifications').html('');
if (type === 'success') {
alertType = ' alert-success ';
glyphSign = ' glyphicon-ok-sign ';
fasSign = ' fa-check-circle ';
} else if (type === 'danger') {
alertType = ' alert-danger ';
glyphSign = ' glyphicon-exclamation-sign ';
fasSign = ' fa-exclamation-circle ';
} else if (type === 'info') {
alertType = ' alert-info ';
glyphSign = ' glyphicon-exclamation-sign ';
fasSign = ' fa-exclamation-circle ';
} else if (type === 'warning') {
alertType = ' alert-warning ';
glyphSign = ' glyphicon-exclamation-sign ';
fasSign = ' fa-exclamation-circle ';
}
var htmlSnippet = '<div id="alert-flash" class="alert alert' + alertType +
'alert-dismissable alert-floating">' +
@ -231,7 +231,7 @@ var HelperModule = (function(){
'<button type="button" class="close" ' +
'data-dismiss="alert" aria-label="Close">' +
'<span aria-hidden="true">×</span></button>' +
'<span class="glyphicon' + glyphSign + '"></span>&nbsp;' +
'<span class="fas' + fasSign + '"></span>&nbsp;' +
'<span>' + message + '</span>' +
'</div>' +
'</div>';

16
app/assets/javascripts/my_modules/results.js.erb
View file

@ -28,8 +28,8 @@
$('#results-collapse-btn').click(function () {
$('.result .panel-collapse').collapse('hide');
$(document).find('span.collapse-result-icon').each(function() {
$(this).addClass('glyphicon-collapse-down');
$(this).removeClass('glyphicon-collapse-up');
$(this).addClass('fa-caret-square-down');
$(this).removeClass('fa-caret-square-up');
});
});
@ -80,8 +80,8 @@
var collapseIcon = $(this).find('.collapse-result-icon');
var collapsed = $(this).hasClass('collapsed');
// Toggle collapse button
collapseIcon.toggleClass('glyphicon-collapse-up', !collapsed);
collapseIcon.toggleClass('glyphicon-collapse-down', collapsed);
collapseIcon.toggleClass('fa-caret-square-up', !collapsed);
collapseIcon.toggleClass('fa-caret-square-down', collapsed);
});
}
@ -100,8 +100,8 @@
function _expandAllResults() {
$('.result .panel-collapse').collapse('show');
$(document).find('span.collapse-result-icon').each(function() {
$(this).addClass('glyphicon-collapse-up');
$(this).removeClass('glyphicon-collapse-down');
$(this).addClass('fa-caret-square-up');
$(this).removeClass('fa-caret-square-down');
});
$(document).find('div.step-result-hot-table').each(function() {
_renderTable(this);
@ -111,8 +111,8 @@
function expandResult(result) {
$('.panel-collapse', result).collapse('show');
$(result).find('span.collapse-result-icon').each(function() {
$(this).addClass('glyphicon-collapse-up');
$(this).removeClass('glyphicon-collapse-down');
$(this).addClass('fa-caret-square-up');
$(this).removeClass('fa-caret-square-down');
});
_renderTable($(result).find('div.step-result-hot-table'));
animateSpinner(null, false);

4
app/assets/javascripts/projects/canvas.js.erb
View file

@ -1119,8 +1119,8 @@ function updateModuleHtml(module, id, name, gridDistX, gridDistY) {
var toggleIcon = document.createElement("span");
$(toggleIcon)
.addClass("glyphicon")
.addClass("glyphicon-triangle-bottom")
.addClass("fas")
.addClass("fa-caret-down")
.attr("aria-hidden", "true")
.appendTo(dropdownToggle);

22
app/assets/javascripts/protocols/steps.js.erb
View file

@ -48,7 +48,7 @@
$('.task-state-label').html(data.module_state_label);
task_button
.find('button')
.html('<span class="glyphicon glyphicon-remove"></span>&nbsp;' +
.html('<span class="fas fa-times"></span>&nbsp;' +
data.task_button_title);
modal.modal('hide');
},
@ -81,7 +81,7 @@
button = step.find("[data-action='complete-step']");
button.attr("data-action", "uncomplete-step");
button.find(".btn").removeClass("btn-toggle").addClass("btn-default");
button.find("button").html('<span class="glyphicon glyphicon-remove"></span>&nbsp;' + data.new_title);
button.find("button").html('<span class="fas fa-times"></span>&nbsp;' + data.new_title);
if (data.task_ready_to_complete) {
$('#completed-task-modal').modal('show');
@ -94,7 +94,7 @@
button = step.find("[data-action='uncomplete-step']");
button.attr("data-action", "complete-step");
button.find(".btn").removeClass("btn-default").addClass("btn-toggle");
button.find("button").html('<span class="glyphicon glyphicon-ok"></span>&nbsp;' + data.new_title);
button.find("button").html('<span class="fas fa-check"></span>&nbsp;' + data.new_title);
}
},
error: function (data) {
@ -196,8 +196,8 @@
var collapseIcon = $(this).find(".collapse-step-icon");
var collapsed = $(this).hasClass("collapsed");
// Toggle collapse button
collapseIcon.toggleClass("glyphicon-collapse-up", !collapsed);
collapseIcon.toggleClass("glyphicon-collapse-down", collapsed);
collapseIcon.toggleClass("fa-caret-square-up", !collapsed);
collapseIcon.toggleClass("fa-caret-square-down", collapsed);
});
}
@ -620,16 +620,16 @@
renderTable($(this));
});
$(document).find("span.collapse-step-icon").each(function() {
$(this).addClass("glyphicon-collapse-up");
$(this).removeClass("glyphicon-collapse-down");
$(this).addClass("fa-caret-square-up");
$(this).removeClass("fa-caret-square-down");
});
}
function expandStep(step) {
$('.panel-collapse', step).collapse('show');
$(step).find("span.collapse-step-icon")
.addClass("glyphicon-collapse-up")
.removeClass("glyphicon-collapse-down");
.addClass("fa-caret-square-up")
.removeClass("fa-caret-square-down");
$(step).find("div.step-result-hot-table").each(function() {
renderTable($(this));
});
@ -667,8 +667,8 @@
$("[data-action='collapse-steps']").click(function () {
$('.step .panel-collapse').collapse('hide');
$(document).find("span.collapse-step-icon").each(function() {
$(this).addClass("glyphicon-collapse-down");
$(this).removeClass("glyphicon-collapse-up");
$(this).addClass("fa-caret-square-down");
$(this).removeClass("fa-caret-square-up");
});
});

2
app/assets/javascripts/repository_columns/index.js.erb
View file

@ -121,7 +121,7 @@
html += '<span class="fas fa-pencil-alt"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.edit_column" %></button>&nbsp;';
html += '<button class="btn btn-default delete-column" data-action="destroy">';
html += '<span class="glyphicon glyphicon-trash"></span>&nbsp;';
html += '<span class="fas fa-trash-alt"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.delete_column" %>';
html += '</button></span></div></li>';
$(html).insertBefore('.repository-columns-body ul li:first')

18
app/assets/javascripts/samples/sample_datatable.js.erb
View file

@ -921,11 +921,11 @@ function createSampleGroupSelect(data, selected) {
$option = $('<option></option>')
.attr('value', -1).text(I18n.t('samples.table.no_group'))
.attr('data-icon', 'glyphicon glyphicon-asterisk');
.attr('data-icon', 'fas fa-asterisk');
$selectGroup.append($option);
$.each(data, function(i, val) {
var $span = $('<span></span>').addClass('glyphicon glyphicon-asterisk')
var $span = $('<span></span>').addClass('fas fa-asterisk')
.css('color', val.color);
var $option = $('<option></option>')
.attr('value', val.id).text(val.name)
@ -1077,7 +1077,7 @@ function changeToEditMode() {
var editable = $(el).is('[data-editable]');
var deletable = $(el).is('[data-deletable]');
var visClass = (visible) ? 'fas fa-eye' : 'glyphicon-eye-close';
var visClass = (visible) ? 'fa-eye' : 'fa-eye-slash';
var visLi = (visible) ? '' : 'col-invisible';
var editClass = (editable) ? '' : 'disabled';
var delClass = (deletable) ? '' : 'disabled';
@ -1102,11 +1102,11 @@ function changeToEditMode() {
'<span class="text">' + generateColumnNameTooltip(thederName) + '</span> ' +
'<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' +
'<span class="pull-right controls">' +
'<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.save") %>"></span>' +
'<span class="cancel glyphicon glyphicon-remove" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
'<span class="vis glyphicon ' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
'<span class="ok fas fa-check" style="display: none;" title="<%= I18n.t("general.save") %>"></span>' +
'<span class="cancel fas fa-times" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
'<span class="vis fas' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
'<span class="edit fas fa-pencil-alt ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '" title="<%= I18n.t("samples.columns_delete") %>"></span>' +
'<span class="del fas fa-trash-alt ' + delClass + '" title="<%= I18n.t("samples.columns_delete") %>"></span>' +
'</span><br></span></li>';
dropdownList.append(html);
}
@ -1140,14 +1140,14 @@ function changeToEditMode() {
var column = table.column(li.attr('data-position'));
if (column.visible()) {
self.addClass('glyphicon-eye-close');
self.addClass('fa-eye-slash');
self.removeClass('fas fa-eye');
li.addClass('col-invisible');
column.visible(false);
table.setColumnSearchable(column.index(), false);
} else {
self.addClass('fas fa-eye');
self.removeClass('glyphicon-eye-close');
self.removeClass('fa-eye-slash');
li.removeClass('col-invisible');
column.visible(true);
table.setColumnSearchable(column.index(), true);

2
app/assets/javascripts/sidebar.js.erb
View file

@ -124,7 +124,7 @@
$(".tree li.parent_li ")
.find("> span i")
.removeClass("no-arrow")
.addClass("glyphicon glyphicon-triangle-right expanded");
.addClass("fas fa-caret-right expanded");
// Add IDs to all parent <lis>
var i = 0;

6
app/assets/javascripts/sitewide/atwho_res.js.erb
View file

@ -172,7 +172,7 @@ var SmartAnnotation = (function() {
'">Tasks</button>' +
rep_buttons +
'<div class="dismiss">' +
'<span class="glyphicon glyphicon-remove"></span>' +
'<span class="fas fa-times"></span>' +
'</div>' +
'<div class="help">' +
'<div>' +
@ -458,7 +458,7 @@ var SmartAnnotation = (function() {
'</div>' +
'</div>' +
'<div class="dismiss">' +
'<span class="glyphicon glyphicon-remove"></span>' +
'<span class="fas fa-times"></span>' +
'</div>' +
'</div>',
limit: <%= Constants::ATWHO_SEARCH_LIMIT %>,
@ -480,7 +480,7 @@ var SmartAnnotation = (function() {
// Closes the atwho popup * needed in repositories to close the popup
// if nothing is selected and the user leaves the form *
function closePopup() {
$('.atwho-header-res').find('.glyphicon-remove').click();
$('.atwho-header-res').find('.fa-times').click();
}
function initialize(field) {

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

@ -270,11 +270,11 @@
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-file"></span>';
html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>';
html += '<div class="pull-right">';
html += '<a data-item-id="' + i + '" href="#">';
html += '<span class="glyphicon glyphicon-remove"></span></a></div></div>';
html += '<span class="fas fa-times"></span></a></div></div>';
html += '<div class="panel-body">';
html += '<label class="control-label">';
html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>:</label> ';
@ -442,11 +442,11 @@
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-file"></span>';
html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>';
html += '<div class="pull-right">';
html += '<a data-item-id="' + i + '" href="#">';
html += '<span class="glyphicon glyphicon-remove"></span></a></div></div>';
html += '<span class="fas fa-times"></span></a></div></div>';
html += '<div class="panel-body"><div class="form-group">';
html += '<label class="control-label">Name</label>';
html += '<input type="text" class="form-control" ';

2
app/assets/javascripts/sitewide/string_utils.js
View file

@ -10,7 +10,7 @@ function truncateLongString( el, chars ) {
var html = "";
if( $.type(el) !== 'string' &&
el.children().hasClass("glyphicon")) {
el.children().hasClass('fas')) {
html = el.children()[0];
}

5
app/assets/stylesheets/constants.scss
View file

@ -79,11 +79,6 @@ $headings-font-weight: 500;
$headings-line-height: 1.1;
$headings-color: inherit;
// // Iconography
// $icon-font-path: "../fonts/";
// $icon-font-name: "glyphicons-halflings-regular";
// $icon-font-svg-id: "glyphicons_halflingsregular";
// Components
$padding-base-vertical: 6px;
$padding-base-horizontal: 12px;

9
app/assets/stylesheets/mixins.scss
View file

@ -5,15 +5,6 @@
-o-box-shadow: $shadows;
}
@mixin glyphicon-flip-horizontal() {
-moz-transform: scaleX(-1);
-o-transform: scaleX(-1);
-webkit-transform: scaleX(-1);
transform: scaleX(-1);
filter: FlipH;
-ms-filter: "FlipH";
}
@mixin rotate($degrees) {
-webkit-transform: rotate($degrees);
-moz-transform: rotate($degrees);

6
app/assets/stylesheets/partials/_tree_view.scss
View file

@ -41,7 +41,7 @@
padding: 0;
}
&.glyphicon-map-marker {
&.fa-map-marker-alt {
border: 0;
display: inline-block;
padding: 0;
@ -65,7 +65,7 @@
padding-left: 15px;
}
i.glyphicon {
i.fas {
cursor: pointer;
font-size: 9pt;
@ -90,7 +90,7 @@
}
#settings {
.glyphicon-triangle-right {
.fa-caret-right {
margin-left: -15px;
}

4
app/assets/stylesheets/projects.scss
View file

@ -299,7 +299,7 @@ path, ._jsPlumb_endpoint {
height: 0px;
display: inline-block;
& .glyphicon {
& .fas {
position: inherit;
}
@ -423,7 +423,7 @@ li.module-hover {
}
}
.glyphicon, .fas {
.fas {
color: $color-white;
font-size: $font-size-h6;
}

4
app/assets/stylesheets/reports_pdf.scss
View file

@ -2,8 +2,8 @@
* Additional rules when generating PDF from the reports.
*/
// Hide all glyphicons
.glyphicon {
// Hide all fas icons
.fas {
display: none;
}

4
app/assets/stylesheets/sample_types_groups.scss
View file

@ -44,11 +44,11 @@
display: none;
}
.glyphicon-ok {
.fa-check {
color: $brand-default;
}
.glyphicon {
.fas {
cursor: pointer;
font-size: 15px;
}

2
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -251,7 +251,7 @@
margin-left: 17px;
}
.glyphicon-ok-sign {
.fa-check-circle {
color: $brand-primary;
margin-left: -2px;
margin-right: 2px;

10
app/assets/stylesheets/themes/scinote.scss
View file

@ -406,7 +406,7 @@ a[data-toggle="tooltip"] {
#help-link {
padding: 13px;
.glyphicon.glyphicon-info-sign {
.fas.fa-info-circle {
font-size: $font-size-large;
margin-top: 4px;
}
@ -456,7 +456,7 @@ a[data-toggle="tooltip"] {
padding-left: 10px;
}
&:not(.disabled) span.glyphicon {
&:not(.disabled) span.fas {
color: transparent !important;
}
}
@ -1715,7 +1715,7 @@ th.custom-field .modal-tooltiptext {
.atwho-li-res {
.glyphicon-tint {
.fa-tint {
margin-left: 5px;
margin-right: 5px;
}
@ -1817,7 +1817,7 @@ a.disabled-with-click-events {
margin-right: 400px;
}
.glyphicon {
.fas {
margin-left: 100px;
}
@ -1827,7 +1827,7 @@ a.disabled-with-click-events {
display: none;
}
.glyphicon {
.fas {
margin-left: 10px;
}
}

2
app/datatables/protocol_linked_children_datatable.rb
View file

@ -67,7 +67,7 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
locals: { experiment: record.my_module.experiment }
)
res += '</li>'
res += "<li><span class='glyphicon glyphicon-credit-card'></span>&nbsp;"
res += "<li><span class='fas fa-credit-card'></span>&nbsp;"
res += @controller.render_to_string(
partial: 'search/results/partials/my_module_text.html.erb',
locals: { my_module: record.my_module, link_to_page: :protocols }

4
app/datatables/sample_datatable.rb
View file

@ -149,10 +149,10 @@ class SampleDatatable < CustomDatatable
def sample_group_cell(record)
if record.sample_group.nil?
"<span class='glyphicon glyphicon-asterisk'></span> " \
"<span class='fas fa-asterisk'></span> " \
"#{I18n.t('samples.table.no_group')}"
else
"<span class='glyphicon glyphicon-asterisk' " \
"<span class='fas fa-asterisk' " \
"style='color: #{escape_input(record.sample_group.color)}'></span> " \
"#{escape_input(record.sample_group.name)}"
end

2
app/datatables/teams_datatable.rb
View file

@ -71,7 +71,7 @@ class TeamsDatatable < CustomDatatable
# If user is last admin of team, don't allow
# him/her to leave team
def leave_team_button(user_team)
button = "<span class=\"glyphicon glyphicon-log-out\"></span>
button = "<span class=\"fas fa-sign-out-alt\"></span>
<span class=\"hidden-xs\">
#{I18n.t('users.settings.teams.index.leave')}
</span>"

2
app/helpers/application_helper.rb
View file

@ -148,7 +148,7 @@ module ApplicationHelper
alt='thumb'></div><div class='col-xs-8'>
<div class='row'><div class='col-xs-9 text-left'><h5>
#{user.full_name}</h5></div><div class='col-xs-3 text-right'>
<span class='glyphicon glyphicon-remove' aria-hidden='true'></span>
<span class='fas fa-times' aria-hidden='true'></span>
</div></div><div class='row'><div class='col-xs-12'>
<p class='silver'>#{user.email}</p>)
if user_still_in_team

6
app/helpers/bootstrap_form_helper.rb
View file

@ -48,7 +48,7 @@ module BootstrapFormHelper
end
res << "<input type='datetime' class='form-control' name='#{input_name}' id='#{id}' readonly data-ts='#{timestamp}' />"
if options[:clear] then
res << "<span class='input-group-addon' id='#{id}_clear'><span class='glyphicon glyphicon-remove'></span></span></div>"
res << "<span class='input-group-addon' id='#{id}_clear'><span class='fas fa-times'></span></span></div>"
end
res << "</div></div></div></div><script type='text/javascript'>$(function () { var dt = $('##{id}'); dt.datetimepicker({ #{jsOpts}ignoreReadonly: true, locale: '#{js_locale}', format: '#{js_format}' }); if (dt.length > 0 && dt.data['ts'] != '') { $('##{id}').data('DateTimePicker').date(moment($('##{id}').data('ts'))); }"
if options[:clear] then
@ -181,8 +181,8 @@ module BootstrapFormHelper
id = "#{@object_name}_#{name.to_s}"
input_name = "#{@object_name}[#{name.to_s}]"
icon_str = '<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>'
icon_str_hidden = '<span class="glyphicon glyphicon-ok" aria-hidden="true" style="display: none;"></span>'
icon_str = '<span class="fas fa-check" aria-hidden="true"></span>'
icon_str_hidden = '<span class="fas fa-check" aria-hidden="true" style="display: none;"></span>'
label = name.to_s.humanize
if options[:label] then

6
app/javascript/packs/fontawesome.scss vendored
View file

@ -1,4 +1,4 @@
$fa-font-path: "~@fortawesome/fontawesome-free-webfonts/webfonts/";
$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
@import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome";
@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid";
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
@import "~@fortawesome/fontawesome-free/scss/fa-solid";

20
app/javascript/src/components/AlertsContainer/components/Alert.jsx
View file

@ -18,12 +18,12 @@ class Alert extends Component {
return classes[type] || classes.success;
}
static glyphiconClass(type) {
static fasClass(type) {
const classes = {
error: "glyphicon-exclamation-sign",
alert: "glyphicon-exclamation-sign",
notice: "glyphicon-info-sign",
success: "glyphicon-ok-sign"
error: "fa-exclamation-circle",
alert: "fa-exclamation-circle",
notice: "fa-info-circle",
success: "fa-check-circle"
};
return classes[type] || classes.success;
}
@ -45,9 +45,9 @@ class Alert extends Component {
${Alert.alertClass(this.props.type)}
alert-dismissable
alert-floating`;
const glyphiconClassName =
`glyphicon
${Alert.glyphiconClass(this.props.type)}`;
const fasClassName =
`fas
${Alert.fasClass(this.props.type)}`;
return (
<Wrapper className={alertClassName}>
@ -61,7 +61,7 @@ class Alert extends Component {
onClick={this.props.onClose}>
<span aria-hidden="true">×</span>
</button>
<span className={glyphiconClassName} />
<span className={fasClassName} />
<span>&nbsp;{this.props.message}</span>
</Col>
</Row>
@ -78,4 +78,4 @@ Alert.propTypes = {
onClose: func.isRequired
};
export default Alert;
export default Alert;

2
app/javascript/src/components/Navigation/components/InfoDropdown.jsx
View file

@ -48,7 +48,7 @@ class InfoDropdown extends Component<*, State> {
noCaret
title={
<span>
<span className="glyphicon glyphicon-info-sign" />&nbsp;
<span className="fas fa-info-circle" />&nbsp;
<span className="visible-xs-inline visible-sm-inline">
<FormattedMessage id="navbar.info_label" />
</span>

2
app/javascript/src/components/Navigation/components/NotificationImage.jsx
View file

@ -20,7 +20,7 @@ const NotificationImage = ({className, type, avatar}: Props) => {
),
system_message: (
<span className="system-message">
<i className="glyphicon glyphicon-tower" />
<i className="fas fa-chess-rook" />
</span>
),
deliver: (

2
app/javascript/src/components/Navigation/components/SearchDropdown.jsx
View file

@ -63,7 +63,7 @@ class SearchDropdown extends Component {
noCaret
title={
<span>
<span className="glyphicon glyphicon-search" />&nbsp;
<span className="fas fa-search" />&nbsp;
<span className="visible-xs-inline visible-sm-inline">
<FormattedMessage id="navbar.search_label" />
</span>

2
app/javascript/src/scenes/SettingsPage/scenes/preferences/index.jsx
View file

@ -94,7 +94,7 @@ class SettingsPreferences extends Component<Props, State> {
title="settings_page.system_message"
subtitle="settings_page.system_message_msg"
emailNotification={this.state.system_message_email_notification}
iconClasses="glyphicon glyphicon-tower"
iconClasses="fas fa-chess-rook"
iconBackground={ICON_GREEN_COLOR}
reloadInfo={this.getPreferencesInfo}
/>

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

@ -12,11 +12,11 @@
<% if can_manage_experiment?(@experiment) %>
<%=link_to "", type: "button", class: "btn btn-primary", id: "canvas-new-module" do %>
<span class="hbtn-default">
<span class="glyphicon glyphicon-credit-card"></span>
<span class="fas fa-credit-card"></span>
<%= t("experiments.canvas.edit.new_module") %>
</span>
<span class="hbtn-hover">
<span class="glyphicon glyphicon-credit-card"></span>
<span class="fas fa-credit-card"></span>
<em class="hidden-xs"><%= t("experiments.canvas.edit.new_module_hover") %></em>
<span class="visible-xs-inline"><%= t("experiments.canvas.edit.new_module") %></span>
</span>
@ -25,7 +25,7 @@
<div class="btn-group pull-right" role="group">
<%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-default cancel-edit-canvas" do %>
<span class="hidden-xs"><%= t("experiments.canvas.edit.cancel") %></span>
<span class="glyphicon glyphicon-remove visible-xs" style="height: 16px;margin-top: 4px;">&nbsp;</span>
<span class="fas fa-times visible-xs" style="height: 16px;margin-top: 4px;">&nbsp;</span>
<% end %>
<%= f.submit class: "btn btn-success", id: "canvas-save" do %>
<span class="visibile-xs"><%= t("experiments.canvas.edit.save_short") %></span>

2
app/views/canvas/edit/_my_module.html.erb
View file

@ -15,7 +15,7 @@
<div class="dropdown pull-right module-options">
<a class="dropdown-toggle" id="<%= my_module.id %>_options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
<span class="fas fa-caret-down" aria-hidden="true"></span>
</a>
<ul class="dropdown-menu custom-dropdown-menu no-scale" aria-labelledby="<%= my_module.id %>_options">
<li class="dropdown-header"><%= t('projects.index.options_header') %></li>

2
app/views/comments/_edit.html.erb
View file

@ -9,7 +9,7 @@
value: @comment.message %>
<span class="input-group-btn">
<a class="btn btn-default" data-action="save">
<span class="glyphicon glyphicon-ok"></span>
<span class="fas fa-check"></span>
</a>
</span>
</div>

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

@ -20,7 +20,7 @@
<span class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="exActionsMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="hidden-xs"><%= t'experiments.canvas.actions' %></span>
<span class="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span>
<span class="visible-xs-inline"><i class="fas fa-sort"></i></span>
<span class="caret"></span>
</button>
<%= render partial: 'experiments/dropdown_actions.html.erb',
@ -31,13 +31,13 @@
<span class="hidden-xs"><%=t 'experiments.canvas.zoom' %></span>
<div id="zoom-level-buttons" class="btn-group" 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>
<span class="fas fa-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>
<span class="fas fa-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>
<span class="fas fa-th" aria-hidden="true"></span>
<% end %>
</div>
</div>

2
app/views/layouts/sign_in_halt.html.erb
View file

@ -38,7 +38,7 @@
<div class="alert alert-danger alert-dismissable alert-floating">
<div class="container">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
<span><%= sanitize_input(flash[:error]) %></span>
</div>
</div>

10
app/views/my_module_tags/_index_edit.html.erb
View file

@ -15,12 +15,12 @@
<span class="fas fa-pencil-alt"></span>
<% end %>
<%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-tag-link', title: t("experiments.canvas.modal_manage_tags.remove_tag", module: @my_module.name) do %>
<span class="glyphicon glyphicon-remove"></span>
<span class="fas fa-times"></span>
<% end %>
<%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.experiment.project, tag, format: :json), method: :delete, html: { class: "delete-tag-form"} do |f| %>
<%= hidden_field_tag :my_module_id, @my_module.id %>
<%= f.button class: 'btn btn-link delete-tag-link', title: t("experiments.canvas.modal_manage_tags.delete_tag") do %>
<span class="glyphicon glyphicon-trash"></span>
<span class="fas fa-trash-alt"></span>
<% end %>
<% end %>
</div>
@ -35,10 +35,10 @@
<div class="pull-right">
<%= f.color_picker_select :color, Constants::TAG_COLORS, class: "edit-tag-color" %>
<%= f.button class: "btn btn-link save-tag-link", title: t("experiments.canvas.modal_manage_tags.save_tag") do %>
<span class="glyphicon glyphicon-ok"></span>
<span class="fas fa-check"></span>
<% end %>
<%= link_to "", remote: true, class: 'btn btn-link cancel-tag-link', title: t("experiments.canvas.modal_manage_tags.cancel_tag") do %>
<span class="glyphicon glyphicon-remove"></span>
<span class="fas fa-times"></span>
<% end %>
</div>
<% end %>
@ -74,7 +74,7 @@
<%= f.hidden_field :name, :value => t("tags.create.new_name") %>
<%= f.hidden_field :color, :value => Constants::TAG_COLORS[0] %>
<%= f.button class: "btn btn-primary" do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%=t "experiments.canvas.modal_manage_tags.create_new" %></span>
<% end %>
<% end %>

6
app/views/my_modules/_due_date_label.html.erb
View file

@ -2,19 +2,19 @@
<%= t("my_modules.states.completed") %>
<span class="due-date-label">
<%= l(my_module.completed_on, format: :full_date) %>
<span class="glyphicon glyphicon-ok"></span>
<span class="fas fa-check"></span>
</span>
<% elsif my_module.is_one_day_prior? %>
<%= t("my_modules.states.due_soon") %>
<span class="due-date-label">
<%=l my_module.due_date, format: :full_date %>
<span class="glyphicon glyphicon-alert"></span>
<span class="fas fa-exclamation-triangle"></span>
</span>
<% elsif my_module.is_overdue? %>
<%= t("my_modules.states.overdue") %>
<span class="due-date-label">
<%=l my_module.due_date, format: :full_date %>
<span class="glyphicon glyphicon-alert"></span>
<span class="fas fa-exclamation-triangle"></span>
</span>
<% elsif my_module.due_date %>
<%= t("experiments.canvas.full_zoom.due_date") %>

12
app/views/my_modules/_module_header.html.erb
View file

@ -1,7 +1,7 @@
<div class="row">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "my_modules.module_header.start_date" %></span>
@ -13,10 +13,10 @@
<div class="badge-icon">
<% if can_manage_module?(@my_module) %>
<%= link_to due_date_my_module_path(@my_module, format: :json), remote: true, class: "due-date-link", style: "color: inherit" do %>
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
<% end %>
<% else %>
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
<% end %>
</div>
<div class="well well-sm">
@ -39,7 +39,7 @@
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-ok"></span>
<span class="fas fa-check"></span>
</div>
<div class="well well-sm">
<span class="task-state-label">
@ -77,10 +77,10 @@
<div class="badge-icon">
<% if can_manage_module?(@my_module) %>
<%= link_to description_my_module_path(@my_module, format: :json), remote: true, class: "description-link", style: "color: inherit" do %>
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
<% end %>
<% else %>
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
<% end %>
</div>
<div class="well well-sm">

8
app/views/my_modules/_result.html.erb
View file

@ -2,11 +2,11 @@
<div class="badge-num">
<span class="badge icon">
<% if result.is_text %>
<span class="glyphicon glyphicon-font"></span>
<span class="fas fa-font"></span>
<% elsif result.is_table %>
<span class="fas fa-table"></span>
<% elsif result.is_asset %>
<span class="glyphicon glyphicon-picture"></span>
<span class="fas fa-image"></span>
<% end %>
</span>
</div>
@ -25,7 +25,7 @@
data-confirm-text="<%= t('my_modules.results.archive_confirm') %>"
title="<%= t'my_modules.results.options.archive_title' %>"
onclick="Results.archive(event, this);">
<span class="glyphicon glyphicon-briefcase"></span>
<span class="fas fa-briefcase"></span>
</a>
<%= form_for :result, url: result_path_of_type(result), method: :patch, html: {id: 'result-archive-form-' + result.id.to_s } do |f| %>
<%= f.hidden_field :archived, value: true %>
@ -33,7 +33,7 @@
<% end %>
</div>
<a class="result-panel-collapse-link" href="#result-panel-<%= result.id %>" data-toggle="collapse" data-remote="true">
<span class="glyphicon glyphicon-collapse-down collapse-result-icon"></span>
<span class="fas fa-caret-square-down collapse-result-icon"></span>
<strong><%= result.name %></strong> |
<span><%= t('my_modules.results.published_on', timestamp: l(result.created_at, format: :full), user: h(result.user.full_name)).html_safe %></span>
</a>

2
app/views/my_modules/_state_button_complete.html.erb
View file

@ -1,4 +1,4 @@
<button class="btn btn-toggle">
<span class="glyphicon glyphicon-ok"></span>
<span class="fas fa-check"></span>
<%= t("my_modules.buttons.complete") %>
</button>

2
app/views/my_modules/_state_button_uncomplete.html.erb
View file

@ -1,4 +1,4 @@
<button class="btn btn-default">
<span class="glyphicon glyphicon-remove"></span>
<span class="fas fa-times"></span>
<%= t("my_modules.buttons.uncomplete") %>
</button>

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

@ -37,12 +37,12 @@
<h3 class="panel-title">
<% if result.is_asset %>
<% if result.asset.is_image? %>
<span class="glyphicon glyphicon-picture"></span>
<span class="fas fa-image"></span>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-file"></span>
<% end %>
<% elsif result.is_text %>
<span class="glyphicon glyphicon-asterisk"></span>
<span class="fas fa-asterisk"></span>
<% elsif result.is_table %>
<span class="fas fa-table"></span>
<% end %>

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

@ -1,43 +1,43 @@
<div class="btn-group" role="group" aria-label="" style="margin-left: 15px;">
<div class="btn-group">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
<span class="glyphicon glyphicon-import"></span>
<span class="fas fa-download"></span>
<span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.load_protocol") %></span>
</a>
<ul class="dropdown-menu">
<% if can_manage_protocol_in_module?(@protocol) %>
<li>
<%= link_to load_from_repository_modal_protocol_path(@protocol, format: :json), remote: true, data: { action: "load-from-repository" } do %>
<span class="glyphicon glyphicon-book"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_repository") %>
<span class="fas fa-book"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_repository") %>
<% end %>
</li>
<% else %>
<li class="disabled"><a href="#"><span class="glyphicon glyphicon-book"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_repository") %></a></li>
<li class="disabled"><a href="#"><span class="fas fa-book"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_repository") %></a></li>
<% end %>
<% 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-file"></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-file"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %></a></li>
<% end %>
</ul>
</div>
<% if can_read_experiment?(@my_module.experiment) %>
<%= link_to raw("<span class=\"glyphicon glyphicon-export\"></span><span class=\"hidden-xs-custom\">&nbsp;" + t('my_modules.protocols.buttons.export') + "</span>"), export_protocols_path(protocol_ids: @protocol.id), class: "btn btn-default", data: {no_turbolink: true} %>
<%= link_to raw("<span class=\"fas fa-upload\"></span><span class=\"hidden-xs-custom\">&nbsp;" + t('my_modules.protocols.buttons.export') + "</span>"), export_protocols_path(protocol_ids: @protocol.id), class: "btn btn-default", data: {no_turbolink: true} %>
<% else %>
<a href="#" class="btn btn-default disabled"><span class="glyphicon glyphicon-export"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.export") %></span></a>
<a href="#" class="btn btn-default disabled"><span class="fas fa-upload"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.export") %></span></a>
<% end %>
<% if can_read_protocol_in_module?(@protocol) && can_create_protocols_in_repository?(@protocol.team) %>
<span data-hook="protocol-copy-to-repository">
<%= link_to copy_to_repository_modal_protocol_path(@protocol, format: :json), id: "protocol-copy-to-repository", class: "btn btn-default", remote: true, data: { action: "copy-to-repository" } do %>
<span class="glyphicon glyphicon-saved"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
<span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
<% end %>
</span>
<% else %>
<a href="#" class="btn btn-default disabled"><span class="glyphicon glyphicon-saved"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span></a>
<a href="#" class="btn btn-default disabled"><span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span></a>
<% end %>
</div>

20
app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb
View file

@ -1,9 +1,9 @@
<div class="btn-group">
<% if @protocol.unlinked? %>
<a type="button" class="btn btn-info" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.text") %>">
<span class="glyphicon glyphicon-book"></span>
<span class="fas fa-book"></span>
&nbsp;
<span class="glyphicon glyphicon-remove-sign"></span>
<span class="fas fa-times-sign"></span>
</a>
<a type="button" class="btn btn-info dropdown-toggle" disabled="disabled">
<span class="caret"></span>
@ -11,9 +11,9 @@
<% else %>
<% if @protocol.linked_no_diff? %>
<a type="button" class="btn btn-info" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.text") %>">
<span class="glyphicon glyphicon-book"></span>
<span class="fas fa-book"></span>
&nbsp;
<span class="glyphicon glyphicon-ok-sign"></span>
<span class="fas fa-check-circle"></span>
</a>
<a type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
@ -32,9 +32,9 @@
</ul>
<% elsif @protocol.newer_than_parent? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="glyphicon glyphicon-book"></span>
<span class="fas fa-book"></span>
&nbsp;
<span class="glyphicon glyphicon-circle-arrow-down"></span>
<span class="fas fa-arrow-circle-up"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
@ -73,9 +73,9 @@
</ul>
<% elsif @protocol.parent_newer? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="glyphicon glyphicon-book"></span>
<span class="fas fa-book"></span>
&nbsp;
<span class="glyphicon glyphicon-circle-arrow-up"></span>
<span class="fas fa-arrow-circle-up"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
@ -104,9 +104,9 @@
</ul>
<% elsif @protocol.parent_and_self_newer? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="glyphicon glyphicon-book"></span>
<span class="fas fa-book"></span>
&nbsp;
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>

4
app/views/my_modules/repository.html.erb
View file

@ -22,13 +22,13 @@
<button type="button" class="btn btn-default"
data-assign-url-modal="<%= assign_repository_records_modal_my_module_path(@my_module, @repository) %>"
id="assignRepositoryRecords" onclick="openAssignRecordsModal()" disabled>
<span class="glyphicon glyphicon-ok-circle"></span>
<span class="fas fa-check-circle"></span>
<span class="hidden-xs-custom"><%= t'repositories.assign_records_to_module' %></span>
</button>
<button type="button" class="btn btn-default"
data-unassign-url="<%= unassign_repository_records_modal_my_module_path(@my_module, @repository)%>"
id="unassignRepositoryRecords" onclick="openUnassignRecordsModal()" disabled>
<span class="glyphicon glyphicon-ban-circle"></span>
<span class="fas fa-ban"></span>
<span class="hidden-xs-custom"><%= t'repositories.unassign_records_from_module' %></span>
</button>
<% end %>

8
app/views/my_modules/results.html.erb
View file

@ -7,10 +7,10 @@
<div id="results-toolbar">
<div class="pull-right">
<button class="btn btn-default" id="results-collapse-btn">
<span class="glyphicon glyphicon-collapse-up"></span>
<span class="fas fa-caret-square-up"></span>
<span class="hidden-xs-custom"><%= t'my_modules.results.collapse_label' %></button></span>
<button class="btn btn-default" id="results-expand-btn">
<span class="glyphicon glyphicon-collapse-down"></span>
<span class="fas fa-caret-square-down"></span>
<span class="hidden-xs-custom"><%= t'my_modules.results.expand_label' %></button></span>
</div>
@ -20,7 +20,7 @@
id="new-result-text"
data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id) %>"
href="#">
<span class="glyphicon glyphicon-font"></span>
<span class="fas fa-font"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_text_result") %></span>
</a>
<a class="btn btn-primary"
@ -34,7 +34,7 @@
id="new-result-asset"
data-href="<%= new_my_module_result_asset_path(my_module_id: @my_module.id) %>"
href="#">
<span class="glyphicon glyphicon-picture"></span>
<span class="fas fa-image"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_asset_result") %></span>
</a>
<% end %>

4
app/views/projects/_notifications.html.erb
View file

@ -9,7 +9,7 @@
<li class="notification alert-red">
<div class="date-time">
<span><%= l(mod.due_date, format: :full) %></span>
<span class="glyphicon glyphicon-alert"></span>
<span class="fas fa-exclamation-triangle"></span>
</div>
<%=t "projects.index.module_overdue_html", module: mod.name, days: days %>
</li>
@ -18,7 +18,7 @@
<li class="notification alert-yellow">
<div class="date-time">
<span><%= l(mod.due_date, format: :full) %></span>
<span class="glyphicon glyphicon-alert"></span>
<span class="fas fa-exclamation-triangle"></span>
</div>
<%=t "projects.index.module_one_day_due_html", module: mod.name %>
</li>

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

@ -13,7 +13,7 @@
<div class="dropdown">
<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="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span>
<span class="visible-xs-inline"><i class="fas fa-sort"></i></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="sortMenu">

6
app/views/projects/experiment_archive/_experiment.html.erb
View file

@ -38,7 +38,7 @@
</div>
<div class="col-xs-8">
<span title="<%=t "projects.experiment_archive.archived_on_title", date: l(experiment.archived_on, format: :full_date), time: l(experiment.archived_on, format: :time) %>">
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar-alt" aria-hidden="true"></span>
<%=l experiment.archived_on, format: :full_date %>
</span>
</div>
@ -49,7 +49,7 @@
</div>
<div class="col-xs-8">
<span title="<%=t "projects.experiment_archive.created_on_title", date: l(experiment.created_at, format: :full_date), time: l(experiment.created_at, format: :time) %>">
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar-alt" aria-hidden="true"></span>
<%=l experiment.created_at, format: :full_date %>
</span>
</div>
@ -60,7 +60,7 @@
</div>
<div class="col-xs-8">
<span title="<%=t "projects.experiment_archive.created_on_title", date: l(experiment.updated_at, format: :full_date), time: l(experiment.updated_at, format: :time) %>">
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar-alt" aria-hidden="true"></span>
<%=l experiment.updated_at, format: :full_date %>
</span>
</div>

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

@ -37,7 +37,7 @@
<br />
<a class="btn btn-primary btn-lg"
id="new-project-btn">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t('projects.index.no_projects.create_new_button') %></span>
</a>
<% else %>
@ -86,7 +86,7 @@
<% if @teams.exists? && can_create_projects?(current_team) %>
<!-- new project button -->
<a class="btn btn-primary pull-right" id="new-project-btn">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span class="fas fa-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.index.new" %></span>
</a>
<% end %>
@ -95,7 +95,7 @@
<div class="dropdown">
<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="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span>
<span class="visible-xs-inline"><i class="fas fa-sort"></i></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="sortMenu">

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

@ -13,7 +13,7 @@
<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">
<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="fas fa-sort"></i></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="sortMenu">
@ -32,7 +32,7 @@
type: "button",
id: 'new-experiment',
class: 'btn btn-primary pull-right' do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %>
<% end %>

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

@ -40,7 +40,7 @@
</div>
<% end %>
<span>
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar-alt" aria-hidden="true"></span>
<%= localize(experiment.created_at, format: t('time.formats.full_date')) %> - <%= localize(experiment.updated_at, format: t('time.formats.full_date')) %>
</span>
<div data-hook="experiment-card-body">

16
app/views/protocols/_header.html.erb
View file

@ -11,7 +11,7 @@
<div class="row">
<div class="col-xs-6 col-sm-4 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.created_at" %>:</span>
@ -21,7 +21,7 @@
<div class="col-xs-6 col-sm-4 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.updated_at" %>:</span>
@ -43,10 +43,10 @@
<div class="badge-icon">
<% if can_manage_protocol_in_repository?(@protocol) %>
<a data-action="edit-keywords" data-remote="true" href="<%= edit_keywords_modal_protocol_path(@protocol, format: :json) %>" style="color: inherit;">
<span class="glyphicon glyphicon-text-color"></span>
<span class="fas fa-font"></span>
</a>
<% else %>
<span class="glyphicon glyphicon-text-color"></span>
<span class="fas fa-font"></span>
<% end %>
</div>
<div class="well well-sm">
@ -65,10 +65,10 @@
<div class="badge-icon">
<% if can_manage_protocol_in_repository?(@protocol) %>
<a data-action="edit-authors" data-remote="true" href="<%= edit_authors_modal_protocol_path(@protocol, format: :json) %>" style="color: inherit;">
<span class="glyphicon glyphicon-education"></span>
<span class="fas fa-graduation-cap"></span>
</a>
<% else %>
<span class="glyphicon glyphicon-education"></span>
<span class="fas fa-graduation-cap"></span>
<% end %>
</div>
<div class="well well-sm">
@ -87,10 +87,10 @@
<div class="badge-icon">
<% if can_manage_protocol_in_repository?(@protocol) %>
<a data-action="edit-description" data-remote="true" href="<%= edit_description_modal_protocol_path(@protocol, format: :json) %>" style="color: inherit;">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
</a>
<% else %>
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
<% end %>
</div>
<div class="well well-sm">

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

@ -6,15 +6,15 @@
class="btn btn-primary"
data-action="new-step"
data-href="<%= new_protocol_step_path(protocol_id: @protocol.id, format: :json) %>">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span class="fas fa-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "protocols.steps.new_step" %></span>
</a>
<% end %>
<a class="btn btn-default" data-action="collapse-steps">
<span class="glyphicon glyphicon-collapse-up"></span>
<span class="fas fa-caret-square-up"></span>
<span class="hidden-xs"><%= t("protocols.steps.collapse_label") %></a></span>
<a class="btn btn-default" data-action="expand-steps">
<span class="glyphicon glyphicon-collapse-down"></span>
<span class="fas fa-caret-square-down"></span>
<span class="hidden-xs"><%= t("protocols.steps.expand_label") %></a></span>
</div>

2
app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb
View file

@ -7,7 +7,7 @@
</span>
&nbsp; &nbsp;
<span class="step-panel-collapse-link" data-toggle="collapse">
<span class="glyphicon collapse-step-icon glyphicon-collapse-up"></span>
<span class="fas fa-caret-square-up collapse-step-icon "></span>
<strong data-val="name"><%= 'Protocol info' %></strong>
</span>
</div>

2
app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
View file

@ -13,7 +13,7 @@
</span>
&nbsp; &nbsp;
<span class="step-panel-collapse-link" data-toggle="collapse">
<span class="glyphicon collapse-step-icon glyphicon-collapse-up"></span>
<span class="fas fa-caret-square-up collapse-step-icon"></span>
<% title = nil %>
<% step['components'].each do |key1,value1| #finding section (title of step) %>
<% key1 = value1 if value1.class == Hash %>

8
app/views/protocols/import_export/_import_modal.html.erb
View file

@ -57,10 +57,10 @@
<div data-role="multiple-protocols-buttons">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<div class="btn-group" role="group">
<a href="#" class="btn btn-default" data-action="jump-to-first-protocol"><i class="glyphicon glyphicon-fast-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-previous-protocol"><i class="glyphicon glyphicon-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-next-protocol"><i class="glyphicon glyphicon-forward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-last-protocol"><i class="glyphicon glyphicon-fast-forward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-first-protocol"><i class="fas fa-fast-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-previous-protocol"><i class="fas fa-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-next-protocol"><i class="fas fa-forward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-last-protocol"><i class="fas fa-fast-forward"></i></a>
</div>
<div class="btn-group" role="group">
<div data-role="import-all">

2
app/views/protocols/import_export/_preview_templates.html.erb
View file

@ -7,7 +7,7 @@
&nbsp;
&nbsp;
<span class="step-panel-collapse-link" data-toggle="collapse">
<span class="glyphicon glyphicon-collapse-down collapse-step-icon"></span>
<span class="fas fa-caret-square-down collapse-step-icon"></span>
<strong data-val="name"></strong>
</span>
</div>

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

@ -22,7 +22,7 @@
</div>
<div class="btn-group" role="group">
<a class="btn btn-primary" <%= can_create_protocols_in_repository?(@current_team) ? "data-action=create-new" : "disabled=disabled" %> data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.create_new") %></span>
</a>
<a class="btn btn-default" data-action="edit">
@ -30,7 +30,7 @@
<span class="hidden-xs">&nbsp;<%= t("protocols.index.edit") %></span>
</a>
<a class="btn btn-default" data-action="clone">
<span class="glyphicon glyphicon-duplicate"></span>
<span class="fas fa-copy"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.clone_btn") %></span>
</a>
<% if @type == :public %>
@ -52,12 +52,12 @@
aria-expanded="false"
href="#"
<%= 'disabled' unless can_create_protocols_in_repository?(@current_team) %>>
<span class="glyphicon glyphicon-import"></span><span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span></a>
<span class="fas fa-download"></span><span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span></a>
<% if can_create_protocols_in_repository?(@current_team) %>
<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-file"></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,21 +67,21 @@
</li>
<li>
<%= link_to "#modal-import-json-protocol", "data-toggle" => "modal" do %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-file"></span>
<span class="hidden-xs"><%= t("protocols.index.import_json") %></span>
<% end %>
</li>
</ul>
<% end %>
<a class="btn btn-default" data-action="export" data-export-url="<%= export_protocols_path() %>">
<span class="glyphicon glyphicon-export"></span>
<span class="fas fa-upload"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.export") %></span>
</a>
</div>
<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-briefcase"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.archive_action") %></span>
</a>
</div>
@ -91,7 +91,7 @@
</div>
<div class="btn-group" role="group">
<a class="btn btn-default" data-action="restore" data-url="<%= restore_protocols_path %>">
<span class="glyphicon glyphicon-refresh"></span>
<span class="fas fa-sync-alt"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.restore") %></span>
</a>
</div>

2
app/views/protocols/index/_import_results_modal.html.erb
View file

@ -19,7 +19,7 @@
<!-- (THIS IS UGLY) -->
<div data-template="import-result-message-error" style="display: none;">
<div class="alert alert-danger" style="margin-bottom: 15px;" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
<span data-val="message"></span>
</div>
</div>

10
app/views/protocols/index/_protocol_preview_modal_body.html.erb
View file

@ -1,7 +1,7 @@
<div class="row">
<div class="col-xs-6 col-sm-4 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.created_at" %>:</span>
@ -11,7 +11,7 @@
<div class="col-xs-6 col-sm-4 col-md-4">
<div class="badge-icon">
<span class="glyphicon glyphicon-calendar"></span>
<span class="fas fa-calendar-alt"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.updated_at" %>:</span>
@ -31,7 +31,7 @@
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="badge-icon">
<span class="glyphicon glyphicon-text-color"></span>
<span class="fas fa-font"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.keywords" %>:</span>
@ -41,7 +41,7 @@
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="badge-icon">
<span class="glyphicon glyphicon-education"></span>
<span class="fas fa-graduation-cap"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.authors" %>:</span>
@ -51,7 +51,7 @@
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="badge-icon">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
</div>
<div class="well well-sm">
<span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.description" %>:</span>

2
app/views/protocols/index/_results_modal_body.html.erb
View file

@ -5,7 +5,7 @@
<% if failed.count > 0 %>
<div class="alert alert-danger" style="margin-bottom: 15px;" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
<%= t("protocols.index.#{en_action}.message_failed", nr: failed.count) %>
</div>
<% end %>

10
app/views/reports/elements/_element_controls.html.erb
View file

@ -4,15 +4,15 @@
<% if !defined? show_remove then show_remove = true end %>
<%if show_sort %>
<a href="" data-action="sort-asc" title="<%=t "projects.reports.elements.all.sort_asc" %>"><span class="glyphicon glyphicon-sort-by-attributes"></span></a>
<a href="" data-action="sort-desc" title="<%=t "projects.reports.elements.all.sort_desc" %>"><span class="glyphicon glyphicon-sort-by-attributes-alt"></span></a>
<a href="" data-action="sort-asc" title="<%=t "projects.reports.elements.all.sort_asc" %>"><span class="fas fa-sort-by-attributes"></span></a>
<a href="" data-action="sort-desc" title="<%=t "projects.reports.elements.all.sort_desc" %>"><span class="fas fa-sort-by-attributes-alt"></span></a>
<% end %>
<% if show_move_up %>
<a href="" data-action="move-up" title="<%=t "projects.reports.elements.all.move_up" %>"><span class="glyphicon glyphicon-chevron-up"></span></a>
<a href="" data-action="move-up" title="<%=t "projects.reports.elements.all.move_up" %>"><span class="fas fa-chevron-up"></span></a>
<% end %>
<% if show_move_down %>
<a href="" data-action="move-down" title="<%=t "projects.reports.elements.all.move_down" %>"><span class="glyphicon glyphicon-chevron-down"></span></a>
<a href="" data-action="move-down" title="<%=t "projects.reports.elements.all.move_down" %>"><span class="fas fa-chevron-down"></span></a>
<% end %>
<% if show_remove %>
<a href="" data-action="remove" title="<%=t "projects.reports.elements.all.remove" %>"><span class="glyphicon glyphicon-remove"></span></a>
<a href="" data-action="remove" title="<%=t "projects.reports.elements.all.remove" %>"><span class="fas fa-times"></span></a>
<% end %>

4
app/views/reports/elements/_my_module_element.html.erb
View file

@ -1,7 +1,7 @@
<% if my_module.blank? and @my_module.present? then my_module = @my_module end %>
<% timestamp = my_module.created_at %>
<% name = my_module.name %>
<div class="report-element report-module-element" data-ts="<%= timestamp.to_i %>" data-type="my_module" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-modal-title="<%=t "projects.reports.elements.modals.module_contents.head_title", module: my_module.name %>" data-name="<%= name %>" data-icon-class="glyphicon glyphicon-credit-card">
<div class="report-element report-module-element" data-ts="<%= timestamp.to_i %>" data-type="my_module" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-modal-title="<%=t "projects.reports.elements.modals.module_contents.head_title", module: my_module.name %>" data-name="<%= name %>" data-icon-class="fas fa-credit-card">
<div class="report-element-header">
<div class="row">
<div class="pull-left user-time">
@ -16,7 +16,7 @@
<div class="row">
<div class="pull-left module-name">
<h4>
<span class="glyphicon glyphicon-credit-card"></span>
<span class="fas fa-credit-card"></span>
<%= name %></h4>
</div>
<div class="pull-right module-due-date">

4
app/views/reports/elements/_my_module_result_asset_element.html.erb
View file

@ -4,12 +4,12 @@
<% comments = result.result_comments %>
<% timestamp = asset.created_at %>
<% name = result.name %>
<% icon_class = 'glyphicon ' + (is_image ? 'glyphicon-picture' : 'glyphicon-file') %>
<% icon_class = 'fas ' + (is_image ? 'fa-image' : 'fa-file') %>
<div class="report-element report-result-element report-result-asset-element" data-ts="<%= timestamp.to_i %>" data-type="result_asset" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="<%= icon_class %>">
<div class="report-element-header">
<div class="row">
<div class="pull-left result-icon">
<span class="glyphicon <%= icon_class %>"></span>
<span class="<%= icon_class %>"></span>
</div>
<div class="pull-left result-name">
<%= name %>

4
app/views/reports/elements/_my_module_result_text_element.html.erb
View file

@ -3,11 +3,11 @@
<% comments = result.result_comments %>
<% timestamp = result.created_at %>
<% name = result.name %>
<div class="report-element report-result-element report-result-text-element" data-ts="<%= timestamp.to_i %>" data-type="result_text" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="glyphicon glyphicon-asterisk">
<div class="report-element report-result-element report-result-text-element" data-ts="<%= timestamp.to_i %>" data-type="result_text" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="fas fa-asterisk">
<div class="report-element-header">
<div class="row">
<div class="pull-left result-icon">
<span class="glyphicon glyphicon-asterisk"></span>
<span class="fas fa-asterisk"></span>
</div>
<div class="pull-left result-name">
<%= name %>

4
app/views/reports/elements/_my_module_samples_element.html.erb
View file

@ -2,11 +2,11 @@
<% if order.blank? and @order.present? then order = @order end %>
<% timestamp = Time.current + 1.year - 1.days %>
<% samples_json = my_module.samples_json_hot(order) %>
<div class="report-element report-module-samples-element" data-sort-hot="3" data-ts="<%= timestamp.to_i %>" data-type="my_module_samples" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%=t "projects.reports.elements.module_samples.sidebar_name" %>" data-icon-class="glyphicon glyphicon-tint">
<div class="report-element report-module-samples-element" data-sort-hot="3" data-ts="<%= timestamp.to_i %>" data-type="my_module_samples" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%=t "projects.reports.elements.module_samples.sidebar_name" %>" data-icon-class="fas fa-tint">
<div class="report-element-header">
<div class="row">
<div class="pull-left samples-icon">
<span class="glyphicon glyphicon-tint"></span>
<span class="fas fa-tint"></span>
</div>
<div class="pull-left samples-name">
<%=t "projects.reports.elements.module_samples.name", my_module: my_module.name %>

4
app/views/reports/elements/_my_module_step_element.html.erb
View file

@ -6,7 +6,7 @@
<% assets = step.assets %>
<% checklists = step.checklists %>
<% comments = step.step_comments %>
<div class="report-element report-step-element" data-ts="<%= timestamp.to_i %>" data-type="step" data-id='{ "step_id": <%= step.id %> }' data-scroll-id="<%= step.id %>" data-modal-title="<%=t "projects.reports.elements.modals.step_contents.head_title", step: step.name %>" data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position + 1), name: step.name %>" data-icon-class="glyphicon glyphicon-circle-arrow-right">
<div class="report-element report-step-element" data-ts="<%= timestamp.to_i %>" data-type="step" data-id='{ "step_id": <%= step.id %> }' data-scroll-id="<%= step.id %>" data-modal-title="<%=t "projects.reports.elements.modals.step_contents.head_title", step: step.name %>" data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position + 1), name: step.name %>" data-icon-class="fas fa-arrow-circle-right">
<div class="report-element-header">
<div class="row">
<div class="pull-left user-time">
@ -21,7 +21,7 @@
<div class="row">
<div class="pull-left step-name">
<h5>
<span class="glyphicon glyphicon-circle-arrow-right"></span>
<span class="fas fa-arrow-circle-right"></span>
<b><%=t "projects.reports.elements.step.step_pos", pos: (step.position + 1) %></b>&nbsp;<%= step.name %>
<%= step_status_label(step) %>
</h5>

2
app/views/reports/elements/_new_element.html.erb
View file

@ -8,7 +8,7 @@
</div>
</div>
<div class="plus-icon">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
</div>
<div class="line right-line">
<div class="filler-wrapper">

2
app/views/reports/elements/_project_header_element.html.erb
View file

@ -1,6 +1,6 @@
<% if project.blank? and @project.present? then project = @project end %>
<% name = t("projects.reports.elements.project_header.title", project: project.name) %>
<div class="report-element report-project-header-element" data-ts="ignore" data-type="project_header" data-id='{ "project_id": <%= project.id %> }' data-scroll-id="<%= project.id %>" data-name="<%= name %>" data-icon-class="glyphicon glyphicon-header">
<div class="report-element report-project-header-element" data-ts="ignore" data-type="project_header" data-id='{ "project_id": <%= project.id %> }' data-scroll-id="<%= project.id %>" data-name="<%= name %>" data-icon-class="fas fa-heading">
<div class="report-element-header">
<div class="row">
<div class="pull-left user-time">

4
app/views/reports/elements/_step_asset_element.html.erb
View file

@ -1,12 +1,12 @@
<% if asset.blank? and @asset.present? then asset = @asset end %>
<% is_image = asset.is_image? %>
<% timestamp = asset.created_at %>
<% icon_class = 'glyphicon ' + (is_image ? 'glyphicon-picture' : 'glyphicon-file') %>
<% icon_class = 'fas ' + (is_image ? 'fa-image' : 'fa-file') %>
<div class="report-element report-step-attachment-element report-step-asset-element" data-ts="<%= timestamp.to_i %>" data-type="step_asset" data-id='{ "asset_id": <%= asset.id %> }' data-scroll-id="<%= asset.id %>" data-name="<%=t "projects.reports.elements.step_asset.sidebar_name", file: asset.file_file_name %>" data-icon-class="<%= icon_class %>">
<div class="report-element-header">
<div class="row">
<div class="pull-left attachment-icon">
<span class="glyphicon <%= icon_class %>"></span>
<span class="<%= icon_class %>"></span>
</div>
<div class="pull-left file-name">
<em><%=t 'projects.reports.elements.step_asset.file_name', file: truncate( asset.file_file_name, length: Constants::FILENAME_TRUNCATION_LENGTH) %></em>

4
app/views/reports/index.html.erb
View file

@ -7,7 +7,7 @@
<div class="col-md-12">
<% if can_manage_reports?(current_team) %>
<%= link_to '#', class: 'btn btn-primary', id: 'new-report-btn', 'data-no-turbolink' => true do %>
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span class="fas fa-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.new" %></span>
<% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %>
@ -15,7 +15,7 @@
<span class="hidden-xs"><%=t "projects.reports.index.edit" %></span>
<% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %>
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span class="fas fa-times" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.delete" %></span>
<% end %>
<% end %>

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

@ -3,7 +3,7 @@
<div class="dropdown" id="sort-report">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="glyphicon glyphicon-sort visible-xs-inline"></span>
<span class="fas fa-sort visible-xs-inline"></span>
<span class="hidden-xs"><%= t'projects.reports.new.nav_sort_by' %></span>
<span class="caret"></span>
</button>
@ -14,14 +14,14 @@
</div>
<%= link_to "", class: "btn btn-default", remote: true, id: "print-report" do %>
<span class="glyphicon glyphicon-print"></span>
<span class="fas fa-print"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_print" %></span>
<% end %>
<%= form_tag generate_project_reports_path(@project, format: :pdf), method: :post, target: "_blank", class: "get-report-pdf-form" do %>
<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-file-download"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_pdf" %></span>
<% end %>
</div>

4
app/views/reports/new/modal/_experiment_contents.html.erb
View file

@ -5,13 +5,13 @@
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#tasks-tab" aria-controls="tasks-tab" role="tab" data-toggle="tab">
<span class="glyphicon glyphicon-credit-card visible-xs"></span>
<span class="fas fa-credit-card visible-xs"></span>
<span class="hidden-xs"><%= t("projects.reports.elements.modals.project_contents.tasks_tab") %></span>
</a>
</li>
<li role="presentation">
<a href="#content-tab" aria-controls="content-tab" role="tab" data-toggle="tab">
<span class="glyphicon glyphicon-link visible-xs"></span>
<span class="fas fa-link visible-xs"></span>
<span class="hidden-xs"><%= t("projects.reports.elements.modals.project_contents.content_tab") %></span>
</a>
</li>

2
app/views/reports/new/modal/_module_contents.html.erb
View file

@ -5,7 +5,7 @@
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#content-tab" aria-controls="content-tab" role="tab" data-toggle="tab">
<span class="glyphicon glyphicon-link visible-xs"></span>
<span class="fas fa-link visible-xs"></span>
<span class="hidden-xs"><%= t("projects.reports.elements.modals.project_contents.content_tab") %></span>
</a>
</li>

4
app/views/reports/new/modal/_project_contents.html.erb
View file

@ -5,14 +5,14 @@
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#tasks-tab" aria-controls="tasks-tab" role="tab" data-toggle="tab">
<span class="glyphicon glyphicon-credit-card visible-xs"></span>
<span class="fas fa-credit-card visible-xs"></span>
<span class="hidden-xs"><%= t("projects.reports.elements.modals.project_contents.tasks_tab") %></span>
</a>
</li>
<% if project.project_my_modules.is_archived(false).exists? %>
<li role="presentation">
<a href="#content-tab" aria-controls="content-tab" role="tab" data-toggle="tab">
<span class="glyphicon glyphicon-link visible-xs"></span>
<span class="fas fa-link visible-xs"></span>
<span class="hidden-xs"><%= t("projects.reports.elements.modals.project_contents.content_tab") %></span>
</a>
</li>

2
app/views/repositories/_delete_repository_modal.html.erb
View file

@ -10,7 +10,7 @@
<div class="modal-body">
<p><%= t("repositories.index.modal_delete.message_html", name: @repository.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
&nbsp;
<%= t("repositories.index.modal_delete.alert_heading") %>
<ul>

2
app/views/repositories/_repository_row_info_modal.html.erb
View file

@ -58,7 +58,7 @@
<%= render partial: 'search/results/partials/experiment_text.html.erb',
locals: { experiment: element.my_module.experiment } %>
</li>
<li><span class='glyphicon glyphicon-credit-card'></span>&nbsp;
<li><span class='fas fa-credit-card'></span>&nbsp;
<%= render partial: 'search/results/partials/my_module_text.html.erb',
locals: { my_module: element.my_module,
link_to_page: :repositories,

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

@ -17,7 +17,7 @@
id="create-new-repository"
data-remote="true"
href="<%= create_modal_team_repositories_path(current_team) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t('libraries.index.no_libraries.create_new_button') %></span>
</a>
<% else %>

12
app/views/repositories/show.html.erb
View file

@ -10,7 +10,7 @@
<% if can_create_repository_rows?(@repository.team) %>
<button type="button" class="btn btn-primary editAdd" id="addRepositoryRecord" onclick="onClickAddRecord()">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
</button>
<% end %>
@ -90,7 +90,7 @@
id="create-new-repository"
data-remote="true"
href="<%= create_modal_team_repositories_path(@repository.team) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t('libraries.index.no_libraries.create_new_button') %></span>
</a>
<% end %>
@ -101,11 +101,11 @@
<div class="btn-group inline" id="saveCancel" data-toggle="buttons" style="display:none">
<button type="button" class="btn btn-success" id="saveRecord" onclick="onClickSave()">
<span class="glyphicon glyphicon-save"></span>
<span class="fas fa-save"></span>
<%= t("repositories.save_record") %>
</button>
<button type="button" class="btn btn-default" id="cancelSave" onclick="onClickCancel()">
<span class="glyphicon glyphicon-remove visible-xs-inline"></span>
<span class="fas fa-times visible-xs-inline"></span>
<span class="hidden-xs"><%= t("repositories.cancel_save") %></span>
</button>
</div>
@ -119,13 +119,13 @@
</button>
<button type="button" class="btn btn-default"
id="deleteRepositoryRecordsButton" onclick="onClickDelete()" disabled>
<span class="glyphicon glyphicon-trash"></span>
<span class="fas fa-trash-alt"></span>
<span class="hidden-xs-custom"><%= t'repositories.delete_record' %></span>
<%= submit_tag I18n.t('repositories.delete_record'), :class => "hidden
delete_repository_records_submit" %>
</button>
<button type="button" class="btn btn-default copyRow" id="copyRepositoryRecords" onclick="onClickCopyRepositoryRecords()" disabled>
<span class="glyphicon glyphicon-duplicate"></span>
<span class="fas fa-copy"></span>
<span class="hidden-xs-custom"><%= t("repositories.copy_record") %></span>
</button>
<% end %>

2
app/views/repository_columns/_delete_column_modal_body.html.erb
View file

@ -7,7 +7,7 @@
id: @repository_column.id} do |f| %>
<p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
&nbsp;
<%= t("repositories.modal_delete_column.alert_heading") %>
<ul>

4
app/views/repository_columns/index.html.erb
View file

@ -17,7 +17,7 @@
<button class="btn btn-primary"
data-modal-url="<%= repository_columns_create_html_path(@repository) %>"
data-action="new-column-modal">
<span class="glyphicon glyphicon-plus"></span>&nbsp;<%=t 'libraries.repository_columns.index.new_column' %>
<span class="fas fa-plus"></span>&nbsp;<%=t 'libraries.repository_columns.index.new_column' %>
</button>
</div>
</div>
@ -46,7 +46,7 @@
<%=t 'libraries.repository_columns.index.edit_column'%>
</button>&nbsp;
<button class="btn btn-default delete-column" data-action="destroy">
<span class="glyphicon glyphicon-trash"></span>
<span class="fas fa-trash-alt"></span>
<%=t 'libraries.repository_columns.index.delete_column'%>
</button>
</span>

2
app/views/result_assets/_new.html.erb
View file

@ -3,7 +3,7 @@
<%=t 'assets.drag_n_drop.label_html' %>
<label>
<span class="btn btn-primary">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<%=t 'assets.drag_n_drop.browse_label' %>
</span>
<input type="file"

2
app/views/sample_groups/_sample_group.html.erb
View file

@ -16,7 +16,7 @@
<% end %>
</span>
<span class="edit-sample-group fas fa-pencil-alt"></span>
<span class="delete glyphicon glyphicon-trash"></span>
<span class="delete fas fa-trash-alt"></span>
</span>
</span>
</li>

2
app/views/sample_my_modules/_index.html.erb
View file

@ -5,7 +5,7 @@
<li><em><%= t 'experiments.canvas.popups.no_samples' %></em></li>
<% else %>
<% @samples.each do |sample| %>
<li><span class="text-muted glyphicon glyphicon-triangle-right"></span><span><%= sample.name %></span></li>
<li><span class="text-muted fas fa-caret-right"></span><span><%= sample.name %></span></li>
<% end %>
<% end %>
<hr>

2
app/views/sample_types/_sample_type.html.erb
View file

@ -8,7 +8,7 @@
<input class="text-edit" style="display: none;" />
<span class="pull-right">
<span class="edit-sample-type fas fa-pencil-alt"></span>
<span class="delete glyphicon glyphicon-trash"></span>
<span class="delete fas fa-trash-alt"></span>
</span>
</span>
</li>

2
app/views/samples/_delete_custom_field_modal_body.html.erb
View file

@ -9,7 +9,7 @@
<%= f.hidden_field :column_index, value: column_index %>
<p><%= t("samples.modal_delete_custom_field.message", cf: @custom_field.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
&nbsp;
<%= t("samples.modal_delete_custom_field.alert_heading") %>
<ul>

4
app/views/samples/_info_sample_modal.html.erb
View file

@ -19,7 +19,7 @@
<br>
<span>
<%= t "samples.modal_info.sample_group" %>
<span class="glyphicon glyphicon-asterisk" style="<%= "color: #{@sample.sample_group.color}" if @sample.sample_group.present? %>"></span>
<span class="fas fa-asterisk" style="<%= "color: #{@sample.sample_group.color}" if @sample.sample_group.present? %>"></span>
<% if @sample.sample_group.present? %>
<%= @sample.sample_group.name %>
<% else %>
@ -64,7 +64,7 @@
<%= render partial: 'search/results/partials/experiment_text.html.erb',
locals: { experiment: mod.experiment } %>
</li>
<li><span class='glyphicon glyphicon-credit-card'></span>&nbsp;
<li><span class='fas fa-credit-card'></span>&nbsp;
<%= render partial: 'search/results/partials/my_module_text.html.erb',
locals: { my_module: mod, link_to_page: :samples } %>
</li>

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

@ -19,7 +19,7 @@
value="<%= @display_query %>">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<span class="glyphicon glyphicon-search"></span>
<span class="fas fa-search"></span>
</button>
</span>
</div>
@ -83,7 +83,7 @@
match_case: @search_case, utf8: '✓',
search_id: @search_id}.to_query %>">
<span class="badge pull-right"><%= @module_search_count %></span>
<span class="glyphicon glyphicon-credit-card"></span>
<span class="fas fa-credit-card"></span>
<%= t'Modules' %>
</a>
</li>
@ -97,7 +97,7 @@
match_case: @search_case, utf8: '✓',
search_id: @search_id}.to_query %>">
<span class="badge pull-right"><%= @result_search_count %></span>
<span class="glyphicon glyphicon-modal-window"></span>
<span class="fas fa-columns"></span>
<%= t'Results' %>
</a>
</li>
@ -153,7 +153,7 @@
match_case: @search_case, utf8: '✓',
search_id: @search_id}.to_query %>">
<span class="badge pull-right"><%= @step_search_count %></span>
<span class="glyphicon glyphicon-circle-arrow-right"></span>
<span class="fas fa-arrow-circle-right"></span>
<%= t'Steps' %>
</a>
</li>
@ -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-file"></span>
<%= t'Assets' %>
</a>
</li>

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

@ -9,7 +9,7 @@
<input class="form-control" type="text" name="q" placeholder="<%= t('nav.search') %>">
<span class="input-group-btn">
<button id="search-button" class="btn btn-default" type="submit">
<span class="glyphicon glyphicon-search"></span>
<span class="fas fa-search"></span>
</button>
</span>
</div>

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

@ -1,12 +1,12 @@
<% @asset_results.each do |asset| %>
<h5>
<% if asset.is_image? %>
<span class="glyphicon glyphicon-picture"></span>
<span class="fas fa-image"></span>
<% else %>
<% if wopi_file?(asset) %>
<%= file_extension_icon(asset) %>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-file"></span>
<% end %>
<% end %>
<%= render partial: "search/results/partials/asset_text.html.erb", locals: { asset: asset, query: search_query } %>

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

@ -1,6 +1,6 @@
<% results.each do |checklist| %>
<h5>
<span class="glyphicon glyphicon-check"></span>
<span class="fas fa-check-square"></span>
<%= highlight checklist.name, search_query.strip.split(/\s+/) %>
</h5>

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

@ -1,6 +1,6 @@
<% results.each do |mod| %>
<h5>
<span class="glyphicon glyphicon-credit-card"></span>
<span class="fas fa-credit-card"></span>
<%= render partial: "search/results/partials/my_module_text.html.erb", locals: { my_module: mod, query: search_query } %>
</h5>

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

@ -1,14 +1,14 @@
<% results.each do |result| %>
<h5>
<% if result.is_text %>
<span class="glyphicon glyphicon-asterisk"></span>
<span class="fas fa-asterisk"></span>
<% elsif result.is_table %>
<span class="fas fa-table"></span>
<% else %>
<% if result.asset.is_image? %>
<span class="glyphicon glyphicon-picture"></span>
<span class="fas fa-image"></span>
<% else %>
<span class="glyphicon glyphicon-file"></span>
<span class="fas fa-file"></span>
<% end %>
<% end %>
<%= render partial: "search/results/partials/result_text.html.erb", locals: { result: result, query: search_query, target: nil } %>

4
app/views/search/results/_samples.html.erb
View file

@ -1,6 +1,6 @@
<% results.each do |sample| %>
<h5>
<span class="glyphicon glyphicon-tint"></span>
<span class="fas fa-tint"></span>
<%=t "search.index.samples.sample" %>
<%= highlight sample.name, search_query.strip.split(/\s+/) %>
</h5>
@ -17,7 +17,7 @@
<br>
<span>
<%=t "search.index.samples.sample_group" %>
<span class="glyphicon glyphicon-asterisk" style="<%= "color: #{sample.sample_group.color}" if sample.sample_group.present? %>"></span>
<span class="fas fa-asterisk" style="<%= "color: #{sample.sample_group.color}" if sample.sample_group.present? %>"></span>
<% if sample.sample_group.present? %>
<%= highlight sample.sample_group.name, search_query.strip.split(/\s+/) %>
<% else %>

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

@ -1,6 +1,6 @@
<% results.each do |step| %>
<h5>
<span class="glyphicon glyphicon-circle-arrow-right"></span>
<span class="fas fa-arrow-circle-right"></span>
<%= render partial: "search/results/partials/step_text.html.erb", locals: { step: step, query: search_query, target: nil } %>
</h5>

4
app/views/shared/_file_preview_modal.html.erb
View file

@ -9,11 +9,11 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="preview-close" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span></button>
<button type="button" class="preview-close" data-dismiss="modal"><span class="fas fa-times"></span></button>
<span class="file-name"></span>
<span class="file-wopi-controls"></span>
<a class="file-download-link" href='#'>
<p><span class="glyphicon glyphicon-download-alt"></span> <%= t('Download')%></p>
<p><span class="fas fa-download"></span> <%= t('Download')%></p>
</a>
</div>
<div class="modal-body">

6
app/views/shared/_flash_alerts.html.erb
View file

@ -3,7 +3,7 @@
<div id="alert-flash" class="alert alert-success alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="glyphicon glyphicon-ok-sign"></span>
<span class="fas fa-check-circle"></span>
<span><%= sanitize_input(flash[:success]) %></span>
</div>
</div>
@ -12,7 +12,7 @@
<div id="alert-flash" class="alert alert-info alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fas fa-info-circle"></span>
<span><%= notice %></span>
</div>
</div>
@ -21,7 +21,7 @@
<div id="alert-flash" class="alert alert-danger alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-circle"></span>
<span><%= alert || sanitize_input(flash[:error]) %></span>
</div>
</div>

4
app/views/shared/_navigation.html.erb
View file

@ -44,7 +44,7 @@
data-id="<%= team.id %>"
class="text-center change-team">
<% if current_team == team %>
<span class="glyphicon glyphicon-ok-sign"></span> <strong><%= team.name %></strong>
<span class="fas fa-check-circle"></span> <strong><%= team.name %></strong>
<% else %>
<span class="team-name"><%= team.name %></span>
<% end %>
@ -55,7 +55,7 @@
<% if current_user.teams.length > 1 && can_create_teams? %>
<li>
<%= link_to new_team_path do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<%= t('users.settings.teams.index.new_team') %>
<% end %>
</li>

4
app/views/shared/_sample.html.erb
View file

@ -2,10 +2,10 @@
</td>
<% if assigned %>
<td data-sort="1">
<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
<span class="fas fa-check" aria-hidden="true"></span>
<% else %>
<td data-sort="0">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
<span class="fas fa-times" aria-hidden="true"></span>
<% end %>
</td>
<td><%= sample.name %></td>

16
app/views/shared/_samples.html.erb
View file

@ -23,18 +23,18 @@
<% if can_create_samples?(@team) %>
<button type="button" class="btn btn-default editAdd" id="addSample" onclick="onClickAddSample()">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t("samples.add_new_sample") %></span>
</button>
<button type="button" class="btn btn-default" id="importSamplesButton" data-toggle="modal" data-target="#modal-import-samples">
<span class="glyphicon glyphicon-cloud-upload"></span>
<span class="fas fa-cloud-upload-alt"></span>
<span class="hidden-xs"><%= t("samples.import") %></span>
</button>
<% end %>
<% if can_read_team?(@team) %>
<a href="#" class="btn btn-default" id="exportSamplesButton" data-turbolinks="false">
<span class="glyphicon glyphicon-cloud-download"></span>
<span class="fas fa-cloud-download-alt"></span>
<span class="hidden-xs"><%= t("samples.export") %></span>
</a>
@ -83,11 +83,11 @@
<div class="btn-group" id="saveCancel" data-toggle="buttons" style="display:none">
<button type="button" class="btn btn-primary" id="saveSample" onclick="onClickSave()">
<span class="glyphicon glyphicon-save"></span>
<span class="fas fa-save"></span>
<%= t("samples.save_sample") %>
</button>
<button type="button" class="btn btn-default" id="cancelSave" onclick="onClickCancel()">
<span class="glyphicon glyphicon-remove visible-xs-inline"></span>
<span class="fas fa-times visible-xs-inline"></span>
<span class="hidden-xs"><%= t("samples.cancel_save") %></span>
</button>
</div>
@ -102,7 +102,7 @@
<!-- Don't check if user can manage the selected samples, because the ones that he can't, will be left untouched -->
<button type="button" class="btn btn-default"
id="deleteSamplesButton" data-target="#deleteSamples" data-toggle="modal" disabled>
<span class="glyphicon glyphicon-trash"></span>
<span class="fas fa-trash-alt"></span>
<span class="hidden-xs-custom"><%= t'samples.delete_samples' %></span>
<%= submit_tag I18n.t('samples.delete_samples'), :class => "hidden
delete_samples_submit" %>
@ -111,13 +111,13 @@
<% if module_page? && can_assign_sample_to_module?(@my_module) %>
<button type="button" class="btn btn-default"
id="assignSamples" onclick="$(this).next().click();" disabled>
<span class="glyphicon glyphicon-ok-circle"></span>
<span class="fas fa-check-circle"></span>
<span class="hidden-xs-custom"><%= t'samples.assign_samples_to_module' %></span>
</button>
<%= submit_tag MyModulesController::ASSIGN_SAMPLES, :class => "hidden" %>
<button type="button" class="btn btn-default"
id="unassignSamples" onclick="$(this).next().click();" disabled>
<span class="glyphicon glyphicon-ban-circle"></span>
<span class="fas fa-ban"></span>
<span class="hidden-xs-custom"><%= t'samples.unassign_samples_to_module' %></span>
</button>
<%= submit_tag MyModulesController::UNASSIGN_SAMPLES, :class => "hidden" %>

Some files were not shown because too many files have changed in this diff Show more