@@ -, +, @@ --- .../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 @@
Search reports by keyword: - +
@@ -152,7 +152,7 @@