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 <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2022-10-28 08:26:40 +02:00 committed by Tomas Cohen Arazi
parent dd350b4081
commit 4cb736fb7a
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
7 changed files with 101 additions and 181 deletions

View File

@ -8,9 +8,12 @@
>
{{ $__(item.text) }}</router-link
>
<router-link v-else :to="item.path">
<router-link v-else-if="item.path" :to="item.path">
{{ $__(item.text) }}</router-link
>
<a v-else class="disabled">
{{ $__(item.text) }}</a
>
</li>
</ol>
</nav>
@ -28,4 +31,12 @@ export default {
currentRoute() { return this.$route.path }
},
};
</script>
</script>
<style scoped>
a.disabled {
padding: .6em .3em;
text-decoration: none;
color: #000;
}
</style>

View File

@ -1,28 +0,0 @@
<template>
<ul>
<li>
<router-link :to="`/cgi-bin/koha/erm/eholdings/ebsco/packages`">
{{ $__("Packages") }}</router-link
>
</li>
<li>
<router-link :to="`/cgi-bin/koha/erm/eholdings/ebsco/titles`">
{{ $__("Titles") }}</router-link
>
</li>
</ul>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
},
components: {
},
};
</script>

View File

@ -1,28 +0,0 @@
<template>
<ul>
<li>
<router-link :to="`/cgi-bin/koha/erm/eholdings/local/packages`">
{{ $__("Packages") }}</router-link
>
</li>
<li>
<router-link :to="`/cgi-bin/koha/erm/eholdings/local/titles`">
{{ $__("Titles") }}</router-link
>
</li>
</ul>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
},
components: {
},
};
</script>

View File

@ -1,51 +0,0 @@
<template>
<ul>
<li v-for="provider in erm_providers" :key="provider">
<router-link
v-if="provider == 'local'"
:to="`/cgi-bin/koha/erm/eholdings/local`"
>
{{ $__("Local") }}</router-link
>
<router-link
v-else-if="provider == 'ebsco'"
:to="`/cgi-bin/koha/erm/eholdings/ebsco`"
>
{{ $__("EBSCO") }}</router-link
>
<ul>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/packages`"
>
{{ $__("Packages") }}</router-link
>
</li>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/titles`"
>
{{ $__("Titles") }}</router-link
>
</li>
</ul>
</li>
</ul>
</template>
<script>
export default {
setup() {
return { erm_providers, }
},
data() {
return {
}
},
methods: {
},
components: {
},
};
</script>

View File

@ -35,69 +35,78 @@
<li>
<router-link
to="/cgi-bin/koha/erm/eholdings"
class="disabled"
>
<i class="fa fa-crosshairs"></i>
{{ $__("eHoldings") }}</router-link
>
{{ $__("eHoldings") }}
</router-link>
</li>
<ul>
<li
v-for="provider in erm_providers"
:key="provider"
>
<router-link
v-if="provider == 'local'"
:to="`/cgi-bin/koha/erm/eholdings/local`"
<li>
<ul>
<li
v-for="provider in erm_providers"
:key="provider"
>
<i
class="fa fa-map-marker"
></i>
{{ $__("Local") }}</router-link
>
<router-link
v-else-if="provider == 'ebsco'"
:to="`/cgi-bin/koha/erm/eholdings/ebsco`"
>
<i
class="fa fa-globe"
></i>
{{ $__("EBSCO") }}</router-link
>
<ul>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/packages`"
>
<i
class="
fa
fa-archive
"
></i>
{{
$__("Packages")
}}</router-link
>
</li>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/titles`"
>
<i
class="
fa
fa-sort-alpha-asc
"
></i>
{{
$__("Titles")
}}</router-link
>
</li>
</ul>
</li>
</ul>
<router-link
v-if="provider == 'local'"
:to="`/cgi-bin/koha/erm/eholdings/local`"
class="disabled"
>
<i
class="fa fa-map-marker"
></i>
{{
$__("Local")
}}</router-link
>
<router-link
v-else-if="
provider == 'ebsco'
"
:to="`/cgi-bin/koha/erm/eholdings/ebsco`"
class="disabled"
>
<i class="fa fa-globe"></i>
{{
$__("EBSCO")
}}</router-link
>
<ul>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/packages`"
>
<i
class="
fa
fa-archive
"
></i>
{{
$__("Packages")
}}</router-link
>
</li>
<li>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/${provider}/titles`"
>
<i
class="
fa
fa-sort-alpha-asc
"
></i>
{{
$__("Titles")
}}</router-link
>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</div>
</div>
@ -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;
}
</style>

View File

@ -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";

View File

@ -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,
},