View | Details | Raw Unified | Return to bug 30952
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt (-1 lines)
Lines 15-21 Link Here
15
<body id="catalog_ISBDdetail" class="catalog">
15
<body id="catalog_ISBDdetail" class="catalog">
16
16
17
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'cat-search.inc' %]
19
18
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
    <ol>
20
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt (-1 lines)
Lines 16-22 Link Here
16
<body id="catalog_MARCdetail" class="catalog">
16
<body id="catalog_MARCdetail" class="catalog">
17
17
18
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'cat-search.inc' %]
20
19
21
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22
    <ol>
21
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-37 / +46 lines)
Lines 3-8 Link Here
3
[% USE Asset %]
3
[% USE Asset %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'adv-search.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Advanced search &rsaquo; Catalog &rsaquo; Koha</title>
10
<title>Advanced search &rsaquo; Catalog &rsaquo; Koha</title>
8
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
Lines 26-33 Link Here
26
[%- END -%]
29
[%- END -%]
27
30
28
<body id="catalog_advsearch" class="catalog">
31
<body id="catalog_advsearch" class="catalog">
29
[% INCLUDE 'header.inc' %]
32
[% INCLUDE 'header.inc' form=formulaire %]
30
[% INCLUDE 'adv-search.inc' %]
31
33
32
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
34
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
33
    <ol>
35
    <ol>
Lines 40-87 Link Here
40
            </a>
42
            </a>
41
        </li>
43
        </li>
42
    </ol>
44
    </ol>
45
46
    <ol>
47
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
48
    </ol>
49
    <ol>
50
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
51
    </ol>
43
</nav>
52
</nav>
44
53
45
<div class="main container-fluid">
54
<div class="main container-fluid">
46
    <div class="row">
55
    <div class="row">
47
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
56
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
48
57
49
            <form action="search.pl" method="get">
58
<form action="search.pl" method="get">
50
                <div id="advanced-search">
59
    <div id="advanced-search">
51
                    <input type="hidden" name="advsearch" value="1"/>
60
        <input type="hidden" name="advsearch" value="1"/>
52
                    <h1>Advanced search</h1>
61
        <h2>Advanced search</h2>
53
                    <p>
54
                        <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a>
55
                        [% IF searchid %]
56
                            <div id="previous_search_link"></div>
57
                        [% END %]
58
                    </p>
59
62
60
                    <!-- SEARCH BUTTONS -->
63
        <!-- SEARCH BUTTONS -->
61
                    <div id="toolbar" class="btn-toolbar">
64
        <div id="toolbar" class="btn-toolbar">
62
                        <fieldset class="action" id="submit1">
65
            <div>
63
                            <div class="btn-group">
66
                <div class="btn-group">
64
                                <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
67
                    <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
65
                            </div>
68
                </div>
66
                            <div class="btn-group">
69
                <div class="btn-group">
67
                            [% IF ( expanded_options ) %]
70
                    [% IF ( expanded_options ) %]
68
                                <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>
71
                    <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="pat"><i class="fa fa-search-minus"></i> Fewer options</a>
69
                            </div>
72
                </div>
70
                            [% ELSE %]
73
                    [% ELSE %]
71
                                <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>
74
                        <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="pat"><i class="fa fa-search-plus"></i> More options</a>
72
                            </div>
75
                </div>
73
                            [% END %]
76
                    [% END %]
74
                            <div class="btn-group">
77
                <div class="btn-group">
75
                                <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>
78
                    <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>
76
                            </div>
79
                </div>
77
                        </fieldset> <!-- /.action -->
80
                <div class="btn-group">
78
                    </div> <!-- /#toolbar -->
81
                    <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="pat"><i class="fa fa-search-minus"></i> Go to item search</a>
79
                    <!-- /SEARCH BUTTONS -->
82
                </div>
83
                [% IF searchid %]
84
                    <div id="previous_search_link"></div>
85
                [% END %]
86
            </div>
87
        </div>
88
        <!-- /SEARCH BUTTONS -->
80
89
81
                    [% IF ( outer_servers_loop ) %]
90
                    [% IF ( outer_servers_loop ) %]
82
                        <!-- DATABASES -->
91
                        <!-- DATABASES -->
83
                        <fieldset>
92
                        <fieldset>
84
                            <legend>Select local databases</legend>
93
                            <h3>Select local databases</h3>
85
                            [% FOREACH local_servers_loo IN local_servers_loop %]
94
                            [% FOREACH local_servers_loo IN local_servers_loop %]
86
                                [% IF ( local_servers_loo.checked ) %]
95
                                [% IF ( local_servers_loo.checked ) %]
87
                                    <input type="checkbox" id="[% local_servers_loo.id | html %]" name="[% local_servers_loo.name | html %]" checked="checked" value="[% local_servers_loo.value | html %]" />
96
                                    <input type="checkbox" id="[% local_servers_loo.id | html %]" name="[% local_servers_loo.name | html %]" checked="checked" value="[% local_servers_loo.value | html %]" />
Lines 99-105 Link Here
99
                    [% IF ( outer_servers_loop ) %]
108
                    [% IF ( outer_servers_loop ) %]
100
                        <!-- REMOTE DATABASES -->
109
                        <!-- REMOTE DATABASES -->
101
                        <fieldset id="databases">
110
                        <fieldset id="databases">
102
                            <legend>Select remote databases</legend>
111
                            <h3>Select remote databases</h3>
103
                            [% FOREACH outer_servers_loo IN outer_servers_loop %]
112
                            [% FOREACH outer_servers_loo IN outer_servers_loop %]
104
                                [% IF ( outer_servers_loo.checked ) %]
113
                                [% IF ( outer_servers_loo.checked ) %]
105
                                    <input type="checkbox" id="[% outer_servers_loo.id | html %]" name="[% outer_servers_loo.name | html %]" checked="checked" value="[% outer_servers_loo.value | html %]" />
114
                                    <input type="checkbox" id="[% outer_servers_loo.id | html %]" name="[% outer_servers_loo.name | html %]" checked="checked" value="[% outer_servers_loo.value | html %]" />
Lines 116-122 Link Here
116
125
117
                    <!-- BOOLEAN SEARCH OPTIONS -->
126
                    <!-- BOOLEAN SEARCH OPTIONS -->
118
                    <fieldset id="searchterms">
127
                    <fieldset id="searchterms">
119
                        <legend>Search for </legend>
128
                        <h3>Search for </h3>
120
                        [% FOREACH query IN queries %]
129
                        [% FOREACH query IN queries %]
121
                            [% IF ( expanded_options ) %]
130
                            [% IF ( expanded_options ) %]
122
                                [% IF loop.first %]
131
                                [% IF loop.first %]
Lines 195-201 Link Here
195
                    <div class="tab-content">
204
                    <div class="tab-content">
196
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
205
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
197
                            <div id="advsearch-[% advsearchloo.advanced_search_type | html %]"  role="tabpanel" class="tab-pane advsearch">
206
                            <div id="advsearch-[% advsearchloo.advanced_search_type | html %]"  role="tabpanel" class="tab-pane advsearch">
198
                                <h4>Limit to any of the following:</h4>
207
                                <h3>Limit to any of the following:</h3>
199
                                <table>
208
                                <table>
200
                                    <tr>
209
                                    <tr>
201
                                        [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
210
                                        [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
Lines 236-242 Link Here
236
                [% IF ( expanded_options ) %]
245
                [% IF ( expanded_options ) %]
237
                    <!-- BASIC LIMITS -->
246
                    <!-- BASIC LIMITS -->
238
                    <fieldset id="basiclimits">
247
                    <fieldset id="basiclimits">
239
                        <legend>Limits</legend>
248
                        <h3>Limits</h3>
240
                        <fieldset id="pubrange">
249
                        <fieldset id="pubrange">
241
                            <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
250
                            <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
242
                            <p>
251
                            <p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 lines)
Lines 47-53 Link Here
47
<body id="catalog_detail" class="catalog">
47
<body id="catalog_detail" class="catalog">
48
48
49
[% INCLUDE 'header.inc' %]
49
[% INCLUDE 'header.inc' %]
50
[% INCLUDE 'cat-search.inc' %]
51
50
52
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
51
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
53
    <ol>
52
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt (-1 lines)
Lines 25-31 Link Here
25
<body id="catalog_imageviewer" class="catalog">
25
<body id="catalog_imageviewer" class="catalog">
26
26
27
[% INCLUDE 'header.inc' %]
27
[% INCLUDE 'header.inc' %]
28
[% INCLUDE 'cat-search.inc' %]
29
28
30
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
31
    <ol>
30
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-1 lines)
Lines 13-19 Link Here
13
<body id="catalog_issuehistory" class="catalog">
13
<body id="catalog_issuehistory" class="catalog">
14
14
15
[% INCLUDE 'header.inc' %]
15
[% INCLUDE 'header.inc' %]
16
[% INCLUDE 'cat-search.inc' %]
17
16
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
    <ol>
18
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-7 / +24 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE To %]
2
[% USE To %]
3
[% USE Asset %]
3
[% USE Asset %]
4
[% formulaire = BLOCK %]
5
    [% INCLUDE 'home-search.inc' %]
6
[% END %]
4
[% USE AuthorisedValues %]
7
[% USE AuthorisedValues %]
5
8
6
[%- BLOCK form_label -%]
9
[%- BLOCK form_label -%]
Lines 148-155 Link Here
148
</head>
151
</head>
149
152
150
<body id="catalog_itemsearch" class="catalog">
153
<body id="catalog_itemsearch" class="catalog">
151
  [% INCLUDE 'header.inc' %]
154
  [% INCLUDE 'header.inc' form=formulaire %]
152
  [% INCLUDE 'home-search.inc' %]
153
155
154
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
156
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
155
    <ol>
157
    <ol>
Lines 165-170 Link Here
165
            </a>
167
            </a>
166
        </li>
168
        </li>
167
    </ol>
169
    </ol>
170
171
    <ol>
172
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
173
    </ol>
174
175
    <ol>
176
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
177
    </ol>
168
</nav>
178
</nav>
169
179
170
<div class="main container-fluid">
180
<div class="main container-fluid">
Lines 172-187 Link Here
172
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
182
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
173
183
174
    <div id="item-search-block">
184
    <div id="item-search-block">
185
<<<<<<< HEAD
175
      <h1>Item search</h1>
186
      <h1>Item search</h1>
176
187
177
      <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
188
      <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
189
=======
190
      <h2>Item search</h2>
191
>>>>>>> Bug 30952: Catalogue module restyling
178
      <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
192
      <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
179
          <div id="toolbar" class="btn-toolbar">
193
          <div id="toolbar" class="btn-toolbar">
180
              <fieldset class="action">
194
              <div>
181
                  <div class="btn-group">
195
                <div class="btn-group">
182
                      <button class="btn btn-default"><i class="fa fa-search"></i> Search</button>
196
                  <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
183
                  </div>
197
                </div>
184
              </fieldset>
198
                <div class="btn-group">
199
                  <a href="/cgi-bin/koha/catalogue/search.pl" class="pat"><i class="fa fa-search-minus"></i> Go to advanced search</a>
200
                </div>
201
              </div>
185
          </div>
202
          </div>
186
          <fieldset>
203
          <fieldset>
187
            [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %]
204
            [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt (-1 lines)
Lines 17-23 Link Here
17
17
18
<body id="catlaog_labeledMARCdetail" class="catalog">
18
<body id="catlaog_labeledMARCdetail" class="catalog">
19
	[% INCLUDE 'header.inc' %]
19
	[% INCLUDE 'header.inc' %]
20
	[% INCLUDE 'cat-search.inc' %]
21
20
22
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23
        <ol>
22
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-1 lines)
Lines 13-19 Link Here
13
<body id="catalog_moredetail" class="catalog">
13
<body id="catalog_moredetail" class="catalog">
14
[% USE KohaDates %]
14
[% USE KohaDates %]
15
[% INCLUDE 'header.inc' %]
15
[% INCLUDE 'header.inc' %]
16
[% INCLUDE 'cat-search.inc' %]
17
16
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
    <ol>
18
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 lines)
Lines 15-21 Link Here
15
15
16
<body id="catalog_results" class="catalog">
16
<body id="catalog_results" class="catalog">
17
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'cat-search.inc' %]
19
18
20
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
19
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
21
[% CoceProviders   = Koha.Preference('CoceProviders') %]
20
[% CoceProviders   = Koha.Preference('CoceProviders') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-1 lines)
Lines 11-17 Link Here
11
<body id="catalogue_search-history" class="catalogue">
11
<body id="catalogue_search-history" class="catalogue">
12
12
13
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'cat-search.inc' %]
15
14
16
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
    <ol>
16
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt (-2 lines)
Lines 10-16 Link Here
10
<body id="catalog_stockrotation" class="catalog">
10
<body id="catalog_stockrotation" class="catalog">
11
[% USE KohaDates %]
11
[% USE KohaDates %]
12
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'cat-search.inc' %]
14
13
15
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16
    <ol>
15
    <ol>
17
- 

Return to bug 30952