Bugzilla – Attachment 136951 Details for
Bug 30952
New design for staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30952: Catalogue module restyling
Bug-30952-Catalogue-module-restyling.patch (text/plain), 16.04 KB, created by
Solene D
on 2022-07-01 14:21:45 UTC
(
hide
)
Description:
Bug 30952: Catalogue module restyling
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-01 14:21:45 UTC
Size:
16.04 KB
patch
obsolete
>From 6c752b55d57ef815528a71e709f8b5f3dcf7a215 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Thu, 31 Mar 2022 11:16:07 +0200 >Subject: [PATCH] Bug 30952: Catalogue module restyling > >--- > .../prog/en/modules/catalogue/ISBDdetail.tt | 1 - > .../prog/en/modules/catalogue/MARCdetail.tt | 1 - > .../prog/en/modules/catalogue/advsearch.tt | 83 ++++++++++--------- > .../prog/en/modules/catalogue/detail.tt | 1 - > .../prog/en/modules/catalogue/imageviewer.tt | 1 - > .../prog/en/modules/catalogue/issuehistory.tt | 1 - > .../prog/en/modules/catalogue/itemsearch.tt | 31 +++++-- > .../en/modules/catalogue/labeledMARCdetail.tt | 1 - > .../prog/en/modules/catalogue/moredetail.tt | 1 - > .../prog/en/modules/catalogue/results.tt | 1 - > .../en/modules/catalogue/search-history.tt | 1 - > .../en/modules/catalogue/stockrotation.tt | 1 - > 12 files changed, 70 insertions(+), 54 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index 00e019de88..4f8fd1070f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -15,7 +15,6 @@ > <body id="catalog_ISBDdetail" class="catalog"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 1a4ecb6b86..b07e646029 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -16,7 +16,6 @@ > <body id="catalog_MARCdetail" class="catalog"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 29808258d1..34a9dfe305 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -3,6 +3,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'adv-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Advanced search › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -26,8 +29,7 @@ > [%- END -%] > > <body id="catalog_advsearch" class="catalog"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'adv-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -40,48 +42,55 @@ > </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"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > >- <form action="search.pl" method="get"> >- <div id="advanced-search"> >- <input type="hidden" name="advsearch" value="1"/> >- <h1>Advanced search</h1> >- <p> >- <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a> >- [% IF searchid %] >- <div id="previous_search_link"></div> >- [% END %] >- </p> >+<form action="search.pl" method="get"> >+ <div id="advanced-search"> >+ <input type="hidden" name="advsearch" value="1"/> >+ <h2>Advanced search</h2> > >- <!-- SEARCH BUTTONS --> >- <div id="toolbar" class="btn-toolbar"> >- <fieldset class="action" id="submit1"> >- <div class="btn-group"> >- <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >- </div> >- <div class="btn-group"> >- [% IF ( expanded_options ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a> >- </div> >- [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a> >- </div> >- [% END %] >- <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a> >- </div> >- </fieldset> <!-- /.action --> >- </div> <!-- /#toolbar --> >- <!-- /SEARCH BUTTONS --> >+ <!-- SEARCH BUTTONS --> >+ <div id="toolbar" class="btn-toolbar"> >+ <div> >+ <div class="btn-group"> >+ <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >+ </div> >+ <div class="btn-group"> >+ [% IF ( expanded_options ) %] >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="pat"><i class="fa fa-search-minus"></i> Fewer options</a> >+ </div> >+ [% ELSE %] >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="pat"><i class="fa fa-search-plus"></i> More options</a> >+ </div> >+ [% END %] >+ <div class="btn-group"> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="pat"><i class="fa fa-trash"></i> Clear fields</a> >+ </div> >+ <div class="btn-group"> >+ <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="pat"><i class="fa fa-search-minus"></i> Go to item search</a> >+ </div> >+ [% IF searchid %] >+ <div id="previous_search_link"></div> >+ [% END %] >+ </div> >+ </div> >+ <!-- /SEARCH BUTTONS --> > > [% IF ( outer_servers_loop ) %] > <!-- DATABASES --> > <fieldset> >- <legend>Select local databases</legend> >+ <h3>Select local databases</h3> > [% FOREACH local_servers_loo IN local_servers_loop %] > [% IF ( local_servers_loo.checked ) %] > <input type="checkbox" id="[% local_servers_loo.id | html %]" name="[% local_servers_loo.name | html %]" checked="checked" value="[% local_servers_loo.value | html %]" /> >@@ -99,7 +108,7 @@ > [% IF ( outer_servers_loop ) %] > <!-- REMOTE DATABASES --> > <fieldset id="databases"> >- <legend>Select remote databases</legend> >+ <h3>Select remote databases</h3> > [% FOREACH outer_servers_loo IN outer_servers_loop %] > [% IF ( outer_servers_loo.checked ) %] > <input type="checkbox" id="[% outer_servers_loo.id | html %]" name="[% outer_servers_loo.name | html %]" checked="checked" value="[% outer_servers_loo.value | html %]" /> >@@ -116,7 +125,7 @@ > > <!-- BOOLEAN SEARCH OPTIONS --> > <fieldset id="searchterms"> >- <legend>Search for </legend> >+ <h3>Search for </h3> > [% FOREACH query IN queries %] > [% IF ( expanded_options ) %] > [% IF loop.first %] >@@ -195,7 +204,7 @@ > <div class="tab-content"> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <div id="advsearch-[% advsearchloo.advanced_search_type | html %]" role="tabpanel" class="tab-pane advsearch"> >- <h4>Limit to any of the following:</h4> >+ <h3>Limit to any of the following:</h3> > <table> > <tr> > [% FOREACH itemtypeloo IN advsearchloo.code_loop %] >@@ -236,7 +245,7 @@ > [% IF ( expanded_options ) %] > <!-- BASIC LIMITS --> > <fieldset id="basiclimits"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <fieldset id="pubrange"> > <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options --> > <p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 117046cd6d..1f26e9dd63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -47,7 +47,6 @@ > <body id="catalog_detail" class="catalog"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 63cbeea4c4..6fde26b1ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -25,7 +25,6 @@ > <body id="catalog_imageviewer" class="catalog"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index f537e57af9..685e0824fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -13,7 +13,6 @@ > <body id="catalog_issuehistory" class="catalog"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 27521c1635..57ed833211 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE To %] > [% USE Asset %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'home-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > > [%- BLOCK form_label -%] >@@ -148,8 +151,7 @@ > </head> > > <body id="catalog_itemsearch" class="catalog"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'home-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -165,6 +167,14 @@ > </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"> >@@ -172,16 +182,23 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > > <div id="item-search-block"> >+<<<<<<< HEAD > <h1>Item search</h1> > > <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p> >+======= >+ <h2>Item search</h2> >+>>>>>>> Bug 30952: Catalogue module restyling > <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform"> > <div id="toolbar" class="btn-toolbar"> >- <fieldset class="action"> >- <div class="btn-group"> >- <button class="btn btn-default"><i class="fa fa-search"></i> Search</button> >- </div> >- </fieldset> >+ <div> >+ <div class="btn-group"> >+ <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >+ </div> >+ <div class="btn-group"> >+ <a href="/cgi-bin/koha/catalogue/search.pl" class="pat"><i class="fa fa-search-minus"></i> Go to advanced search</a> >+ </div> >+ </div> > </div> > <fieldset> > [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 81732a1ce6..7b03e227e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -17,7 +17,6 @@ > > <body id="catlaog_labeledMARCdetail" class="catalog"> > [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 2f7ddbd78e..26c9a7c676 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -13,7 +13,6 @@ > <body id="catalog_moredetail" class="catalog"> > [% USE KohaDates %] > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index f9b80cffe6..80cf4917ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -15,7 +15,6 @@ > > <body id="catalog_results" class="catalog"> > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > [% IntranetCoce = Koha.Preference('IntranetCoce') %] > [% CoceProviders = Koha.Preference('CoceProviders') %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 0ef57c025b..37fffc407e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -11,7 +11,6 @@ > <body id="catalogue_search-history" class="catalogue"> > > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index 25c74f9fcf..25e9be9c46 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -10,7 +10,6 @@ > <body id="catalog_stockrotation" class="catalog"> > [% USE KohaDates %] > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >-- >2.17.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30952
:
136810
|
136812
|
136813
|
136815
|
136816
|
136818
|
136819
|
136820
|
136822
|
136823
|
136825
|
136827
|
136828
|
136830
|
136831
|
136833
|
136834
|
136836
|
136837
|
136839
|
136840
|
136842
|
136844
|
136845
|
136847
|
136848
|
136878
|
136879
|
136880
|
136881
|
136882
|
136883
|
136884
|
136885
|
136886
|
136887
|
136888
|
136889
|
136890
|
136891
|
136892
|
136893
|
136894
|
136895
|
136896
|
136897
|
136898
|
136899
|
136900
|
136901
|
136902
|
136950
|
136951
|
136952
|
136953
|
136954
|
136955
|
136956
|
136957
|
136958
|
136959
|
136960
|
136961
|
136962
|
136963
|
136964
|
136965
|
136966
|
136967
|
136968
|
136969
|
136970
|
136971
|
136972
|
136973
|
136974
|
137408
|
137409
|
137410
|
137411
|
137414
|
137415
|
137416
|
137417
|
137418
|
137419
|
137420
|
137744
|
137767
|
137768
|
137775
|
137776
|
137994
|
138091
|
138092
|
138093
|
138094
|
138095
|
138096
|
138097
|
138098
|
138099
|
138100
|
138101
|
138102
|
138103
|
138245
|
138246
|
138247
|
138293
|
138299
|
138300
|
138302
|
140117
|
140118
|
140119
|
140120
|
140121
|
140122
|
140123
|
140124
|
140125
|
140126
|
140127
|
140128
|
140129
|
140130
|
140131
|
140132
|
140133
|
140134
|
140135
|
140136
|
140137
|
140138
|
140139
|
140140
|
140141
|
140142
|
140143
|
140371
|
140372
|
140373
|
140374
|
140433
|
140435
|
140459
|
140460
|
140512
|
140513
|
140514
|
140515
|
140516
|
140517
|
140519
|
140520
|
140521
|
140522
|
140523
|
140524
|
140525
|
140526
|
140527
|
140528
|
140529
|
140530
|
140531
|
140532
|
140533
|
140534
|
140535
|
140536
|
140537
|
140538
|
140539
|
140540
|
140541
|
140542
|
140543
|
140544
|
140545
|
140546
|
140547
|
140548
|
140549
|
140550
|
140551
|
140552
|
140553
|
140554
|
140555
|
140556
|
140557
|
140558
|
140559
|
140560
|
140566
|
140567
|
140570
|
140571
|
140575
|
140576
|
140577
|
140588
|
140613
|
140617
|
140618
|
140619
|
140620
|
140628
|
140629
|
140635
|
140649
|
140650
|
140651
|
140652
|
140653
|
140654
|
140658
|
140687
|
140976
|
140977
|
141020
|
141024
|
141026
|
141027
|
141041
|
141043
|
141044
|
141047
|
141052
|
141053
|
141054
|
141055
|
141056
|
141057
|
141064
|
141074
|
141075
|
141631
|
141632
|
141633
|
141634
|
141635
|
141636
|
141637
|
141638
|
141639
|
141640
|
141641
|
141642
|
141643
|
141644
|
141645
|
141646
|
141647
|
141648
|
141649
|
141650
|
141651
|
141652
|
141653
|
141654
|
141655
|
141656
|
141657
|
141658
|
141659
|
141660
|
141661
|
141662
|
141663
|
141664
|
141665
|
141666
|
141667
|
141668
|
141669
|
141670
|
141671
|
141672
|
141673
|
141674
|
141675
|
141676
|
141677
|
141678
|
141679
|
141680
|
141681
|
141682
|
141683
|
141684
|
141685
|
141686
|
141687
|
141688
|
141689
|
141690
|
141691
|
141692
|
141693
|
141694
|
141695
|
141696
|
141697
|
141698
|
141699
|
141700
|
141701
|
141702
|
141703
|
141704
|
141705
|
141706
|
141707
|
141708
|
141709
|
141710
|
141711
|
141712
|
141713
|
142604
|
142605