From 213053f88505d69bb2b0bea88cf3f1c069f8ffe6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 6 Oct 2020 14:06:46 +0000 Subject: [PATCH] --- ayanova/src/api/gzutil.js | 18 +++--- ayanova/src/components/attachment-control.vue | 4 +- ayanova/src/components/gz-data-table.vue | 2 +- ayanova/src/plugins/vuetify.js | 64 +++++++++++++++++++ ayanova/src/views/adm-user.vue | 2 +- ayanova/src/views/ay-about.vue | 2 +- ayanova/src/views/ay-data-list-view.vue | 18 +++--- ayanova/src/views/ay-history.vue | 2 +- ayanova/src/views/cust-user.vue | 2 +- ayanova/src/views/home-password.vue | 2 +- 10 files changed, 90 insertions(+), 26 deletions(-) diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js index 8deca19f..7f966bc1 100644 --- a/ayanova/src/api/gzutil.js +++ b/ayanova/src/api/gzutil.js @@ -298,11 +298,11 @@ export default { iconForType: function(ayaType) { switch (ayaType) { case window.$gz.type.NoType: - return "fa-genderless"; + return "$ayiGenderless"; case window.$gz.type.Global: - return "fa-globe"; + return "$ayiGlobe"; case window.$gz.type.User: - return "fa-user"; + return "$ayiUser"; case window.$gz.type.Widget: return "$ayiVial"; case window.$gz.type.ServerState: @@ -310,15 +310,15 @@ export default { case window.$gz.type.License: return "$ayiTicket"; case window.$gz.type.LogFile: - return "fa-glasses"; + return "$ayiGlasses"; case window.$gz.type.PickListTemplate: - return "fa-pencil-ruler"; + return "$ayiPencilRuler"; case window.$gz.type.ServerJob: return "$ayiRobot"; case window.$gz.type.AyaNova7Import: - return "$ayiFile-import"; + return "$ayiFileImport"; case window.$gz.type.TrialSeeder: - return "fa-seedling"; + return "$ayiSeedling"; case window.$gz.type.Metrics: return "$ayiFileMedicalAlt"; case window.$gz.type.Translation: @@ -326,9 +326,9 @@ export default { case window.$gz.type.UserOptions: return "$ayiUserCog"; case window.$gz.type.FileAttachment: - return "fa-paperclip"; + return "$ayiPaperclip"; case window.$gz.type.DataListView: - return "fa-filter"; + return "$ayiFilter"; case window.$gz.type.FormCustom: return "$ayiCustomize"; default: diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue index 1ff3ce60..bfffe234 100644 --- a/ayanova/src/components/attachment-control.vue +++ b/ayanova/src/components/attachment-control.vue @@ -47,7 +47,7 @@ $ayiFolder - fa-paperclip + $ayiPaperclip
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index 522ee910..93ee5b8a 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -20,7 +20,7 @@ - fa-filter + $ayiFilter
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js index e24f728a..b9dee89a 100644 --- a/ayanova/src/plugins/vuetify.js +++ b/ayanova/src/plugins/vuetify.js @@ -47,12 +47,17 @@ import { faFileCsv, faFileExcel, faFileImage, + faFileImport, faFileMedicalAlt, faFilePdf, faFilePowerpoint, faFileVideo, faFileWord, + faFilter, faFolder, + faGenderless, + faGlasses, + faGlobe, faHistory, faHome, faInbox, @@ -60,13 +65,16 @@ import { faKey, faLanguage, faPallet, + faPaperclip, faPaperPlane, faPencilAlt, + faPencilRuler, faPlug, faQuestionCircle, faRobot, faRocket, faSearch, + faSeedling, faServer, faShippingFast, faSignInAlt, @@ -125,12 +133,17 @@ library.add( faFileCsv, faFileExcel, faFileImage, + faFileImport, faFileMedicalAlt, faFilePdf, faFilePowerpoint, faFileVideo, faFileWord, + faFilter, faFolder, + faGenderless, + faGlasses, + faGlobe, faHistory, faHome, faInbox, @@ -138,13 +151,16 @@ library.add( faKey, faLanguage, faPallet, + faPaperclip, faPaperPlane, faPencilAlt, + faPencilRuler, faPlug, faQuestionCircle, faRobot, faRocket, faSearch, + faSeedling, faServer, faShippingFast, faSignInAlt, @@ -364,6 +380,12 @@ const CUSTOM_ICONS = { icon: ["fas", "file-image"] } }, + ayiFileImport: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "file-import"] + } + }, ayiFileMedicalAlt: { component: FontAwesomeIcon, props: { @@ -394,12 +416,36 @@ const CUSTOM_ICONS = { icon: ["fas", "file-word"] } }, + ayiFilter: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "filter"] + } + }, ayiFolder: { component: FontAwesomeIcon, props: { icon: ["fas", "folder"] } }, + ayiGenderless: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "genderless"] + } + }, + ayiGlasses: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "glasses"] + } + }, + ayiGlobe: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "globe"] + } + }, ayiHistory: { component: FontAwesomeIcon, props: { @@ -442,6 +488,12 @@ const CUSTOM_ICONS = { icon: ["fas", "pallet"] } }, + ayiPaperclip: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "paperclip"] + } + }, ayiPaperPlane: { component: FontAwesomeIcon, props: { @@ -454,6 +506,12 @@ const CUSTOM_ICONS = { icon: ["fas", "pencil-alt"] } }, + ayiPencilRuler: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "pencil-ruler"] + } + }, ayiPlug: { component: FontAwesomeIcon, props: { @@ -484,6 +542,12 @@ const CUSTOM_ICONS = { icon: ["fas", "search"] } }, + ayiSeedling: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "seedling"] + } + }, ayiServer: { component: FontAwesomeIcon, props: { diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue index 6bc4b391..ffd7b4f2 100644 --- a/ayanova/src/views/adm-user.vue +++ b/ayanova/src/views/adm-user.vue @@ -132,7 +132,7 @@ id="username" v-model="login" :readonly="formState.readOnly" - prepend-icon="fa-user" + prepend-icon="$ayiUser" autocomplete="off" autocorrect="off" autocapitalize="off" diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue index 6ad9694f..f36b8617 100644 --- a/ayanova/src/views/ay-about.vue +++ b/ayanova/src/views/ay-about.vue @@ -203,7 +203,7 @@ function generateMenu(vm) { }, { title: "Log", - icon: "fa-glasses", + icon: "$ayiGlasses", key: "app:nav:log", data: "ay-log" }, diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue index d4191d58..b2960976 100644 --- a/ayanova/src/views/ay-data-list-view.vue +++ b/ayanova/src/views/ay-data-list-view.vue @@ -114,7 +114,7 @@ item-text="name" item-value="id" :label="$ay.t('Filter')" - prepend-icon="fa-filter" + prepend-icon="$ayiFilter" >