From 54c4852cd7a0d1e183202932f65f59d84ddb7552 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 8 Dec 2020 00:10:49 +0200 Subject: [PATCH] Consistently use solid style of fontawesome --- application/views/appointments/book.php | 5 ++-- .../views/appointments/book_success.php | 5 ++-- application/views/backend/calendar.php | 18 ++++++------ application/views/backend/customers.php | 8 +++--- application/views/backend/header.php | 5 ++-- application/views/backend/services.php | 16 +++++------ application/views/backend/settings.php | 10 +++---- application/views/backend/users.php | 28 +++++++++---------- .../backend/working_plan_exceptions_modal.php | 2 +- application/views/general/error404.php | 5 ++-- application/views/general/update.php | 3 +- application/views/user/forgot_password.php | 3 +- application/views/user/login.php | 3 +- application/views/user/logout.php | 5 ++-- assets/css/backend.css | 4 --- assets/ext/fontawesome/js/all.min.js | 5 ---- assets/ext/fontawesome/js/fontawesome.min.js | 5 ++++ assets/ext/fontawesome/js/solid.min.js | 5 ++++ assets/js/backend_calendar_default_view.js | 8 +++--- assets/js/backend_calendar_table_view.js | 12 ++++---- assets/js/backend_customers_helper.js | 2 +- assets/js/general_functions.js | 2 +- assets/js/working_plan.js | 16 +++++------ assets/js/working_plan_exceptions_modal.js | 6 ++-- 24 files changed, 95 insertions(+), 86 deletions(-) delete mode 100644 assets/ext/fontawesome/js/all.min.js create mode 100644 assets/ext/fontawesome/js/fontawesome.min.js create mode 100644 assets/ext/fontawesome/js/solid.min.js diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php index 3115ccaf..789c1569 100755 --- a/application/views/appointments/book.php +++ b/application/views/appointments/book.php @@ -17,7 +17,8 @@ - + + @@ -376,7 +377,7 @@
diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php index 590fde1d..8bbc94cb 100755 --- a/application/views/appointments/book_success.php +++ b/application/views/appointments/book_success.php @@ -13,7 +13,8 @@ - + +
@@ -37,7 +38,7 @@

- + diff --git a/application/views/backend/calendar.php b/application/views/backend/calendar.php index bc472cb1..998e4aa8 100755 --- a/application/views/backend/calendar.php +++ b/application/views/backend/calendar.php @@ -60,7 +60,7 @@ @@ -68,7 +68,7 @@
@@ -79,12 +79,12 @@
- + session->userdata('role_slug') !== 'admin' ? 'hidden' : '' ?>> - +
@@ -274,12 +274,12 @@
@@ -449,7 +449,7 @@
@@ -480,7 +480,7 @@ diff --git a/application/views/backend/customers.php b/application/views/backend/customers.php index 7720f7ef..eb957b2f 100755 --- a/application/views/backend/customers.php +++ b/application/views/backend/customers.php @@ -55,21 +55,21 @@
@@ -77,7 +77,7 @@ - + + diff --git a/application/views/user/logout.php b/application/views/user/logout.php index d0e39dc9..66bf713a 100644 --- a/application/views/user/logout.php +++ b/application/views/user/logout.php @@ -21,7 +21,8 @@ - + +
@@ -33,7 +34,7 @@
- + diff --git a/assets/css/backend.css b/assets/css/backend.css index 1df4a747..c4936fe6 100644 --- a/assets/css/backend.css +++ b/assets/css/backend.css @@ -94,10 +94,6 @@ root { font-weight: bold; } -#notification { - margin: 15px; -} - #notification strong { margin-right: 15px; } diff --git a/assets/ext/fontawesome/js/all.min.js b/assets/ext/fontawesome/js/all.min.js deleted file mode 100644 index 455df8ca..00000000 --- a/assets/ext/fontawesome/js/all.min.js +++ /dev/null @@ -1,5 +0,0 @@ -/*! - * Font Awesome Free 5.14.0 by @fontawesome - https://fontawesome.com - * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) - */ -!function(){"use strict";var c={},l={};try{"undefined"!=typeof window&&(c=window),"undefined"!=typeof document&&(l=document)}catch(c){}var h=(c.navigator||{}).userAgent,z=void 0===h?"":h,a=c,v=l,m=(a.document,!!v.documentElement&&!!v.head&&"function"==typeof v.addEventListener&&v.createElement,~z.indexOf("MSIE")||z.indexOf("Trident/"),"___FONT_AWESOME___"),s=function(){try{return!0}catch(c){return!1}}();var e=a||{};e[m]||(e[m]={}),e[m].styles||(e[m].styles={}),e[m].hooks||(e[m].hooks={}),e[m].shims||(e[m].shims=[]);var t=e[m];function M(c,z){var l=(2>>0;h--;)l[h]=c[h];return l}function gc(c){return c.classList?bc(c.classList):(c.getAttribute("class")||"").split(" ").filter(function(c){return c})}function Ac(c,l){var h,z=l.split("-"),a=z[0],v=z.slice(1).join("-");return a!==c||""===v||(h=v,~T.indexOf(h))?null:v}function Sc(c){return"".concat(c).replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(//g,">")}function yc(h){return Object.keys(h||{}).reduce(function(c,l){return c+"".concat(l,": ").concat(h[l],";")},"")}function wc(c){return c.size!==Lc.size||c.x!==Lc.x||c.y!==Lc.y||c.rotate!==Lc.rotate||c.flipX||c.flipY}function kc(c){var l=c.transform,h=c.containerWidth,z=c.iconWidth,a={transform:"translate(".concat(h/2," 256)")},v="translate(".concat(32*l.x,", ").concat(32*l.y,") "),m="scale(".concat(l.size/16*(l.flipX?-1:1),", ").concat(l.size/16*(l.flipY?-1:1),") "),s="rotate(".concat(l.rotate," 0 0)");return{outer:a,inner:{transform:"".concat(v," ").concat(m," ").concat(s)},path:{transform:"translate(".concat(z/2*-1," -256)")}}}var Zc={x:0,y:0,width:"100%",height:"100%"};function xc(c){var l=!(1").concat(m.map(Jc).join(""),"")}var $c=function(){};function cl(c){return"string"==typeof(c.getAttribute?c.getAttribute(J):null)}var ll={replace:function(c){var l=c[0],h=c[1].map(function(c){return Jc(c)}).join("\n");if(l.parentNode&&l.outerHTML)l.outerHTML=h+($.keepOriginalSource&&"svg"!==l.tagName.toLowerCase()?"\x3c!-- ".concat(l.outerHTML," --\x3e"):"");else if(l.parentNode){var z=document.createElement("span");l.parentNode.replaceChild(z,l),z.outerHTML=h}},nest:function(c){var l=c[0],h=c[1];if(~gc(l).indexOf($.replacementClass))return ll.replace(c);var z=new RegExp("".concat($.familyPrefix,"-.*"));delete h[0].attributes.style,delete h[0].attributes.id;var a=h[0].attributes.class.split(" ").reduce(function(c,l){return l===$.replacementClass||l.match(z)?c.toSvg.push(l):c.toNode.push(l),c},{toNode:[],toSvg:[]});h[0].attributes.class=a.toSvg.join(" ");var v=h.map(function(c){return Jc(c)}).join("\n");l.setAttribute("class",a.toNode.join(" ")),l.setAttribute(J,""),l.innerHTML=v}};function hl(c){c()}function zl(h,c){var z="function"==typeof c?c:$c;if(0===h.length)z();else{var l=hl;$.mutateApproach===y&&(l=i.requestAnimationFrame||hl),l(function(){var c=!0===$.autoReplaceSvg?ll.replace:ll[$.autoReplaceSvg]||ll.replace,l=_c.begin("mutate");h.map(c),l(),z()})}}var al=!1;function vl(){al=!1}var ml=null;function sl(c){if(t&&$.observeMutations){var a=c.treeCallback,v=c.nodeCallback,m=c.pseudoElementsCallback,l=c.observeMutationsRoot,h=void 0===l?o:l;ml=new t(function(c){al||bc(c).forEach(function(c){if("childList"===c.type&&0>>0;n--;)e[n]=t[n];return e}function Ct(t){return t.classList?At(t.classList):(t.getAttribute("class")||"").split(" ").filter(function(t){return t})}function Ot(t,e){var n,a=e.split("-"),r=a[0],i=a.slice(1).join("-");return r!==t||""===i||(n=i,~Y.indexOf(n))?null:i}function Pt(t){return"".concat(t).replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(//g,">")}function St(n){return Object.keys(n||{}).reduce(function(t,e){return t+"".concat(e,": ").concat(n[e],";")},"")}function Nt(t){return t.size!==yt.size||t.x!==yt.x||t.y!==yt.y||t.rotate!==yt.rotate||t.flipX||t.flipY}function Mt(t){var e=t.transform,n=t.containerWidth,a=t.iconWidth,r={transform:"translate(".concat(n/2," 256)")},i="translate(".concat(32*e.x,", ").concat(32*e.y,") "),o="scale(".concat(e.size/16*(e.flipX?-1:1),", ").concat(e.size/16*(e.flipY?-1:1),") "),c="rotate(".concat(e.rotate," 0 0)");return{outer:r,inner:{transform:"".concat(i," ").concat(o," ").concat(c)},path:{transform:"translate(".concat(a/2*-1," -256)")}}}var zt={x:0,y:0,width:"100%",height:"100%"};function Et(t){var e=!(1").concat(o.map(Zt).join(""),"")}var $t=function(){};function te(t){return"string"==typeof(t.getAttribute?t.getAttribute(tt):null)}var ee={replace:function(t){var e=t[0],n=t[1].map(function(t){return Zt(t)}).join("\n");if(e.parentNode&&e.outerHTML)e.outerHTML=n+(et.keepOriginalSource&&"svg"!==e.tagName.toLowerCase()?"\x3c!-- ".concat(e.outerHTML," Font Awesome fontawesome.com --\x3e"):"");else if(e.parentNode){var a=document.createElement("span");e.parentNode.replaceChild(a,e),a.outerHTML=n}},nest:function(t){var e=t[0],n=t[1];if(~Ct(e).indexOf(et.replacementClass))return ee.replace(t);var a=new RegExp("".concat(et.familyPrefix,"-.*"));delete n[0].attributes.style,delete n[0].attributes.id;var r=n[0].attributes.class.split(" ").reduce(function(t,e){return e===et.replacementClass||e.match(a)?t.toSvg.push(e):t.toNode.push(e),t},{toNode:[],toSvg:[]});n[0].attributes.class=r.toSvg.join(" ");var i=n.map(function(t){return Zt(t)}).join("\n");e.setAttribute("class",r.toNode.join(" ")),e.setAttribute(tt,""),e.innerHTML=i}};function ne(t){t()}function ae(n,t){var a="function"==typeof t?t:$t;if(0===n.length)a();else{var e=ne;et.mutateApproach===S&&(e=v.requestAnimationFrame||ne),e(function(){var t=!0===et.autoReplaceSvg?ee.replace:ee[et.autoReplaceSvg]||ee.replace,e=Ft.begin("mutate");n.map(t),e(),a()})}}var re=!1;function ie(){re=!1}var oe=null;function ce(t){if(l&&et.observeMutations){var r=t.treeCallback,i=t.nodeCallback,o=t.pseudoElementsCallback,e=t.observeMutationsRoot,n=void 0===e?b:e;oe=new l(function(t){re||At(t).forEach(function(t){if("childList"===t.type&&0', { - 'class': 'far fa-trash-alt mr-2' + 'class': 'fas fa-trash-alt mr-2' }), $('', { 'text': EALang.delete @@ -416,7 +416,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; 'class': 'edit-popover btn btn-primary ' + displayEdit, 'html': [ $('', { - 'class': 'far fa-edit mr-2' + 'class': 'fas fa-edit mr-2' }), $('', { 'text': EALang.edit @@ -627,7 +627,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete, 'html': [ $('', { - 'class': 'far fa-trash-alt mr-2' + 'class': 'fas fa-trash-alt mr-2' }), $('', { 'text': EALang.delete @@ -638,7 +638,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; 'class': 'edit-popover btn btn-primary ' + displayEdit, 'html': [ $('', { - 'class': 'far fa-edit mr-2' + 'class': 'fas fa-edit mr-2' }), $('', { 'text': EALang.edit diff --git a/assets/js/backend_calendar_table_view.js b/assets/js/backend_calendar_table_view.js index 73e5506c..616dec84 100755 --- a/assets/js/backend_calendar_table_view.js +++ b/assets/js/backend_calendar_table_view.js @@ -1147,7 +1147,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete, 'html': [ $('', { - 'class': 'far fa-trash-alt mr-2' + 'class': 'fas fa-trash-alt mr-2' }), $('', { 'text': EALang.delete @@ -1158,7 +1158,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'edit-popover btn btn-primary ' + displayEdit, 'html': [ $('', { - 'class': 'far fa-edit mr-2' + 'class': 'fas fa-edit mr-2' }), $('', { 'text': EALang.edit @@ -1232,7 +1232,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete, 'html': [ $('', { - 'class': 'far fa-trash-alt mr-2' + 'class': 'fas fa-trash-alt mr-2' }), $('', { 'text': EALang.delete @@ -1243,7 +1243,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'edit-popover btn btn-primary ' + displayEdit, 'html': [ $('', { - 'class': 'far fa-edit mr-2' + 'class': 'fas fa-edit mr-2' }), $('', { 'text': EALang.edit @@ -1358,7 +1358,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'delete-popover btn btn-outline-secondary mr-2' + displayDelete, 'html': [ $('', { - 'class': 'far fa-trash-alt mr-2' + 'class': 'fas fa-trash-alt mr-2' }), $('', { 'text': EALang.delete @@ -1369,7 +1369,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; 'class': 'edit-popover btn btn-primary ' + displayEdit, 'html': [ $('', { - 'class': 'far fa-edit mr-2' + 'class': 'fas fa-edit mr-2' }), $('', { 'text': EALang.edit diff --git a/assets/js/backend_customers_helper.js b/assets/js/backend_customers_helper.js index 93e84d5f..a19165f0 100644 --- a/assets/js/backend_customers_helper.js +++ b/assets/js/backend_customers_helper.js @@ -322,7 +322,7 @@ 'href': GlobalVariables.baseUrl + '/index.php/backend/index/' + appointment.hash, 'html': [ $('', { - 'class': 'far fa-edit mr-1' + 'class': 'fas fa-edit mr-1' }), $('', { 'text': appointment.service.name + ' - ' + appointment.provider.first_name + ' ' + appointment.provider.last_name diff --git a/assets/js/general_functions.js b/assets/js/general_functions.js index 436fa6c9..9bdbdc34 100755 --- a/assets/js/general_functions.js +++ b/assets/js/general_functions.js @@ -567,7 +567,7 @@ window.GeneralFunctions = window.GeneralFunctions || {}; 'target': '_blank', 'html': [ $('', { - 'class': 'far fa-envelope' + 'class': 'fas fa-envelope' }) ] }) diff --git a/assets/js/working_plan.js b/assets/js/working_plan.js index 5fbab3e3..0eb65591 100755 --- a/assets/js/working_plan.js +++ b/assets/js/working_plan.js @@ -135,7 +135,7 @@ 'title': EALang.edit, 'html': [ $('', { - 'class': 'far fa-edit' + 'class': 'fas fa-edit' }) ] }), @@ -145,7 +145,7 @@ 'title': EALang.delete, 'html': [ $('', { - 'class': 'far fa-trash-alt' + 'class': 'fas fa-trash-alt' }) ] }), @@ -155,7 +155,7 @@ 'title': EALang.save, 'html': [ $('', { - 'class': 'far fa-check-circle' + 'class': 'fas fa-check-circle' }) ] }), @@ -321,7 +321,7 @@ 'title': EALang.edit, 'html': [ $('', { - 'class': 'far fa-edit' + 'class': 'fas fa-edit' }) ] }), @@ -331,7 +331,7 @@ 'title': EALang.delete, 'html': [ $('', { - 'class': 'far fa-trash-alt' + 'class': 'fas fa-trash-alt' }) ] }), @@ -393,7 +393,7 @@ 'title': EALang.edit, 'html': [ $('', { - 'class': 'far fa-edit' + 'class': 'fas fa-edit' }) ] }), @@ -403,7 +403,7 @@ 'title': EALang.delete, 'html': [ $('', { - 'class': 'far fa-trash-alt' + 'class': 'fas fa-trash-alt' }) ] }), @@ -413,7 +413,7 @@ 'title': EALang.save, 'html': [ $('', { - 'class': 'far fa-check-circle' + 'class': 'fas fa-check-circle' }) ] }), diff --git a/assets/js/working_plan_exceptions_modal.js b/assets/js/working_plan_exceptions_modal.js index 9b6cee79..5dde83f6 100644 --- a/assets/js/working_plan_exceptions_modal.js +++ b/assets/js/working_plan_exceptions_modal.js @@ -184,7 +184,7 @@ $(function () { 'title': EALang.edit, 'html': [ $('', { - 'class': 'far fa-edit' + 'class': 'fas fa-edit' }) ] }), @@ -194,7 +194,7 @@ $(function () { 'title': EALang.delete, 'html': [ $('', { - 'class': 'far fa-trash-alt' + 'class': 'fas fa-trash-alt' }) ] }), @@ -204,7 +204,7 @@ $(function () { 'title': EALang.save, 'html': [ $('', { - 'class': 'far fa-check-circle' + 'class': 'fas fa-check-circle' }) ] }),