Bugzilla – Attachment 148886 Details for
Bug 33355
ERM UI and markup has some issues
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33355: Update forms markup to be in line with interface patterns
Bug-33355-Update-forms-markup-to-be-in-line-with-i.patch (text/plain), 8.94 KB, created by
Pedro Amorim
on 2023-03-29 08:47:23 UTC
(
hide
)
Description:
Bug 33355: Update forms markup to be in line with interface patterns
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-03-29 08:47:23 UTC
Size:
8.94 KB
patch
obsolete
>From aa8bd93cf429b695e3ae5534d9d3abf1cae2510a Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Wed, 29 Mar 2023 08:27:51 +0000 >Subject: [PATCH] Bug 33355: Update forms markup to be in line with interface > patterns > >https://wiki.koha-community.org/wiki/Interface_patterns >--- > .../prog/js/vue/components/ERM/AgreementLicenses.vue | 4 ++-- > .../prog/js/vue/components/ERM/AgreementPeriods.vue | 10 +++++----- > .../js/vue/components/ERM/AgreementRelationships.vue | 4 ++-- > .../prog/js/vue/components/ERM/AgreementsFormAdd.vue | 2 -- > .../prog/js/vue/components/ERM/Documents.vue | 4 ++-- > .../components/ERM/EHoldingsLocalPackagesFormAdd.vue | 7 +++---- > .../vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue | 7 +++---- > .../prog/js/vue/components/ERM/LicensesFormAdd.vue | 2 -- > .../prog/js/vue/components/ERM/UserRoles.vue | 4 ++-- > 9 files changed, 19 insertions(+), 25 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >index c64d571f14..665be1f2ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >@@ -1,5 +1,5 @@ > <template> >- <div class="page-section" id="agreement_licenses"> >+ <fieldset class="rows" id="agreement_licenses"> > <legend>{{ $__("Licenses") }}</legend> > <fieldset > :id="`agreement_license_${counter}`" >@@ -97,7 +97,7 @@ > ><font-awesome-icon icon="plus" /> {{ $__("Add new license") }}</a > > > <span v-else>{{ $__("There are no licenses created yet") }}</span> >- </div> >+ </fieldset> > </template> > > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementPeriods.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementPeriods.vue >index 0354c78c50..3bab4d9baf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementPeriods.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementPeriods.vue >@@ -1,5 +1,5 @@ > <template> >- <div class="page-section" id="agreement_periods"> >+ <fieldset class="rows" id="agreement_periods"> > <legend>{{ $__("Periods") }}</legend> > <fieldset > :id="`agreement_period_${counter}`" >@@ -58,12 +58,12 @@ > v-model="period.notes" > /> > </li> >- </ol> >+ </ol> > </fieldset> > <a class="btn btn-default" @click="addPeriod" >- ><font-awesome-icon icon="plus" /> {{ $__("Add new period") }}</a >- > >- </div> >+ ><font-awesome-icon icon="plus" /> {{ $__("Add new period") }}</a >+ > >+ </fieldset> > </template> > > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >index 0465bb867e..b5c0468447 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >@@ -1,5 +1,5 @@ > <template> >- <div class="page-section" id="agreement_relationships"> >+ <fieldset class="rows" id="agreement_relationships"> > <legend>{{ $__("Related agreements") }}</legend> > <fieldset > :id="`related_agreement_${counter}`" >@@ -85,7 +85,7 @@ > <span v-else>{{ > $__("There are no other agreements created yet") > }}</span> >- </div> >+ </fieldset> > </template> > > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >index db4d5cea68..34d5ffbe8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >@@ -7,7 +7,6 @@ > <h2 v-else>{{ $__("New agreement") }}</h2> > <div> > <form @submit="onSubmit($event)"> >- <div class="page-section"> > <fieldset class="rows"> > <ol> > <li> >@@ -144,7 +143,6 @@ > </li> > </ol> > </fieldset> >- </div> > <AgreementPeriods :periods="agreement.periods" /> > <UserRoles > :user_type="$__('Agreement user')" >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Documents.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Documents.vue >index 6727027370..d7bc17d759 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Documents.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Documents.vue >@@ -1,5 +1,5 @@ > <template> >- <div class="page-section" id="documents"> >+ <fieldset class="rows" id="documents"> > <legend>{{ $__("Documents") }}</legend> > <fieldset > :id="`document_${counter}`" >@@ -102,7 +102,7 @@ > <a class="btn btn-default" @click="addDocument" > ><font-awesome-icon icon="plus" /> {{ $__("Add new document") }}</a > > >- </div> >+ </fieldset> > </template> > > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >index 268af004b2..4a43863ed3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >@@ -64,12 +64,11 @@ > v-model="erm_package.notes" > /> > </li> >- >- <EHoldingsPackageAgreements >- :package_agreements="erm_package.package_agreements" >- /> > </ol> > </fieldset> >+ <EHoldingsPackageAgreements >+ :package_agreements="erm_package.package_agreements" >+ /> > <fieldset class="action"> > <input type="submit" value="Submit" /> > <router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >index 2c30ab9e0e..ffbd13ab53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >@@ -364,12 +364,11 @@ > :placeholder="$__('Access type')" > /> > </li> >- >- <EHoldingsTitlesFormAddResources >- :resources="title.resources" >- /> > </ol> > </fieldset> >+ <EHoldingsTitlesFormAddResources >+ :resources="title.resources" >+ /> > <fieldset class="action"> > <input type="submit" value="Submit" /> > <router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >index 272253cadf..0c869f22e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >@@ -7,7 +7,6 @@ > <h2 v-else>{{ $__("New license") }}</h2> > <div> > <form @submit="onSubmit($event)"> >- <div class="page-section"> > <fieldset class="rows"> > <ol> > <li> >@@ -125,7 +124,6 @@ > </li> > </ol> > </fieldset> >- </div> > <UserRoles > :user_type="$__('License user')" > :user_roles="license.user_roles" >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UserRoles.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UserRoles.vue >index 20491d794a..27199566b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UserRoles.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UserRoles.vue >@@ -1,5 +1,5 @@ > <template> >- <div class="page-section" id="user_roles"> >+ <fieldset class="rows" id="user_roles"> > <legend>{{ $__("Users") }}</legend> > <fieldset > class="rows" >@@ -60,7 +60,7 @@ > <a class="btn btn-default" @click="addUser" > ><font-awesome-icon icon="plus" /> {{ $__("Add new user") }}</a > > >- </div> >+ </fieldset> > </template> > > <script> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33355
:
148885
|
148886
|
148887
|
148888
|
148934
|
148935
|
148936
|
149116
|
149117
|
149118
|
149760
|
149761
|
149883
|
149884
|
149885
|
150043
|
150044
|
150045
|
150163
|
150164
|
150165
|
150759
|
150760
|
150761