From 635f8aa94dc2d3ffc751f69f158082f50cae97f4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 17 Apr 2019 00:01:35 +0000 Subject: [PATCH] --- ayanova/src/App.vue | 16 +++++++++++++--- ayanova/src/api/locale.js | 1 + ayanova/src/views/inventory-widget-edit.vue | 20 ++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue index e788e94d..3df192d7 100644 --- a/ayanova/src/App.vue +++ b/ayanova/src/App.vue @@ -165,18 +165,28 @@ export default { } else { //main menu, put in the standard items that always show that.appBar.mainMenuItems = [ - { title: "Log off", icon: "sign-out-alt", key: "app:logout" }, { - title: "Help", - key: "app:help:index.html" + title: this.$gzlocale.get("Logout"), + icon: "sign-out-alt", + key: "app:logout" } ]; //If other items specified add them above the standard ones + var hasSpecialHelpLink = false; if (ctx.mainMenuItems) { that.appBar.mainMenuItems = ctx.mainMenuItems.concat( that.appBar.mainMenuItems ); } + + //Now see if there is a help item or not and add it if not` + if (!hasSpecialHelpLink) { + that.appBar.mainMenuItems.push({ + title: this.$gzlocale.get("MenuHelp"), + icon: "question-circle", + key: "app:help:index.html" + }); + } } }); diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index 98331a42..f2d5ba92 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -52,6 +52,7 @@ export default { "Administration", "Operations", "HelpAboutAyaNova", + "MenuHelp", "Logout", //form required options "Active", diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index d423dfb0..5f63d586 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -180,10 +180,22 @@ export default { icon: "fa-splotch", title: this.$gzlocale.get("Widget"), contextMenuItems: [ - { title: "DUPLICATE", icon: "clone", key: "duplicate" }, - { title: "SAVE", icon: "save", key: "save" }, - { title: "DELETE", icon: "trash-alt", key: "delete" }, - { title: "HELP", key: "app:help:intro/#searching" } + { + title: this.$gzlocale.get("Duplicate"), + icon: "clone", + key: "duplicate" + }, + { title: this.$gzlocale.get("Save"), icon: "save", key: "save" }, + { + title: this.$gzlocale.get("Delete"), + icon: "trash-alt", + key: "delete" + }, + { + title: this.$gzlocale.get("MenuHelp"), + icon: "question-circle", + key: "app:help:intro/#searching" + } ] }); this.$gzevent.$on("menu-click", clickHandler);