Bugzilla – Attachment 148887 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: Tidyness for forms markup, squash this later
Bug-33355-Tidyness-for-forms-markup-squash-this-la.patch (text/plain), 27.51 KB, created by
Pedro Amorim
on 2023-03-29 08:47:27 UTC
(
hide
)
Description:
Bug 33355: Tidyness for forms markup, squash this later
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-03-29 08:47:27 UTC
Size:
27.51 KB
patch
obsolete
>From 37b1e7d7640a9236541a72de2b159f144f135d38 Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Wed, 29 Mar 2023 08:28:11 +0000 >Subject: [PATCH] Bug 33355: Tidyness for forms markup, squash this later > >--- > .../vue/components/ERM/AgreementPeriods.vue | 8 +- > .../vue/components/ERM/AgreementsFormAdd.vue | 256 +++++++++--------- > .../ERM/EHoldingsLocalTitlesFormAdd.vue | 4 +- > .../js/vue/components/ERM/LicensesFormAdd.vue | 222 +++++++-------- > 4 files changed, 234 insertions(+), 256 deletions(-) > >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 3bab4d9baf..d54711370e 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 >@@ -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 >- > >- </fieldset> >+ ><font-awesome-icon icon="plus" /> {{ $__("Add new period") }}</a >+ > >+ </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 34d5ffbe8e..12e8f12268 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,142 +7,134 @@ > <h2 v-else>{{ $__("New agreement") }}</h2> > <div> > <form @submit="onSubmit($event)"> >- <fieldset class="rows"> >- <ol> >- <li> >- <label for="agreement_name" class="required" >- >{{ $__("Agreement name") }}:</label >- > >- <input >- id="agreement_name" >- v-model="agreement.name" >- :placeholder="$__('Agreement name')" >- required >- /> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="agreement_vendor_id" >- >{{ $__("Vendor") }}:</label >- > >- <v-select >- id="agreement_vendor_id" >- v-model="agreement.vendor_id" >- label="name" >- :reduce="vendor => vendor.id" >- :options="vendors" >- /> >- </li> >- <li> >- <label for="agreement_description" >- >{{ $__("Description") }}: >- </label> >- <textarea >- id="agreement_description" >- v-model="agreement.description" >- :placeholder="$__('Description')" >- rows="10" >- cols="50" >- /> >- </li> >- <li> >- <label for="agreement_status" class="required" >- >{{ $__("Status") }}:</label >- > >- <v-select >- id="agreement_status" >- v-model="agreement.status" >- label="description" >- :reduce="av => av.value" >- :options="av_agreement_statuses" >- @option:selected="onStatusChanged" >- :required="!agreement.status" >- > >- <template #search="{ attributes, events }"> >- <input >- :required="!agreement.status" >- class="vs__search" >- v-bind="attributes" >- v-on="events" >- /> >- </template> >- </v-select> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="agreement_closure_reason" >- >{{ $__("Closure reason") }}:</label >- > >- <v-select >- id="agreement_closure_reason" >- v-model="agreement.closure_reason" >- label="description" >- :reduce="av => av.value" >- :options="av_agreement_closure_reasons" >- :disabled=" >- agreement.status == 'closed' >- ? false >- : true >- " >- /> >- </li> >- <li> >- <label for="agreement_is_perpetual" >- >{{ $__("Is perpetual") }}:</label >- > >- <label >- class="radio" >- for="agreement_is_perpetual_yes" >- >Yes >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <label for="agreement_name" class="required" >+ >{{ $__("Agreement name") }}:</label >+ > >+ <input >+ id="agreement_name" >+ v-model="agreement.name" >+ :placeholder="$__('Agreement name')" >+ required >+ /> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="agreement_vendor_id" >+ >{{ $__("Vendor") }}:</label >+ > >+ <v-select >+ id="agreement_vendor_id" >+ v-model="agreement.vendor_id" >+ label="name" >+ :reduce="vendor => vendor.id" >+ :options="vendors" >+ /> >+ </li> >+ <li> >+ <label for="agreement_description" >+ >{{ $__("Description") }}: >+ </label> >+ <textarea >+ id="agreement_description" >+ v-model="agreement.description" >+ :placeholder="$__('Description')" >+ rows="10" >+ cols="50" >+ /> >+ </li> >+ <li> >+ <label for="agreement_status" class="required" >+ >{{ $__("Status") }}:</label >+ > >+ <v-select >+ id="agreement_status" >+ v-model="agreement.status" >+ label="description" >+ :reduce="av => av.value" >+ :options="av_agreement_statuses" >+ @option:selected="onStatusChanged" >+ :required="!agreement.status" >+ > >+ <template #search="{ attributes, events }"> > <input >- type="radio" >- name="is_perpetual" >- id="agreement_is_perpetual_yes" >- :value="true" >- v-model="agreement.is_perpetual" >+ :required="!agreement.status" >+ class="vs__search" >+ v-bind="attributes" >+ v-on="events" > /> >- </label> >- <label >- class="radio" >- for="agreement_is_perpetual_no" >- >No >- <input >- type="radio" >- name="is_perpetual" >- id="agreement_is_perpetual_no" >- :value="false" >- v-model="agreement.is_perpetual" >- /> >- </label> >- </li> >- <li> >- <label for="agreement_renewal_priority" >- >{{ $__("Renewal priority") }}:</label >- > >- <v-select >- id="agreement_renewal_priority" >- v-model="agreement.renewal_priority" >- label="description" >- :reduce="av => av.value" >- :options="av_agreement_renewal_priorities" >+ </template> >+ </v-select> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="agreement_closure_reason" >+ >{{ $__("Closure reason") }}:</label >+ > >+ <v-select >+ id="agreement_closure_reason" >+ v-model="agreement.closure_reason" >+ label="description" >+ :reduce="av => av.value" >+ :options="av_agreement_closure_reasons" >+ :disabled=" >+ agreement.status == 'closed' ? false : true >+ " >+ /> >+ </li> >+ <li> >+ <label for="agreement_is_perpetual" >+ >{{ $__("Is perpetual") }}:</label >+ > >+ <label >+ class="radio" >+ for="agreement_is_perpetual_yes" >+ >Yes >+ <input >+ type="radio" >+ name="is_perpetual" >+ id="agreement_is_perpetual_yes" >+ :value="true" >+ v-model="agreement.is_perpetual" > /> >- </li> >- <li> >- <label for="agreement_license_info" >- >{{ $__("License info") }}: >- </label> >- <textarea >- id="agreement_license_info" >- v-model="agreement.license_info" >- placeholder="License info" >+ </label> >+ <label class="radio" for="agreement_is_perpetual_no" >+ >No >+ <input >+ type="radio" >+ name="is_perpetual" >+ id="agreement_is_perpetual_no" >+ :value="false" >+ v-model="agreement.is_perpetual" > /> >- </li> >- </ol> >- </fieldset> >+ </label> >+ </li> >+ <li> >+ <label for="agreement_renewal_priority" >+ >{{ $__("Renewal priority") }}:</label >+ > >+ <v-select >+ id="agreement_renewal_priority" >+ v-model="agreement.renewal_priority" >+ label="description" >+ :reduce="av => av.value" >+ :options="av_agreement_renewal_priorities" >+ /> >+ </li> >+ <li> >+ <label for="agreement_license_info" >+ >{{ $__("License info") }}: >+ </label> >+ <textarea >+ id="agreement_license_info" >+ v-model="agreement.license_info" >+ placeholder="License info" >+ /> >+ </li> >+ </ol> >+ </fieldset> > <AgreementPeriods :periods="agreement.periods" /> > <UserRoles > :user_type="$__('Agreement user')" >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 ffbd13ab53..9127b613dc 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 >@@ -366,9 +366,7 @@ > </li> > </ol> > </fieldset> >- <EHoldingsTitlesFormAddResources >- :resources="title.resources" >- /> >+ <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 0c869f22e2..82c2278b8c 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,123 +7,111 @@ > <h2 v-else>{{ $__("New license") }}</h2> > <div> > <form @submit="onSubmit($event)"> >- <fieldset class="rows"> >- <ol> >- <li> >- <label class="required" for="license_name" >- >{{ $__("License name") }}:</label >- > >- <input >- id="license_name" >- v-model="license.name" >- :placeholder="$__('License name')" >- required >- /> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="license_vendor_id" >- >{{ $__("Vendor") }}:</label >- > >- <v-select >- id="license_vendor_id" >- v-model="license.vendor_id" >- label="name" >- :reduce="vendor => vendor.id" >- :options="vendors" >- /> >- </li> >- <li> >- <label >- for="license_description" >- class="required" >- >{{ $__("Description") }}: >- </label> >- <textarea >- id="license_description" >- v-model="license.description" >- :placeholder="$__('Description')" >- rows="10" >- cols="50" >- required >- /> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="license_type" class="required" >- >{{ $__("Type") }}:</label >- > >- <v-select >- id="license_type" >- v-model="license.type" >- label="description" >- :reduce="av => av.value" >- :options="av_license_types" >- > >- <template #search="{ attributes, events }"> >- <input >- :required="!license.type" >- class="vs__search" >- v-bind="attributes" >- v-on="events" >- /> >- </template> >- </v-select> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="license_status" class="required" >- >{{ $__("Status") }}:</label >- > >- <v-select >- id="license_status" >- v-model="license.status" >- :reduce="av => av.value" >- :options="av_license_statuses" >- label="description" >- > >- <template #search="{ attributes, events }"> >- <input >- :required="!license.status" >- class="vs__search" >- v-bind="attributes" >- v-on="events" >- /> >- </template> >- </v-select> >- <span class="required">{{ >- $__("Required") >- }}</span> >- </li> >- <li> >- <label for="started_on" >- >{{ $__("Start date") }}:</label >- > >- <flat-pickr >- id="started_on" >- v-model="license.started_on" >- :config="fp_config" >- data-date_to="ended_on" >- /> >- </li> >- <li> >- <label for="ended_on" >- >{{ $__("End date") }}:</label >- > >- <flat-pickr >- id="ended_on" >- v-model="license.ended_on" >- :config="fp_config" >- /> >- </li> >- </ol> >- </fieldset> >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <label class="required" for="license_name" >+ >{{ $__("License name") }}:</label >+ > >+ <input >+ id="license_name" >+ v-model="license.name" >+ :placeholder="$__('License name')" >+ required >+ /> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="license_vendor_id" >+ >{{ $__("Vendor") }}:</label >+ > >+ <v-select >+ id="license_vendor_id" >+ v-model="license.vendor_id" >+ label="name" >+ :reduce="vendor => vendor.id" >+ :options="vendors" >+ /> >+ </li> >+ <li> >+ <label for="license_description" class="required" >+ >{{ $__("Description") }}: >+ </label> >+ <textarea >+ id="license_description" >+ v-model="license.description" >+ :placeholder="$__('Description')" >+ rows="10" >+ cols="50" >+ required >+ /> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="license_type" class="required" >+ >{{ $__("Type") }}:</label >+ > >+ <v-select >+ id="license_type" >+ v-model="license.type" >+ label="description" >+ :reduce="av => av.value" >+ :options="av_license_types" >+ > >+ <template #search="{ attributes, events }"> >+ <input >+ :required="!license.type" >+ class="vs__search" >+ v-bind="attributes" >+ v-on="events" >+ /> >+ </template> >+ </v-select> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="license_status" class="required" >+ >{{ $__("Status") }}:</label >+ > >+ <v-select >+ id="license_status" >+ v-model="license.status" >+ :reduce="av => av.value" >+ :options="av_license_statuses" >+ label="description" >+ > >+ <template #search="{ attributes, events }"> >+ <input >+ :required="!license.status" >+ class="vs__search" >+ v-bind="attributes" >+ v-on="events" >+ /> >+ </template> >+ </v-select> >+ <span class="required">{{ $__("Required") }}</span> >+ </li> >+ <li> >+ <label for="started_on" >+ >{{ $__("Start date") }}:</label >+ > >+ <flat-pickr >+ id="started_on" >+ v-model="license.started_on" >+ :config="fp_config" >+ data-date_to="ended_on" >+ /> >+ </li> >+ <li> >+ <label for="ended_on">{{ $__("End date") }}:</label> >+ <flat-pickr >+ id="ended_on" >+ v-model="license.ended_on" >+ :config="fp_config" >+ /> >+ </li> >+ </ol> >+ </fieldset> > <UserRoles > :user_type="$__('License user')" > :user_roles="license.user_roles" >-- >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