@@ -, +, @@ --- .../intranet-tmpl/prog/css/src/_tables.scss | 19 + .../prog/css/src/staff-global.scss | 158 ++++-- .../prog/en/includes/.patron-search.inc.swp | Bin 16384 -> 0 bytes .../prog/en/includes/acquisitions-search.inc | 4 +- .../prog/en/includes/authorities-search.inc | 511 ++++++++++------- .../prog/en/includes/authorities-toolbar.inc | 2 +- .../prog/en/includes/budgets-admin-search.inc | 6 +- .../prog/en/includes/cat-search.inc | 2 +- .../prog/en/includes/cat-toolbar.inc | 4 +- .../prog/en/includes/cities-admin-search.inc | 75 +++ .../prog/en/includes/clubs-table.inc | 10 +- .../en/includes/contracts-admin-search.inc | 74 +++ .../en/includes/currencies-admin-search.inc | 85 ++- .../prog/en/includes/desks-admin-search.inc | 75 +++ .../prog/en/includes/letters-search.inc | 77 ++- .../prog/en/includes/members-toolbar.inc | 4 +- .../prog/en/includes/patron-search.inc | 124 +---- .../prog/en/includes/patron_messages.inc | 2 + .../prog/en/includes/patrons-admin-search.inc | 75 +++ .../prog/en/includes/prefs-admin-search.inc | 55 +- .../prog/en/includes/reports-toolbar.inc | 8 +- .../prog/en/includes/serials-toolbar.inc | 4 +- .../en/includes/suggestions-add-search.inc | 75 +++ .../prog/en/includes/z3950-admin-search.inc | 79 ++- .../prog/en/modules/acqui/acqui-home.tt | 8 +- .../prog/en/modules/acqui/basket.tt | 22 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 3 - .../prog/en/modules/admin/aqbudgets.tt | 18 +- .../prog/en/modules/admin/aqplan.tt | 5 +- .../prog/en/modules/admin/audio_alerts.tt | 3 +- .../prog/en/modules/admin/authtypes.tt | 10 +- .../prog/en/modules/admin/background_jobs.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 18 +- .../modules/admin/branch_transfer_limits.tt | 6 +- .../prog/en/modules/admin/branches.tt | 6 +- .../prog/en/modules/admin/classsources.tt | 22 +- .../prog/en/modules/admin/columns_settings.tt | 280 +++------- .../prog/en/modules/admin/credit_types.tt | 6 +- .../prog/en/modules/admin/currency.tt | 4 +- .../prog/en/modules/admin/debit_types.tt | 8 +- .../prog/en/modules/admin/edi_accounts.tt | 8 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 3 +- .../en/modules/admin/items_search_fields.tt | 9 +- .../prog/en/modules/admin/library_groups.tt | 28 +- .../en/modules/admin/marc-overlay-rules.tt | 15 +- .../modules/admin/marc_subfields_structure.tt | 34 +- .../prog/en/modules/admin/marctagstructure.tt | 9 +- .../prog/en/modules/admin/matching-rules.tt | 28 +- .../prog/en/modules/admin/oai_sets.tt | 14 +- .../en/modules/admin/patron-attr-types.tt | 8 +- .../prog/en/modules/admin/share_content.tt | 8 +- .../prog/en/modules/admin/transfer_limits.tt | 6 +- .../prog/en/modules/admin/usage_statistics.tt | 6 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../modules/authorities/authorities-home.tt | 2 +- .../prog/en/modules/authorities/detail.tt | 2 + .../modules/authorities/searchresultlist.tt | 2 +- .../prog/en/modules/catalogue/ISBDdetail.tt | 6 +- .../prog/en/modules/catalogue/MARCdetail.tt | 6 +- .../prog/en/modules/catalogue/detail.tt | 4 +- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 4 +- .../prog/en/modules/catalogue/moredetail.tt | 4 +- .../prog/en/modules/catalogue/results.tt | 32 +- .../prog/en/modules/clubs/club-enrollments.tt | 2 +- .../prog/en/modules/clubs/clubs-add-modify.tt | 14 +- .../prog/en/modules/clubs/clubs.tt | 59 +- .../prog/en/modules/clubs/patron-clubs-tab.tt | 4 +- .../prog/en/modules/clubs/patron-enroll.tt | 6 +- .../en/modules/clubs/templates-add-modify.tt | 18 +- .../prog/en/modules/labels/barcode-print.tt | 8 +- .../en/modules/labels/label-bib-search.tt | 6 +- .../en/modules/labels/label-edit-profile.tt | 15 +- .../en/modules/labels/label-edit-range.tt | 2 +- .../en/modules/labels/label-edit-template.tt | 8 +- .../prog/en/modules/labels/label-manage.tt | 10 +- .../prog/en/modules/labels/label-print.tt | 30 +- .../prog/en/modules/labels/result.tt | 6 +- .../prog/en/modules/labels/search.tt | 8 +- .../prog/en/modules/labels/spinelabel-home.tt | 2 +- .../prog/en/modules/members/member.tt | 521 +++++++++++++----- .../prog/en/modules/members/members-update.tt | 2 +- .../prog/en/modules/members/moremember.tt | 13 +- .../prog/en/modules/patroncards/edit-batch.tt | 24 +- .../en/modules/patroncards/edit-layout.tt | 2 +- .../en/modules/patroncards/edit-template.tt | 3 +- .../prog/en/modules/patroncards/home.tt | 2 +- .../en/modules/patroncards/image-manage.tt | 33 +- .../prog/en/modules/patroncards/manage.tt | 16 +- .../prog/en/modules/patroncards/print.tt | 43 +- .../en/modules/plugins/plugins-disabled.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 4 +- .../prog/en/modules/plugins/plugins-upload.tt | 5 +- .../en/modules/reports/acquisitions_stats.tt | 5 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reports/borrowers_out.tt | 2 +- .../en/modules/reports/borrowers_stats.tt | 5 +- .../en/modules/reports/cash_register_stats.tt | 95 ++-- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../en/modules/reports/catalogue_stats.tt | 6 +- .../prog/en/modules/reports/dictionary.tt | 28 +- .../modules/reports/guided_reports_start.tt | 54 +- .../en/modules/reports/issues_avg_stats.tt | 3 +- .../prog/en/modules/reports/issues_stats.tt | 3 +- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 3 +- .../prog/en/modules/reports/serials_stats.tt | 4 +- .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- .../modules/rotating_collections/addItems.tt | 11 +- .../rotating_collections/editCollections.tt | 11 +- .../rotatingCollections.tt | 6 +- .../transferCollection.tt | 11 +- .../prog/en/modules/suggestion/suggestion.tt | 299 +++++----- .../prog/en/modules/tags/review.tt | 24 +- .../en/modules/tools/additional-contents.tt | 6 +- .../automatic_item_modification_by_age.tt | 22 +- .../prog/en/modules/tools/batchMod-edit.tt | 33 +- .../en/modules/tools/batch_delete_records.tt | 20 +- .../tools/batch_record_modification.tt | 90 ++- .../prog/en/modules/tools/export.tt | 135 ++--- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/letter.tt | 24 +- .../en/modules/tools/manage-marc-import.tt | 20 +- .../prog/en/modules/tools/modborrowers.tt | 30 +- .../prog/en/modules/tools/picture-upload.tt | 13 +- .../prog/en/modules/tools/quotes.tt | 3 +- .../en/modules/tools/stage-marc-import.tt | 2 - .../prog/en/modules/tools/upload-images.tt | 8 +- .../prog/en/modules/tools/upload.tt | 14 +- .../virtualshelves/addbybiblionumber.tt | 2 +- 131 files changed, 2383 insertions(+), 1680 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -401,6 +401,25 @@ tbody { } } } + .dropdown-menu{ + + background-color: #fff; + color: #000; + top: 100%; + + a{ + color: #000; + + &:hover, + &:focus{ + background-image: none; + background-color: #fff; + color: #000; + padding: 3px 20px; + text-decoration: underline; + } + } + } } .dataTables_wrapper { --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -28,7 +28,7 @@ a { } &.authlink { - background-color: #e6f0f2; + background-color: #e3f1df; border-radius: 5px; display: inline-block; padding: 2px 4px; @@ -38,7 +38,7 @@ a { &:link, &:visited { //color: #71B443; - padding: 6px 25px; + // padding: 6px 25px; } &.btn-link { @@ -64,16 +64,16 @@ a { box-shadow: none; font-size: 100%; - &:hover, &:focus, &:active{ + &:hover, &:focus, &:active, &:active:hover, &:active:focus{ text-decoration: underline; color: #71B443; - padding: .3em; - border: none; - background-color: transparent; - border: none; - box-shadow: none; - font-size: 100%; - } + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + } } &.cancel { @@ -694,6 +694,38 @@ p { font: 400 13.3333px Arial; } } + + &.plusdessous{ + background-color: #352C2E; + height: auto !important; + padding: 0 5px 10px 5px; + top: 30px; + border-bottom-left-radius: 17px; + border-bottom-right-radius: 17px; + + input{ + outline-offset: 0px; + outline: 1px black; + height: 20px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none; + margin-top: 5px; + margin-left: 0px; + width: 100%; + z-index: 100; + display: inline-block !important; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; + } + } } strong { @@ -1255,13 +1287,13 @@ ol { } fieldset { - overflow: auto; + //overflow: auto; background-color: #FFF; position: relative; color: #696969; left: 0px; top: 0px; - //border: 2px solid #B9D8D9; + //border: 2px solid #bfd9b9; //border-radius: 5px; margin: 0em 1em 1em 0em; //display: block; @@ -1282,7 +1314,7 @@ fieldset { } .standard { - background-color:#f4f8f9 !important; + background-color:#F4F8F9 !important; } .contrast { @@ -1306,9 +1338,10 @@ fieldset { &.brief { - //border: 2px solid #B9D8D9; + //border: 2px solid #bfd9b9; width: 50%; box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + overflow: visible; div { &.hint { @@ -1671,7 +1704,7 @@ fieldset { /* legend { background-color: #FFFFFF; - border: 2px solid #B9D8D9; + border: 2px solid #bfd9b9; border-radius: 3px; font-size: 123.1%; font-weight: bold; @@ -1808,7 +1841,7 @@ div { &.rule { background-color: #F4F8F9; - border: 2px solid #B9D8D9; + border: 2px solid #bfd9b9; border-radius: 5px; margin: .3em; padding: .3em; @@ -2140,7 +2173,7 @@ dd { position: relative; float: right; height: 100%; - padding: 0.3em; + // padding: 0.3em; .dropdown-menu { /*border-top-width: 1px; @@ -2162,7 +2195,7 @@ dd { border: 0.5px solid lightgray; font-size: 100%; background-color: #fff; - margin: 0; + margin: 5px 0 0 0; box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); position: absolute; text-decoration: none; @@ -2319,7 +2352,7 @@ dd { padding-bottom: 25px; h5 { - //border-right: 1px solid #B9D8D9; + //border-right: 1px solid #bfd9b9; margin-bottom: 0; padding: .5em .9em; font-weight: bold; @@ -2357,7 +2390,7 @@ dd { } > div { - //border-right: 1px solid #B9D8D9; + //border-right: 1px solid #bfd9b9; width: 100%; } @@ -2584,7 +2617,7 @@ i { .circ-settings { //background-color: #F4F8F9; border-radius: 0; - //border-top: 2px solid #B9D8D9; + //border-top: 2px solid #bfd9b9; display: none; margin-left: -1em; margin-right: -1em; @@ -2794,6 +2827,9 @@ i { //border: 1px solid #BCBCBC; color: #000000; text-align: center; + background-color: #fff; + // box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + ul, h5 { @@ -2888,7 +2924,7 @@ i { } #menu { - border-right: 1px solid #B9D8D9; + border-right: 1px solid #bfd9b9; margin-right: .5em; padding-bottom: 2em; padding-top: 1em; @@ -2896,7 +2932,7 @@ i { li { a { background: linear-gradient(to bottom, #E8F0F6 0%, #E8F0F6 96%, #C1C1C1 100%); - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-bottom-left-radius: 5px; border-top-left-radius: 5px; display: block; @@ -3060,6 +3096,7 @@ li { #searchresults { background-color: #fff; margin-top: 20px; + // overflow: auto; box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); padding: 20px; @@ -3078,8 +3115,8 @@ li { font-size: 90%; list-style: url("../img/item-bullet.svg"); padding: .2em 0; - background-color: #fff; - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + // background-color: #fff; + //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); color: #000; top: 100%; @@ -3145,6 +3182,7 @@ li { //top: 50px; background-color: #fff; color: #000; + height: fit-content; top: 100%; a{ @@ -3270,7 +3308,7 @@ li { } #biblio-cover-slider { - border: 1px solid #b9d8d9; + border: 1px solid #bfd9b9; border-radius: 3px; margin: 5px; padding: 10px 5px 5px 5px; @@ -3321,7 +3359,7 @@ td { } } -#lientype, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ +#lientype, #add, #merge-patrons, #btn_batchremove, #doedit, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ color: #71B443; padding: .3em; border: none; @@ -3330,7 +3368,7 @@ td { box-shadow: none; font-size: 100%; - &:hover{ + &:hover, &:active, &:focus, &:active:hover, &:active:focus{ text-decoration: underline; } } @@ -3791,8 +3829,8 @@ td { } .ui-widget-header { - background: #E6F0F2 none; - border: 1px solid #B9D8D9; + background: #b5dbad none; + border: 1px solid #bfd9b9; color: #222222; font-weight: bold; } @@ -3801,7 +3839,7 @@ td { .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { // background: #F4F8F9 none; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; color: #555555; font-weight: normal; } @@ -3812,8 +3850,8 @@ td { .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - background: #E6F0F2 none; - border: 1px solid #B9D8D9; + background: #cad8c6 none; + border: 1px solid #bfd9b9; color: #212121; font-weight: normal; } @@ -3855,7 +3893,7 @@ td { padding: 3px 1em 3px .4em; &:hover { - background: #E6F0F2 none; + background: #e3f1df none; color: #212121; font-weight: normal; } @@ -4064,8 +4102,8 @@ td { } li { - //background: none repeat scroll 0 0 #E6F0F2; - //border: 1px solid #B9D8D9; + //background: none repeat scroll 0 0 #e3f1df; + //border: 1px solid #bfd9b9; // border-bottom: 0 none; border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -4103,7 +4141,7 @@ td { a { background: none repeat scroll 0 0 transparent; color: #fff; - cursor: text; + // cursor: text; //font-weight: bold; outline: 0 none; top: 1px; @@ -4249,7 +4287,7 @@ td { } .pluginname { - background-color: #E6F0F2; + background-color: #e3f1df; cursor: move; margin: .3em; padding-bottom: 4px; @@ -4417,6 +4455,12 @@ nav { li { list-style: none; + .haut{ + position: relative; + bottom: 3px; + left: 300px; + } + .filteraction{ position: absolute; right: 30px; @@ -5068,6 +5112,7 @@ button, &:active, &:focus{ background-color: #fec22c9f; + color: #000; } } @@ -5082,6 +5127,10 @@ button, .panel { background: #F4F8F9 none; box-shadow: none; + + &:hover{ + background: #e3f1df none; + } } .panel-collapse { @@ -5104,7 +5153,7 @@ button, } &:hover { - background: #e6f0f2 none; + background: #e3f1df none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } @@ -5118,7 +5167,7 @@ button, } &:hover { - background: #e6f0f2 none; + background: #e3f1df none; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } @@ -5127,14 +5176,14 @@ button, } .panel-default { - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; > .panel-heading { background: transparent none; padding: 0; + .panel-collapse { > .panel-body { - border-top-color: #B9D8D9; + border-top-color: #bfd9b9; } } } @@ -5333,7 +5382,7 @@ label { fieldset, ol { - background-color: transparent; + background-color: #FFF; border: 0; margin: 0; padding: 0; @@ -5341,7 +5390,7 @@ label { } .modal-content { - background-color: #EDF4F6; + background-color: rgb(211, 223, 204); } .btn-group { @@ -5384,10 +5433,11 @@ code { .tab-content { /* background-color: #FFF; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-top-width: 0;*/ border: 3px solid #538200; border-radius: 4px; + overflow: auto; //border-top-width: 0; padding: 1em; } @@ -5476,7 +5526,7 @@ progress { } span { - background-color: #EBF3FF; + background-color: #ecffeb; border-radius: 5px; display: inline-block; font-size: 75%; @@ -5485,7 +5535,7 @@ progress { white-space: nowrap; &.selected { - background-color: #CCE0FC; + background-color: #d2fad0; } } } @@ -5546,7 +5596,7 @@ progress { #browse-return-to-results { background-color: #E8F0F6; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-bottom-width: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; @@ -5557,7 +5607,7 @@ progress { .browse-button { background-color: #FFF; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; color: #004D99; display: block; overflow: hidden; @@ -5745,7 +5795,7 @@ input.renew { .branchgriditem { background-color: #FFFFFF; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-radius: 3px; display: table-cell; float: left; @@ -5772,7 +5822,7 @@ input.renew { #new_rule { background-color: #F4F8F9; - border: 2px solid #B9D8D9; + border: 2px solid #bfd9b9; border-radius: 5px; display: none; margin: .3em; @@ -5858,7 +5908,7 @@ input.renew { } #fixedlengthbuilderaction { - border: 3px solid #E6F0F2; + border: 3px solid #e3f1df; left: 80%; padding: 5px; position: relative; @@ -6294,7 +6344,7 @@ input.renew { } .about h2 { - border-bottom: 1px solid #B9D8D9; + border-bottom: 1px solid #bfd9b9; padding: .5em .2em; margin: .5em 0; } @@ -6318,7 +6368,7 @@ input.renew { /*#catalog-search-link { //color : #fff; - //border-right: 1px solid lighten( #E6F0F2, 15% ); + //border-right: 1px solid lighten( #e3f1df, 15% ); //padding-right: .3em; }*/ --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -26,8 +26,8 @@ + + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -75,7 +75,7 @@ Actions - + + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -3,7 +3,7 @@ + + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -139,8 +139,8 @@ --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -6,19 +6,6 @@ [% USE To %] [% PROCESS 'html_helpers.inc' %] [% PROCESS 'patronfields.inc' %] - - -
- Show SQL code + Show SQL code
- +
[% IF allresults.size %] @@ -144,7 +144,7 @@

Search reports by keyword: - +

@@ -152,7 +152,7 @@
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -210,8 +210,8 @@ [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc @@ -25,4 +25,79 @@ Search catalog + + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -4,7 +4,7 @@ @@ -13,7 +13,7 @@ [% INCLUDE 'catalogue-search-box.inc' %] + + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -41,8 +41,8 @@
-

Acquisitions

[% INCLUDE 'acquisitions-toolbar.inc' %] +

Acquisitions

[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% UNLESS ( loop_budget ) %] [% IF ( CAN_user_acquisition_period_manage ) %] @@ -58,7 +58,7 @@
[% END %]
-
+

Manage orders

@@ -73,8 +73,8 @@ [% IF ( CAN_user_suggestions_suggestions_manage && ( suggestions_count || all_pendingsuggestions ) ) %]
-
- Pending suggestions +
+

Pending suggestions

Manage suggestions: --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -4,8 +4,8 @@ [% PROCESS 'i18n.inc' %] [% BLOCK csv_export %]

- Export as CSV - + Export as CSV + @@ -420,7 +421,7 @@ [% IF op == 'delete_confirm' %]
-

Delete fund [% budget_name | html %]?

+

Delete fund [% budget_name | html %]?

If you delete this fund, all orders linked to this fund will be deleted! @@ -450,7 +451,6 @@ [% IF op == 'list' %] - Filters

Fund filters

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -49,7 +49,7 @@ [% INCLUDE 'budgets-admin-toolbar.inc' %] -

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    +

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    @@ -61,6 +61,8 @@ [% ELSE %]

    Cells contain estimated values only.

    [% END %] + +

    Show/hide columns: @@ -176,6 +178,7 @@ [% ELSE %]

    +
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -46,7 +46,6 @@
    -

    Add new alertEdit alert

    Add new alertEdit alert

    @@ -100,7 +99,7 @@

    Audio alerts are disabled

    [% IF ( CAN_user_parameters_manage_sysprefs ) %] -

    Please enable system preference AudioAlerts to activate sounds.

    +

    Please enable system preference AudioAlerts to activate sounds.

    [% ELSE %]

    The system preference AudioAlerts must be enabled to activate sounds.

    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -195,7 +195,7 @@ Authority types › Administration › Koha
@@ -1162,9 +1162,9 @@ [% cells.cell | $raw %] @@ -1173,11 +1173,11 @@ [% cells.cell | $raw %] @@ -1186,7 +1186,7 @@ [% cells.cell | $raw %] @@ -1208,7 +1208,7 @@ [% END #/IF ( execute ) %] [% IF ( create ) %] -

Create from SQL

+

Create from SQL

Create report from SQL

@@ -1294,7 +1294,7 @@ [% END # /IF saved_results %] [% IF ( showsql ) %] -

Saved reports - SQL

+

Saved reports - SQL

[% reportname | html %]

    @@ -1404,7 +1404,7 @@ [% ELSE %] [% END %] [% END %] @@ -1445,7 +1445,7 @@
- Clear + Clear
@@ -1484,7 +1484,7 @@ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -51,10 +51,9 @@
-

Average checkout period

+

Average checkout period

[% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

Average checkout period

[% IF ( mainloo.loopfilter ) %]

Filtered on:

[% FOREACH loopfilte IN mainloo.loopfilter %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -54,10 +54,9 @@
-

Circulation statistics

+

Circulation statistics

[% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

Circulation statistics

[% IF ( mainloo.loopfilter ) %]

Filtered on:

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -58,8 +58,8 @@ [% IF ( do_it ) %] -[% FOREACH mainloo IN mainloop %]

    Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]

    +[% FOREACH mainloo IN mainloop %]
[% authority_type.auth_tag_to_report | html %]
- + Actions
@@ -249,8 +249,8 @@ Authority types › Administration › Koha --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -162,7 +162,7 @@ [% IF op == 'list' %] -

Background jobs

+

Background jobs

[% IF jobs.count %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -150,7 +150,7 @@ MARC frameworks › Administration › Koha

[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])

The framework is used [% biblios_use_this_framework | html %] times.

- +
[% ELSE %]

Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

@@ -212,8 +212,8 @@ MARC frameworks › Administration › Koha
@@ -236,8 +236,8 @@ MARC frameworks › Administration › Koha @@ -282,8 +282,8 @@ MARC frameworks › Administration › Koha @@ -306,8 +306,8 @@ MARC frameworks › Administration › Koha --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -54,9 +54,9 @@
[% IF ( limitType == 'ccode' ) %]For all collection codes: [% ELSE %]For all item types: [% END %] - Select all + Select all | - Clear all + Clear all | Switch to advanced editor
@@ -77,7 +77,7 @@

Policy for [% codes_loo.limit_phrase | html %]: [% codes_loo.code | html %]

-

Select all | Clear all

+

Select all | Clear all

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -134,7 +134,7 @@ Libraries › Administration › Koha
[% IF op == 'add_form' %] -

[% IF library %]Modify library[% ELSE %]New library[% END %]

+

[% IF library %]Modify library[% ELSE %]New library[% END %]

@@ -299,7 +299,7 @@ Libraries › Administration › Koha [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
-

Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?

+

Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?

@@ -312,7 +312,7 @@ Libraries › Administration › Koha [% END %] [% IF op == 'list' %] -

Libraries

+

Libraries

[% IF libraries_count > 0 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -159,9 +159,9 @@ Classification sources › Administration › Koha [% IF op == 'add_source' %] [% IF class_source %] -

Modify classification source

+

Modify classification source

[% ELSE %] -

Add classification source

+

Add classification source

[% END %] @@ -223,9 +223,9 @@ Classification sources › Administration › Koha [% IF op == 'add_sort_rule' %] [% IF sort_rule %] -

Modify filing rule

+

Modify filing rule

[% ELSE %] -

Add filing rule

+

Add filing rule

[% END %] @@ -261,17 +261,17 @@ Classification sources › Administration › Koha
- Cancel + Cancel +
[% END %] [% IF op == 'add_split_rule' %] [% IF split_rule %] -

Modify splitting rule

+

Modify splitting rule

[% ELSE %] -

Add splitting rule

+

Add splitting rule

[% END %] @@ -288,11 +288,13 @@ Classification sources › Administration › Koha Required [% END %] -
  • +
  • + Required
  • -
  • +
  • + [% IF pagename == 'additem' AND tablename == 'itemst' %] -
    Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
    +
    Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
    [% END %]
  • @@ -208,230 +208,90 @@
    -

    Table settings

    -
    -
    - -
    -
    -

    Acquisition tables

    - [% PROCESS pagelist module=modules.acqui modulename="acqui" %] -
    -
    +

    Table settings

    +
    + +
    +

    Acquisition tables

    + [% PROCESS pagelist module=modules.acqui modulename="acqui" %]
    -
    - -
    -
    -

    Administration tables

    - [% PROCESS pagelist module=modules.admin modulename="admin" %] -
    -
    + +
    +

    Administration tables

    + [% PROCESS pagelist module=modules.admin modulename="admin" %]
    -
    - -
    -
    -

    Authorities tables

    - [% PROCESS pagelist module=modules.authorities modulename="authorities" %] -
    -
    + +
    +

    Authorities tables

    + [% PROCESS pagelist module=modules.authorities modulename="authorities" %]
    -
    - -
    -
    -

    Catalogue tables

    - [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %] -
    -
    + +
    +

    Catalogue tables

    + [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %]
    -
    - -
    -
    -

    Cataloguing tables

    - [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %] -
    -
    + +
    +

    Cataloguing tables

    + [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %]
    -
    - -
    -
    -

    Circulation tables

    - [% PROCESS pagelist module=modules.circ modulename="circ" %] -
    -
    + +
    +

    Circulation tables

    + [% PROCESS pagelist module=modules.circ modulename="circ" %]
    -
    - -
    -
    -

    Course reserves tables

    - [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] -
    -
    + +
    +

    Course reserves tables

    + [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %]
    -
    - -
    -
    -

    Interlibrary loans tables

    - [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %] -
    -
    + +
    +

    Interlibrary loans tables

    + [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %]
    -
    - -
    -
    -

    Patrons tables

    - [% PROCESS pagelist module=modules.members modulename="members" %] -
    -
    + +
    +

    Patrons tables

    + [% PROCESS pagelist module=modules.members modulename="members" %]
    -
    - -
    -
    -

    Point of sale tables

    - [% PROCESS pagelist module=modules.pos modulename="pos" %] -
    -
    + +
    +

    Point of sale tables

    + [% PROCESS pagelist module=modules.pos modulename="pos" %]
    -
    - -
    -
    -

    Tools tables

    - [% PROCESS pagelist module=modules.tools modulename="tools" %] -
    -
    + +
    +

    Tools tables

    + [% PROCESS pagelist module=modules.tools modulename="tools" %]
    -
    - -
    -
    -

    OPAC tables

    - [% PROCESS pagelist module=modules.opac modulename="opac" %] -
    -
    + +
    +

    OPAC tables

    + [% PROCESS pagelist module=modules.opac modulename="opac" %]
    -
    - -
    -
    -

    Reports tables

    - [% PROCESS pagelist module=modules.reports modulename="reports" %] -
    -
    + +
    +

    Reports tables

    + [% PROCESS pagelist module=modules.reports modulename="reports" %]
    -
    - -
    -
    -

    Serials tables

    - [% PROCESS pagelist module=modules.serials modulename="serials" %] -
    -
    + +
    +

    Serials tables

    + [% PROCESS pagelist module=modules.serials modulename="serials" %]
    @@ -445,15 +305,23 @@
    + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] - - [%- IF ( panel.defined && panel >= 0 ) -%] - - [%- END -%] + }); + [% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -87,9 +87,9 @@ [% IF op == 'add_form' %] [% IF credit_type %] -

    Modify a credit type

    +

    Modify a credit type

    [% ELSE %] -

    New credit type

    +

    New credit type

    [% END %] @@ -166,7 +166,7 @@ New credit type
    -

    Account credit types

    +

    Account credit types

    [% IF credit_types.count %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -169,7 +169,7 @@ [% IF op =='delete_confirm' %] [% IF nb_of_orders or nb_of_vendors %]
    -

    Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

    +

    Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

    [% IF nb_of_orders %] This currency is used by [% nb_of_orders | html %] orders. @@ -209,7 +209,7 @@ [% IF op == 'list' %] -

    Currencies and exchange rates

    +

    Currencies and exchange rates

    [% IF currencies and no_active_currency %]

    No active currency is defined

    Please edit one currency and mark it as active.

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -85,9 +85,9 @@ [% IF op == 'add_form' %] [% IF debit_type %] -

    Modify a debit type

    +

    Modify a debit type

    [% ELSE %] -

    New debit type

    +

    New debit type

    [% END %] @@ -157,7 +157,7 @@ New debit type
    -

    Account debit types

    +

    Account debit types

    [% IF debit_types.count %]
    @@ -222,7 +222,7 @@ [% ELSE %]
    - There are no account debit types defined. Create new debit type + There are no account debit types defined. Create new debit type
    [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -265,16 +265,16 @@ EDI accounts › Administration › Koha
    - Cancel
    -cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel + [% END %] [% IF delete_confirm %]
    -

    Delete this account?

    +

    Delete this account?

    @@ -303,7 +303,7 @@ cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel [% END %] [% IF display %] [% IF ( ediaccounts ) %] -

    Vendor EDI accounts

    +

    Vendor EDI accounts

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -148,7 +148,7 @@ Library EANs › Administration › Koha [% IF delete_confirm %]
    -

    Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

    +

    Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

    @@ -161,7 +161,6 @@ Library EANs › Administration › Koha [% END %] [% IF display %] -

    Library EANs

    [% IF ( eans ) %]

    Library EANs

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -75,7 +75,7 @@ [% END %] [% IF fields.size %]
    -

    Item search fields

    +

    Item search fields

    @@ -108,7 +108,7 @@
    Vendor
    [% ELSE %] -

    Item search fields

    +

    Item search fields

    There are no item search fields defined.
    @@ -116,15 +116,12 @@
    -

    Add a new field

    Add a new field

    [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
    - - Cancel - Cancel + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -74,13 +74,13 @@ -

    Library groups

    +

    Library groups

    [% FOREACH root_group IN root_groups %] @@ -112,7 +112,7 @@

    Add group

    @@ -177,7 +177,7 @@ @@ -244,7 +244,7 @@ Are you sure you want to delete ? @@ -265,7 +265,7 @@ Are you sure you want to remove from ? @@ -420,25 +420,25 @@
    [% IF group.branchcode %] - + [% ELSE %]
    - +
    - +
    - + Actions
    [% END %]
    -
    +
    NOTE: Only KPZ file format is supported.
    -
    -
    +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -50,10 +50,9 @@
    -

    Acquisitions statistics

    +

    Acquisitions statistics

    [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

    Acquisitions statistics

    [% IF ( mainloo.loopfilter.size ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] @@ -328,9 +327,7 @@ -
    -
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -54,8 +54,8 @@
    [% IF ( do_it ) %] +

    Patrons with the most checkouts

    [% FOREACH mainloo IN mainloop %] -

    Patrons with the most checkouts

    [% IF ( mainloo.loopfilter ) %] [% IF mainloo.loopfilter.size %]

    Filtered on:

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -40,8 +40,8 @@
    [% IF ( do_it ) %] +

    Patrons with no checkouts

    [% FOREACH mainloo IN mainloop %] -

    Patrons with no checkouts

    [% IF ( mainloo.loopfilter ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -58,10 +58,9 @@
    -

    Patrons statistics

    +

    Patrons statistics

    [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

    Patrons statistics

    [% IF ( mainloo.loopfilter.size>0 ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] @@ -319,9 +318,7 @@ -
    -
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -61,6 +61,55 @@

    Cash register statistics

    + +[% IF ( do_it ) %] +
     
    + + + + + + + + + + + + + + + + + + [% FOREACH loopresul IN loopresult %] + + + + + + + + + + + + + + + [% END %] + + + [% IF transaction_type == "ACT" %] + + + + [% END %] + + +
    Manager namePatron card numberPatron nameTransaction libraryTransaction dateUpdatedTransaction typeNotesAmountBibliographic record titleBarcodeItem type
    [% loopresul.mfirstname | html %] [% loopresul.msurname | html %][% loopresul.cardnumber | html %][% loopresul.bfirstname | html %] [% loopresul.bsurname | html %][% loopresul.branchname | html %][% loopresul.date | $KohaDates %][% loopresul.timestamp | $KohaDates with_hours = 1 %][% loopresul.type_description | html %][% loopresul.note | html %][% loopresul.amount | $Price %][% loopresul.title | html %][% loopresul.barcode | html %][% ItemTypes.GetDescription(loopresul.itype) | html %]
    TOTAL[% total | $Price %] 
    + + [% ELSE %] +

    Cash register statistics [% beginDate | $KohaDates %] to [% endDate | $KohaDates %]

    @@ -161,52 +210,6 @@
    - [% IF ( do_it ) %] -
     
    - - - - - - - - - - - - - - - - - - [% FOREACH loopresul IN loopresult %] - - - - - - - - - - - - - - - [% END %] - - - [% IF transaction_type == "ACT" %] - - - - [% END %] - - -
    Manager namePatron card numberPatron nameTransaction libraryTransaction dateUpdatedTransaction typeNotesAmountBibliographic record titleBarcodeItem type
    [% loopresul.mfirstname | html %] [% loopresul.msurname | html %][% loopresul.cardnumber | html %][% loopresul.bfirstname | html %] [% loopresul.bsurname | html %][% loopresul.branchname | html %][% loopresul.date | $KohaDates %][% loopresul.timestamp | $KohaDates with_hours = 1 %][% loopresul.type_description | html %][% loopresul.note | html %][% loopresul.amount | $Price %][% loopresul.title | html %][% loopresul.barcode | html %][% ItemTypes.GetDescription(loopresul.itype) | html %]
    TOTAL[% total | $Price %] 
    - [% END %] [%# do_it %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -53,8 +53,8 @@ [% IF ( do_it ) %] +

    Top [% mainloo.limit | html %] Most-circulated items

    [% FOREACH mainloo IN mainloop %] -

    Top [% mainloo.limit | html %] Most-circulated items

    [% IF ( mainloo.loopfilter ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -51,10 +51,9 @@
    -

    Catalog statistics

    +

    Catalog statistics

    [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

    Catalog statistics

    [% IF ( mainloo.loopfilter ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] @@ -325,9 +324,6 @@ -
    - -
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -166,7 +166,7 @@ [% END %]
    [% ELSE %] -
    There are no saved definitions. Add a definition to the dictionary.
    +
    There are no saved definitions. Add a definition to the dictionary.
    [% END %] [% END %] @@ -182,15 +182,14 @@ - - -
    + +
    [% END %] [%- IF ( step_2 ) -%] -

    Add new definition

    +

    Add new definition

    Step 2 of 5: Choose the area

    @@ -206,13 +205,12 @@ -
    -
    +
    [%- END -%] [% IF ( step_3 ) %] -

    Add new definition

    +

    Add new definition

    Step 3 of 5: Choose a column

    @@ -242,13 +240,12 @@ -
    -
    +
    [% END %] [% IF ( step_4 ) %] -

    Add new definition

    +

    Add new definition

    Step 4 of 5: Specify a value

    @@ -290,8 +287,7 @@ [% END %] -
    -
    +
    @@ -304,7 +300,7 @@ -

    Add new definition

    +

    Add new definition

    Step 5 of 5: Confirm details

    @@ -334,9 +330,7 @@
    - - -
    +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -167,7 +167,7 @@
    Loading
    @@ -182,7 +182,7 @@ [% INCLUDE "reports-toolbar.inc" %] [% IF ( start ) %] -

    Guided reports

    +

    Guided reports

    Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.

    Build and run reports

    @@ -244,7 +244,7 @@ [% IF ( filters.keyword ) %] Keyword: [% filters.keyword | html %] [% END %] - Clear + Clear

    [% END %] @@ -381,16 +381,16 @@
    [% IF savedreport.seems_obsolete %] This report seems obsolete, it uses biblioitems.marcxml field. - Update SQL + Update SQL [% END %]
    [%# There should be no space between these two buttons, it would render badly %] - Run
    @@ -563,7 +563,7 @@
    - [% FOREACH column IN columns %] [% IF ( column.table ) %] [% IF ( loop.first ) %] @@ -934,8 +934,8 @@
    @@ -1039,7 +1039,7 @@
    [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %]
    - @@ -1079,7 +1079,7 @@ [% IF ( unlimited_total > 10 && limit <= 1000 ) %]
    -
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -40,7 +40,7 @@ [% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports ) %] -
    +

    Guided reports

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -55,10 +55,9 @@
    -

    Holds statistics

    +

    Holds statistics

    [% IF ( do_it ) %] [% IF ( mainloop ) %] -

    Holds statistics

    [% IF ( loopfilter ) %]

    Filtered on:

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -87,7 +87,7 @@ [% ELSE %] -
      +
      1. @@ -118,7 +118,7 @@
      -
      +

      Output

      1. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -45,7 +45,7 @@
        -

        Comments

        +

        Comments

        --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -44,15 +44,16 @@
        -

        Add/remove items from collection

        [% IF ( ! colId ) %] +

        Add/remove items from collection

        [% ELSE %] [% INCLUDE 'rotating-collections-toolbar.inc' %] +

        Add/remove items from collection

        Collection [% colTitle | html %]

        [% IF ( previousActionAdd ) %] @@ -98,7 +99,7 @@
        - Add or remove items +

        Add or remove items

        1. @@ -113,7 +114,7 @@

          - +

        @@ -136,7 +137,7 @@
    - + [% END %]
    [% INCLUDE 'biblio-title.inc' biblio=collectionItemsLoo link = 1 %] [% collectionItemsLoo.itemcallnumber | html %] [% collectionItemsLoo.barcode | html %]RemoveRemove
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt @@ -63,7 +63,7 @@ [% IF ( createSuccess ) %]

    Collection [% createdTitle | html %] added successfully

    -

    Return to rotating collections home

    +

    Return to rotating collections home

    [% ELSE %]
    @@ -120,9 +120,9 @@ [% IF action == "new" || action == "edit" %] [% IF ( previousActionEdit ) %] -

    Edit collection [% editColTitle | html %]

    +

    Edit collection [% editColTitle | html %]

    [% ELSE %] -

    Add new collection

    +

    Add new collection

    [% END %] @@ -154,9 +154,8 @@ [% END %] -
    -
    -

    Cancel

    + +

    Cancel

    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt @@ -42,9 +42,10 @@ [% INCLUDE 'rotating-collections-toolbar.inc' %] -

    Rotating collections

    +

    Rotating collections

    [% IF ( collectionsLoop ) %] +
    @@ -62,7 +63,7 @@
    [% Branches.GetName( collectionsLoo.colBranchcode ) | html %]
    - + Actions
    +
    [% ELSE %]
    There are no collections currently defined.
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt @@ -45,7 +45,7 @@
    -

    Transfer collection [% colTitle | html %]

    +

    Transfer collection [% colTitle | html %]

    [% IF ( messages ) %] [% FOREACH message IN messages %] @@ -63,12 +63,12 @@ [% IF ( transferSuccess ) %] [% ELSIF ( transferFailure ) %] [% END %] @@ -86,9 +86,8 @@ -
    -
    - Cancel + + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -8,7 +8,7 @@ [% USE TablesSettings %] [% SET footerjs = 1 %] [% formulaire = BLOCK %] - [% INCLUDE 'circ-search.inc' %] + [% INCLUDE 'cat-search.inc' %] [% END %] [% INCLUDE 'doc-head-open.inc' %] @@ -118,9 +118,10 @@ <div class="col-md-8 col-md-offset-2"> <div id="toolbar" class="btn-toolbar"> - <a class="btn btn-default" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid | html %]"><i class="fa fa-pencil"></i> Edit</a> - <a class="btn btn-default deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a> - </div> + <div> + <a class="btn btn-default pat" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid | html %]"><i class="fa fa-pencil"></i> Edit</a> + <a class="btn btn-default deletesuggestion pat" href="suggestion.pl?op=delete&suggestionid=[% suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a> + </div></div> <fieldset class="rows"> <h3>Bibliographic information</h3> @@ -203,22 +204,22 @@ <span class="label">Status:</span> [% SET status_found = 0 %] [% IF ( STATUS == 'ASKED' ) %] - <span>Pending</span> + Pending [% SET status_found = 1 %] [% ELSIF ( STATUS == 'ACCEPTED' ) %] - <span>Accepted</span> + Accepted [% SET status_found = 1 %] [% ELSIF ( STATUS == 'CHECKED' ) %] - <span>Checked</span> + Checked [% SET status_found = 1 %] [% ELSIF ( STATUS == 'REJECTED' ) %] - <span>Rejected</span> + Rejected [% SET status_found = 1 %] [% ELSIF ( STATUS == 'ORDERED' ) %] - <span>Ordered</span> + Ordered [% SET status_found = 1 %] [% ELSIF ( STATUS == 'AVAILABLE' ) %] - <span>Available</span> + Available [% SET status_found = 1 %] [% ELSE %] [% FOREACH s IN SuggestionStatuses %] @@ -321,7 +322,7 @@ </fieldset> <fieldset class="action"> - <a href="suggestion.pl"><< Back to suggestions</a> + <a href="suggestion.pl" id="lientype"><< Back to suggestions</a> </fieldset> </div> <!-- /.col-md-8 col-md-offset-2 --> @@ -343,11 +344,11 @@ <div class="dialog [% m.type | html %]"> [% SWITCH m.code %] [% CASE 'biblio_exists' %] - <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> + A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. [% CASE 'manager_not_enough_permissions' %] - <span>The manager you selected does not have sufficient permissions.</span> + The manager you selected does not have sufficient permissions. [% CASE %] - <span>[% m.code | html %]</span> + [% m.code | html %] [% END %] </div> <!-- /.dialog --> [% END %] @@ -488,7 +489,7 @@ [% ELSE %] <input type="text" size="31" id="select-other_reason" name="other_reason" placeholder="please note your reason here..." /> [% END %] - <a href="#back">Cancel</a> + <a class="cancel" href="#back">Cancel</a> </span> </li> [% END %] @@ -517,7 +518,7 @@ [% END %] </td> <td> - <a href="#" id="edit_suggester" class="btn btn-default">Set to patron</a> + <a href="#" id="edit_suggester" class="btn btn-default lientype">Set to patron</a> </td> </tr> <tr> @@ -567,9 +568,9 @@ | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) [% END %] <br /> - <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> + <a id="edit_manager" class="new_window lientype" href="#"><i class="fa fa-search"></i> Select manager</a> [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] - <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> + <a id="restore_previous_manager" class="lientype" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> [% END %] <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> @@ -646,7 +647,7 @@ [% IF ( suggestionid ) %] [% IF ( need_confirm ) %] <input type="hidden" name="save_confirmed" value="1" /> - <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> + <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="principal" value="Confirm your suggestion" /> [% ELSE %] <input type="submit" class="principal" value="Save" /> [% END %] @@ -654,7 +655,7 @@ [% ELSE %] [% IF ( need_confirm ) %] <input type="hidden" name="save_confirmed" value="1" /> - <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> + <input onclick="this.form.op.value = 'save'; this.form.submit();" class="principal" type="submit" value="Confirm your suggestion" /> [% ELSE %] <input type="submit" class="principal" value="Submit your suggestion" /> [% END %] @@ -666,10 +667,9 @@ [% IF op == 'else' %] <div id="toolbar" class="btn-toolbar"> - <div> - <a class="pat" id="newsuggestion" href="suggestion.pl?op=add&branchcode=[% branchcode | uri %]"><i class="fa fa-plus"></i> New purchase suggestion</a> - </div> - </div> + <div> + <a class="btn btn-default pat" id="newsuggestion" href="suggestion.pl?op=add&branchcode=[% branchcode | uri %]"><i class="fa fa-plus"></i> New purchase suggestion</a> + </div></div> <h2>Suggestions management</h2> @@ -685,58 +685,74 @@ <div class="dialog [% m.type | html %]"> [% SWITCH m.code %] [% CASE 'already_exists' %] - <span>The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>)</span> + The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>) [% CASE 'biblio_exists' %] - <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> + A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. [% CASE %] - <span>[% m.code | html %]</span> + [% m.code | html %] [% END %] </div> <!-- /.dialog --> [% END # /FOR m %] [% UNLESS ( notabs ) %] <div id="suggestiontabs" class="toptabs"> - <fieldset id="searchresults"> - <ul class="ui-tabs-nav" role="tablist"> + <div id="searchresults"> + <ul class="ui-tabs-nav"> [% FOREACH suggestion IN suggestions %] - <li role="presentation"> - <a href="#[% suggestion.suggestiontype | uri %]" aria-controls="[% suggestion.suggestiontype | uri %]" role="tab" data-toggle="tab"> + <li> + <a href="#[% suggestion.suggestiontype | uri %]"> [% IF ( suggestion.suggestiontypelabel ) %] - [% IF (suggestion.suggestiontypelabel == "Pending") %]<span>Pending</span> - [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]<span>Accepted</span> - [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]<span>Checked</span> - [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]<span>Rejected</span> - [% ELSIF (suggestion.suggestiontypelabel == "Available") %]<span>Available</span> - [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]<span>Ordered</span> - [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]<span>Status unknown</span> - [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]<span>Any</span> + [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending + [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted + [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked + [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected + [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available + [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered + [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown + [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %] [% ELSE %] [% IF ( suggestion.suggestiontype ) %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) | html %] [% ELSE %] - <span>No name</span> + No name [% END %] [% END %] - ([% suggestion.suggestions_loop.size | html %]) - </a> - </li> + ([% suggestion.suggestions_loop.size | html %])</a></li> + [% END # /FOREACH suggestion %] </ul> <!-- /.ui-tabs-nav --> - <div class="tab-content"> [% END # /UNLESS notabs %] - [% FOREACH suggestion IN suggestions %] - <div id="[% suggestion.suggestiontype | html %]" role="tabpanel" class="tab-pane"> - <form class="update_suggestions" name="f" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype| uri %]"> + [% FOREACH suggestion IN suggestions %] + <div id="[% suggestion.suggestiontype | html %]"> + <form class="update_suggestions" name="f" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype| uri %]"> [% IF ( suggestion.suggestions_loop ) %] <p> - <a class="checkall" id="lientype" href="#">Check all</a> | <a class="uncheckall" id="lientype" href="#">Uncheck all</a> + <a class="checkall" href="#">Check all</a> | <a class="uncheckall" href="#">Uncheck all</a> </p> - <table id="table_[% loop.count | html %]" class="sorted"> - <thead> + <table id="table_[% loop.count | html %]" class="sorted"> + <thead> + <tr> + <th class="NoSort noExport"> </th> + <th class="anti-the">Suggestion</th> + <th>Suggested by</th> + <th>Suggested on</th> + <th>Managed by</th> + <th>Managed on</th> + <th>Last modification by</th> + <th>Last modification on</th> + <th>Last updated</th> + <th>Library</th> + <th>Fund</th> + <th>Status</th> + <th class="NoSort noExport"> </th> + </tr> + </thead> + <tbody> + [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] <tr> <td> <input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid | html %]" /> @@ -830,7 +846,7 @@ </td> <td class="actions"> <div class="btn-group dropup"> - <a class="btn btn-default btn-xs" role="button" id="lientype" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="lientype" sid="more_actions_[% suggestions_loo.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> + <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=edit" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle lientype" id="more_actions_[% suggestions_loo.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% suggestions_loo.suggestionid | html %]"> <li><a class="deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a></li> [% UNLESS suggestions_loo.archived %] @@ -867,76 +883,48 @@ <option value="ACCEPTED">Accepted</option> [% END %] - [% IF ( suggestions_loo.reason ) %] - <br />([% suggestions_loo.reason | html %]) - [% END %] - </td> - <td class="actions"> - <div class="btn-group dropup"> - <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% suggestions_loo.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> - <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% suggestions_loo.suggestionid | html %]"> - <li><a class="deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a></li> - [% UNLESS suggestions_loo.archived %] - <li><a class="archivesuggestion" href="suggestion.pl?op=archive&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Archive</a></li> - [% ELSE %] - <li><a class="unarchivesuggestion" href="suggestion.pl?op=unarchive&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Unarchive</a></li> - [% END %] - </ul> - </div> - </td> - </tr> - [% END # /FOREACH suggestions_loo %] - </tbody> - </table> <!-- /#table_[% loop.count | html %] --> - - <div class="row"> - <h2 style="padding-left:1em;">Change selected suggestions</h2> - <div class="col-sm-4"> - <fieldset> - <div id="select-reason[% loop.index | html %]"> - <label for="STATUSreason[% loop.index | html %]">Mark selected as: </label> - <select name="STATUS" id="STATUSreason[% loop.index | html %]"> - <option value=""> -- Choose a status --</option> - - [% IF (statusselected_ASKED ) %] - <option value="ASKED" selected="selected">Pending</option> - [% ELSE %] - <option value="ASKED">Pending</option> - [% END %] + [% IF (statusselected_CHECKED ) %] + <option value="CHECKED" selected="selected">Checked</option> + [% ELSE %] + <option value="CHECKED">Checked</option> + [% END %] - [% IF (statusselected_ACCEPTED ) %] - <option value="ACCEPTED" selected="selected">Accepted</option> - [% ELSE %] - <option value="ACCEPTED">Accepted</option> - [% END %] + [% IF ( statusselected_REJECTED ) %] + <option value="REJECTED" selected="selected">Rejected</option> + [% ELSE %] + <option value="REJECTED">Rejected</option> + [% END %] - [% IF (statusselected_CHECKED ) %] - <option value="CHECKED" selected="selected">Checked</option> - [% ELSE %] - <option value="CHECKED">Checked</option> - [% END %] + [% IF ( statusselected_ORDERED ) %] + <option value="ORDERED" selected="selected">Ordered</option> + [% ELSE %] + <option value="ORDERED">Ordered</option> + [% END %] - [% IF ( statusselected_REJECTED ) %] - <option value="REJECTED" selected="selected">Rejected</option> - [% ELSE %] - <option value="REJECTED">Rejected</option> - [% END %] + [% FOREACH s IN SuggestionStatuses %] + <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> + [% END %] + </select> - [% IF ( statusselected_ORDERED ) %] - <option value="ORDERED" selected="selected">Ordered</option> - [% ELSE %] - <option value="ORDERED">Ordered</option> - [% END %] + <label for="choosereason[% loop.index | html %]">with this reason:</label> + <select name="reason" id="choosereason[% loop.index | html %]"> + <option value=""> -- Choose a reason -- </option> + [% FOREACH reasonsloo IN suggestion.reasonsloop %] + <option value="[% reasonsloo.lib | html %]">[% reasonsloo.lib | html %]</option> + [% END %] + <option value="other">Others...</option> + </select> - [% FOREACH s IN SuggestionStatuses %] - <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> - [% END %] - </select> + <span class="other_reason"> + <input type="text" size="31" name="other_reason" placeholder="please note your reason here..." /> + <a href="#" class="cancel_note">Cancel</a> + </span> + </div> <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> <fieldset class="action"> - <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_status">Submit</button> + <button type="submit" class="btn btn-default btn-xs principal" value="update_status">Submit</button> </fieldset> </fieldset> </div> <!-- /.col-sm-4 --> @@ -950,7 +938,7 @@ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> <fieldset class="action"> - <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_itemtype">Submit</button> + <button type="submit" class="btn btn-default btn-xs principal" value="update_itemtype">Submit</button> </fieldset> </fieldset> </div> <!-- /.col-sm-4 --> @@ -958,13 +946,13 @@ <div class="col-sm-2"> <fieldset> <span class="label">Update manager</span><br/> - <a id="set_manager_[% loop.count | html %]" data-tab="[% loop.count | html %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a> + <a id="set_manager_[% loop.count | html %]" data-tab="[% loop.count | html %]" class="set_manager lientype" href="#"><i class="fa fa-search"></i> Select manager</a> <span id="managedby_name[% loop.count | html %]"></span> <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count | html %]" value="[% logged_in_user.borrowernumber | html %]" /> <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> <fieldset class="action"> - <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_manager">Submit</button> + <button type="submit" class="btn btn-default btn-xs principal" value="update_manager">Submit</button> </fieldset> </fieldset> </div> <!-- /.col-sm-2 --> @@ -975,32 +963,23 @@ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> <fieldset class="action"> - <button type="submit" class="btn btn-default btn-xs" id="lientype" value="delete">Delete</button> - </fieldset> - </div> <!-- /.col-sm-2 --> - <div class="col-sm-2"> - <fieldset> - <span class="label">Archive selected</span> - <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> - <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> - <fieldset class="action"> - <button type="submit" class="btn btn-default btn-xs" value="archive">Archive</button> - </fieldset> + <button type="submit" class="btn btn-default btn-xs cancel" value="delete">Delete</button> </fieldset> - </div> <!-- /.col-sm-2 --> - </div> <!-- /.row --> + </fieldset> + </div> <!-- /.col-sm-2 --> + </div> <!-- /.row --> - [% ELSE %] - <strong>No results.</strong> - [% END # /IF ( suggestion.suggestions_loop ) %] - </form> <!-- /.update_suggestions --> - </div> <!-- /#[% suggestion.suggestiontype | html %] --> - [% END # /FOREACH suggestion %] + [% ELSE %] + <strong>No results.</strong> + [% END # /IF ( suggestion.suggestions_loop ) %] + </form> <!-- /.update_suggestions --> + </div> <!-- /#[% suggestion.suggestiontype | html %] --> + [% END # /FOREACH suggestion %] [% UNLESS ( notabs ) %] - </fieldset> </div> <!-- /.notabs --> [% END # /UNLESS notabs %] [% END # /IF op == 'else' %] + </div> [% UNLESS op == 'save' %] [% UNLESS ( op == 'show' ) %] @@ -1008,13 +987,12 @@ <div class="col-sm-2 col-sm-pull-10"> <aside> - <div id="filters"> <form name="suggestionfilter" action="suggestion.pl" method="get"> <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> <fieldset class="brief"> <ol style="display:block;"> <li> - <p for="displayby">Organize by: + <p for="displayby">Organize by: <select name="displayby" id="displayby" style="width:auto;"> [% IF ( displayby == "STATUS" ) %] <option value="STATUS" selected="selected">Status</option> @@ -1041,8 +1019,8 @@ [% ELSE %] <option value="acceptedby">Accepted by</option> [% END %] - </select> - <input class="principal" type="submit" value="Go" /></p> + </select></p> + <input type="submit" class="principal" value="Go" /> </li> </ol> </fieldset> <!-- /.brief --> @@ -1051,7 +1029,7 @@ <div id="limits"> <fieldset class="brief"> - <h4 class="local_collapse"><a href="#">Bibliographic information <span class="caret"></span></a></h4> + <h4 class="local_collapse"><a href="#">Bibliographic information</a></h4> <ol> <li> <p for="title"> Title: @@ -1075,13 +1053,13 @@ </li> <li> <p for="collectiontitle"> Collection title: - <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input class="principal" type="submit" value="Go" /> + <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input type="submit" class="principal" value="Go" /> </p></li> </ol> </fieldset> <!-- /.brief --> <fieldset class="brief"> - <h4 class="local_collapse"><a href="#">Suggestion information <span class="caret"></span></a></h4> + <h4 class="local_collapse"><a href="#">Suggestion information</a></h4> <ol> <li> <p for="archived" style="display: inline;">Include archived: @@ -1089,8 +1067,8 @@ <input type="checkbox" id="archived" name="filter_archived" checked="checked" title="Include archived suggestions in the search" /> [% ELSE %] <input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" /> - [% END %]</p> - </li> + [% END %] + </p></li> <li> <p for="STATUS[% loop.index | html %]"> Status: <select name="STATUS" id="STATUS[% loop.index | html %]"> @@ -1146,8 +1124,8 @@ <option value="[% suggestedby_loo.code | html %]">[% suggestedby_loo.desc | html %]</option> [% END %] [% END %] - </select></p> - </li> + </select> + </p></li> <li> <p for="suggesteddate_from">Suggested date from: <input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from | html %]" data-date_to="suggesteddate_to" class="flatpickr" /> @@ -1188,8 +1166,8 @@ <option value="[% acceptedby_loo.code | html %]">[% acceptedby_loo.desc | html %]</option> [% END %] [% END %] - </select> - </p></li> + </select></p> + </li> <li> <p for="accepteddate_from">Accepted date from: <input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from | html %]" data-date_to="accepteddate_to" class="flatpickr" /> @@ -1199,14 +1177,14 @@ <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" class="flatpickr" /> </p></li> <li> - <input class="principal" type="submit" value="Go" /> + <input type="submit" class="principal" value="Go" /> </li> </ol> </fieldset> <fieldset class="brief"> <h4 class="local_collapse"> - <a href="#">Acquisition information <span class="caret"></span></a> + <a href="#">Acquisition information</a> </h4> <ol> <li> @@ -1228,7 +1206,7 @@ </select></p> </li> <li> - <input class="principal" type="submit" value="Go" /> + <input type="submit" class="principal" value="Go" /> </li> </ol> </fieldset> @@ -1236,7 +1214,7 @@ </form> <!-- /suggestionsfilter --> [% INCLUDE 'acquisitions-menu.inc' %] - </div> + </aside> </div> <!-- /.col-sm-2.col-sm-pull-10 --> [% END # /UNLESS ( op == 'show' ) %] @@ -1252,9 +1230,9 @@ var tab = ''; function editManagerPopup(selected_tab) { tab = selected_tab; - window.open("/cgi-bin/koha/members/search.pl?columns=cardnumber,name,branch,category,action&selection_type=select&callback=select_manager&filter=suggestions_managers", + window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select&callback=select_manager&permissions=suggestions.suggestions_manage", 'PatronPopup', - 'width=1024,height=768,scrollbars=yes,toolbar=no,' + 'width=740,height=450,location=yes,toolbar=no,' + 'scrollbars=yes,resize=yes' ); } @@ -1289,9 +1267,9 @@ } function editSuggesterPopup() { - window.open("/cgi-bin/koha/members/search.pl?columns=cardnumber,name,branch,category,action&selection_type=select&callback=select_suggester", + window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select&callback=select_suggester", 'PatronPopup', - 'width=1024,height=768,scrollbars=yes,toolbar=no,' + 'width=740,height=450,location=yes,toolbar=no,' + 'scrollbars=yes,resize=yes' ); } @@ -1337,16 +1315,15 @@ [% INCLUDE 'columns_settings.inc' %] <script> $(document).ready(function() { - if( $("#suggestiontabs .tab-pane.active").length < 1 ){ - $("#suggestiontabs a:first").tab("show"); - } - table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %] + $('#suggestiontabs').tabs(); + + columns_settings = [% TablesSettings.GetColumns( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %] [% FOREACH suggestion IN suggestions %] [% IF ( suggestion.suggestions_loop ) %] KohaTable("table_[% loop.count| html %]", { "sorting": [[ 3, "asc" ]], "autoWidth": false, - }, table_settings ); + }, columns_settings ); [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -49,7 +49,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } <div class="row"> <div class="col-sm-8 col-sm-push-2"> -<h1>Tags</h1> +<h2>Tags</h2> <form method="post" action="/cgi-bin/koha/tags/review.pl"> <h4>Displaying [% IF ( filter_approved_all ) %]all[% END %] @@ -199,7 +199,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> <form method="post" action="/cgi-bin/koha/tags/review.pl"> <input type="text" size="14" name="test" id="test" /> - <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> + <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm principal" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> <div id="verdict"> [% IF ( test_term ) %] [% IF ( verdict_ok ) %] @@ -217,13 +217,14 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } </div> <div class="col-sm-2 col-sm-pull-10"> <aside> + <div id="filters"> <form method="post" action="/cgi-bin/koha/tags/review.pl"> <fieldset class="brief"> <h4>Filters</h4> <ol> - <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /> + <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p> </li> - <li><label for="approved">Status:</label> + <li><p for="approved">Status: <select name="approved" id="approved"> [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option> [% ELSE %]<option value="all">all</option>[% END %] @@ -233,23 +234,24 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% ELSE %]<option value="0">pending</option>[% END %] [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option> [% ELSE %]<option value="-1">rejected</option>[% END %] - </select> + </select></p> </li> - <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /> + <li><p for="approver">Reviewer: <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /></p> </li> <li> - <label for="from">Date: from </label> + <p for="from">Date: from <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" /> - <div class="hint">[% INCLUDE 'date-format.inc' %]</div> + <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> - <label for="to">...to </label> + <p for="to">...to <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" /> - <div class="hint">[% INCLUDE 'date-format.inc' %]</div> + <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> </li> </ol> - <fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> + <fieldset class="action"><button type="submit" class="btn btn-default btn-sm principal"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> </fieldset> </form> +</div> </aside> </div> </div> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -251,6 +251,7 @@ [% IF languages.size %] <div id="tabs" class="toptabs"> + <fieldset id="searchresults"> <ul class="nav nav-tabs" role="tablist"> [% FOR language IN languages %] [% IF language.lang == 'default' %] @@ -263,7 +264,7 @@ <div class="tab-content"> [% FOR language IN languages %] <div id="lang_[% language.lang | uri %]" class="lang clearfix tab-pane" data-lang="[% language.description | html %]"> - <fieldset class="rows"> + <fieldset> <ol> <li> <label for="title_[% language.lang | html %]">Title: </label> @@ -279,6 +280,7 @@ </div> [% END %] </div> <!-- /.tab-content --> + </fieldset> </div> [% ELSE %] <div id="lang_default"> @@ -383,7 +385,7 @@ [% c.content | $raw %] </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-secondary cancel" data-dismiss="modal">Close</button> </div> </div> </div> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt @@ -53,21 +53,19 @@ [% IF ( op == 'edit_form' ) %] <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> - <h2>Rules for automatic item modifications by age</h2> <div id="toolbar" class="btn-toolbar"> <div class="btn-group"> <button class="pat add_rule"><i class="fa fa-plus"></i> Add rule</button> </div> <div class="btn-group"> - <button type="submit" id="save_rules" class="pat"><i class="fa fa-save"></i> Save</button> + <button type="submit" id="save_rules" class="principal"><i class="fa fa-save"></i> Save</button> </div> <div class="btn-group"> - <a class="pat" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> + <a class="cancel" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> </div> </div> <h2>Rules for automatic item modifications by age</h2> [% ELSE %] - <h2>Automatic item modifications by age</h2> [% IF ( rules ) %] <div id="toolbar" class="btn-toolbar"> <div class="btn-group"> @@ -134,8 +132,8 @@ </select> = <input type="text" value="[% condition.value | html %]" name="condition_value_[% id | html %]" /> - <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a condition</a> - <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove condition</a> + <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a condition</a> + <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove condition</a> </div> [% END %] </div> @@ -155,8 +153,8 @@ </select> = <input type="text" value="[% substitution.value | html %]" name="substitution_value_[% id | html %]" /> - <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a> - <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a> + <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a substitution</a> + <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove substitution</a> <span class="required">A field name is required</span> </div> [% END %] @@ -200,8 +198,8 @@ </select> = <input type="text" value="" name="condition_value" /> - <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a condition</a> - <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove condition</a> + <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a condition</a> + <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove condition</a> </div> </div> <div class="blocks"> @@ -215,8 +213,8 @@ </select> = <input type="text" value="" name="substitution_value" /> - <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a> - <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a> + <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a substitution</a> + <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove substitution</a> <span class="required">A field name is required</span> </div> </div> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -40,25 +40,25 @@ <div class="main container-fluid"> - <h1>Batch item modification</h1> + <h2>Batch item modification</h2> [% IF op == 'enqueued' %] <div class="dialog message"> <p>The job has been enqueued! It will be processed as soon as possible.</p> - <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> - | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> + <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> + | <a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> </div> <fieldset class="action"> [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] [% IF searchid %] - <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> + <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> [% ELSE %] - <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> + <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> [% END %] [% ELSIF src %] - <a href="[% src | url %]">Return to where you were</a> + <a id="lientype" href="[% src | url %]">Return to where you were</a> [% ELSE %] - <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> + <a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> [% END %] </fieldset> [% END %] @@ -179,15 +179,16 @@ [% UNLESS (too_many_items_process) %] <div id="cataloguing_additem_newitem"> - <h2>Edit items</h2> - <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> + <fieldset class="rows"> + <h3>Edit items</h3> + <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> [%# no_plugin from batchMod-edit, jQuery is included at the end of the template and cataloguing plugins are not working in this situation %] [% PROCESS subfields_for_item subfields => subfields, add_regex => 1, add_delete_checkbox => 1, no_plugin => 1 %] </fieldset> <fieldset class="rows"> - <legend>Other attributes</legend> + <h3>Other attributes</h3> <ol> <li> <div class="subfield_line"> @@ -203,25 +204,25 @@ </fieldset> <fieldset class="action"> - <input type="submit" id="mainformsubmit" value="Save" /> + <input type="submit" class="principal" id="mainformsubmit" value="Save" /> <a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a> </fieldset> </div> <!-- /#cataloguing_additem_newitem --> [% ELSE %] - <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> + <p><a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> [% END # /UNLESS too_many_items_process %] [% ELSE # IF show %] <fieldset class="action"> [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] [% IF searchid %] - <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> + <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> [% ELSE %] - <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> + <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> [% END %] [% ELSIF src %] - <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> + <a id="lientype"class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> [% ELSE %] - <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> + <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> [% END %] </fieldset> <!-- /.action --> [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -82,7 +82,7 @@ </li> [% IF lists.count %] <li id="show_list_option" role="presentation"> - <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> + <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> </li> [% END %] <li role="presentation"> @@ -92,7 +92,7 @@ <div class="tab-content"> <div id="uploadfile_tab" role="tabpanel" class="tab-pane active"> - <fieldset class="rows"> + <fieldset> <h3>Use a file</h3> <ol> <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> @@ -103,7 +103,7 @@ [% IF lists.count %] <div id="shelves_tab" role="tabpanel" class="tab-pane"> - <fieldset class="rows"> + <fieldset> <h3>Or select a list of records</h3> <ol> <li> @@ -122,7 +122,7 @@ [% END %] <div id="enterlist_tab" role="tabpanel" class="tab-pane"> - <fieldset class="rows"> + <fieldset> <h3>Or enter a list of record numbers</h3> <ol> <li> @@ -149,9 +149,9 @@ <div id="toolbar"> <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a> - | <a id="selectwithoutitems" href="#">Select without items</a> - | <a id="selectnotreserved" href="#">Select without holds</a> - | <a id="selectwithoutsubscriptions" href="#">Select without subscriptions</a> + | <a class="lientype" id="selectwithoutitems" href="#">Select without items</a> + | <a class="lientype" id="selectnotreserved" href="#">Select without holds</a> + | <a class="lientype" id="selectwithoutsubscriptions" href="#">Select without subscriptions</a> </div> <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectrecords"> <table id="biblios" class="records"> @@ -185,7 +185,7 @@ <div id="toolbar"> <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a> - | <a id="clearlinkedtobiblio" href="#">Clear used authorities</a> + | <a class="lientype" id="clearlinkedtobiblio" href="#">Clear used authorities</a> </div> <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectauths"> <table id="authorities" class="records"> @@ -223,8 +223,8 @@ [% ELSIF op == 'enqueued' %] <div class="dialog message"> <p>The job has been enqueued! It will be processed as soon as possible.</p> - <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> - | <a href="/cgi-bin/koha/tools/batch_delete_records.pl" title="New batch record deletion">New batch record deletion</a></p> + <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> + | <a id="lientype" href="/cgi-bin/koha/tools/batch_delete_records.pl" title="New batch record deletion">New batch record deletion</a></p> </div> [% ELSE %] No action defined for the template. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -12,7 +12,7 @@ </head> <body id="tools_batch_record_modification" class="tools"> - [% INCLUDE 'header.inc' form=formulaire %] + [% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -83,59 +83,37 @@ <br><br> <div id="batch_mod_form" class="toptabs" style="clear:both"> - <fieldset id="searchresults"> - <ul class="nav nav-tabs" role="tablist"> - <li role="presentation" class="active"> - <a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a> - </li> - [% IF lists.count %] - <li id="show_list_option"> - <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> - </li> - [% END %] - <li role="presentation"> - <a href="#enterlist_tab" aria-controls="enterlist_tab" role="tab" data-toggle="tab">Enter a list of record numbers</a> - </li> + <fieldset id="searchresults"> + <ul> + <li><a href="#uploadfile_tab">Upload a file</a></li> + [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %] + <li><a href="#enterlist_tab">Enter a list of record numbers</a></li> </ul> - <div class="tab-content"> - <div id="uploadfile_tab" role="tabpanel" class="tab-pane active"> - <fieldset class="rows"> - <ol> - <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> - </ol> - </fieldset> -   - </div> - - [% IF lists.count %] - <div id="shelves_tab" role="tabpanel" class="tab-pane"> - <fieldset class="rows"> - <ol> - <li> - <label for="shelf_number">List: </label> - <select name="shelf_number" id="shelf_number"> - <option value="">Select a list</option> - [% FOREACH list IN lists %] - <option value="[% list.shelfnumber | html %]">[% list.shelfname | html %]</option> - [% END %] - </option> - </select> - </li> - </ol> - </fieldset> -   - </div> - [% END %] + <div id="uploadfile_tab"> + <fieldset class="rows"> + <h3>Use a file</h3> + <ol> + <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> + </ol> + </fieldset> +   + </div> - <div id="enterlist_tab" role="tabpanel" class="tab-pane"> + [% IF lists.count %] + <div id="shelves_tab"> <fieldset class="rows"> <h3>Or select a list of records</h3> <ol> <li> - <label for="recordnumber_list">Record numbers: </label> - <textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea> - <div class="hint">Enter a list of biblionumbers or authority IDs, one per line.</div> + <label for="shelf_number">Use records from the following list: </label> + <select name="shelf_number" id="shelf_number"> + <option value="">Select a list</option> + [% FOREACH list IN lists %] + <option value="[% list.shelfnumber | html %]">[% list.shelfname | html %]</option> + [% END %] + </option> + </select> </li> </ol> </fieldset> @@ -162,7 +140,7 @@ <h3>Use MARC modification template:</h3> <ol> <li> - <label for="marc_modification_template_id" class="required">Template: </label> + <label for="marc_modification_template_id" class="required">Modify record using the following template: </label> <select name="marc_modification_template_id" id="marc_modification_template_id" required="required"> <option value="">Select a template</option> [% FOREACH mmt IN MarcModificationTemplatesLoop %] @@ -174,7 +152,7 @@ </fieldset> <fieldset class="action"> <input type="hidden" name="op" value="list" /> - <input class="principal" type="submit" value="Continue" class="button" /> + <input type="submit" class="principal" value="Continue" class="button" /> <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> </fieldset> </form> <!-- /#record_ids_selection --> @@ -229,7 +207,7 @@ <td>[% biblio.biblionumber | html %]</td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td> <td class="actions"> - <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" id="lientype" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> + <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> </td> </tr> [% END %] @@ -245,7 +223,7 @@ <thead> <tr> <th></th> - <th>AuthID</th> + <th>Authid</th> <th>Summary</th> <th> </th> </tr> @@ -266,12 +244,12 @@ <fieldset class="action"> <input type="hidden" name="op" value="modify" /> <input type="hidden" name="recordtype" value="[% recordtype | html %]" /> - <input type="submit" class="principal" id="mainformsubmit" value="Modify selected records" class="button" /> + <input type="submit" id="mainformsubmit" value="Modify selected records" class="button principal" /> </fieldset> </form> <!-- /#process --> [% ELSE %] <div class="dialog message"> - No records were modified. [% IF recordtype != 'biblio' %]<a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>[% END %] + No records were modified. [% IF recordtype != 'biblio' %]<a id="lientype" href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>[% END %] </div> [% END %] [% ELSIF view == 'errors' %] @@ -285,8 +263,8 @@ [% ELSIF view == 'enqueued' %] <div class="dialog message"> <p>The job has been enqueued! It will be processed as soon as possible.</p> - <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> - | <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> + <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> + | <a id="lientype" href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> </div> [% ELSE %] <div class="dialog alert"> @@ -310,6 +288,8 @@ <script> $(document).ready(function() { + $("#batch_mod_form").tabs(); + $("input[type='radio']").click(function() { if ($(this).attr('id') == 'authority_type') { $("#show_list_option").hide(); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -32,12 +32,6 @@ </a> </li> </ol> - <ol> - [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] - </ol> - <ol> - <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> - </ol> </nav> <div class="main container-fluid"> @@ -45,19 +39,16 @@ <div class="col-sm-10 col-sm-push-2"> <main> - <h1>Export data</h1> - [% FOR m IN messages %] <div class="dialog [% m.type | html %]"> [% SWITCH m.code %] - [% CASE 'invalid_mimetype' %]<span>The file used does not have a valid format. Only csv and txt are allowed.</span> + [% CASE 'invalid_mimetype' %]The file used does not have a valid format. Only csv and txt are allowed. [% CASE %][% m.code | html %] [% END %] </div> [% END %] <div id="exporttype" class="toptabs"> -<fieldset id="searchresults"> <ul> <li><a href="#bibs">Export bibliographic records</a></li> <li><a href="#auths">Export authority records</a></li> @@ -95,8 +86,10 @@ [% END %] </select> </li> - <li role="presentation"> - <a href="#auths" aria-controls="auths" role="tab" data-toggle="tab">Export authority records</a> + + <li> + <label>With items owned by the following libraries: </label> + [% INCLUDE 'branch-selector.inc' branches = libraries %] </li> </ol> @@ -107,18 +100,12 @@ <label for="startcn">From item call number: </label> <input id="startcn" type="text" name="start_callnumber" size="15" /> </li> - [% END %] - [% IF ( allow_conf_export ) %] - <li role="presentation"> - <a href="#conf" aria-controls="conf" role="tab" data-toggle="tab">Export configuration</a> + <li> + <label for="endcn">To item call number: </label> + <input id="endcn" type="text" name="end_callnumber" size="15" /> </li> - [% END %] - </ul> - <div class="tab-content"> - <div id="bibs" role="tabpanel" class="tab-pane active"> - <p> - <strong>Note : The items are exported by this tool unless specified.</strong> - </p> + </ol> + </fieldset> <fieldset class="rows"> <h3>Accession date (inclusive)</h3> @@ -191,7 +178,7 @@ <input type="hidden" name="op" value="export" /> <input type="hidden" name="record_type" value="bibs" /> - <fieldset class="action"><input type="submit" class="principal" value="Export bibliographic records" class="button" /></fieldset> + <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" id="principal" /></fieldset> </form> </div> @@ -250,21 +237,11 @@ </li></ol> </fieldset> <input type="hidden" name="op" value="export" /> - <inpexporttyut type="hidden" name="record_type" value="auths" /> + <input type="hidden" name="record_type" value="auths" /> - <fieldset class="rows"> - <legend>Accession date (inclusive)</legend> - <ol> - <li> - <label for="from">Start date:</label> - <input type="text" size="10" id="from" name="start_accession" value="[% from | html %]" class="flatpickr" data-date_to="to" /> - </li> - <li> - <label for="to">End date:</label> - <input size="10" id="to" name="end_accession" value="[% end_accession | html %]" type="text" class="flatpickr" /> - </li> - </ol> - </fieldset> + <fieldset class="action"><input type="submit" value="Export authority records" class="button" id="principal" /></fieldset> +</form> +</div> [% IF ( allow_db_export ) %] <div id="db"> @@ -283,70 +260,14 @@ [% END %] </fieldset> - <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset> - </form> - </div> - - <div id="auths" role="tabpanel" class="tab-pane"> - <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl"> - <fieldset class="rows"> - <legend> Select records to export </legend> - <ol><li> - <label for="start">From authid: </label> - <input id="start" type="text" name="starting_authid" size="6" /> - </li> - <li> - <label for="end">To authid: </label> - <input id="end" type="text" name="ending_authid" size="6" /> - </li> - <li> - <label for="authtype">Authority type: </label> - <select name="authtype" id="authtype"> - <option value="">-- All --</option> - [% FOREACH authority_type IN authority_types %] - <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> - [% END %] - </select> - </li> - </ol> - </fieldset> - <fieldset class="rows"> - <legend> - Use a file - </legend> - <ol> - <li>File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li> - <li><label for="id_list_file">File:</label> <input type="file" id="id_list_file" name="id_list_file" /></li> - </ol> - </fieldset> - <fieldset class="rows"> - <legend>Options</legend> - <ol> - <li> - <label for="export_remove_fields">Don't export fields:</label> - <input id="export_remove_fields" type="text" name="export_remove_fields" /> - separate by a blank. (e.g., 100a 200 606) - </li></ol> - </fieldset> - <fieldset class="rows"> - <legend>Output format</legend> - <ol><li> - <label for="output_format">File format: </label> - <select id="output_format_auth" name="output_format"> - <option value="marc">MARC</option> - <option value="xml">XML</option> - </select> - </li> - <li> - <label for="filename_auth">File name:</label><input id="filename_auth" type="text" name="filename_auth" value="koha.mrc" /> - </li></ol> - </fieldset> - <input type="hidden" name="op" value="export" /> - <input type="hidden" name="record_type" value="auths" /> - - <fieldset class="action"><input type="submit" value="Export authority records" class="button" /></fieldset> - </form> - </div> + [% IF ( dbfiles && (dbfiles.size > 0) ) %] + <input type="hidden" name="op" value="export" /> + <input type="hidden" name="record_type" value="db" /> + <fieldset class="action"><input type="submit" value="Download database" class="button" id="principal" /></fieldset> + [% END %] +</form> +</div> +[% END %] [% IF ( allow_conf_export ) %] <div id="conf"> @@ -359,16 +280,21 @@ [% FOREACH conffile IN conffiles %] <li><input type="radio" name="filename" value="[% conffile | html %]">[% conffile | html %]</input></li> [% END %] + </ul> + [% ELSE %] + <p>Unfortunately, no backups are available.</p> + [% END %] + </fieldset> [% IF ( conffiles && (conffiles.size > 0) ) %] <input type="hidden" name="op" value="export" /> <input type="hidden" name="record_type" value="conf" /> - <fieldset class="action"><input type="submit" value="Download configuration" class="button" /></fieldset> + <fieldset class="action"><input type="submit" value="Download configuration" class="button" id="principal" /></fieldset> [% END %] </form> </div> [% END %] -</fieldset> + </div> </main> @@ -386,6 +312,7 @@ [% INCLUDE 'calendar.inc' %] <script> $(document).ready(function() { + $('#exporttype').tabs(); $("li.csv_profiles").hide(); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -351,7 +351,7 @@ [% END %] <fieldset class="rows"> - <legend>Welcome email</legend> + <h3>Welcome email</h3> <ul> <li> <input class="welcome_new" type="checkbox" id="welcome_new" name="welcome_new"/> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -134,8 +134,8 @@ </div> </div> <div class="modal-footer"> - <!-- TODO <a href="#" class="btn btn-default" id="preview_template_button" role="button" data-toggle="modal">Convert using the Template Toolkit syntax</a>--> - <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> + <!-- TODO <a href="#" class="btn btn-default principal" id="preview_template_button" role="button" data-toggle="modal">Convert using the Template Toolkit syntax</a>--> + <button class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</button> </div> </div> <!-- /.modal-content --> </div> <!-- /.modal-dialog --> @@ -290,19 +290,21 @@ [% END # /IF no_op_set %] [% IF add_form or copy_form %] - <h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1> + <h2>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h2> <div id="toolbar" class="btn-toolbar"> <div class="btn-group"> - <button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button> - <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <button class="btn btn-default principal" id="submit_form"><i class="fa fa-save"></i> Save</button> + <button class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"> <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a id="saveandcontinue" href="#">Save and continue editing</a></li> </ul> </div> - <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> + <div> + <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> + </div> </div> <!-- /#toolbar --> <form id="add_notice" name="Aform" method="post" enctype="multipart/form-data" class="validate"> @@ -455,7 +457,7 @@ <!-- Nav tabs --> <ul class="nav nav-tabs" role="tablist"> <li role="presentation"> - <a href="#lang_default" aria-controls="lang_default" role="tab" data-toggle="tab">Default</a> + <a id="lientype" href="#lang_default" aria-controls="lang_default" role="tab" data-toggle="tab">Default</a> </li> [% FOR language IN languages %] [% FOR sublanguage IN language.sublanguages_loop %] @@ -502,10 +504,10 @@ <div id="[% letter.message_transport_type | html %]_[% lang | html %]" class="panel-collapse collapse" role="tabpanel" aria-labelledby="[% letter.message_transport_type | html %]_[% lang | html %]Heading"> <div class="panel-body"> [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %] - <fieldset class="rows mtt" disabled="disabled"> + <fieldset class="rows mtt" style="box-shadow:none" disabled="disabled"> <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div> [% ELSE %] - <fieldset class="rows mtt"> + <fieldset class="rows mtt" style="box-shadow:none"> [% END %] <ol> [% IF ( letter.updated_on ) %] @@ -542,7 +544,7 @@ </select> </td> <td class="actions"> - <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button> + <button id="lientype" type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button> </td> <td> <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea> @@ -586,7 +588,7 @@ [% IF ( delete_confirm ) %] <div class="dialog alert"> - <h1>Delete notice?</h1> + <h2>Delete notice?</h2> <table> <thead> <tr> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -76,7 +76,7 @@ [% IF ( label_batch_msg == "error" ) %] Error attempting to create label batch. Please ask your system administrator to check the log for more details. [% ELSE %] - Label <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. + Label <a id="lientype" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. [% END %] </strong></p> </div> @@ -94,7 +94,7 @@ [% UNLESS ( batch_info ) %] <div class="dialog message"> <p>No records have been staged.</p> - <p><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> + <p><a id="lientype" href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> </div> [% END %] [% END %] @@ -170,7 +170,7 @@ [% END %] [% END %] </select> - <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> + <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> [% ELSE %] <span class="label">Matching rule applied</span> [% IF ( current_matcher_id ) %] @@ -183,7 +183,7 @@ <li> [% IF ( can_commit ) %] <label for="overlay_action">Action if matching record found:</label> - [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> + [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_overlay_action">Reset</a></span> [% ELSE %] <span class="label">Action if matching record found:</span> [% IF ( overlay_action == 'replace' ) %] @@ -200,7 +200,7 @@ <li> [% IF ( can_commit ) %] <label for="nomatch_action">Action if no match found:</label> - [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> + [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_nomatch_action">Reset</a></span> [% ELSE %] <span class="label">Action if no match found:</span> [% IF ( nomatch_action == 'create_new' ) %] @@ -216,7 +216,7 @@ <li> [% IF ( can_commit ) %] <label for="item_action">Item processing:</label> - [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> + [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_item_action">Reset</a></span> [% ELSE %] <span class="label">Item processing:</span> [% IF ( item_action == 'always_add' ) %] @@ -396,7 +396,7 @@ <td>[% batch_lis.num_records | html %]</td> <td>[% batch_lis.num_items | html %] [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] - (<a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) + (<a id="lientype" href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) [% END %] </td> <td class="actions"> @@ -410,7 +410,7 @@ <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> <input type="hidden" name="op" value="delete-batch" /> - <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> + <button id="lientype" type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> </form> [% END %] </td> @@ -449,7 +449,7 @@ <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> </div> <div class="modal-footer"> - <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> + <button class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</button> </div> </div> </div> @@ -611,7 +611,7 @@ '<a class="btn btn-default btn-xs" target="_blank" href="' + record_details_url + aData['matched'] + '"><i class="fa fa-eye"></i> ' + _("View") + '</a> ' [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] - + '<a class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url + + '<a id="lientype" class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url + aData['matched'] + '"><i class="fa fa-pencil"></i> ' + _("Edit") + '</a>' [% END %] ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -43,10 +43,11 @@ <main> [% IF ( op == 'show_form' ) %] - <h1>Batch patron modification</h1> + <h2>Batch patron modification</h2> <form id="patron_batchmod_form" method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl"> <input type="hidden" name="op" value="show" /> <div id="batch_patron_options" class="toptabs"> + <fieldset> <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"> <a href="#usecardnumber" aria-controls="usecardnumber" role="tab" data-toggle="tab">By card number</a> @@ -62,8 +63,8 @@ </ul> <div class="tab-content"> <div id="usecardnumber" role="tabpanel" class="tab-pane active"> - <fieldset class="rows"> - <legend>Use a file of card numbers</legend> + <fieldset> + <h3>Use a file of card numbers</h3> <ol> <li> <label for="cardnumberuploadfile">File: </label> <input type="file" @@ -72,8 +73,8 @@ </li> </ol> </fieldset> - <fieldset class="rows"> - <legend>Or list card numbers one by one</legend> + <fieldset> + <h3>Or list card numbers one by one</h3> <ol> <li> <label for="cardnumberlist">Card number list (one card number per line): @@ -83,13 +84,13 @@ </li> </ol> - <input type="submit" value="Continue" class="button principal" /> + <input type="submit" value="Continue" class="button" id="principal" /> <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> </fieldset> </div> <div id="useborrowernumber" role="tabpanel" class="tab-pane"> - <fieldset class="rows"> - <legend>Use a file of borrowernumbers</legend> + <fieldset> + <h3>Use a file of borrowernumbers</h3> <ol> <li> <label for="borrowernumberuploadfile">File: </label> <input type="file" @@ -98,8 +99,8 @@ </li> </ol> </fieldset> - <fieldset class="rows"> - <legend>List borrowernumbers one by one</legend> + <fieldset> + <h3>List borrowernumbers one by one</h3> <ol> <li> <label for="borrowernumberlist">Borrowernumber list (one number per line): @@ -110,14 +111,14 @@ </ol> </fieldset> <fieldset class="action"> - <input type="submit" value="Continue" class="button" /> + <input type="submit" value="Continue" class="button principal" /> <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> </fieldset> </div> [% IF patron_lists %] <div id="uselist" role="tabpanel" class="tab-pane"> - <fieldset class="rows"> - <legend>Use a patron list</legend> + <fieldset> + <h3>Use a patron list</h3> <ol> <li> <label for="patron_list_id">Patron list: </label> @@ -131,12 +132,13 @@ </ol> </fieldset> <fieldset class="action"> - <input type="submit" value="Continue" class="button" /> + <input type="submit" value="Continue" class="button principal" /> <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> </fieldset> </div> [% END %] </div> <!-- /.tab-content --> + </fieldset> </div><!-- /#batch_patron_options --> </form> [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -56,16 +56,16 @@ [% IF ( ERRORS ) %] [% IF ( TCOUNTS ) %] <div class="dialog alert"> - <h1>Patron image(s) uploaded with some errors</h1> + <h2>Patron image(s) uploaded with some errors</h2> </div> [% ELSE %] <div class="dialog alert"> - <h1>Patron image failed to upload</h1> + <h2>Patron image failed to upload</h2> </div> [% END %] [% ELSE %] <div class="dialog message"> - <h1>Patron image(s) successfully uploaded</h1> + <h2>Patron image(s) successfully uploaded</h2> </div> [% END %] <ul class="data"> @@ -117,7 +117,7 @@ <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li> [% END %]</ul> [% ELSE %] - <h1>Upload patron images</h1> + <h2>Upload patron images</h2> [% IF ( ERRORS ) %] <div class="dialog alert"> [% FOREACH ERROR IN ERRORS %] @@ -157,11 +157,10 @@ <span class="required">Required</span> </li> </ol> - </fieldset> - <fieldset class="action"> + <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> <input type="hidden" name="op" value="Upload" /> - <input type="submit" value="Upload" class="submit" /> + <input type="submit" value="Upload" class="principal" /> <a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a> </fieldset> </form> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -86,8 +86,7 @@ <span class="required">Required</span> </li> </ol> - </fieldset> - <fieldset class="action"> + <input type="hidden" name="id" value="[% quote.id | html %]" /> <input class="principal" type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/tools/quotes.pl">Cancel</a> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -65,7 +65,6 @@ <h2>Stage MARC records for import</h2> [% IF ( uploadmarc ) %] -<h1>MARC staging results</h1> <ul> [% SWITCH (record_type) %] [% CASE 'biblio' %] @@ -99,7 +98,6 @@ </p> [% END %] [% ELSE %] -<h1>Stage MARC records for import</h1> <ul> <li>Select a MARC file to stage in the import reservoir. It will be parsed, and each valid record staged for later import into the catalog.</li> <li>You can enter a name for this import. It may be useful, when creating a record, to remember where the suggested MARC data comes from!</li> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -141,7 +141,7 @@ <h2>Upload local cover image</h2> [% ELSIF biblio %] <h2> - Upload local cover image for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> + Upload local cover image for <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> [% IF ( itemnumber ) %], Item number: [% itemnumber | html %][% END %] </h2> [% ELSIF itemnumber %] @@ -171,7 +171,7 @@ <h3>[% total | html %] images found</h3> <ul> [% FOREACH result IN results %] - <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]">[% result.title | html %]</a></li> + <li><a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]">[% result.title | html %]</a></li> [% END %] </ul> <hr /> @@ -201,7 +201,7 @@ </div> <div id="filedrag"> - <a id="click_to_select" href="#">Drop files here or click to select a file</a> + <a id="click_to_select" class="lientype" href="#">Drop files here or click to select a file</a> <div id="messages"></div> </div> @@ -292,7 +292,7 @@ <img id="thumbnail_[% img.imagenumber | html %]" src="/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img.imagenumber | html %]&thumbnail=1" alt="Thumbnail" /> [% END %] </a> - <a href="#" class="remove" data-coverimg="[% img.imagenumber | html %]"><i class="fa fa-trash"></i> Delete image</a> + <a href="#" id="lientype" class="remove" data-coverimg="[% img.imagenumber | html %]"><i class="fa fa-trash"></i> Delete image</a> </li> [% END # /IF img %] [% END # /FOREACH img %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -87,7 +87,7 @@ <div class="hint"> Note: No upload categories are defined. [% IF ( CAN_user_parameters_manage_auth_values ) -%] - Add values to the <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary. + Add values to the <a id="lientype" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary. [% ELSE -%] An administrator must add values to the UPLOAD authorized value category otherwise all uploads will be marked as temporary. [% END %] @@ -158,8 +158,8 @@ <h3>Search uploads by name or hashvalue</h3> <ol> <li> - <label for="term">Search term: </label> - <input type="text" id="term" name="term" value=""/> + <p for="term">Search term: + <input type="text" id="term" name="term" value=""/></p> </li> </ol> <fieldset class="action"> @@ -180,7 +180,7 @@ [% BLOCK closer %] [% IF plugin %] - <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> + <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> [% END %] [% END %] @@ -197,11 +197,11 @@ [% BLOCK newsearch %] <form id="newsearch"> <fieldset class="action"> - <button id="new_search">New search</button> + <button id="new_search" class="cancel">New search</button> </fieldset> </form> [% IF plugin %] - <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> + <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> [% END %] [% END %] @@ -301,7 +301,7 @@ [% PROCESS closer %] [% ELSIF mode == 'report' %] <div id="toolbar" class="btn-toolbar"> - <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default">Upload file</a> + <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default principal">Upload file</a> </div> [% IF uploads %] <h3>Your request gave the following results:</h3> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt @@ -109,7 +109,7 @@ <!-- SAVE --> <fieldset class="action"> <input type="hidden" name="sortfield" value="title" /> - <input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a> + <input type="submit" value="Save" class="principal" /> <a class="close cancel" href="#">Cancel</a> </fieldset> </form> <!-- /SAVE --> --