From 4cb736fb7a72af2d217b89faa4a7c0591e35d761 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 28 Oct 2022 08:26:40 +0200 Subject: [PATCH] Bug 32030: Remove unnecessary landing pages We had "home/main page" for eholdings, eholdings/local and eholdings/ebsco. They only contains a list for links we can find in the navigation menu on the left. This patch suggests to remove them, and adjust the style of the links to make them non-clickable. In the breadcrumb, on E-Resource managemente / eHoldings / Local / Titles => Holdings and Local will be black, without cursor on hover In the nav menu, eHoldings, EBSCO and Local are not clickable and black. Signed-off-by: Jonathan Field Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- .../prog/js/vue/components/ERM/Breadcrumb.vue | 15 +- .../vue/components/ERM/EHoldingsEBSCOHome.vue | 28 ---- .../vue/components/ERM/EHoldingsLocalHome.vue | 28 ---- .../js/vue/components/ERM/EHoldingsMain.vue | 51 ------ .../prog/js/vue/components/ERM/ERMMain.vue | 145 ++++++++++-------- .../intranet-tmpl/prog/js/vue/main-erm.ts | 6 +- koha-tmpl/intranet-tmpl/prog/js/vue/routes.js | 9 -- 7 files changed, 101 insertions(+), 181 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOHome.vue delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalHome.vue delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsMain.vue diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Breadcrumb.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Breadcrumb.vue index dcce72f22f..b1e3edbe5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Breadcrumb.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Breadcrumb.vue @@ -8,9 +8,12 @@ > {{ $__(item.text) }} - + {{ $__(item.text) }} + + {{ $__(item.text) }} @@ -28,4 +31,12 @@ export default { currentRoute() { return this.$route.path } }, }; - \ No newline at end of file + + + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOHome.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOHome.vue deleted file mode 100644 index 3803e8781d..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOHome.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalHome.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalHome.vue deleted file mode 100644 index 41ea9a01b8..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalHome.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsMain.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsMain.vue deleted file mode 100644 index 4685c4c364..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsMain.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue index fb7e9045e8..9fb8a85a49 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue @@ -35,69 +35,78 @@
  • - {{ $__("eHoldings") }} + {{ $__("eHoldings") }} +
    • -
      -
    • - - - {{ $__("Local") }} - - - {{ $__("EBSCO") }} +
        +
      • -
          -
        • - - - {{ - $__("Packages") - }} -
          • -
        • - - - {{ - $__("Titles") - }} -
          • -
        -
        • -
      + + + {{ + $__("Local") + }} + + + {{ + $__("EBSCO") + }} +
        +
      • + + + {{ + $__("Packages") + }} +
        • +
      • + + + {{ + $__("Titles") + }} +
        • +
      +
      • +
    + @@ -120,7 +129,7 @@ import { inject } from 'vue' import Breadcrumb from "./Breadcrumb.vue" import Dialog from "./Dialog.vue" import { fetchVendors } from "../../fetch" -import "vue-select/dist/vue-select.css"; +import "vue-select/dist/vue-select.css" export default { setup() { @@ -164,7 +173,8 @@ export default { #navmenulist a.router-link-active { font-weight: 700; } -#menu ul ul, #navmenulist ul ul { +#menu ul ul, +#navmenulist ul ul { padding-left: 2em; font-size: 100%; } @@ -175,10 +185,21 @@ form .v-select { width: 30%; } -.v-select, input:not([type=submit]):not([type=search]):not([type=button]):not([type=checkbox]), textarea { - border-color: rgba(60,60,60,0.26); +.v-select, +input:not([type="submit"]):not([type="search"]):not([type="button"]):not([type="checkbox"]), +textarea { + border-color: rgba(60, 60, 60, 0.26); border-width: 1px; border-radius: 4px; min-width: 30%; } + +#navmenulist ul li a.disabled { + color: #666; + pointer-events: none; + font-weight: 700; +} +#navmenulist ul li a.disabled.router-link-active { + color: #000; +} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts index 719815697d..c42ebe1745 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts @@ -19,7 +19,11 @@ import App from "./components/ERM/ERMMain.vue"; import { routes } from "./routes"; -const router = createRouter({ history: createWebHistory(), routes }); +const router = createRouter({ + history: createWebHistory(), + linkExactActiveClass: "current", + routes, +}); import { useMainStore } from "./stores/main"; import { useVendorStore } from "./stores/vendors"; diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js index 97e4b5500c..4c94d4fbe2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js @@ -4,8 +4,6 @@ import AgreementsList from "./components/ERM/AgreementsList.vue"; import AgreementsShow from "./components/ERM/AgreementsShow.vue"; import AgreementsFormAdd from "./components/ERM/AgreementsFormAdd.vue"; import AgreementsFormConfirmDelete from "./components/ERM/AgreementsFormConfirmDelete.vue"; -import EHoldingsMain from "./components/ERM/EHoldingsMain.vue"; -import EHoldingsLocalHome from "./components/ERM/EHoldingsLocalHome.vue"; import EHoldingsLocalPackagesFormAdd from "./components/ERM/EHoldingsLocalPackagesFormAdd.vue"; import EHoldingsLocalTitlesFormConfirmDelete from "./components/ERM/EHoldingsLocalTitlesFormConfirmDelete.vue"; import EHoldingsLocalTitlesFormAdd from "./components/ERM/EHoldingsLocalTitlesFormAdd.vue"; @@ -16,7 +14,6 @@ import EHoldingsLocalPackagesFormConfirmDelete from "./components/ERM/EHoldingsL import EHoldingsLocalResourcesShow from "./components/ERM/EHoldingsLocalResourcesShow.vue"; import EHoldingsLocalTitlesList from "./components/ERM/EHoldingsLocalTitlesList.vue"; import EHoldingsLocalTitlesShow from "./components/ERM/EHoldingsLocalTitlesShow.vue"; -import EHoldingsEBSCOHome from "./components/ERM/EHoldingsEBSCOHome.vue"; import EHoldingsEBSCOPackagesList from "./components/ERM/EHoldingsEBSCOPackagesList.vue"; import EHoldingsEBSCOPackagesShow from "./components/ERM/EHoldingsEBSCOPackagesShow.vue"; import EHoldingsEBSCOResourcesShow from "./components/ERM/EHoldingsEBSCOResourcesShow.vue"; @@ -43,12 +40,10 @@ const breadcrumbs = { eholdings: { home: { text: "eHoldings", // $t("eHoldings") - path: "/cgi-bin/koha/erm/eholdings", }, local: { home: { text: "Local", // $t("Local") - path: "/cgi-bin/koha/erm/eholdings/local", }, titles: { text: "Titles", // $t("Titles") @@ -62,7 +57,6 @@ const breadcrumbs = { ebsco: { home: { text: "EBSCO", // $t("EBSCO") - path: "/cgi-bin/koha/erm/eholdings/ebsco", }, titles: { text: "Titles", // $t("Titles") @@ -201,7 +195,6 @@ export const routes = [ children: [ { path: "", - component: EHoldingsMain, meta: { breadcrumb: () => breadcrumb_paths.eholdings, }, @@ -211,7 +204,6 @@ export const routes = [ children: [ { path: "", - component: EHoldingsLocalHome, meta: { breadcrumb: () => breadcrumb_paths.eholdings_local, }, @@ -407,7 +399,6 @@ export const routes = [ children: [ { path: "", - component: EHoldingsEBSCOHome, meta: { breadcrumb: () => breadcrumb_paths.eholdings_ebsco, }, -- 2.39.5