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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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