This commit is contained in:
2020-10-05 22:13:18 +00:00
parent f2678cc9b4
commit 17652ec56d
16 changed files with 55 additions and 25 deletions

View File

@@ -107,7 +107,7 @@ export default {
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: "Review", title: "Review",
icon: "fa-calendar-check", icon: "$ayiCalendarCheck",
key: "app:review", key: "app:review",
data: { ayaType: formAyaType, recordId: formRecordId } data: { ayaType: formAyaType, recordId: formRecordId }
}); });
@@ -116,7 +116,7 @@ export default {
//anything not would be the exception rather than the rule //anything not would be the exception rather than the rule
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: "History", title: "History",
icon: "fa-history", icon: "$ayiHistory",
key: "app:history", key: "app:history",
data: { ayaType: formAyaType, recordId: formRecordId } data: { ayaType: formAyaType, recordId: formRecordId }
}); });
@@ -176,7 +176,7 @@ export default {
//For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: "Search", title: "Search",
icon: "fa-search", icon: "$ayiSearch",
key: "app:search", key: "app:search",
data: formAyaType data: formAyaType
}); });
@@ -185,7 +185,7 @@ export default {
//HELP //HELP
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: "MenuHelp", title: "MenuHelp",
icon: "fa-question-circle", icon: "$ayiQuestionCircle",
key: "app:help", key: "app:help",
data: vm.appBar.helpUrl data: vm.appBar.helpUrl
}); });
@@ -194,7 +194,7 @@ export default {
if (!isCoreBizObject && ctx.helpUrl != "form-ay-about") { if (!isCoreBizObject && ctx.helpUrl != "form-ay-about") {
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: "HelpAboutAyaNova", title: "HelpAboutAyaNova",
icon: "fa-info-circle", icon: "$ayiInfoCircle",
key: "app:nav:abt", key: "app:nav:abt",
data: "ay-about" data: "ay-about"
}); });

View File

@@ -168,7 +168,7 @@ function initNavPanel() {
) { ) {
sub.push({ sub.push({
title: "Search", title: "Search",
icon: "fa-search", icon: "$ayiSearch",
route: "/home-search", route: "/home-search",
key: key++ key: key++
}); });
@@ -177,7 +177,7 @@ function initNavPanel() {
//HISTORY / MRU / ACTIVITY (personal) //HISTORY / MRU / ACTIVITY (personal)
sub.push({ sub.push({
title: "History", title: "History",
icon: "fa-history", icon: "$ayiHistory",
route: `/history/3/${window.$gz.store.state.userId}/true`, route: `/history/3/${window.$gz.store.state.userId}/true`,
key: key++ key: key++
}); });
@@ -663,7 +663,7 @@ function initNavPanel() {
//EVENT LOG / HISTORY //EVENT LOG / HISTORY
sub.push({ sub.push({
title: "History", title: "History",
icon: "fa-history", icon: "$ayiHistory",
route: "/adm-history", route: "/adm-history",
key: key++ key: key++
}); });
@@ -717,7 +717,7 @@ function initNavPanel() {
// LOGS // LOGS
sub.push({ sub.push({
title: "ServerLog", title: "ServerLog",
icon: "fa-history", icon: "$ayiHistory",
route: "/ops-log", route: "/ops-log",
key: key++ key: key++
}); });
@@ -749,7 +749,7 @@ function initNavPanel() {
// OPS VIEW SERVER CONFIGURATION // OPS VIEW SERVER CONFIGURATION
sub.push({ sub.push({
title: "ViewServerConfiguration", title: "ViewServerConfiguration",
icon: "fa-info-circle", icon: "$ayiInfoCircle",
route: "/ops-view-configuration", route: "/ops-view-configuration",
key: key++ key: key++
}); });

View File

@@ -28,7 +28,7 @@
></v-text-field> ></v-text-field>
</v-col> </v-col>
</v-row> </v-row>
<v-btn icon @click="goHelp()"><v-icon>fa-question-circle</v-icon></v-btn> <v-btn icon @click="goHelp()"><v-icon>$ayiQuestionCircle</v-icon></v-btn>
<v-btn <v-btn
:disabled="!canDoAction()" :disabled="!canDoAction()"
color="blue darken-1" color="blue darken-1"

View File

@@ -14,7 +14,7 @@
<v-icon large color="success">fa-check-circle</v-icon> <v-icon large color="success">fa-check-circle</v-icon>
</template> </template>
<template v-if="options.type == 'info'"> <template v-if="options.type == 'info'">
<v-icon large color="info">fa-info-circle</v-icon> <v-icon large color="info">$ayiInfoCircle</v-icon>
</template> </template>
<template v-if="options.type == 'warning'"> <template v-if="options.type == 'warning'">
<v-icon large color="warning">fa-exclamation-circle</v-icon> <v-icon large color="warning">fa-exclamation-circle</v-icon>

View File

@@ -118,7 +118,7 @@ export default {
}, },
errors(val) { errors(val) {
if (this.hasError()) { if (this.hasError()) {
this.errorIcon = "fa-question-circle"; this.errorIcon = "$ayiQuestionCircle";
} else { } else {
this.errorIcon = null; this.errorIcon = null;
} }

View File

@@ -278,7 +278,7 @@
<!-- HELP --> <!-- HELP -->
<v-btn depressed tile class="ml-1" @click="goHelp()"> <v-btn depressed tile class="ml-1" @click="goHelp()">
<v-icon>fa-question-circle</v-icon></v-btn <v-icon>$ayiQuestionCircle</v-icon></v-btn
> >
<!-- END OF BUTTONS --> <!-- END OF BUTTONS -->
</div> </div>

View File

@@ -14,15 +14,18 @@ Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globa
import { import {
faBars, faBars,
faBell, faBell,
faCalendarCheck,
faCaretDown, faCaretDown,
faChevronDown, faChevronDown,
faEllipsisV, faEllipsisV,
faEye, faEye,
faEyeSlash, faEyeSlash,
faHistory,
faInfoCircle, faInfoCircle,
faUser, faUser,
faKey, faKey,
faQuestionCircle, faQuestionCircle,
faSearch,
faSignInAlt, faSignInAlt,
faSignOutAlt faSignOutAlt
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
@@ -32,14 +35,17 @@ Vue.component("font-awesome-icon", FontAwesomeIcon);
library.add( library.add(
faBars, faBars,
faBell, faBell,
faCalendarCheck,
faCaretDown, faCaretDown,
faChevronDown, faChevronDown,
faEllipsisV, faEllipsisV,
faEye, faEye,
faEyeSlash, faEyeSlash,
faHistory,
faInfoCircle, faInfoCircle,
faKey, faKey,
faQuestionCircle, faQuestionCircle,
faSearch,
faSignInAlt, faSignInAlt,
faSignOutAlt, faSignOutAlt,
faUser faUser
@@ -52,6 +58,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "bell"] icon: ["fas", "bell"]
} }
}, },
ayiCalendarCheck: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "calendar-check"]
}
},
ayiEye: { ayiEye: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -70,6 +82,18 @@ const CUSTOM_ICONS = {
icon: ["fas", "ellipsis-v"] icon: ["fas", "ellipsis-v"]
} }
}, },
ayiHistory: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "history"]
}
},
ayiInfoCircle: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "info-circle"]
}
},
ayiKey: { ayiKey: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -82,6 +106,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "question-circle"] icon: ["fas", "question-circle"]
} }
}, },
ayiSearch: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "search"]
}
},
ayiSignIn: { ayiSignIn: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {

View File

@@ -76,7 +76,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-history", icon: "$ayiHistory",
title: "History", title: "History",
helpUrl: "form-adm-history", helpUrl: "form-adm-history",
hideSearch: true, hideSearch: true,

View File

@@ -93,7 +93,7 @@
<v-card-title> <v-card-title>
<v-text-field <v-text-field
v-model="search" v-model="search"
append-icon="fa-search" append-icon="$ayiSearch"
:label="$ay.t('Search')" :label="$ay.t('Search')"
single-line single-line
hide-details hide-details

View File

@@ -191,7 +191,7 @@ export default {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
icon: "fa-info-circle", icon: "$ayiInfoCircle",
title: "HelpAboutAyaNova", title: "HelpAboutAyaNova",
helpUrl: "form-ay-about", helpUrl: "form-ay-about",
menuItems: [ menuItems: [

View File

@@ -359,7 +359,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
icon: "fa-history", icon: "$ayiHistory",
title: "History", title: "History",
helpUrl: "form-ay-history", helpUrl: "form-ay-history",
menuItems: [] menuItems: []

View File

@@ -14,7 +14,7 @@ export default {
let vm = this; let vm = this;
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: false, isMain: false,
icon: "fa-info-circle", icon: "$ayiInfoCircle",
title: "Log", title: "Log",
helpUrl: "form-ay-log", helpUrl: "form-ay-log",

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-calendar-check", icon: "$ayiCalendarCheck",
title: "Review", title: "Review",
helpUrl: "form-ay-review" helpUrl: "form-ay-review"
}); });

View File

@@ -27,7 +27,7 @@
<v-col cols="12" sm="4" lg="4" xl="3"> <v-col cols="12" sm="4" lg="4" xl="3">
<v-btn color="primary" v-on:click="getDataFromApi()" value="SEARCH"> <v-btn color="primary" v-on:click="getDataFromApi()" value="SEARCH">
<v-icon :data-cy="!!$ay.dev ? 'btnsearch' : false" <v-icon :data-cy="!!$ay.dev ? 'btnsearch' : false"
>fa-search</v-icon >$ayiSearch</v-icon
> >
</v-btn> </v-btn>
</v-col> </v-col>
@@ -67,7 +67,7 @@
:data-cy=" :data-cy="
!!$ay.dev ? 'btnexcerpt' + item.index : false !!$ay.dev ? 'btnexcerpt' + item.index : false
" "
>fa-info-circle</v-icon >$ayiInfoCircle</v-icon
> >
</v-btn> </v-btn>
</v-list-item-action> </v-list-item-action>
@@ -329,7 +329,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-search", icon: "$ayiSearch",
title: "Search", title: "Search",
helpUrl: "form-home-search", helpUrl: "form-home-search",
hideSearch: true, hideSearch: true,

View File

@@ -145,7 +145,7 @@ export default {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-history", icon: "$ayiHistory",
title: "ServerLog", title: "ServerLog",
helpUrl: "form-ops-log", helpUrl: "form-ops-log",
formData: { formData: {

View File

@@ -179,7 +179,7 @@ export default {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-info-circle", icon: "$ayiInfoCircle",
title: "ViewServerConfiguration", title: "ViewServerConfiguration",
helpUrl: "ops-config-environment-variables", helpUrl: "ops-config-environment-variables",
menuItems: [] menuItems: []