This commit is contained in:
2020-10-06 16:26:35 +00:00
parent 6a7b02a157
commit 7f63c66e67
7 changed files with 64 additions and 8 deletions

View File

@@ -46,6 +46,7 @@ import {
faDolly, faDolly,
faDollyFlatbed, faDollyFlatbed,
faDoorOpen, faDoorOpen,
faDraftingCompass,
faEdit, faEdit,
faEllipsisV, faEllipsisV,
faExclamationCircle, faExclamationCircle,
@@ -84,6 +85,7 @@ import {
faItalic, faItalic,
faKey, faKey,
faLanguage, faLanguage,
faLifeRing,
faLink, faLink,
faListOl, faListOl,
faListUl, faListUl,
@@ -109,7 +111,11 @@ import {
faSignInAlt, faSignInAlt,
faSignOutAlt, faSignOutAlt,
faSitemap, faSitemap,
faSkullCrossbones,
faSlidersH, faSlidersH,
faSort,
faSortAmountDown,
faSortAmountUp,
faSquareFull, faSquareFull,
faStepBackward, faStepBackward,
faStepForward, faStepForward,
@@ -125,6 +131,7 @@ import {
faToolbox, faToolbox,
faTools, faTools,
faTrashAlt, faTrashAlt,
faUndo,
faUser, faUser,
faUserCog, faUserCog,
faUsers, faUsers,
@@ -168,6 +175,7 @@ library.add(
faDolly, faDolly,
faDollyFlatbed, faDollyFlatbed,
faDoorOpen, faDoorOpen,
faDraftingCompass,
faEdit, faEdit,
faEllipsisV, faEllipsisV,
faExclamationCircle, faExclamationCircle,
@@ -206,6 +214,7 @@ library.add(
faItalic, faItalic,
faKey, faKey,
faLanguage, faLanguage,
faLifeRing,
faLink, faLink,
faListOl, faListOl,
faListUl, faListUl,
@@ -231,7 +240,11 @@ library.add(
faSignInAlt, faSignInAlt,
faSignOutAlt, faSignOutAlt,
faSitemap, faSitemap,
faSkullCrossbones,
faSlidersH, faSlidersH,
faSort,
faSortAmountDown,
faSortAmountUp,
farSquare, farSquare,
faSquareFull, faSquareFull,
faStepBackward, faStepBackward,
@@ -248,6 +261,7 @@ library.add(
faToolbox, faToolbox,
faTools, faTools,
faTrashAlt, faTrashAlt,
faUndo,
faUser, faUser,
faUserCog, faUserCog,
faUsers, faUsers,
@@ -442,6 +456,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "door-open"] icon: ["fas", "door-open"]
} }
}, },
ayiDraftingCompass: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "drafting-compass"]
}
},
ayiEdit: { ayiEdit: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -670,6 +690,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "language"] icon: ["fas", "language"]
} }
}, },
ayiLifeRing: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "life-ring"]
}
},
ayiLink: { ayiLink: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -820,6 +846,30 @@ const CUSTOM_ICONS = {
icon: ["fas", "sitemap"] icon: ["fas", "sitemap"]
} }
}, },
ayiSkullCrossbones: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "skull-crossbones"]
}
},
ayiSort: {
component: FontAwesomeIcon,
props: {
icon: ["far", "sort"]
}
},
ayiSortAmountDown: {
component: FontAwesomeIcon,
props: {
icon: ["far", "sort-amount-down"]
}
},
ayiSortAmountUp: {
component: FontAwesomeIcon,
props: {
icon: ["far", "sort-amount-up"]
}
},
ayiSquare: { ayiSquare: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -916,6 +966,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "trash-alt"] icon: ["fas", "trash-alt"]
} }
}, },
ayiUndo: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "undo"]
}
},
ayiUser: { ayiUser: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {

View File

@@ -421,7 +421,7 @@ function generateMenu(vm) {
if (vm.rights.delete) { if (vm.rights.delete) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "ResetToDefault", title: "ResetToDefault",
icon: "fa-undo", icon: "$ayiUndo",
surface: false, surface: false,
key: FORM_KEY + ":delete", key: FORM_KEY + ":delete",
vm: vm vm: vm

View File

@@ -572,7 +572,7 @@ function generateMenu(vm) {
//erase database //erase database
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "AdminEraseDatabase", title: "AdminEraseDatabase",
icon: "fa-skull-crossbones", icon: "$ayiSkullCrossbones",
key: FORM_KEY + ":erase", key: FORM_KEY + ":erase",
vm: vm vm: vm
}); });

View File

@@ -122,7 +122,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-drafting-compass", icon: "$ayiDraftingCompass",
title: "ReportList", title: "ReportList",
helpUrl: "form-adm-report-templates", helpUrl: "form-adm-report-templates",
menuItems: [], menuItems: [],

View File

@@ -209,7 +209,7 @@ function generateMenu(vm) {
}, },
{ {
title: "HelpTechSupport", title: "HelpTechSupport",
icon: "fa-life-ring", icon: "$ayiLifeRing",
href: window.$gz.menu.contactSupportUrl(), href: window.$gz.menu.contactSupportUrl(),
target: "_blank", target: "_blank",
key: "about:contact" key: "about:contact"

View File

@@ -78,14 +78,14 @@
<template v-if="item.isSortable"> <template v-if="item.isSortable">
<div @click="toggleSort(item)" class="pt-6"> <div @click="toggleSort(item)" class="pt-6">
<v-btn x-large v-if="item.sort == null" icon> <v-btn x-large v-if="item.sort == null" icon>
<v-icon x-large>fa-sort</v-icon></v-btn <v-icon x-large>$ayiSort</v-icon></v-btn
> >
<v-btn <v-btn
v-if="item.sort != null && item.sort == '-'" v-if="item.sort != null && item.sort == '-'"
icon icon
x-large x-large
><v-icon color="primary" x-large ><v-icon color="primary" x-large
>fa-sort-amount-down</v-icon >$ayiSortAmountDown</v-icon
></v-btn ></v-btn
> >
<v-btn <v-btn
@@ -93,7 +93,7 @@
icon icon
x-large x-large
><v-icon color="primary" x-large ><v-icon color="primary" x-large
>fa-sort-amount-up</v-icon >$ayiSortAmountUp</v-icon
></v-btn ></v-btn
> >
<label class="v-label theme--light" <label class="v-label theme--light"

View File

@@ -1049,7 +1049,7 @@ async function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
icon: "fa-drafting-compass", icon: "$ayiDraftingCompass",
title: "ReportDesignReport", title: "ReportDesignReport",
helpUrl: "form-ay-report-edit", helpUrl: "form-ay-report-edit",
formData: { formData: {