Commit c449b66e authored by Curtis Adam's avatar Curtis Adam

Update the old FontAwesome icons to the v5 specifications

parent 4d866d6a
......@@ -934,7 +934,7 @@ $themes: (
color: $thm_gray !important;
}
#markdeepNavigation .fa, #markdeepNavigation .markdeep-center, #markdeepNavigation .markdeep-fullscreen, .card-button {
#markdeepNavigation .fas, #markdeepNavigation .fab, #markdeepNavigation .far, #markdeepNavigation .markdeep-center, #markdeepNavigation .markdeep-fullscreen, .card-button {
color: $thm_gray ;
border-color: $thm_gray;
background-color: $white;
......@@ -946,14 +946,14 @@ $themes: (
border-color: $markdeep_help_border !important;
}
#markdeepNavigation .fa:hover, #markdeepNavigation .markdeep-center:hover, #markdeepNavigation .markdeep-help:hover, #markdeepNavigation .markdeep-fullscreen:hover, .card-button:hover,
#markdeepNavigation .fa:focus, #markdeepNavigation .markdeep-center:focus, #markdeepNavigation .markdeep-help:focus, #markdeepNavigation .markdeep-fullscreen:focus, .card-button:focus {
#markdeepNavigation .fas:hover,#markdeepNavigation .fab:hover,#markdeepNavigation .far:hover, #markdeepNavigation .markdeep-center:hover, #markdeepNavigation .markdeep-help:hover, #markdeepNavigation .markdeep-fullscreen:hover, .card-button:hover,
#markdeepNavigation .fas:focus,#markdeepNavigation .fab:focus,#markdeepNavigation .far:focus, #markdeepNavigation .markdeep-center:focus, #markdeepNavigation .markdeep-help:focus, #markdeepNavigation .markdeep-fullscreen:focus, .card-button:focus {
background-color: $button_background_hover !important;
color: $button_text_hover !important;
border-color: $button_background_hover !important;
}
.material-icons.pressed, .fa.pressed, .card-button.pressed, .material-icons.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed, .fas.pressed, .fab.pressed, .far.pressed, .card-button.pressed, .material-icons.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .card-button.pressed:focus {
background-color: lighten($thm_gray, 10%);
color: $white;
......@@ -973,7 +973,7 @@ $themes: (
}
#markdeepNavigation {
.material-icons.pressed, .fa.pressed, .card-button.pressed, .material-icons.pressed:hover,
.material-icons.pressed, .fas.pressed, .fab.pressed, .far.pressed, .card-button.pressed, .material-icons.pressed:hover,
.material-icons.pressed:focus, .card-button.pressed:focus {
background-color: $thm_orange;
border-color: $thm_orange;
......@@ -3432,7 +3432,7 @@ $themes: (
}
//loading screen
.loadingScreenContainer .fa {
.loadingScreenContainer .fas,.loadingScreenContainer .fab, .loadingScreenContainer .far {
color: $loading_screen_icon !important;
}
......@@ -3464,7 +3464,7 @@ $themes: (
background-color: $card_navigation_active_background_hover !important
}
.modal-icon, .modal-icon .fa, .modal-icon {
.modal-icon, .modal-icon .fas, .modal-icon .fab, .modal-icon .far, .modal-icon {
color: $modal_icon !important;
}
......
......@@ -38,7 +38,7 @@ export let Bonus = class Bonus {
if (isCSVExport) {
notifications += TAPi18n.__('leitnerProgress.notification.mail', {}, "de");
} else {
notifications += "<i class='fa fa-envelope'> " + TAPi18n.__('leitnerProgress.notification.mail') + "</i>";
notifications += "<i class='fas fa-envelope'> " + TAPi18n.__('leitnerProgress.notification.mail') + "</i>";
}
}
if (ServerSettings.isPushEnabled() && user.webNotification) {
......@@ -48,7 +48,7 @@ export let Bonus = class Bonus {
if (isCSVExport) {
notifications += TAPi18n.__('leitnerProgress.notification.push', {}, "de");
} else {
notifications += "<i class='fa fa-bell'> " + TAPi18n.__('leitnerProgress.notification.push') + "</i>";
notifications += "<i class='fas fa-bell'> " + TAPi18n.__('leitnerProgress.notification.push') + "</i>";
}
}
return notifications;
......
let footerNavigation = {
"agb": "<i class='fa fa-gavel'></i>&nbsp;",
"backToHome": "<i class='fa fa-home'></i>&nbsp;",
"datenschutz": "<i class='fa fa-lock'></i>&nbsp;",
"demo": "<i class='fa fa-tv'></i>&nbsp;",
"faq": "<i class='fa fa-question-circle'></i>&nbsp;",
"help": "<i class='fa fa-medkit'></i>&nbsp;",
"impressum": "<i class='fa fa-gavel'></i>&nbsp;",
"learning": "<i class='fa fa-graduation-cap'></i>&nbsp;",
"statistics": "<i class='fa fa-folder-open'></i>&nbsp;"
"agb": "<i class='fas fa-gavel'></i>&nbsp;",
"backToHome": "<i class='fas fa-home'></i>&nbsp;",
"datenschutz": "<i class='fas fa-lock'></i>&nbsp;",
"demo": "<i class='fas fa-tv'></i>&nbsp;",
"faq": "<i class='fas fa-question-circle'></i>&nbsp;",
"help": "<i class='fas fa-medkit'></i>&nbsp;",
"impressum": "<i class='fas fa-gavel'></i>&nbsp;",
"learning": "<i class='fas fa-graduation-cap'></i>&nbsp;",
"statistics": "<i class='fas fa-folder-open'></i>&nbsp;"
};
let landingPageNavigation = {
"mobileInfo": "<i class='fas fa-info-circle'></i>",
"wordcloud": "<i class='fa fa-cloud'></i>"
"wordcloud": "<i class='fas fa-cloud'></i>"
};
//Only used for the active route display on mobile. Will be carried over to desktop after the main template got refactored.
let topNavigation = {
"workload": "<i class='fa fa-graduation-cap'></i>&nbsp;",
"workload": "<i class='fas fa-graduation-cap'></i>&nbsp;",
"all": {
"all": "<i class='fa fa-archive'></i>&nbsp;",
"cardsets": "<i class='fa fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span>"
"all": "<i class='fas fa-archive'></i>&nbsp;",
"cardsets": "<i class='fas fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span>"
},
"public": {
"public": "<i class='fa fa-folder-open'></i>&nbsp;",
"cardsets": "<i class='fa fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span>"
"public": "<i class='fas fa-folder-open'></i>&nbsp;",
"cardsets": "<i class='fas fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span>"
},
"personal": {
"personal": "<i class='fa fa-archive'></i>&nbsp;",
"cardsets": "<i class='fa fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;</span>"
"personal": "<i class='fas fa-archive'></i>&nbsp;",
"cardsets": "<i class='fas fa-archive'></i>&nbsp;",
"repetitorien": "<span class='hidden-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span><span class='visible-xs'><i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;</span>"
},
"transcripts": {
"transcripts": "<i class='fa fa-clipboard'></i>&nbsp;",
"personal": "<i class='fa fa-clipboard'></i>&nbsp;",
"bonus": "<i class='fa fa-clipboard'></i>&nbsp;"
"transcripts": "<i class='fas fa-clipboard'></i>&nbsp;",
"personal": "<i class='fas fa-clipboard'></i>&nbsp;",
"bonus": "<i class='fas fa-clipboard'></i>&nbsp;"
},
"profile": "<i class='fa fa-user'></i>&nbsp;",
"profileOverview": "<i class='fa fa-trophy'></i>&nbsp;",
"profileBilling": "<i class='fa fa-credit-card'></i>&nbsp;",
"profileMembership": "<i class='fa fa-users'></i>&nbsp;",
"profileNotifications": "<i class='fa fa-bell'></i>&nbsp;",
"profileSettings": "<i class='fa fa-user'></i>&nbsp;",
"profileRequests": "<i class='fa fa-check'></i>&nbsp;",
"backend": "<i class='fa fa-server'></i>&nbsp;",
"useCases": "<i class='fa fa-map-signs'></i>",
"profile": "<i class='fas fa-user'></i>&nbsp;",
"profileOverview": "<i class='fas fa-trophy'></i>&nbsp;",
"profileBilling": "<i class='fas fa-credit-card'></i>&nbsp;",
"profileMembership": "<i class='fas fa-users'></i>&nbsp;",
"profileNotifications": "<i class='fas fa-bell'></i>&nbsp;",
"profileSettings": "<i class='fas fa-user'></i>&nbsp;",
"profileRequests": "<i class='fas fa-check'></i>&nbsp;",
"backend": "<i class='fas fa-server'></i>&nbsp;",
"useCases": "<i class='fas fa-map-signs'></i>",
"displayMode": {
"wordcloud": "<i class='fa fa-cloud'></i>",
"list": "<i class='fa fa-table'></i>"
"wordcloud": "<i class='fas fa-cloud'></i>",
"list": "<i class='fas fa-table'></i>"
}
};
let labels = {
"lecturerAuthorized": "<i class='fa fa-graduation-cap'></i>",
"wordcloud": "<i class='fa fa-cloud'></i>"
"lecturerAuthorized": "<i class='fas fa-graduation-cap'></i>",
"wordcloud": "<i class='fas fa-cloud'></i>"
};
//Only used for the active route display on mobile. Will be carried over to desktop after the main template got refactored.
let miscNavigation = {
"cardset": "<i class='fa fa-archive'></i>&nbsp;",
"repetitorium": "<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;",
"cardset": "<i class='fas fa-archive'></i>&nbsp;",
"repetitorium": "<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;",
"progress": "<i class='far fa-chart-bar'></i>&nbsp;",
"toggleImpressum": "<i class='fa fa-medkit'></i>&nbsp;"
"toggleImpressum": "<i class='fas fa-medkit'></i>&nbsp;"
};
let aspectRatio = {
"53": "<i class='fa fa-id-card'></i>&nbsp;",
"169": "<i class='fa fa-desktop'></i>&nbsp;",
"1610": "<i class='fa fa-desktop'></i>&nbsp;",
"43": "<i class='fa fa-desktop'></i>&nbsp;",
"fill": "<i class='fa fa-arrows-alt'></i>&nbsp;",
"din": "<i class='fa fa-id-card'></i>&nbsp;"
"53": "<i class='fas fa-id-card'></i>&nbsp;",
"169": "<i class='fas fa-desktop'></i>&nbsp;",
"1610": "<i class='fas fa-desktop'></i>&nbsp;",
"43": "<i class='fas fa-desktop'></i>&nbsp;",
"fill": "<i class='fas fa-arrows-alt'></i>&nbsp;",
"din": "<i class='fas fa-id-card'></i>&nbsp;"
};
let useCasesIcons = {
"workload": "<i class='fa fa-graduation-cap'></i>&nbsp;",
"myCardsets": "<i class='fa fa-archive'></i>&nbsp;",
"myRepositories": "<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;",
"myTranscripts": "<i class='fa fa-clipboard'></i>&nbsp;",
"create": "<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-plus'></i>&nbsp;",
"search": "<i class='fa fa fa-search'></i>&nbsp;"
"workload": "<i class='fas fa-graduation-cap'></i>&nbsp;",
"myCardsets": "<i class='fas fa-archive'></i>&nbsp;",
"myRepositories": "<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;",
"myTranscripts": "<i class='fas fa-clipboard'></i>&nbsp;",
"create": "<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-plus'></i>&nbsp;",
"search": "<i class='fa fas fa-search'></i>&nbsp;"
};
module.exports = {
......
......@@ -431,9 +431,9 @@ Template.registerHelper("getTranscriptBonusLabel", function (cardset) {
Template.registerHelper("getCardsetIcons", function (isShuffled) {
if (isShuffled) {
return "<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;";
return "<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-archive'></i>&nbsp;<i class='fas fa-ellipsis-h'></i>&nbsp;";
} else {
return "<i class='fa fa-archive'></i>&nbsp;";
return "<i class='fas fa-archive'></i>&nbsp;";
}
});
......
......@@ -20,7 +20,7 @@
<li><a href="{{pathFor route='home'}}">{{_ "navbar-collapse.frontend"}}</a></li>
<li id="notificationsBtn_admin" class="dropdown">
<a role="button" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bell"></i> {{#if countNotifications}}
<i class="fas fa-bell"></i> {{#if countNotifications}}
<span class="badge">{{countNotifications}}</span>{{/if}}
</a>
......@@ -85,14 +85,14 @@
<li>
<a class="{{#if isActiveRoute regex='admin_dashboard'}}active{{/if}}"
href="{{pathFor route='admin_dashboard'}}">
<i class="fa fa-tachometer-alt"></i>
<i class="fas fa-tachometer-alt"></i>
<span>{{_ "admin.dashboard"}}</span>
</a>
</li>
<li>
<a class="{{#if isActiveRoute regex='admin_users|admin_user'}}active{{/if}}"
href="{{pathFor route='admin_users'}}">
<i class="fa fa-users"></i>
<i class="fas fa-users"></i>
<span>{{_ "admin.users"}}</span>
</a>
</li>
......@@ -106,21 +106,21 @@
<li>
<a class="{{#if isActiveRoute regex='admin_apiAccess'}}active{{/if}}"
href="{{pathFor route='admin_apiAccess'}}">
<i class="fa fa-key"></i>
<i class="fas fa-key"></i>
<span>{{_ "admin.api.access"}}</span>
</a>
</li>
<li>
<a class="{{#if isActiveRoute regex='admin_notifications'}}active{{/if}}"
href="{{pathFor route='admin_notifications'}}">
<i class="fa fa-bell"></i>
<i class="fas fa-bell"></i>
<span>{{_ "admin.notifications"}}</span>
</a>
</li>
<li>
<a class="{{#if isActiveRoute regex='admin_settings'}}active{{/if}}"
href="{{pathFor route='admin_settings'}}">
<i class="fa fa-cog fa-spin"></i>
<i class="fas fa-cog fa-spin"></i>
<span>{{_ "admin.settings"}}</span>
</a>
</li>
......
......@@ -44,7 +44,7 @@ Template.admin_apiAccess.helpers({
sortable: false,
cellClass: 'edit',
fn: function (value) {
return new Spacebars.SafeString("<button id='" + value + "' class='exportAPICardset btn btn-xs btn-raised'><i class=\"fa fa-archive\"></i> <i class='fa fa-cloud-download-alt'></i> " + TAPi18n.__('export.filename.export') + "</button>");
return new Spacebars.SafeString("<button id='" + value + "' class='exportAPICardset btn btn-xs btn-raised'><i class=\"fas fa-archive\"></i> <i class='fas fa-cloud-download-alt'></i> " + TAPi18n.__('export.filename.export') + "</button>");
}
},
{
......
......@@ -144,7 +144,7 @@ Template.admin_notifications.helpers({
if (user === undefined) {
return TAPi18n.__('admin.optionNotPossible');
} else if (Meteor.user()._id !== value) {
return new Spacebars.SafeString("<a class='mailToReceiverAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalNotificationAdmin'><i class='receiver-fa fa fa-envelope'></i></a>");
return new Spacebars.SafeString("<a class='mailToReceiverAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalNotificationAdmin'><i class='receiver-fa fas fa-envelope'></i></a>");
}
}
},
......@@ -157,7 +157,7 @@ Template.admin_notifications.helpers({
if (object.sender === undefined) {
return TAPi18n.__('admin.optionNotPossible');
} else if (Meteor.user()._id !== value) {
return new Spacebars.SafeString("<a class='mailToSenderAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalNotificationAdmin'><i class='sender-fa fa fa-envelope'></i></a>");
return new Spacebars.SafeString("<a class='mailToSenderAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalNotificationAdmin'><i class='sender-fa fas fa-envelope'></i></a>");
}
}
},
......@@ -239,7 +239,7 @@ Template.admin_notifications.helpers({
if (object.sender === undefined) {
return TAPi18n.__('admin.optionNotPossible');
} else if (Meteor.user()._id !== value) {
return new Spacebars.SafeString("<a class='mailToLecturerAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#notificationLecturerModalAdmin'><i class='fa fa-university'></i></a>");
return new Spacebars.SafeString("<a class='mailToLecturerAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#notificationLecturerModalAdmin'><i class='fas fa-university'></i></a>");
}
}
},
......@@ -395,9 +395,9 @@ Template.admin_notifications.events({
Session.set('notificationId', notification._id);
}
if (event.target.className == "mailToReceiverAdmin btn btn-xs btn-default" ||
event.target.className == "receiver-fa fa fa-envelope" ||
event.target.className == "receiver-fa fas fa-envelope" ||
event.target.className == "mailToSenderAdmin btn btn-xs btn-default" ||
event.target.className == "sender-fa fa fa-envelope") {
event.target.className == "sender-fa fas fa-envelope") {
if (cardset !== undefined) {
Session.set('isCardset', true);
Session.set('getCardset', cardset);
......@@ -406,7 +406,7 @@ Template.admin_notifications.events({
}
if (event.target.className == "mailToReceiverAdmin btn btn-xs btn-default" ||
event.target.className == "receiver-fa fa fa-envelope") {
event.target.className == "receiver-fa fas fa-envelope") {
Session.set('getUsername', receiver);
Session.set('targetId', notification.receiver_id);
Session.set('isReceiver', true);
......@@ -417,7 +417,7 @@ Template.admin_notifications.events({
Session.set('isReceiver', false);
}
}
if (event.target.className === 'mailToLecturerAdmin btn btn-xs btn-default' || event.target.className === "fa fa-university") {
if (event.target.className === 'mailToLecturerAdmin btn btn-xs btn-default' || event.target.className === "fas fa-university") {
Session.set('lecturerrequest', notification.request);
Session.set('request_id', notification.sender_id);
Session.set('requesttext', notification.text);
......
......@@ -56,7 +56,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.superAdmin'), cellClass: 'admin',
fn: function (value, object) {
if (Roles.userIsInRole(value, 'admin')) {
return new Spacebars.SafeString("<span name='admin" + object.profilename + "'><i class='fa fa-check'></i></span>");
return new Spacebars.SafeString("<span name='admin" + object.profilename + "'><i class='fas fa-check'></i></span>");
}
}
},
......@@ -64,7 +64,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.admin'), cellClass: 'editor',
fn: function (value) {
if (Roles.userIsInRole(value, 'editor')) {
return new Spacebars.SafeString("<i class='fa fa-check'></i>");
return new Spacebars.SafeString("<i class='fas fa-check'></i>");
}
}
},
......@@ -72,7 +72,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.lecturer'), cellClass: 'lecturer',
fn: function (value) {
if (Roles.userIsInRole(value, 'lecturer')) {
return new Spacebars.SafeString("<i class='fa fa-check'></i>");
return new Spacebars.SafeString("<i class='fas fa-check'></i>");
}
}
},
......@@ -80,7 +80,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.pro'), cellClass: 'pro',
fn: function (value) {
if (Roles.userIsInRole(value, 'pro')) {
return new Spacebars.SafeString("<i class='fa fa-check'></i>");
return new Spacebars.SafeString("<i class='fas fa-check'></i>");
}
}
},
......@@ -88,7 +88,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.university'), cellClass: 'university',
fn: function (value) {
if (Roles.userIsInRole(value, 'university')) {
return new Spacebars.SafeString("<i class='fa fa-check'></i>");
return new Spacebars.SafeString("<i class='fas fa-check'></i>");
}
}
},
......@@ -105,7 +105,7 @@ Template.admin_users.helpers({
sortable: false,
fn: function (value) {
if (value) {
return new Spacebars.SafeString("<a class='mailtoUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalAdmin'><span class='flex-content'><i class='fa fa-envelope'></i></span></a>");
return new Spacebars.SafeString("<a class='mailtoUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.notifyuser') + "' data-toggle='modal' data-target='#messageModalAdmin'><span class='flex-content'><i class='fas fa-envelope'></i></span></a>");
}
}
},
......@@ -119,7 +119,7 @@ Template.admin_users.helpers({
key: '_id', label: TAPi18n.__('admin.blocked'), cellClass: 'blocked',
fn: function (value) {
if (Roles.userIsInRole(value, 'blocked')) {
return new Spacebars.SafeString("<i class='fa fa-check'></i>");
return new Spacebars.SafeString("<i class='fas fa-check'></i>");
}
}
},
......@@ -159,7 +159,7 @@ Template.admin_users.events({
if (event.target.className === "deleteUserAdmin btn btn-xs btn-default" || event.target.className === "fas fa-ban") {
Session.set('userId', user._id);
}
if (event.target.className === "mailtoUserAdmin btn btn-xs btn-default" || event.target.className === "fa fa-envelope") {
if (event.target.className === "mailtoUserAdmin btn btn-xs btn-default" || event.target.className === "fas fa-envelope") {
Session.set('userId', user._id);
Session.set('getUsername', user.profilename);
}
......
......@@ -116,7 +116,7 @@ img.cardside {
white-space: nowrap;
}
}
.fa, img {
.fas, .fab, .far, img {
vertical-align: top;
}
img {
......
<template name="cardEditorItemButtonCancel">
<button id="cardCancel" class="btn btn-danger btn-raised cancel col-xs-12 col-sm-3 pull-right"
tabindex="16"><i class="fa fa-times"></i> {{_
tabindex="16"><i class="fas fa-times"></i> {{_
"declinecard"}}</button>
</template>
......@@ -2,7 +2,7 @@
{{#unless isTranscriptRoute}}
<button id="cardSave"
class="btn btn-success btn-raised saveFirst col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="13"><i class="far fa-save"></i> <i class="fa fa-plus"></i> {{_ "savecard"}}
tabindex="13"><i class="far fa-save"></i> <i class="fas fa-plus"></i> {{_ "savecard"}}
</button>
{{/unless}}
</template>
......@@ -2,6 +2,6 @@
{{#if gotMultipleCards}}
<button id="cardSaveNext"
class="btn btn-default btn-raised saveNext col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="15"><i class="far fa-save"></i> <i class="fa fa-arrow-right"></i> {{_ "savecardNext"}}</button>
tabindex="15"><i class="far fa-save"></i> <i class="fas fa-arrow-right"></i> {{_ "savecardNext"}}</button>
{{/if}}
</template>
......@@ -2,6 +2,6 @@
<button id="cardSaveReturn"
class="btn {{#if
isEditCard}}btn-success{{else}}{{#if isTranscriptRoute}}btn-success{{else}}btn-default{{/if}}{{/if}} btn-raised save col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="14"><i class="far fa-save"></i> <i class="fa fa-sign-out-alt"></i> {{_ "savecardReturn"}}
tabindex="14"><i class="far fa-save"></i> <i class="fas fa-sign-out-alt"></i> {{_ "savecardReturn"}}
</button>
</template>
......@@ -5,7 +5,7 @@
<div class="modal-content modal-content-for-buttons">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-times"></i>
<i class="fas fa-times"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="cancelEditTitle" class="modal-title">{{_ "modal-dialog.cancelEditCardTitle"}}
......
......@@ -5,7 +5,7 @@
<div class="modal-content modal-content-for-buttons">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-trash"></i>
<i class="fas fa-trash"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="deleteCardTitle" class="modal-title">{{_ "deletecard"}}
......
......@@ -69,7 +69,7 @@
</a>
<a id="rightCarouselControl" class="right carousel-control" href="#cardCarousel"
data-slide="next">
<span class="fa fa-angle-right"></span>
<span class="fas fa-angle-right"></span>
</a>
{{/unless}}
{{/if}}
......
<template name="cardSidebarItemAspectRatio">
{{#unless is3DActive}}
{{#if gotAspectRatio}}
<i class="card-button aspect-ratio-button fa fa-desktop hidden-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
<i class="card-button aspect-ratio-button fas fa-desktop hidden-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
{{/if}}
{{/unless}}
</template>
<template name="cardSidebarItemCardList">
{{#if gotMultipleCards}}
<i class="card-button cardHeaderItem btn fa fa-list selectCard" data-id="{{this._id}}"
<i class="card-button cardHeaderItem btn fas fa-list selectCard" data-id="{{this._id}}"
title="{{_ "card.tooltip.showIndex"}}"></i>
{{/if}}
</template>
<template name="cardSidebarItemDelete">
{{#if canDeleteCard}}
{{#if isCardNavigationVisible}}
<button class="hidden-xs deleteCard fa fa-trash card-button cardHeaderItem"
<button class="hidden-xs deleteCard fas fa-trash card-button cardHeaderItem"
data-type="cardNavigation" title="{{_ "card.tooltip.delete"}}"></button>
{{else}}
<button class="hidden-xs deleteCard fa fa-trash card-button cardHeaderItem"
<button class="hidden-xs deleteCard fas fa-trash card-button cardHeaderItem"
data-type="cardNavigation" title="{{_ "card.tooltip.delete"}}" disabled></button>
{{/if}}
{{/if}}
......
<template name="cardSidebarItemHelp">
<i class="hidden-xs card-button cardHeaderItem btn fa fa-question showModalHelp {{#if modalActive}}pressed{{/if}}" title="{{_ "card.tooltip.showHelp"}}"></i>
<i class="hidden-xs card-button cardHeaderItem btn fas fa-question showModalHelp {{#if modalActive}}pressed{{/if}}" title="{{_ "card.tooltip.showHelp"}}"></i>
</template>
<template name="cardSidebarItemHideSidebar">
{{#if isSidebarHidden}}
<i class="card-button toggleSidebar active fa fa-angle-double-right" title="{{_ "card.tooltip.showSidebar"}}"></i>
<i class="card-button toggleSidebar active fas fa-angle-double-right" title="{{_ "card.tooltip.showSidebar"}}"></i>
{{else}}
<i class="card-button toggleSidebar fa fa-angle-double-left" title="{{_ "card.tooltip.hideSidebar"}}"></i>
<i class="card-button toggleSidebar fas fa-angle-double-left" title="{{_ "card.tooltip.hideSidebar"}}"></i>
{{/if}}
</template>
......@@ -2,13 +2,13 @@
{{#if gotMultipleCards}}
{{#unless isFirstCardActive}}
{{#if isCardNavigationVisible}}
<button class="fa fa-arrow-left card-button cardHeaderItem scrollLeft"
<button class="fas fa-arrow-left card-button cardHeaderItem scrollLeft"
data-type="cardNavigation"
title="{{#unless isCardset}}{{_ "card.tooltip.previousCard"
hotkey=getPreviousCardHotkey}}{{else}}{{_
"card.tooltip.previousCard" hotkey=""}}{{/unless}}"></button>
{{else}}
<button class="fa fa-arrow-left card-button cardHeaderItem scrollLeft"
<button class="fas fa-arrow-left card-button cardHeaderItem scrollLeft"
data-type="cardNavigation"
title="{{#unless isCardset}}{{_ "card.tooltip.previousCard"
hotkey=getPreviousCardHotkey}}{{else}}{{_
......@@ -22,12 +22,12 @@
{{#if gotMultipleCards}}
{{#unless isLastCardActive}}
{{#if isCardNavigationVisible}}
<button class="fa fa-arrow-right card-button cardHeaderItem scrollRight"
<button class="fas fa-arrow-right card-button cardHeaderItem scrollRight"
data-type="cardNavigation"
title="{{#unless isCardset}}{{_ "card.tooltip.nextCard" hotkey=getNextCardHotkey}}{{else}}{{_
"card.tooltip.nextCard" hotkey=""}}{{/unless}}"></button>
{{else}}
<button class="fa fa-arrow-right card-button cardHeaderItem scrollRight"
<button class="fas fa-arrow-right card-button cardHeaderItem scrollRight"
data-type="cardNavigation"
title="{{#unless isCardset}}{{_ "card.tooltip.nextCard" hotkey=getNextCardHotkey}}{{else}}{{_
"card.tooltip.nextCard" hotkey=""}}{{/unless}}" disabled></button>
......
<template name="cardSidebarToggle3D">
{{#if got3DMode}}
{{#if gotFeatureSupport 4}}
<i class="card-button cardHeaderItem btn toggle3D fa fa-cube {{#if is3DActive}}pressed{{/if}}"
<i class="card-button cardHeaderItem btn toggle3D fas fa-cube {{#if is3DActive}}pressed{{/if}}"
data-type="cardNavigation" title="{{_ "card.tooltip.toggle3D"}}"></i>
{{/if}}
{{/if}}
......
<template name="cardSidebarItemZoomText">
<span class="zoomText zoomTextButton btn fa fa-search-plus card-button cardHeaderItem {{getButtonColor}}"
<span class="zoomText zoomTextButton btn fas fa-search-plus card-button cardHeaderItem {{getButtonColor}}"
data-type="cardNavigation"
title="{{_ "card.tooltip.zoomText"}}"></span>
......
......@@ -20,7 +20,7 @@
</div>
<div class="panel-footer">
<button id="exportCSV" class="btn btn-success btn-raised"><span class="flex-content"><i class="far fa-chart-bar"></i>&nbsp;<i
class="fa fa-cloud-download-alt"></i>&nbsp;{{_
class="fas fa-cloud-download-alt"></i>&nbsp;{{_
"box_export"}}</span></button>
</div>
</div>
......@@ -70,7 +70,7 @@
{{this.box6}}{{{getPercentage this.box6}}}
</span>
<i class="fa fa-trophy pull-right"></i>
<i class="fas fa-trophy pull-right"></i>
{{else}}
<span class="red-learning-text">
{{this.box6}}{{{getPercentage this.box6}}}
......@@ -94,7 +94,7 @@
data-box5="{{this.box5}}" data-box6="{{this.box6}}"
data-mailnotification="{{this.mailNotification}}" data-webnotification="{{this.webNotification}}"
title="{{_ "leitnerProgress.tooltip.removeUser"}}">
<i class="fa fa-trash" data-user_id="{{this.user_id}}"
<i class="fas fa-trash" data-user_id="{{this.user_id}}"
data-firstname="{{this.birthname}}"
data-lastname="{{this.givenname}}"
data-email="{{this.email}}" data-box1="{{this.box1}}"
......@@ -111,7 +111,7 @@
</table>
</div>
<button class="btn btn-block btn-raised btn-danger" id="backButton">
<span class="flex-content"><i class="fa fa-arrow-left"></i> {{_ "backbutton"}}</span>
<span class="flex-content"><i class="fas fa-arrow-left"></i> {{_ "backbutton"}}</span>
</button>
</div>
{{/unless}}
......
......@@ -5,7 +5,7 @@
<div class="modal-content modal-content-for-buttons">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-trash"></i>
<i class="fas fa-trash"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="removeUserFromBonusTitle" class="modal-title">{{_ "leitnerProgress.modal.removeUser.title"}}
......
......@@ -22,12 +22,12 @@
{{#if isCardsetEditor this.id}}
<a class="btn btn-block btn-raised btn-danger removeEditor"
data-id="{{this.id}}">
<i class="fa fa-minus"></i> {{_ "admin.cardset.removeFromWordcloud"}}
<i class="fas fa-minus"></i> {{_ "admin.cardset.removeFromWordcloud"}}
</a>
{{else}}
<a class="btn btn-block btn-raised btn-success addEditor"
data-id="{{this.id}}">
<i class="fa fa-plus"></i> {{_ "admin.cardset.addToWordcloud"}}
<i class="fas fa-plus"></i> {{_ "admin.cardset.addToWordcloud"}}
</a>
{{/if}}
</td>
......@@ -37,7 +37,7 @@
</table>
</div>
<button class="btn btn-block btn-raised btn-danger" id="backButton">
<span class="pull-left"><i class="fa fa-arrow-left"></i> {{_ "backbutton"}}</span>
<span class="pull-left"><i class="fas fa-arrow-left"></i> {{_ "backbutton"}}</span>
</button>
</div>
{{/unless}}
......
......@@ -4,7 +4,7 @@
<tr>
<td colspan="2">
<a class="col-xs-12 btn btn-raised btn-block btn-success" data-toggle="modal"
data-target="{{#if isProfileCompleted}}#joinBonusModal{{else}}#profileIncompleteModal{{/if}}"><span class="flex-content"><i class="fa fa-sign-in-alt"></i>&nbsp;{{_
data-target="{{#if isProfileCompleted}}#joinBonusModal{{else}}#profileIncompleteModal{{/if}}"><span class="flex-content"><i class="fas fa-sign-in-alt"></i>&nbsp;{{_
"bonus.info.button.join"}}</span></a>
</td>
</tr>
......@@ -13,7 +13,7 @@
<tr>