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

(-)a/koha-tmpl/intranet-tmpl/prog/css/calendar.css (-1 / +1 lines)
Lines 770-776 fieldset.brief li.radio { Link Here
770
770
771
.flatpickr-calendar {
771
.flatpickr-calendar {
772
  border-radius: 0;
772
  border-radius: 0;
773
  border: 1px solid #B9D8D9;
773
  border: 1px solid #71B344;
774
  -webkit-box-shadow: none;
774
  -webkit-box-shadow: none;
775
          box-shadow: none; }
775
          box-shadow: none; }
776
776
(-)a/koha-tmpl/intranet-tmpl/prog/css/login.css (-4 / +14 lines)
Lines 20-26 a:hover { Link Here
20
}
20
}
21
21
22
body	{
22
body	{
23
	background: #f5f5f5;
23
	background: #f3f4f4;
24
}
24
}
25
25
26
form, label input {
26
form, label input {
Lines 42-48 label { Link Here
42
42
43
#login {
43
#login {
44
	background: #fff;
44
	background: #fff;
45
	border: 1px solid #a2a2a2;
45
	border: none;
46
	box-shadow: 8px 8px 12px rgb(170 170 170);
46
	margin: 4em auto;
47
	margin: 4em auto;
47
	padding: 1.5em;
48
	padding: 1.5em;
48
	position : relative;
49
	position : relative;
Lines 107-112 label { Link Here
107
#login #submit-button, #login .button {
108
#login #submit-button, #login .button {
108
	font-size: 1.4em;
109
	font-size: 1.4em;
109
	padding : .3em .6em;
110
	padding : .3em .6em;
111
	background: rgba(254, 195, 44, 1);
112
    border: none;
113
    color: #000;
114
}
115
116
#login #submit-button:hover, #login #submit-button:focus, #login #submit-button:active{
117
	background: rgba(254, 195, 44, 0.7) !important;
118
    border: none;
110
}
119
}
111
120
112
#login #onerror_actions {
121
#login #onerror_actions {
Lines 145-151 label { Link Here
145
}
154
}
146
155
147
.submit input:active, .button:active {
156
.submit input:active, .button:active {
148
	background: #f4f4f4;
157
	background: #fff;
149
	border: 1px solid #999;
158
	border: 1px solid #999;
150
	border-left-color: #999;
159
	border-left-color: #999;
151
	border-top-color: #999;
160
	border-top-color: #999;
Lines 155-162 label { Link Here
155
	text-align: right;
164
	text-align: right;
156
}
165
}
157
166
167
158
textarea, input, select {
168
textarea, input, select {
159
    background: #f4f4f4;
169
    background: #fff;
160
    border: 1px solid #b2b2b2;
170
    border: 1px solid #b2b2b2;
161
    color: #000;
171
    color: #000;
162
    font:  13px Verdana, Arial, Helvetica, sans-serif;
172
    font:  13px Verdana, Arial, Helvetica, sans-serif;
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss (-1 / +1 lines)
Lines 153-159 fieldset.brief li.radio { Link Here
153
153
154
.flatpickr-calendar {
154
.flatpickr-calendar {
155
    border-radius: 0;
155
    border-radius: 0;
156
    border: 1px solid #B9D8D9;
156
    border: 1px solid #71B344;
157
    box-shadow: none;
157
    box-shadow: none;
158
}
158
}
159
159
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-11 / +130 lines)
Lines 37-43 a { Link Here
37
    &.btn {
37
    &.btn {
38
        &:link,
38
        &:link,
39
        &:visited {
39
        &:visited {
40
            color: #71B443;
40
            //color: #71B443;
41
            padding: 6px 25px;
41
            padding: 6px 25px;
42
        }
42
        }
43
43
Lines 55-60 a { Link Here
55
55
56
    }
56
    }
57
57
58
    &.lientype{
59
        color: #71B443;
60
    padding: .3em;
61
    border: none;
62
    background-color: transparent;
63
    border: none;
64
    box-shadow: none;
65
    font-size: 100%;
66
67
    &:hover, &:focus, &:active{
68
        text-decoration: underline;
69
        color: #71B443;
70
    padding: .3em;
71
    border: none;
72
    background-color: transparent;
73
    border: none;
74
    box-shadow: none;
75
    font-size: 100%;
76
    }
77
    }
78
58
    &.cancel {
79
    &.cancel {
59
80
60
        background-color: transparent;
81
        background-color: transparent;
Lines 640-645 hr { Link Here
640
661
641
p {
662
p {
642
    margin: .7em 0;
663
    margin: .7em 0;
664
665
    &.plus{
666
        background-color: #352C2E;
667
        height: 100% !important;    
668
        top: 30px;
669
        border-bottom-left-radius: 17px;
670
        border-bottom-right-radius: 17px;
671
672
        input{
673
            outline-offset: 0px;
674
            outline: 1px black;
675
            float: right;
676
            height: 30px;
677
            border-radius: 17px;
678
            padding-left: 2em;
679
            padding-right: 1.5em;
680
            border: none;
681
            margin-left: 0px;
682
            position: absolute;
683
            top: -5px;
684
            right: 30px;
685
            z-index: 100;
686
            display: inline-block !important;
687
            letter-spacing: normal;
688
            word-spacing: normal;
689
            text-transform: none;
690
            text-indent: 0px;
691
            text-shadow: none;
692
            text-align: start;
693
            cursor: text;
694
            font: 400 13.3333px Arial;
695
        }
696
    }
643
}
697
}
644
698
645
strong {
699
strong {
Lines 832-838 label, Link Here
832
        align-items: center;
886
        align-items: center;
833
        justify-content: center;
887
        justify-content: center;
834
        flex-wrap: wrap;
888
        flex-wrap: wrap;
835
        width: 150px;
889
        width: 200px;
836
        height: 150px;
890
        height: 150px;
837
        margin-right: auto;
891
        margin-right: auto;
838
        margin-left: auto;
892
        margin-left: auto;
Lines 885-893 label, Link Here
885
            border-color: #418940;
939
            border-color: #418940;
886
        }
940
        }
887
941
888
        h1{
889
            font-weight: bold;
890
        }
891
    }
942
    }
892
}
943
}
893
944
Lines 1204-1209 ol { Link Here
1204
}
1255
}
1205
1256
1206
fieldset {
1257
fieldset {
1258
    overflow: auto;
1207
    background-color: #FFF;
1259
    background-color: #FFF;
1208
    position: relative;
1260
    position: relative;
1209
    color: #696969;
1261
    color: #696969;
Lines 2088-2093 dd { Link Here
2088
        position: relative;
2140
        position: relative;
2089
        float: right;
2141
        float: right;
2090
        height: 100%;
2142
        height: 100%;
2143
        padding: 0.3em;
2091
2144
2092
        .dropdown-menu {
2145
        .dropdown-menu {
2093
            /*border-top-width: 1px;
2146
            /*border-top-width: 1px;
Lines 2154-2159 dd { Link Here
2154
            }
2207
            }
2155
        }
2208
        }
2156
2209
2210
        #up{
2211
            display: table;
2212
        }
2213
2214
        #down{
2215
            display: table;
2216
        }
2217
2157
        #patdrop{
2218
        #patdrop{
2158
            border-top-width: 1px;
2219
            border-top-width: 1px;
2159
            text-align: center;
2220
            text-align: center;
Lines 2197-2202 dd { Link Here
2197
        border-radius: 0;
2258
        border-radius: 0;
2198
        margin-top: 0;
2259
        margin-top: 0;
2199
        z-index: 300;
2260
        z-index: 300;
2261
        left: auto !important;
2262
        width: 851px;
2200
    }
2263
    }
2201
2264
2202
    a.addtocart {
2265
    a.addtocart {
Lines 3258-3264 td { Link Here
3258
    }
3321
    }
3259
}
3322
}
3260
3323
3261
#lientype, #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{
3324
#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{
3262
    color: #71B443;
3325
    color: #71B443;
3263
    padding: .3em;
3326
    padding: .3em;
3264
    border: none;
3327
    border: none;
Lines 4311-4317 nav { Link Here
4311
   // top: 0px;
4374
   // top: 0px;
4312
    //position: absolute;
4375
    //position: absolute;
4313
    //right: 5px;
4376
    //right: 5px;
4314
    overflow-x: hidden;
4377
    //overflow-x: hidden;
4378
    //overflow-y: visible;
4315
    display: block !important;
4379
    display: block !important;
4316
    height: auto !important;
4380
    height: auto !important;
4317
}
4381
}
Lines 4353-4358 nav { Link Here
4353
    li {
4417
    li {
4354
        list-style: none;
4418
        list-style: none;
4355
4419
4420
        .filteraction{
4421
            position: absolute;
4422
            right: 30px;
4423
            top: -5px;
4424
            width: 25px;
4425
            height: 30px;
4426
            border: none;
4427
            padding-left: 5px;
4428
            padding-right: 5px;
4429
            margin: 0;
4430
            display: inline;
4431
        
4432
            a{
4433
                color: #71B443;
4434
                vertical-align: middle;
4435
4436
                &:hover, &:active{
4437
                    background-color: transparent;
4438
                    //font-weight: bold;
4439
                    text-decoration: none;
4440
                
4441
                }
4442
            }
4443
4444
        }
4445
4356
        .residentsearch {
4446
        .residentsearch {
4357
            border: 0;
4447
            border: 0;
4358
            //border-bottom: 1px solid #85CA11;
4448
            //border-bottom: 1px solid #85CA11;
Lines 4387-4394 nav { Link Here
4387
            position: relative;
4477
            position: relative;
4388
            left: 0px;
4478
            left: 0px;
4389
            top: 0px;
4479
            top: 0px;
4480
            width: 500px;
4390
            //line-height: 40px;
4481
            //line-height: 40px;
4391
            overflow: hidden;
4482
           // overflow: hidden;
4392
            display: block;
4483
            display: block;
4393
            margin: 10px 0;
4484
            margin: 10px 0;
4394
        }
4485
        }
Lines 4396-4403 nav { Link Here
4396
        #submit, #autocsubmit{
4487
        #submit, #autocsubmit{
4397
            background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
4488
            background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
4398
            position: absolute;
4489
            position: absolute;
4399
          //  right : 0px;
4490
            min-width: 7px;
4400
            right : -65px;
4491
            right: 0;
4401
            top: 0px;
4492
            top: 0px;
4402
            width: 25px;
4493
            width: 25px;
4403
            height: 30px;
4494
            height: 30px;
Lines 6130-6135 input.renew { Link Here
6130
                //font-size: 150%;
6221
                //font-size: 150%;
6131
6222
6132
                i{
6223
                i{
6224
6133
                    &.fa{
6225
                    &.fa{
6134
                    color: #fff;
6226
                    color: #fff;
6135
                    border-radius: 50%;
6227
                    border-radius: 50%;
Lines 6146-6151 input.renew { Link Here
6146
                    border: solid 3px #71B443;
6238
                    border: solid 3px #71B443;
6147
                    }
6239
                    }
6148
6240
6241
                    &.fond{
6242
                        opacity: 70%;
6243
                        position: relative;
6244
                        top: 5px;
6245
                        border: none;
6246
                        right: 20px;
6247
                        border-radius: 0;
6248
                        background-color: transparent;
6249
                        width: auto;
6250
                        height: auto;
6251
                        margin: 0;
6252
                        padding: 0;
6253
                    }
6254
6149
                }
6255
                }
6150
6256
6151
                h1 {
6257
                h1 {
Lines 6163-6172 input.renew { Link Here
6163
                            background-color: #418940;
6269
                            background-color: #418940;
6164
                            border: solid 3px #418940;
6270
                            border: solid 3px #418940;
6165
                        }
6271
                        }
6272
                        &.fond{
6273
                            opacity: 70%;
6274
                            position: relative;
6275
                            top: 5px;
6276
                            border: none;
6277
                            right: 20px;
6278
                            border-radius: 0;
6279
                            background-color: transparent;
6280
                            width: auto;
6281
                            height: auto;
6282
                            margin: 0;
6283
                            padding: 0;
6284
                        }
6166
                    }
6285
                    }
6167
6286
6168
                    h1{
6287
                    h1{
6169
                    font-weight: bold;
6288
                    //font-weight: bold;
6170
                    }
6289
                    }
6171
                }
6290
                }
6172
            }
6291
            }
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-13 / +108 lines)
Lines 1199-1205 a.authlink { Link Here
1199
  padding: 2px 4px; }
1199
  padding: 2px 4px; }
1200
1200
1201
a.btn:link, a.btn:visited {
1201
a.btn:link, a.btn:visited {
1202
  color: #71B443;
1203
  padding: 6px 25px; }
1202
  padding: 6px 25px; }
1204
1203
1205
a.btn.btn-link:link, a.btn.btn-link:visited {
1204
a.btn.btn-link:link, a.btn.btn-link:visited {
Lines 1209-1214 a.btn.btn-link:hover { Link Here
1209
  text-decoration: underline;
1208
  text-decoration: underline;
1210
  font-weight: bold; }
1209
  font-weight: bold; }
1211
1210
1211
a.lientype {
1212
  color: #71B443;
1213
  padding: .3em;
1214
  border: none;
1215
  background-color: transparent;
1216
  border: none;
1217
  -webkit-box-shadow: none;
1218
          box-shadow: none;
1219
  font-size: 100%; }
1220
  a.lientype:hover, a.lientype:focus, a.lientype:active {
1221
    text-decoration: underline;
1222
    color: #71B443;
1223
    padding: .3em;
1224
    border: none;
1225
    background-color: transparent;
1226
    border: none;
1227
    -webkit-box-shadow: none;
1228
            box-shadow: none;
1229
    font-size: 100%; }
1230
1212
a.cancel {
1231
a.cancel {
1213
  background-color: transparent;
1232
  background-color: transparent;
1214
  color: #696969;
1233
  color: #696969;
Lines 1640-1645 hr { Link Here
1640
1659
1641
p {
1660
p {
1642
  margin: .7em 0; }
1661
  margin: .7em 0; }
1662
  p.plus {
1663
    background-color: #352C2E;
1664
    height: 100% !important;
1665
    top: 30px;
1666
    border-bottom-left-radius: 17px;
1667
    border-bottom-right-radius: 17px; }
1668
    p.plus input {
1669
      outline-offset: 0px;
1670
      outline: 1px black;
1671
      float: right;
1672
      height: 30px;
1673
      border-radius: 17px;
1674
      padding-left: 2em;
1675
      padding-right: 1.5em;
1676
      border: none;
1677
      margin-left: 0px;
1678
      position: absolute;
1679
      top: -5px;
1680
      right: 30px;
1681
      z-index: 100;
1682
      display: inline-block !important;
1683
      letter-spacing: normal;
1684
      word-spacing: normal;
1685
      text-transform: none;
1686
      text-indent: 0px;
1687
      text-shadow: none;
1688
      text-align: start;
1689
      cursor: text;
1690
      font: 400 13.3333px Arial; }
1643
1691
1644
strong {
1692
strong {
1645
  font-weight: bold; }
1693
  font-weight: bold; }
Lines 1810-1816 label, Link Here
1810
            justify-content: center;
1858
            justify-content: center;
1811
    -ms-flex-wrap: wrap;
1859
    -ms-flex-wrap: wrap;
1812
        flex-wrap: wrap;
1860
        flex-wrap: wrap;
1813
    width: 150px;
1861
    width: 200px;
1814
    height: 150px;
1862
    height: 150px;
1815
    margin-right: auto;
1863
    margin-right: auto;
1816
    margin-left: auto; }
1864
    margin-left: auto; }
Lines 1851-1858 label, Link Here
1851
    .accueil:hover i {
1899
    .accueil:hover i {
1852
      background-color: #418940;
1900
      background-color: #418940;
1853
      border-color: #418940; }
1901
      border-color: #418940; }
1854
    .accueil:hover h1 {
1855
      font-weight: bold; }
1856
1902
1857
#reglages i, #reglages img {
1903
#reglages i, #reglages img {
1858
  text-align: center;
1904
  text-align: center;
Lines 2049-2054 ol { Link Here
2049
  font-weight: bold; }
2095
  font-weight: bold; }
2050
2096
2051
fieldset {
2097
fieldset {
2098
  overflow: auto;
2052
  background-color: #FFF;
2099
  background-color: #FFF;
2053
  position: relative;
2100
  position: relative;
2054
  color: #696969;
2101
  color: #696969;
Lines 2652-2658 dd { Link Here
2652
    display: inline-block;
2699
    display: inline-block;
2653
    position: relative;
2700
    position: relative;
2654
    float: right;
2701
    float: right;
2655
    height: 100%; }
2702
    height: 100%;
2703
    padding: 0.3em; }
2656
    #toolbar div .dropdown-menu,
2704
    #toolbar div .dropdown-menu,
2657
    .btn-toolbar div .dropdown-menu {
2705
    .btn-toolbar div .dropdown-menu {
2658
      /*border-top-width: 1px;
2706
      /*border-top-width: 1px;
Lines 2697-2702 dd { Link Here
2697
          font-weight: bold;
2745
          font-weight: bold;
2698
          background-color: #fff;
2746
          background-color: #fff;
2699
          background-image: none; }
2747
          background-image: none; }
2748
    #toolbar div #up,
2749
    .btn-toolbar div #up {
2750
      display: table; }
2751
    #toolbar div #down,
2752
    .btn-toolbar div #down {
2753
      display: table; }
2700
    #toolbar div #patdrop,
2754
    #toolbar div #patdrop,
2701
    .btn-toolbar div #patdrop {
2755
    .btn-toolbar div #patdrop {
2702
      border-top-width: 1px;
2756
      border-top-width: 1px;
Lines 2736-2742 dd { Link Here
2736
  .btn-toolbar.floating {
2790
  .btn-toolbar.floating {
2737
    border-radius: 0;
2791
    border-radius: 0;
2738
    margin-top: 0;
2792
    margin-top: 0;
2739
    z-index: 300; }
2793
    z-index: 300;
2794
    left: auto !important;
2795
    width: 851px; }
2740
  #toolbar a.addtocart,
2796
  #toolbar a.addtocart,
2741
  .btn-toolbar a.addtocart {
2797
  .btn-toolbar a.addtocart {
2742
    display: block; }
2798
    display: block; }
Lines 3461-3467 td.credit, td.debit, td.total { Link Here
3461
  tfoot td.credit, tfoot td.debit, tfoot td.total {
3517
  tfoot td.credit, tfoot td.debit, tfoot td.total {
3462
    color: #000; }
3518
    color: #000; }
3463
3519
3464
#lientype, #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 {
3520
#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 {
3465
  color: #71B443;
3521
  color: #71B443;
3466
  padding: .3em;
3522
  padding: .3em;
3467
  border: none;
3523
  border: none;
Lines 3470-3476 td.credit, td.debit, td.total { Link Here
3470
  -webkit-box-shadow: none;
3526
  -webkit-box-shadow: none;
3471
          box-shadow: none;
3527
          box-shadow: none;
3472
  font-size: 100%; }
3528
  font-size: 100%; }
3473
  #lientype:hover, #multi_hold_submit:hover, #show-picture-upload:hover, #edit_suggester:hover, #expand_all:hover, #collapse_all:hover, #hide_inactive:hover, #show_inactive:hover, #addnewmessageLabel:hover, #results_batch_ops:hover, #highlight_toggle_off:hover, #selectall:hover, #clearall:hover, #highlight_toggle_on:hover, #addColumn:hover, #remove_from_cart:hover, #place_hold:hover, #add_to_list:hover, #batch_modify:hover, #batch_delete:hover, #delColumn:hover, #edit_manager:hover, #addauth:hover, #unset:hover, #UncheckAll:hover, #check-all:hover, #results_batch_ops #uncheck-all:hover, #frameworkactions:hover, #authtypeactions:hover, #modify_sru_fields:hover, #cartsubmit:hover, #z3950submit:hover, #add_manual_restriction:hover {
3529
  #lientype:hover, #show_invoice_adjustment:hover, #cancel_invoice_adjustment:hover, #show_active_vendors:hover, #add-contact:hover, #multi_hold_submit:hover, #show-picture-upload:hover, #edit_suggester:hover, #expand_all:hover, #collapse_all:hover, #hide_inactive:hover, #show_inactive:hover, #addnewmessageLabel:hover, #results_batch_ops:hover, #highlight_toggle_off:hover, #selectall:hover, #clearall:hover, #highlight_toggle_on:hover, #addColumn:hover, #remove_from_cart:hover, #place_hold:hover, #add_to_list:hover, #batch_modify:hover, #batch_delete:hover, #delColumn:hover, #edit_manager:hover, #addauth:hover, #unset:hover, #UncheckAll:hover, #check-all:hover, #results_batch_ops #uncheck-all:hover, #frameworkactions:hover, #authtypeactions:hover, #modify_sru_fields:hover, #cartsubmit:hover, #z3950submit:hover, #add_manual_restriction:hover {
3474
    text-decoration: underline; }
3530
    text-decoration: underline; }
3475
3531
3476
.highlight_toggle {
3532
.highlight_toggle {
Lines 4179-4185 nav { Link Here
4179
    line-height: 40px; }
4235
    line-height: 40px; }
4180
4236
4181
.navbar-head {
4237
.navbar-head {
4182
  overflow-x: hidden;
4183
  display: block !important;
4238
  display: block !important;
4184
  height: auto !important; }
4239
  height: auto !important; }
4185
4240
Lines 4275-4280 nav { Link Here
4275
4330
4276
            }
4331
            }
4277
        }*/ }
4332
        }*/ }
4333
  .navbar-nav li .filteraction {
4334
    position: absolute;
4335
    right: 30px;
4336
    top: -5px;
4337
    width: 25px;
4338
    height: 30px;
4339
    border: none;
4340
    padding-left: 5px;
4341
    padding-right: 5px;
4342
    margin: 0;
4343
    display: inline; }
4344
    .navbar-nav li .filteraction a {
4345
      color: #71B443;
4346
      vertical-align: middle; }
4347
      .navbar-nav li .filteraction a:hover, .navbar-nav li .filteraction a:active {
4348
        background-color: transparent;
4349
        text-decoration: none; }
4278
  .navbar-nav li .residentsearch {
4350
  .navbar-nav li .residentsearch {
4279
    border: 0;
4351
    border: 0;
4280
    cursor: text;
4352
    cursor: text;
Lines 4293-4305 nav { Link Here
4293
    position: relative;
4365
    position: relative;
4294
    left: 0px;
4366
    left: 0px;
4295
    top: 0px;
4367
    top: 0px;
4296
    overflow: hidden;
4368
    width: 500px;
4297
    display: block;
4369
    display: block;
4298
    margin: 10px 0; }
4370
    margin: 10px 0; }
4299
  .navbar-nav li #submit, .navbar-nav li #autocsubmit {
4371
  .navbar-nav li #submit, .navbar-nav li #autocsubmit {
4300
    background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
4372
    background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
4301
    position: absolute;
4373
    position: absolute;
4302
    right: -65px;
4374
    min-width: 7px;
4375
    right: 0;
4303
    top: 0px;
4376
    top: 0px;
4304
    width: 25px;
4377
    width: 25px;
4305
    height: 30px;
4378
    height: 30px;
Lines 5505-5510 input.renew { Link Here
5505
                justify-content: center;
5578
                justify-content: center;
5506
        display: inline;
5579
        display: inline;
5507
        border: solid 3px #71B443; }
5580
        border: solid 3px #71B443; }
5581
      .buttons-list li a.menucirc i.fond {
5582
        opacity: 70%;
5583
        position: relative;
5584
        top: 5px;
5585
        border: none;
5586
        right: 20px;
5587
        border-radius: 0;
5588
        background-color: transparent;
5589
        width: auto;
5590
        height: auto;
5591
        margin: 0;
5592
        padding: 0; }
5508
      .buttons-list li a.menucirc h1 {
5593
      .buttons-list li a.menucirc h1 {
5509
        font-size: 150%;
5594
        font-size: 150%;
5510
        font-weight: normal;
5595
        font-weight: normal;
Lines 5515-5522 input.renew { Link Here
5515
        .buttons-list li a.menucirc:hover i.fa {
5600
        .buttons-list li a.menucirc:hover i.fa {
5516
          background-color: #418940;
5601
          background-color: #418940;
5517
          border: solid 3px #418940; }
5602
          border: solid 3px #418940; }
5518
        .buttons-list li a.menucirc:hover h1 {
5603
        .buttons-list li a.menucirc:hover i.fond {
5519
          font-weight: bold; }
5604
          opacity: 70%;
5605
          position: relative;
5606
          top: 5px;
5607
          border: none;
5608
          right: 20px;
5609
          border-radius: 0;
5610
          background-color: transparent;
5611
          width: auto;
5612
          height: auto;
5613
          margin: 0;
5614
          padding: 0; }
5520
5615
5521
.about h2 {
5616
.about h2 {
5522
  border-bottom: 1px solid #B9D8D9;
5617
  border-bottom: 1px solid #B9D8D9;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (-1 / +1 lines)
Lines 7-13 Link Here
7
                <label>From an existing record:
7
                <label>From an existing record:
8
                    <input type="text" name="q" size="25" />
8
                    <input type="text" name="q" size="25" />
9
                </label>
9
                </label>
10
                <input type="submit" class="submit" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" />
10
                <input type="submit" class="submit principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" />
11
            </form>
11
            </form>
12
        </li>
12
        </li>
13
        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
13
        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-24 / +25 lines)
Lines 1-33 Link Here
1
[% USE Koha %]
2
[% PROCESS 'html_helpers.inc' %]
3
[% PROCESS 'patronfields.inc' %]
4
<!-- Begin Acquisitions Resident Search Box -->
1
<!-- Begin Acquisitions Resident Search Box -->
5
2
6
<div id="header_search" class="fold">
3
<div id="header_search" class="fold">
7
    <div id="supplier_search" class="residentsearch">
4
    <div id="supplier_search" class="residentsearch">
8
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
5
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
9
            <input type="text" name="supplier" id="supplier" class="focus" placeholder="Search vendors" />
6
            <input type="text" name="supplier" id="supplier" class="head-searchbox focus" placeholder="Search vendors" />
10
            <input type="submit" id="submit" value="" />
7
            <input type="submit" id="submit" value="" />
11
        </form>
8
        </form>
12
    </div>
9
    </div>
13
10
14
    <div id="orders_search" class="residentsearch">
11
    <div id="orders_search" class="residentsearch">
15
        <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
12
		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
16
            <input type="text" id="title" name="title" class="focus" value="[% title | html %]" placeholder="Title" />
13
            <input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title | html %]" />
17
            <input type="text" id="title" name="name" class="focus" value="[% name | html %]" placeholder="Vendor" />
14
            <input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
18
            <input type="hidden" id="do_search" name="do_search" value="do" />
15
            <input type="hidden" id="do_search" name="do_search" value="do" />
19
            <span class="filteraction" id="filteraction_off" style="display:none"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
16
            <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
20
            <span class="filteraction" id="filteraction_on"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
17
            <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
21
            <input value="" id="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
18
            <input value="" class="submit" id="submit" type="submit" />
22
            
19
                        
23
            <p id="filters" class="plus" style="display:none">
20
            <p class="plus" id="filters" style="display:none">
24
                <input type="text" name="basket" id="basket" placeholder="Basket" />
21
                <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
25
                <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" placeholder="Invoice number" />
22
                <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
26
            </p>
23
            </p>
27
        </form>
24
	    </form>
28
    </div>
25
    </div>
26
    
29
27
30
    <ul>
28
    <ul id="taille">
31
        <li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li>
29
        <li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li>
32
        <li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li>
30
        <li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li>
33
31
Lines 37-43 Link Here
37
</div>
35
</div>
38
36
39
37
40
38
 
41
<script type="text/javascript">
39
<script type="text/javascript">
42
    function focusInput(){
40
    function focusInput(){
43
        document.getElementsByClassName('head-searchbox').focus();
41
        document.getElementsByClassName('head-searchbox').focus();
Lines 78-85 Link Here
78
            if (elem == iconssearch[i]){
76
            if (elem == iconssearch[i]){
79
                inputssearch[i].classList.add('focus');
77
                inputssearch[i].classList.add('focus');
80
78
81
                var offsetWidth = buttonssearch[i].offsetWidth +5;
79
                taille(inputssearch[i])
82
                inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)";
83
            }
80
            }
84
        }
81
        }
85
82
Lines 89-103 Link Here
89
86
90
    function fold(){
87
    function fold(){
91
        document.getElementById('header_search').classList.add('fold');
88
        document.getElementById('header_search').classList.add('fold');
92
       // document.getElementsByClassName('head-searchbox').style = "width:calc(355px - 100px)";
89
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
93
        setTimeout(
90
        setTimeout(
94
            function(){
91
            function(){
95
                var offsetWidth = document.getElementsByClassName('buttonsearch').offsetWidth +5;
92
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
96
                document.getElementsByClassName('head-searchbox').style = "width:calc(355px - "+offsetWidth+"px)";
93
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
97
            }
94
            }
98
        , 250);
95
        , 250);
99
    }
96
    }
100
97
98
    function taille(el){
99
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
100
        el.style = "width:calc(500px - "+offsetWidth+"px)";
101
    }
102
101
    $('.btn').click(function(){
103
    $('.btn').click(function(){
102
    if($(this).hasClass('active')){
104
    if($(this).hasClass('active')){
103
        $(this).removeClass('active')
105
        $(this).removeClass('active')
Lines 106-114 Link Here
106
    }
108
    }
107
});
109
});
108
110
109
110
111
</script>
111
</script>
112
  
112
113
113
<!-- /header_search -->
114
<!-- /header_search -->
114
<!-- End Main page Resident Search Box -->
115
<!-- End Main page Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-29 / +36 lines)
Lines 3-39 Link Here
3
<div id="toolbar" class="btn-toolbar">
3
<div id="toolbar" class="btn-toolbar">
4
    [% IF ( booksellerid ) %]
4
    [% IF ( booksellerid ) %]
5
        <div class="btn-group">
5
        <div class="btn-group">
6
        <a class="pat" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
6
            <a class="pat" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
7
        <span class="caret"></span>
7
                <span class="caret"></span>
8
        </a>
8
            </a>
9
        <ul class="dropdown-menu">
9
            <ul class="dropdown-menu">
10
            [% IF CAN_user_acquisition_order_manage && active %]
10
                [% IF CAN_user_acquisition_order_manage && active %]
11
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;op=add_form">Basket</a></li>
11
                    <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;op=add_form">Basket</a></li>
12
            [% END %]
13
            [% IF CAN_user_acquisition_contracts_manage && active %]
14
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
15
            [% END %]
16
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
17
                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
18
            [% END %]
19
        </ul>
20
        </div>
21
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
22
                <div class="btn-group"><a class="pat" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&amp;op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div>
23
                [% UNLESS ( basketcount OR subscriptioncount ) %]
24
                    <div class="btn-group">
25
                        <form action="/cgi-bin/koha/acqui/supplier.pl" method="post">
26
                            <input type="hidden" name="op" value="delete" />
27
                            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
28
                            <button class="pat" id="deletesupplier" type="submit"><i class="fa fa-trash"></i> Delete vendor</button>
29
                        </form></div>
30
                [% END %]
12
                [% END %]
13
                [% IF CAN_user_acquisition_contracts_manage && active %]
14
                    <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
15
                [% END %]
16
                [% IF ( CAN_user_acquisition_vendors_manage ) %]
17
                    <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
18
                [% END %]
19
            </ul>
20
        </div>
21
        [% IF ( CAN_user_acquisition_vendors_manage ) %]
22
        <div class="btn-group">
23
            <a class="pat" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&amp;op=enter"><i class="fa fa-pencil"></i> Edit vendor</a>
24
        </div>
25
            [% UNLESS ( basketcount OR subscriptioncount ) %]
26
            <div class="btn-group">
27
                <form action="/cgi-bin/koha/acqui/supplier.pl" method="post">
28
                    <input type="hidden" name="op" value="delete" />
29
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
30
                    <button class="pat" id="deletesupplier" type="submit"><i class="fa fa-trash"></i> Delete vendor</button>
31
                </form>
32
            </div>
31
            [% END %]
33
            [% END %]
32
            [% IF CAN_user_acquisition_order_receive && basketcount %]
33
                <div class="btn-group"><a class="pat" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>
34
            [% END %]
35
        [% ELSE %]
36
            <div class="btn-group"><a class="pat" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div>
37
        [% END %]
34
        [% END %]
35
        [% IF CAN_user_acquisition_order_receive && basketcount %]
36
            <div class="btn-group">
37
                <a class="pat" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a>
38
            </div>
39
        [% END %]
40
    [% ELSE %]
41
        <div class="btn-group">
42
            <a class="pat" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a>
43
        </div>
44
    [% END %]
38
</div>
45
</div>
39
<!-- / acquisitions-toolbar.inc -->
46
<!-- / acquisitions-toolbar.inc -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE AuthorisedValues %]
1
[% USE AuthorisedValues %]
2
[% IF wrap_fieldset != 0 %]
2
[% IF wrap_fieldset != 0 %]
3
<fieldset class="rows">
3
<fieldset class="rows">
4
    <legend>Additional fields</legend>
4
    <h3>Additional fields</h3>
5
    <ol>
5
    <ol>
6
[% END %]
6
[% END %]
7
        [% FOR field IN available %]
7
        [% FOR field IN available %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc (-55 / +55 lines)
Lines 1-58 Link Here
1
<!-- Begin main page resident search box -->
2
<div id="header_search" class="fold">
1
3
2
<div id="header_search">
3
    [% INCLUDE 'patron-search-box.inc' %]
4
    [% INCLUDE 'patron-search-box.inc' %]
4
    
5
5
    [% IF (CAN_user_circulate_circulate_remaining_permissions) %]
6
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
6
    <div id="checkout_search" class="residentsearch">
7
        <div id="checkin_search" class="residentsearch">
7
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
8
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
8
            <input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
9
                <input type="text" name="barcode" placeholder="Scan a barcode to check in" class="head-searchbox focus" id="ret_barcode" size="40" accesskey="r" />
9
            <input type="hidden" name="quicksearch" value="1" />
10
                <input value="" class="submit" id="submit" type="submit" />
10
            <input value="" type="submit" id="submitsearch" />
11
            </form>
11
        </form>
12
        </div>
12
    </div>
13
        <div id="renew_search" class="residentsearch">
13
14
            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
14
    <div id="checkin_search" class="residentsearch">
15
                <input type="text" class="head-searchbox focus" placeholder="Scan a barcode to renew" name="barcode" id="ren_barcode" size="40" />
15
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
16
                <input value="" class="submit" id="submit" type="submit" />
16
            <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
17
            </form>
17
            <input value="" type="submit" id="submitsearch" />
18
        </div>
18
        </form>
19
    </div>
20
21
    <div id="renew_search" class="residentsearch">
22
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
23
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" />
24
            <input value="" type="submit" id="submitsearch" />
25
        </form>
26
    </div>
27
    [% END %]
19
    [% END %]
28
20
29
    [% IF CAN_user_borrowers_edit_borrowers %]
21
    [% IF CAN_user_borrowers_edit_borrowers %]
30
    <div id="patron_search" class="residentsearch">
22
        <div id="patron_search" class="residentsearch">
31
        <form action="/cgi-bin/koha/members/member.pl" method="post">
23
            <form action="/cgi-bin/koha/members/member.pl" method="post">
32
            <input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" />
24
                <input name="searchmember" class="head-searchbox focus" placeholder="Enter patron card number or partial name" id="searchmember" size="40" type="text" />
33
            <input type="hidden" name="quicksearch" value="1" />
25
                <input type="hidden" name="quicksearch" value="1" />
34
            <input value="" id="submitsearch" type="submit" />
26
                <input value="" class="submit" id="submit" type="submit" />
35
        </form>
27
            </form>
36
    </div>
28
        </div>
37
    [% END %]
29
    [% END %]
38
30
39
    <ul>
31
    <ul id="taille">
40
        <span id="buttonssearch">
32
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
41
           <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-id-card-o"></i></span>
33
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
42
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %]
34
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
43
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
35
        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
44
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
36
45
            [% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %]
37
        <span id="button_1" class="buttonsearch active">Check out</span>
46
        </span>
38
        <span id="button_2" class="buttonsearch">Check in</span>
39
        <span id="button_3" class="buttonsearch">Renew</span>
40
        <span id="button_4" class="buttonsearch">Search patrons</span>
47
    </ul>
41
    </ul>
48
</div>
42
49
43
50
<script type="text/javascript">
44
<script type="text/javascript">
51
    function focusInput(){
45
    function focusInput(){
52
        document.getElementById('inputsearch').focus();
46
        document.getElementsByClassName('head-searchbox').focus();
53
    }
47
    }
54
48
55
    function toggle(elem){
49
    function toggle(elem){style="width: calc(301px);"
56
        var buttonssearch = document.getElementsByClassName('active');
50
        var buttonssearch = document.getElementsByClassName('active');
57
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
51
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
58
            buttonssearch[i].classList.remove('active');
52
            buttonssearch[i].classList.remove('active');
Lines 63-79 Link Here
63
            fold();
57
            fold();
64
        }else{//Back
58
        }else{//Back
65
            document.getElementById('button_1').classList.add('active');
59
            document.getElementById('button_1').classList.add('active');
66
            document.getElementById('containersearch').classList.remove('fold');
60
            document.getElementById('header_search').classList.remove('fold');
67
            document.getElementById('inputsearch').style = '';
61
            document.getElementsByClassName('head-searchbox').style = '';
68
        }
62
        }
69
        
63
70
        focusInput();
64
        focusInput();
71
    }
65
    }
72
66
73
    function clique(elem){
67
    function clique(elem){
74
        var buttonssearch = document.getElementsByClassName('buttonsearch');
68
        var buttonssearch = document.getElementsByClassName('buttonsearch');
75
        var iconssearch = document.getElementsByClassName('iconsearch');
69
        var iconssearch = document.getElementsByClassName('iconsearch');
76
        var inputssearch = document.getElementsByClassName('inpu');
70
        var inputssearch = document.getElementsByClassName('head-searchbox');
77
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
71
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
78
            buttonssearch[i].classList.remove('active');
72
            buttonssearch[i].classList.remove('active');
79
            if (elem == iconssearch[i]){
73
            if (elem == iconssearch[i]){
Lines 86-111 Link Here
86
80
87
            if (elem == iconssearch[i]){
81
            if (elem == iconssearch[i]){
88
                inputssearch[i].classList.add('focus');
82
                inputssearch[i].classList.add('focus');
83
84
                taille(inputssearch[i])
89
            }
85
            }
90
        }
86
        }
91
87
92
        focusInput();
88
        focusInput();
93
        fold(elem);
89
        fold();
94
    }
90
    }
95
91
96
    function fold(elem){
92
    function fold(){
97
        document.getElementById('containersearch').classList.add('fold');
93
        document.getElementById('header_search').classList.add('fold');
98
       // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
94
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
99
        setTimeout(
95
        setTimeout(
100
            function(){
96
            function(){
101
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
97
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
102
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";		
98
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
103
            }
99
            }
104
        , 250);
100
        , 250);
105
    }
101
    }
106
102
107
103
    function taille(el){
108
104
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
105
        el.style = "width:calc(500px - "+offsetWidth+"px)";
106
    }
109
107
110
    $('.btn').click(function(){
108
    $('.btn').click(function(){
111
    if($(this).hasClass('active')){
109
    if($(this).hasClass('active')){
Lines 114-123 Link Here
114
        $(this).addClass('active')
112
        $(this).addClass('active')
115
    }
113
    }
116
});
114
});
115
117
</script>
116
</script>
118
117
119
<!-- /header_search -->
118
<!-- /header_search -->
120
<!-- End Main page Resident Search Box -->
119
<!-- End Main page Resident Search Box -->
121
120
121
122
</div><!-- /#header_search -->
122
</div><!-- /#header_search -->
123
<!-- End advanced search page resident search box -->
123
<!-- End advanced search page resident search box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc (-3 / +3 lines)
Lines 1-8 Link Here
1
[% PROCESS 'form-blocks.inc' %]
1
[% PROCESS 'form-blocks.inc' %]
2
2
3
<div id="toolbar" class="btn-toolbar">
3
<div id="toolbar" class="btn-toolbar">
4
    <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div>
4
    <div class="btn-group"><a href="#" id="clear" class="btn btn-default pat btn-sm"><i class="fa fa-trash"></i> Clear field</a></div>
5
    <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div>
5
    <div class="btn-group"><a href="#" id="createnew" class="btn btn-default pat btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div>
6
</div>
6
</div>
7
<form name="f" method="get" action="auth_finder.pl">
7
<form name="f" method="get" action="auth_finder.pl">
8
            <input type="hidden" name="source" value="[% source | html %]" />
8
            <input type="hidden" name="source" value="[% source | html %]" />
Lines 158-163 Link Here
158
            </ol>
158
            </ol>
159
        </fieldset>
159
        </fieldset>
160
        [% END %]
160
        [% END %]
161
        <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
161
        <fieldset class="action"> <input type="submit" value="Search" class="submit principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
162
        </fieldset>
162
        </fieldset>
163
</form>
163
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc (-4 / +4 lines)
Lines 54-60 Link Here
54
            <option value="">None</option>
54
            <option value="">None</option>
55
            [% END %]
55
            [% END %]
56
        </select>
56
        </select>
57
        <input type="submit" class="submit" value="Submit" />
57
        <input type="submit" class="submit principal" value="Submit" />
58
    </form>
58
    </form>
59
    </div>
59
    </div>
60
    <div id="main_heading" class="residentsearch">
60
    <div id="main_heading" class="residentsearch">
Lines 110-116 Link Here
110
            <option value="">None</option>
110
            <option value="">None</option>
111
            [% END %]
111
            [% END %]
112
        </select>
112
        </select>
113
        <input type="submit" class="submit" value="Submit" />
113
        <input type="submit" class="submit principal" value="Submit" />
114
    </form>
114
    </form>
115
    </div>
115
    </div>
116
    <div id="matchheading_search" class="residentsearch">
116
    <div id="matchheading_search" class="residentsearch">
Lines 164-170 Link Here
164
            <option value="">None</option>
164
            <option value="">None</option>
165
            [% END %]
165
            [% END %]
166
         </select>
166
         </select>
167
         <input type="submit" class="submit" value="Submit" />
167
         <input type="submit" class="submit principal" value="Submit" />
168
    </form>
168
    </form>
169
    </div>
169
    </div>
170
    <div id="entire_record" class="residentsearch">
170
    <div id="entire_record" class="residentsearch">
Lines 220-226 Link Here
220
            <option value="">None</option>
220
            <option value="">None</option>
221
            [% END %]
221
            [% END %]
222
        </select>
222
        </select>
223
        <input type="submit" class="submit" value="Submit" />
223
        <input type="submit" class="submit principal" value="Submit" />
224
    </form>
224
    </form>
225
    </div>
225
    </div>
226
    <ul>
226
    <ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc (-1 / +1 lines)
Lines 10-16 Link Here
10
                <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" />
10
                <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" />
11
            </div>
11
            </div>
12
            <div class="modal-footer">
12
            <div class="modal-footer">
13
                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
13
                <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button>
14
            </div>
14
            </div>
15
        </div>
15
        </div>
16
    </div>
16
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-2 / +2 lines)
Lines 8-15 Link Here
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9
        [% END %]
9
        [% END %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" id="lientype" >Make payment</a>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" id="lientype" >Pay all charges</a></li>
13
        [% END %]
13
        [% END %]
14
    </li>
14
    </li>
15
[% END %]
15
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc (-7 / +82 lines)
Lines 17-23 Link Here
17
                    [% END %]
17
                    [% END %]
18
            </select>
18
            </select>
19
            <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
19
            <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
20
            <input type="submit" class="submit" name="filter" value="" />
20
            <input type="submit" class="submit" id="submit" name="filter" value="" />
21
        </form>
21
        </form>
22
    </div>
22
    </div>
23
23
Lines 25-38 Link Here
25
25
26
    [% INCLUDE 'catalogue-search-box.inc' %]
26
    [% INCLUDE 'catalogue-search-box.inc' %]
27
27
28
    <ul>
28
    <ul id="taille">
29
        <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-upload"></i></a></li>
29
        <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-credit-card"></i></a></li>
30
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
30
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
31
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
31
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
32
32
33
        <span class="buttonsearch active">Search funds</span>
33
        <span id="button_1" class="buttonsearch active">Search funds</span>
34
        <span class="buttonsearch">Check out</span>
34
        <span id="button_2" class="buttonsearch">Check out</span>
35
        <span class="buttonsearch" href="#catalog_search">Search the catalog</span>
35
        <span id="button_3" class="buttonsearch"Search catalog</span>
36
    </ul>
36
    </ul>
37
</div>
37
</div>
38
39
<script type="text/javascript">
40
    function focusInput(){
41
        document.getElementsByClassName('head-searchbox').focus();
42
    }
43
44
    function toggle(elem){style="width: calc(301px);"
45
        var buttonssearch = document.getElementsByClassName('active');
46
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
47
            buttonssearch[i].classList.remove('active');
48
        }
49
50
        if(elem){
51
            elem.classList.add('active');
52
            fold();
53
        }else{//Back
54
            document.getElementById('button_1').classList.add('active');
55
            document.getElementById('header_search').classList.remove('fold');
56
            document.getElementsByClassName('head-searchbox').style = '';
57
        }
58
59
        focusInput();
60
    }
61
62
    function clique(elem){
63
        var buttonssearch = document.getElementsByClassName('buttonsearch');
64
        var iconssearch = document.getElementsByClassName('iconsearch');
65
        var inputssearch = document.getElementsByClassName('head-searchbox');
66
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
67
            buttonssearch[i].classList.remove('active');
68
            if (elem == iconssearch[i]){
69
                buttonssearch[i].classList.add('active');
70
            }
71
        }
72
73
        for (var i = inputssearch.length - 1; i >= 0; i--) {
74
            inputssearch[i].classList.remove('focus');
75
76
            if (elem == iconssearch[i]){
77
                inputssearch[i].classList.add('focus');
78
79
                taille(inputssearch[i])
80
            }
81
        }
82
83
        focusInput();
84
        fold();
85
    }
86
87
    function fold(){
88
        document.getElementById('header_search').classList.add('fold');
89
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
90
        setTimeout(
91
            function(){
92
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
93
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
94
            }
95
        , 250);
96
    }
97
98
    function taille(el){
99
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
100
        el.style = "width:calc(500px - "+offsetWidth+"px)";
101
    }
102
103
    $('.btn').click(function(){
104
    if($(this).hasClass('active')){
105
        $(this).removeClass('active')
106
    } else {
107
        $(this).addClass('active')
108
    }
109
});
110
111
</script>
112
38
<!-- End Suggestions Resident Search Box -->
113
<!-- End Suggestions Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc (-37 lines)
Lines 1-37 Link Here
1
[% USE Koha %]
2
<div class="gradient">
3
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Catalogue Resident Search Box -->
4
<div id="header_search">
5
6
[% INCLUDE 'patron-search-box.inc' %]
7
8
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
9
<div id="checkin_search" class="residentsearch">
10
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
11
        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
12
        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" />
13
14
        <input value="Submit" class="submit" type="submit" />
15
    </form>
16
</div>
17
<div id="renew_search" class="residentsearch">
18
    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
19
        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
20
        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
21
        <input value="Submit" class="submit" type="submit" />
22
    </form>
23
</div>
24
[% END %]
25
26
[% INCLUDE 'catalogue-search-box.inc' %]
27
28
<ul>
29
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
30
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
31
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
32
    [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
33
</ul>
34
35
</div><!-- /header_search -->
36
</div><!-- /gradient -->
37
<!-- End Catalogue Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc (+73 lines)
Line 0 Link Here
1
[% USE Koha %]
2
<div id="header_search">
3
4
    [% INCLUDE 'patron-search-box.inc' %]
5
6
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
7
    <div id="checkin_search" class="residentsearch">
8
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
9
            <input class="head-searchbox focus" name="barcode" id="ret_barcode" type="text" placeholder="Scan a barcode to check in:" />
10
            <input value="" class="submit" id="submit" type="submit" />
11
        </form>
12
    </div>
13
14
    <div id="renew_search" class="residentsearch">
15
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
16
            <input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew:" />
17
            <input value="" class="submit" id="submit" type="submit" />
18
        </form>
19
    </div>
20
    [% END %]
21
22
    [% INCLUDE 'catalogue-search-box.inc' %]
23
24
    <ul id="taille">
25
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
26
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
27
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
28
        [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
29
        
30
        <span id="button_1" class="buttonsearch">Check out</span>
31
        <span id="button_2" class="buttonsearch">Check in</span>
32
        <span id="button_3" class="buttonsearch">Renew</span>
33
        <span id="button_4" class="buttonsearch active">Search catalog</span>
34
    </ul>
35
</div><!-- /header_search -->
36
37
<script type="text/javascript">
38
    function focusInput(){
39
        document.getElementById('inputsearch').focus();
40
    }
41
42
    function toggle(elem){
43
        var buttonssearch = document.getElementsByClassName('active');
44
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
45
            buttonssearch[i].classList.remove('active');
46
        }
47
48
        if(elem){
49
            elem.classList.add('active');
50
            fold();
51
        }else{//Back
52
            document.getElementById('button_1').classList.add('active');
53
            document.getElementById('containersearch').classList.remove('fold');
54
            document.getElementById('inputsearch').style = '';
55
        }
56
57
        focusInput();
58
    }
59
60
    function fold(){
61
62
        document.getElementById('containersearch').classList.add('fold');
63
        // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
64
        setTimeout(
65
            function(){
66
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
67
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
68
            }
69
        , 250);
70
    }
71
72
</script>
73
<!-- End Catalogue Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc (-6 / +6 lines)
Lines 8-14 Link Here
8
    <div>
8
    <div>
9
        <div id="addbooks_search" class="residentsearch">
9
        <div id="addbooks_search" class="residentsearch">
10
            <form name="search" action="addbooks.pl">
10
            <form name="search" action="addbooks.pl">
11
                <input class="head-searchbox" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" />
11
                <input class="head-searchbox focus" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" />
12
                <input type="submit" id="submit" value="" />
12
                <input type="submit" id="submit" value="" />
13
            </form>
13
            </form>
14
        </div>
14
        </div>
Lines 18-31 Link Here
18
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
18
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
19
    <div id="checkin_search" class="residentsearch">
19
    <div id="checkin_search" class="residentsearch">
20
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
20
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
21
            <input class="head-searchbox" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
21
            <input class="head-searchbox focus" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
22
            <input value="" type="submit" id="submit" />
22
            <input value="" type="submit" id="submit" />
23
        </form>
23
        </form>
24
    </div>
24
    </div>
25
25
26
    <div id="renew_search" class="residentsearch">
26
    <div id="renew_search" class="residentsearch">
27
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
27
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
28
            <input class="head-searchbox" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />
28
            <input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />
29
            <input value="" type="submit" id="submit" />
29
            <input value="" type="submit" id="submit" />
30
        </form>
30
        </form>
31
    </div>
31
    </div>
Lines 33-39 Link Here
33
33
34
    [% INCLUDE 'catalogue-search-box.inc' %]
34
    [% INCLUDE 'catalogue-search-box.inc' %]
35
35
36
    <ul>
36
    <ul id="taille">
37
        <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#addbooks_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
37
        <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#addbooks_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
38
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
38
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
39
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
39
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
Lines 41-48 Link Here
41
        <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
41
        <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
42
42
43
        <span id="button_1" class="buttonsearch">Cataloging search</span>
43
        <span id="button_1" class="buttonsearch">Cataloging search</span>
44
        <span id="button_2" class="buttonsearch active">Check-out</span>
44
        <span id="button_2" class="buttonsearch active">Check out</span>
45
        <span id="button_3" class="buttonsearch">Check-in</span>
45
        <span id="button_3" class="buttonsearch">Check in</span>
46
        <span id="button_4" class="buttonsearch">Renew</span>
46
        <span id="button_4" class="buttonsearch">Renew</span>
47
        <span id="button_5" class="buttonsearch">Search catalog</span>
47
        <span id="button_5" class="buttonsearch">Search catalog</span>
48
    </ul>
48
    </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc (-2 / +3 lines)
Lines 1-4 Link Here
1
    <li>
1
<li>
2
    <span class="circ-hlt">Patron's age is incorrect for their category.</span>
2
    <span class="circ-hlt">Patron's age is incorrect for their category.</span>
3
    Ages allowed are [% age_low | html %]-[% age_high | html %].
3
    Ages allowed are [% age_low | html %]-[% age_high | html %].
4
    <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a></li>
4
    <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
5
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc (-2 / +2 lines)
Lines 102-109 Link Here
102
                [% header_row.unshift(item) | html %]
102
                [% header_row.unshift(item) | html %]
103
            </div>
103
            </div>
104
            <div class="modal-footer">
104
            <div class="modal-footer">
105
                <button id="draw-chart" class="btn btn-default">Draw</button>
105
                <button id="draw-chart" class="btn btn-default lientype">Draw</button>
106
                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
106
                <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button>
107
            </div>
107
            </div>
108
        </div>
108
        </div>
109
    </div>
109
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc (-1 / +1 lines)
Lines 21-27 Link Here
21
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
21
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
22
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
22
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
23
23
24
        <span id="button_1" class="buttonsearch active">Check-out</span>
24
        <span id="button_1" class="buttonsearch active">Check out</span>
25
        <span id="button_2" class="buttonsearch">Renew</span>
25
        <span id="button_2" class="buttonsearch">Renew</span>
26
        <span id="button_3" class="buttonsearch">Search catalog</span>
26
        <span id="button_3" class="buttonsearch">Search catalog</span>
27
    </ul>
27
    </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 / +1 lines)
Lines 121-127 Link Here
121
          <input type="hidden" id="claims-returned-itemnumber" />
121
          <input type="hidden" id="claims-returned-itemnumber" />
122
      </div>
122
      </div>
123
      <div class="modal-footer">
123
      <div class="modal-footer">
124
        <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button>
124
        <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary principal"><i class="fa fa-exclamation-circle"></i> Make claim</button>
125
        <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
125
        <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
126
      </div>
126
      </div>
127
    </div>
127
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc (-19 / +3 lines)
Lines 4-10 Link Here
4
<div id="header_search" class="fold">
4
<div id="header_search" class="fold">
5
5
6
    [% INCLUDE 'patron-search-box.inc' %]
6
    [% INCLUDE 'patron-search-box.inc' %]
7
    [% INCLUDE 'catalogue-search-box.inc' %]
8
7
9
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
8
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
10
    <div id="checkin_search" class="residentsearch">
9
    <div id="checkin_search" class="residentsearch">
Lines 16-22 Link Here
16
15
17
    <div id="renew_search" class="residentsearch">
16
    <div id="renew_search" class="residentsearch">
18
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
17
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
19
            <input class="head-searchbox" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
18
            <input class="head-searchbox focus" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
20
            <input value="" type="submit" id="submit" />
19
            <input value="" type="submit" id="submit" />
21
        </form>
20
        </form>
22
    </div>
21
    </div>
Lines 30-43 Link Here
30
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
29
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
31
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
30
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
32
31
33
        <span id="button_1" class="buttonsearch active">Check-out</span>
32
        <span id="button_1" class="buttonsearch active">Check out</span>
34
        <span id="button_2" class="buttonsearch">Check-in</span>
33
        <span id="button_2" class="buttonsearch">Check in</span>
35
        <span id="button_3" class="buttonsearch">Renew</span>
34
        <span id="button_3" class="buttonsearch">Renew</span>
36
        <span id="button_4" class="buttonsearch">Search catalog</span>
35
        <span id="button_4" class="buttonsearch">Search catalog</span>
37
    </ul>
36
    </ul>
38
</div>
37
</div>
39
38
40
41
<script type="text/javascript">
39
<script type="text/javascript">
42
    function focusInput(){
40
    function focusInput(){
43
        document.getElementsByClassName('head-searchbox').focus();
41
        document.getElementsByClassName('head-searchbox').focus();
Lines 87-108 Link Here
87
    }
85
    }
88
86
89
    function fold(){
87
    function fold(){
90
<<<<<<< HEAD
91
92
        document.getElementById('containersearch').classList.add('fold');
93
        // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
94
        setTimeout(
95
            function(){
96
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
97
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
98
=======
99
        document.getElementById('header_search').classList.add('fold');
88
        document.getElementById('header_search').classList.add('fold');
100
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
89
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
101
        setTimeout(
90
        setTimeout(
102
            function(){
91
            function(){
103
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
92
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
104
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
93
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
105
>>>>>>> Bug 30952: Search bar
106
            }
94
            }
107
        , 250);
95
        , 250);
108
    }
96
    }
Lines 120-129 Link Here
120
    }
108
    }
121
});
109
});
122
110
123
124
125
</script>
111
</script>
126
112
127
128
<!-- /header_search -->
129
<!-- End Main page Resident Search Box -->
113
<!-- End Main page Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc (-5 / +6 lines)
Lines 8-23 Link Here
8
	</div>
8
	</div>
9
9
10
    [% INCLUDE 'patron-search-box.inc' %]
10
    [% INCLUDE 'patron-search-box.inc' %]
11
    
11
    [% INCLUDE 'catalogue-search-box.inc' %]
12
    [% INCLUDE 'catalogue-search-box.inc' %]
12
13
13
    <ul>
14
    <ul id="taille">
14
        <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-upload"></i></a></li>
15
        <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-building-o"></i></a></li>
15
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
16
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
16
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
17
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
17
18
18
        <span class="keep_text">Search cities</span>
19
        <span id="button_1" class="buttonsearch active">Search cities</span>
19
        <span class="keep_text">Check out</span>
20
        <span id="button_2" class="buttonsearch">Check out</span>
20
        <span class="keep_text">Search the catalog</span>
21
        <span id="button_3" class="buttonsearch">Search the catalog</span>
21
    </ul>
22
    </ul>
22
</div>
23
</div>
23
<!-- End Cities Resident Search Box -->
24
<!-- End Cities Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc (-6 / +6 lines)
Lines 72-81 Link Here
72
                [% UNLESS destination == 'holds' %]
72
                [% UNLESS destination == 'holds' %]
73
                    <td class="actions">
73
                    <td class="actions">
74
                        <div class="btn-group dropup">
74
                        <div class="btn-group dropup">
75
                            <a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#">
75
                            <a class="btn btn-default btn-xs dropdown-toggle lientype" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#">
76
                                Actions <b class="caret"></b>
76
                                Actions <b class="caret"></b>
77
                            </a>
77
                            </a>
78
                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]">
78
                            <ul class="dropdown-menu pull-right" id="lientype" role="menu" aria-labelledby="clubactions[% c.id | html %]">
79
                                [% IF ( c.club_enrollments.count ) %]
79
                                [% IF ( c.club_enrollments.count ) %]
80
                                    <li>
80
                                    <li>
81
                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
81
                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
Lines 84-109 Link Here
84
                                    </li>
84
                                    </li>
85
                                [% ELSE %]
85
                                [% ELSE %]
86
                                    <li class="disabled">
86
                                    <li class="disabled">
87
                                        <a href="#" data-toggle="tooltip" data-placement="left" title="There are no enrollments for this club yet">
87
                                        <a href="#" data-toggle="tooltip" data-placement="left" id="lientype" title="There are no enrollments for this club yet">
88
                                            <i class="fa fa-list-ul"></i> Enrollments
88
                                            <i class="fa fa-list-ul"></i> Enrollments
89
                                        </a>
89
                                        </a>
90
                                    </li>
90
                                    </li>
91
                                [% END %]
91
                                [% END %]
92
                                [% IF CAN_user_clubs_edit_clubs %]
92
                                [% IF CAN_user_clubs_edit_clubs %]
93
                                    <li>
93
                                    <li>
94
                                        <a href="clubs-add-modify.pl?id=[% c.id | uri %]">
94
                                        <a id="lientype" href="clubs-add-modify.pl?id=[% c.id | uri %]">
95
                                            <i class="fa fa-pencil"></i> Edit
95
                                            <i class="fa fa-pencil"></i> Edit
96
                                        </a>
96
                                        </a>
97
                                    </li>
97
                                    </li>
98
                                    <li>
98
                                    <li>
99
                                        <a href="#" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]">
99
                                        <a href="#" id="lientype" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]">
100
                                            <i class="fa fa-trash"></i> Delete
100
                                            <i class="fa fa-trash"></i> Delete
101
                                        </a>
101
                                        </a>
102
                                    </li>
102
                                    </li>
103
                                [% END %]
103
                                [% END %]
104
                                [% IF ( c.club_enrollments.count ) %]
104
                                [% IF ( c.club_enrollments.count ) %]
105
                                    <li>
105
                                    <li>
106
                                        <a href="#" class="club_hold_search" data-id="[% c.id | html %]">
106
                                        <a href="#" class="club_hold_search" id="lientype" data-id="[% c.id | html %]">
107
                                            <i class="fa fa-search"></i> Search to hold
107
                                            <i class="fa fa-search"></i> Search to hold
108
                                        </a>
108
                                        </a>
109
                                    </li>
109
                                    </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc (-7 / +7 lines)
Lines 3-24 Link Here
3
<div id="header_search" class="fold">
3
<div id="header_search" class="fold">
4
	<div id="contract_description_search" class="residentsearch">
4
	<div id="contract_description_search" class="residentsearch">
5
	<form action="[% script_name | html %]" method="post">
5
	<form action="[% script_name | html %]" method="post">
6
        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/>
6
        <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/>
7
		<input type="submit" class="submit" name="search" value="" />
7
		<input type="submit" class="submit" id="submit" name="search" value="" />
8
	</form>	
8
	</form>	
9
	</div>
9
	</div>
10
10
11
    [% INCLUDE 'patron-search-box.inc' %]
11
    [% INCLUDE 'patron-search-box.inc' %]
12
    [% INCLUDE 'catalogue-search-box.inc' %]
12
    [% INCLUDE 'catalogue-search-box.inc' %]
13
13
14
	<ul>
14
	<ul id="taille">
15
        <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-upload"></i></a></li>
15
        <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-pencil-square-o"></i></a></li>
16
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
16
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
17
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
18
18
19
        <span class="keep_text">Search contracts</span>
19
        <span  id="button_1" class="buttonsearch active">Search contracts</span>
20
        <span class="keep_text">Check out</span>
20
        <span id="button_2" class="buttonsearch">Check out</span>
21
        <span class="keep_text" href="#catalog_search">Search the catalog</span>
21
        <span id="button_3" class="buttonsearch">Search the catalog</span>
22
	</ul>
22
	</ul>
23
</div>
23
</div>
24
24
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc (-3 / +4 lines)
Lines 3-18 Link Here
3
<div id="header_search" class="fold">
3
<div id="header_search" class="fold">
4
	<div id="currency_search" class="residentsearch">
4
	<div id="currency_search" class="residentsearch">
5
        <form action="[% script_name | html %]" method="post">
5
        <form action="[% script_name | html %]" method="post">
6
                <input class="head-searchbox" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search:" />
6
                <input class="head-searchbox focus" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search:" />
7
                <input type="submit" id="submit" name="search" value="" />
7
                <input type="submit" id="submit" name="search" value="" />
8
        </form>	
8
        </form>	
9
	</div>
9
	</div>
10
10
11
    [% INCLUDE 'patron-search-box.inc' %]
11
    [% INCLUDE 'patron-search-box.inc' %]
12
12
    [% INCLUDE 'catalogue-search-box.inc' %]
13
    [% INCLUDE 'catalogue-search-box.inc' %]
13
14
14
    <ul>
15
    <ul id="taille">
15
        <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-upload"></i></a></li>
16
        <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></i></a></li>
16
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Check out" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-upload"></i></a></li>[% END %]
18
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Check out" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-upload"></i></a></li>[% END %]
18
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc (-14 / +16 lines)
Lines 1-23 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<div class="gradient">
2
<div id="header_search" class="fold">
3
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></div><!-- Begin Desks Resident Search Box -->
3
4
<div id="header_search">
5
        <div id="desk_search" class="residentsearch">
4
        <div id="desk_search" class="residentsearch">
6
        <form action="[% script_name|html %]" method="post">
5
            <form action="[% script_name|html %]" method="post">
7
            <label class="tip" for="desk_name">Desk search:</label>
6
                <input class="head-searchbox focus" type="text" name="desk_name" placeholder="Desk search:" id="desk_name" value="[% searchfield|html %]" size="40" />
8
        <input class="head-searchbox" type="text" name="desk_name" id="desk_name" value="[% searchfield|html %]" size="40" />
7
                <input type="submit" name="submit" value="" class="submit" id="submit" />
9
                <input type="submit" name="submit" value="OK" class="submit" />
8
            </form>
10
        </form>
11
        </div>
9
        </div>
12
10
13
    [% INCLUDE 'patron-search-box.inc' %]
11
    [% INCLUDE 'patron-search-box.inc' %]
12
14
    [% INCLUDE 'catalogue-search-box.inc' %]
13
    [% INCLUDE 'catalogue-search-box.inc' %]
15
14
16
                        <ul>
15
    <ul id="taille">
17
            <li><a class="keep_text" href="#desk_search">Search desks</a></li>
16
        <li><a id="icon_1" title="Search desks" onclick="clique(this)" class="iconsearch" href="#desk_search"><i class="fa fa-desktop"></i></a></li>
18
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
17
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
19
            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
18
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
20
                        </ul>
19
21
</div>
20
        <span id="button_1" class="buttonsearch active">Search desks</span>
21
        <span id="button_2" class="buttonsearch">Check out</span>
22
        <span id="button_3" class="buttonsearch">Search catalog</span>
23
    </ul>
22
</div>
24
</div>
23
<!-- End Desks Resident Search Box -->
25
<!-- End Desks Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-2 / +2 lines)
Lines 56-65 Link Here
56
  [% END %]
56
  [% END %]
57
  [% IF facets_loo.facets.size > 5 %]
57
  [% IF facets_loo.facets.size > 5 %]
58
      <li class="moretoggle">
58
      <li class="moretoggle">
59
          <a href="#"><strong>Show more</strong></a>
59
          <a href="#" id="lientype"><strong>Show more</strong></a>
60
      </li>
60
      </li>
61
      <li class="moretoggle" style="display:none">
61
      <li class="moretoggle" style="display:none">
62
          <a href="#"><strong>Show less</strong></a>
62
          <a href="#" id="lientype"><strong>Show less</strong></a>
63
      </li>
63
      </li>
64
  [% END %]
64
  [% END %]
65
</ul></li>
65
</ul></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-1 / +1 lines)
Lines 199-205 Link Here
199
            [%- END -%]
199
            [%- END -%]
200
            <td>
200
            <td>
201
                <a class="btn btn-default btn-xs cancel-hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
201
                <a class="btn btn-default btn-xs cancel-hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
202
                    <i class="fa fa-trash" aria-hidden="true"></i> Cancel
202
                    <i class="fa fa-trash cancel" aria-hidden="true"></i> Cancel
203
                </a>
203
                </a>
204
            </td>
204
            </td>
205
            <td>
205
            <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc (-6 / +2 lines)
Lines 40-55 Link Here
40
        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
40
        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
41
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
41
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
42
42
43
        <span id="button_1" class="buttonsearch active">Check-out</span>
43
        <span id="button_1" class="buttonsearch active">Check out</span>
44
        <span id="button_2" class="buttonsearch">Check-in</span>
44
        <span id="button_2" class="buttonsearch">Check in</span>
45
        <span id="button_3" class="buttonsearch">Renew</span>
45
        <span id="button_3" class="buttonsearch">Renew</span>
46
        <span id="button_4" class="buttonsearch">Search patrons</span>
46
        <span id="button_4" class="buttonsearch">Search patrons</span>
47
        <span id="button_5" class="buttonsearch">Search catalog</span>
47
        <span id="button_5" class="buttonsearch">Search catalog</span>
48
    </ul>
48
    </ul>
49
</div>
49
</div>
50
50
51
52
53
<script type="text/javascript">
51
<script type="text/javascript">
54
    function focusInput(){
52
    function focusInput(){
55
        document.getElementsByClassName('head-searchbox').focus();
53
        document.getElementsByClassName('head-searchbox').focus();
Lines 122-129 Link Here
122
    }
120
    }
123
});
121
});
124
122
125
126
127
</script>
123
</script>
128
124
129
<!-- /header_search -->
125
<!-- /header_search -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc (-6 / +6 lines)
Lines 4-34 Link Here
4
        [% IF backends_available %]
4
        [% IF backends_available %]
5
          [% IF backends.size > 1 %]
5
          [% IF backends.size > 1 %]
6
            <div class="dropdown btn-group">
6
            <div class="dropdown btn-group">
7
                <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
7
                <button class="btn btn-default pat dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
8
                    <i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
8
                    <i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
9
                </button>
9
                </button>
10
                <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
10
                <ul class="dropdown-menu pat" aria-labelledby="ill-backend-dropdown">
11
                    [% FOREACH backend IN backends %]
11
                    [% FOREACH backend IN backends %]
12
                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
12
                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
13
                    [% END %]
13
                    [% END %]
14
                </ul>
14
                </ul>
15
            </div>
15
            </div>
16
          [% ELSE %]
16
          [% ELSE %]
17
            <a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 | html %]">
17
            <a id="ill-new" class="btn btn-default pat" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 | html %]">
18
                <i class="fa fa-plus"></i> New ILL request
18
                <i class="fa fa-plus"></i> New ILL request
19
            </a>
19
            </a>
20
          [% END %]
20
          [% END %]
21
        [% ELSE %]
21
        [% ELSE %]
22
            <a id="ill-new" class="btn btn-default disabled" href="">
22
            <a id="ill-new" class="btn btn-default pat disabled" href="">
23
                <i class="fa fa-plus"></i> New ILL request
23
                <i class="fa fa-plus"></i> New ILL request
24
            </a>
24
            </a>
25
        [% END %]
25
        [% END %]
26
        [% IF query_type == 'illlist' %]
26
        [% IF query_type == 'illlist' %]
27
            <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
27
            <a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
28
                <i class="fa fa-list"></i> Refresh
28
                <i class="fa fa-list"></i> Refresh
29
            </a>
29
            </a>
30
        [% ELSE %]
30
        [% ELSE %]
31
            <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
31
            <a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
32
                <i class="fa fa-list"></i> List requests
32
                <i class="fa fa-list"></i> List requests
33
            </a>
33
            </a>
34
        [% END %]
34
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
1
2
[% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
2
[% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
3
<li class="dropdown">
3
<li class="dropdown">
4
    <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="fa fa-flag"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
4
    <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button" id="lientype"><i class="fa fa-flag"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
5
    <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
5
    <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
6
    [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
6
    [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
7
        [% IF ( languages_loo.group_enabled ) %]
7
        [% IF ( languages_loo.group_enabled ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc (-3 / +3 lines)
Lines 4-10 Link Here
4
        <div id="notices_search" class="residentsearch">
4
        <div id="notices_search" class="residentsearch">
5
                <form action="/cgi-bin/koha/tools/letter.pl" method="post">
5
                <form action="/cgi-bin/koha/tools/letter.pl" method="post">
6
                        <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/>
6
                        <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/>
7
                        <input type="submit" class="submit" name="search" value="" />
7
                        <input type="submit" class="submit" id="submit" name="search" value="" />
8
                </form>
8
                </form>
9
        </div>
9
        </div>
10
10
Lines 12-19 Link Here
12
12
13
        [% INCLUDE 'catalogue-search-box.inc' %]
13
        [% INCLUDE 'catalogue-search-box.inc' %]
14
14
15
	<ul>
15
	<ul id="taille">
16
                <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-upload"></i></a></li>
16
                <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-commenting-o"></i></a></li>
17
                [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
                [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
18
                [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
18
                [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
19
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc (-49 / +49 lines)
Lines 2-24 Link Here
2
<!-- Begin Main page Resident Search Box -->
2
<!-- Begin Main page Resident Search Box -->
3
3
4
<div id="containersearch" class="fold">
4
<div id="containersearch" class="fold">
5
    [% IF (CAN_user_borrowers) %]
5
6
    <div id="checkout_search" class="residentsearch">
6
    [% INCLUDE 'patron-search-box.inc' %]
7
        <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
8
            <input id="inputsearch"  class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
9
            <input type="hidden" name="quicksearch" value="1" />
10
            <input value="" type="submit" id="submitsearch" />
11
        </form>
12
    </div>
13
    [% END %]
14
7
15
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
8
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
16
    <div id="checkin_search" class="residentsearch">
9
    <div id="checkin_search" class="residentsearch">
17
        <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post">
10
        <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post">
18
            [% IF ( PatronAutoComplete ) %]
11
            [% IF ( PatronAutoComplete ) %]
19
                <div class="autocomplete">
12
                <div class="autocomplete">
20
                        <input autocomplete="off" class="inpu" id="inputsearch" name="findborrower" class="head-searchbox" type="text" placeholder="Scan a barcode to check in" />
13
                    <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
21
                        <input value="" id="submitsearch" type="submit"/>
14
                    <input value="" id="submit" type="submit"/>
22
15
23
                    [% IF ( stickyduedate ) %]
16
                    [% IF ( stickyduedate ) %]
24
                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
17
                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
Lines 27-85 Link Here
27
                </div>
20
                </div>
28
21
29
            [% ELSE %]
22
            [% ELSE %]
30
                <input id="inputsearch" name="findborrower" class="inpu head-searchbox" type="text" autocomplete="off" placeholder=Scan a barcode to check in" />
23
                <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
31
                [% IF ( stickyduedate ) %]
24
                [% IF ( stickyduedate ) %]
32
                <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
25
                <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
33
                <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
26
                <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
34
                [% END %]
27
                [% END %]
35
                <input value="" id="submitsearch" type="submit" />
28
                <input value="" id="submit" type="submit" />
36
            [% END %]
29
            [% END %]
37
        </form>
30
        </form>
38
    </div>
31
    </div>
39
32
40
    <div id="renew_search" class="residentsearch">
33
    <div id="renew_search" class="residentsearch">
41
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
42
            <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
43
            <input value="" type="submit" id="submitsearch" />
44
        </form>
45
    </div>
46
    <div id="search_search" class="residentsearch">
47
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
34
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
48
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
35
            <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
49
            <input value="" type="submit" id="submitsearch" />
36
            <input value="" type="submit" id="submit" />
50
        </form>
37
        </form>
51
    </div>
38
    </div>
52
    [% END %]
53
39
54
    [% IF ( CAN_user_catalogue ) %]
55
    <div id="search_search" class="residentsearch">
40
    <div id="search_search" class="residentsearch">
56
        <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block">
41
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
57
            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
42
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
58
                    [% INCLUDE 'search_indexes.inc' %]
43
            <input value="" type="submit" id="submit" />
59
                [% END %]
60
            <input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" />
61
            <input value="" type="submit" id="submitsearch" />
62
        </form>
44
        </form>
63
    </div>
45
    </div>
64
    [% END %]
46
    [% END %]
65
47
66
    <ul>
48
    [% INCLUDE 'catalogue-search-box.inc' %]
67
        <span id="buttonssearch">
49
68
           <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-search"></i></span>
50
    <ul id="taille">
69
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %]
51
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" href="#circ_search" class="iconsearch"><i class="fa fa-upload"></i></a></li>[% END %]
70
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
52
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" href="#checkin_search" class="iconsearch"><i class="fa fa-download"></i></a></li>[% END %]
71
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
53
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" href="#renew_search" class="iconsearch"><i class="fa fa-retweet"></i></a></li>[% END %]
72
            [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch active" href="#catalog_search">Search catalog</span>[% END %]
54
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" href="#catalog_search" class="iconsearch"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
73
        </span>
55
        
56
        <span id="button_1" class="buttonsearch active">Check-out</span>
57
        <span id="button_2" class="buttonsearch">Check-in</span>
58
        <span id="button_3" class="buttonsearch">Renew</span>
59
        <span id="button_5" class="buttonsearch active">Search catalog</span>
74
    </ul>
60
    </ul>
75
</div>
61
</div>
76
62
77
<script type="text/javascript">
63
<script type="text/javascript">
78
    function focusInput(){
64
    function focusInput(){
79
        document.getElementById('inputsearch').focus();
65
        document.getElementsByClassName('head-searchbox').focus();
80
    }
66
    }
81
67
82
    function toggle(elem){
68
    function toggle(elem){style="width: calc(301px);"
83
        var buttonssearch = document.getElementsByClassName('active');
69
        var buttonssearch = document.getElementsByClassName('active');
84
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
70
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
85
            buttonssearch[i].classList.remove('active');
71
            buttonssearch[i].classList.remove('active');
Lines 90-107 Link Here
90
            fold();
76
            fold();
91
        }else{//Back
77
        }else{//Back
92
            document.getElementById('button_1').classList.add('active');
78
            document.getElementById('button_1').classList.add('active');
93
            document.getElementById('containersearch').classList.remove('fold');
79
            document.getElementById('header_search').classList.remove('fold');
94
            document.getElementById('inputsearch').style = '';
80
            document.getElementsByClassName('head-searchbox').style = '';
95
        }
81
        }
96
82
97
        focusInput();
83
        focusInput();
98
    }
84
    }
99
85
100
101
    function clique(elem){
86
    function clique(elem){
102
        var buttonssearch = document.getElementsByClassName('buttonsearch');
87
        var buttonssearch = document.getElementsByClassName('buttonsearch');
103
        var iconssearch = document.getElementsByClassName('iconsearch');
88
        var iconssearch = document.getElementsByClassName('iconsearch');
104
        var inputssearch = document.getElementsByClassName('inpu');
89
        var inputssearch = document.getElementsByClassName('head-searchbox');
105
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
90
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
106
            buttonssearch[i].classList.remove('active');
91
            buttonssearch[i].classList.remove('active');
107
            if (elem == iconssearch[i]){
92
            if (elem == iconssearch[i]){
Lines 114-138 Link Here
114
99
115
            if (elem == iconssearch[i]){
100
            if (elem == iconssearch[i]){
116
                inputssearch[i].classList.add('focus');
101
                inputssearch[i].classList.add('focus');
102
103
                taille(inputssearch[i])
117
            }
104
            }
118
        }
105
        }
119
106
120
        fold();
121
        focusInput();
107
        focusInput();
108
        fold();
122
    }
109
    }
123
110
124
    function fold(){
111
    function fold(){
125
112
        document.getElementById('header_search').classList.add('fold');
126
        document.getElementById('containersearch').classList.add('fold');
113
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
127
        // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
128
        setTimeout(
114
        setTimeout(
129
            function(){
115
            function(){
130
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
116
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
131
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
117
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
132
            }
118
            }
133
        , 250);
119
        , 250);
134
    }
120
    }
135
121
122
    function taille(el){
123
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
124
        el.style = "width:calc(500px - "+offsetWidth+"px)";
125
    }
126
127
    $('.btn').click(function(){
128
    if($(this).hasClass('active')){
129
        $(this).removeClass('active')
130
    } else {
131
        $(this).addClass('active')
132
    }
133
});
134
135
136
136
137
</script>
137
</script>
138
138
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc (-99 / +99 lines)
Lines 1-111 Link Here
1
[% USE Koha %]
1
<div id="header_search" class="fold">
2
[% USE Branches %]
3
[% USE Categories %]
4
[% USE raw %]
5
[% PROCESS 'html_helpers.inc' %]
6
[% PROCESS 'patronfields.inc' %]
7
<div class="gradient">
8
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Resident Search Box -->
9
<div id="header_search">
10
    <div id="patron_search" class="residentsearch">
11
    <form action="/cgi-bin/koha/members/member.pl" method="post">
12
        <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
13
    <div class="autocomplete">
14
        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
15
        <input type="hidden" name="quicksearch" value="1" />
16
        <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
17
        <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
18
        <input value="Search" class="submit" type="submit" />
19
    </div>
20
21
22
2
23
    <div id="filters">
24
        <p><label for="searchfieldstype">Search fields:</label>
25
            <select name="searchfieldstype" id="searchfieldstype">
26
              [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,surname,othernames,cardnumber,userid' %]
27
              [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
28
              [% search_options = default_fields.merge(standard.split(',')).unique %]
29
              [% FOREACH s_o IN search_options %]
30
                  [% display_name = PROCESS patron_fields name=s_o %]
31
                  [% NEXT IF !display_name.length %]
32
                  [% IF searchfieldstype == s_o %]
33
                      <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option>
34
                  [% ELSE %]
35
                      <option value="[% s_o | html %]">[% display_name | $raw %]</option>
36
                  [% END %]
37
              [% END %]
38
            </select>
39
        </p>
40
        <p>
41
            <label for="searchtype">Search type:</label>
42
            <select name="searchtype" id="searchtype">
43
              [% IF searchtype == 'start_with' %]
44
                  <option selected="selected" value='start_with'>Starts with</option>
45
                  <option value='contain'>Contains</option>
46
              [% ELSE %]
47
                  <option value='start_with'>Starts with</option>
48
                  <option selected="selected" value='contain'>Contains</option>
49
              [% END %]
50
            </select>
51
        </p>
52
53
        <p>
54
            <label for="branchcode">Library: </label>
55
            [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
56
            <select name="branchcode_filter" id="branchcode">
57
                [% IF branches.size != 1 %]
58
                  <option value="">Any</option>
59
                [% END %]
60
                [% PROCESS options_for_libraries libraries => branches %]
61
            </select>
62
        </p>
63
64
        <p>
65
            <label for="categorycode">Category: </label>
66
            [% SET categories = Categories.all() %]
67
            <select name="categorycode_filter" id="categorycode">
68
                <option value="">Any</option>
69
                [% FOREACH category IN categories %]
70
                    [% IF category.categorycode == categorycode_filter %]
71
                        <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
72
                    [% ELSE %]
73
                        <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
74
                    [% END %]
75
                [% END %]
76
            </select>
77
        </p>
78
    </div>
79
    </form>
80
</div>
81
    [% INCLUDE 'patron-search-box.inc' %]
3
    [% INCLUDE 'patron-search-box.inc' %]
82
4
83
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
5
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
84
    <div id="checkin_search" class="residentsearch">
6
    <div id="checkin_search" class="residentsearch">
85
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
7
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
86
        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
8
            <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
87
    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
9
            <input value="" type="submit" id="submit" />
88
    <input value="Submit" class="submit" type="submit" />
10
        </form>
89
    </form>
11
    </div>
12
13
    <div id="renew_search" class="residentsearch">
14
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
15
            <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
16
            <input value="" type="submit" id="submit" />
17
        </form>
90
    </div>
18
    </div>
91
        <div id="renew_search" class="residentsearch">
92
            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
93
                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
94
                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
95
                <input value="Submit" class="submit" type="submit" />
96
            </form>
97
        </div>
98
    [% END %]
19
    [% END %]
99
20
100
    [% INCLUDE 'catalogue-search-box.inc' %]
21
    [% INCLUDE 'catalogue-search-box.inc' %]
101
22
102
    <ul>
23
    <ul id="taille">
103
        <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
24
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
104
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
25
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
105
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
26
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
106
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
27
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
107
        [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
28
29
        <span id="button_1" class="buttonsearch active">Check out</span>
30
        <span id="button_2" class="buttonsearch">Check in</span>
31
        <span id="button_3" class="buttonsearch">Renew</span>
32
        <span id="button_4" class="buttonsearch">Search catalog</span>
108
    </ul>
33
    </ul>
109
</div><!-- /header_search -->
34
</div><!-- /header_search -->
110
</div><!-- /gradient -->
35
111
<!-- End Patrons Resident Search Box -->
36
37
38
39
<script type="text/javascript">
40
    function focusInput(){
41
        document.getElementsByClassName('head-searchbox').focus();
42
    }
43
44
    function toggle(elem){style="width: calc(301px);"
45
        var buttonssearch = document.getElementsByClassName('active');
46
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
47
            buttonssearch[i].classList.remove('active');
48
        }
49
50
        if(elem){
51
            elem.classList.add('active');
52
            fold();
53
        }else{//Back
54
            document.getElementById('button_1').classList.add('active');
55
            document.getElementById('header_search').classList.remove('fold');
56
            document.getElementsByClassName('head-searchbox').style = '';
57
        }
58
59
        focusInput();
60
    }
61
62
    function clique(elem){
63
        var buttonssearch = document.getElementsByClassName('buttonsearch');
64
        var iconssearch = document.getElementsByClassName('iconsearch');
65
        var inputssearch = document.getElementsByClassName('head-searchbox');
66
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
67
            buttonssearch[i].classList.remove('active');
68
            if (elem == iconssearch[i]){
69
                buttonssearch[i].classList.add('active');
70
            }
71
        }
72
73
        for (var i = inputssearch.length - 1; i >= 0; i--) {
74
            inputssearch[i].classList.remove('focus');
75
76
            if (elem == iconssearch[i]){
77
                inputssearch[i].classList.add('focus');
78
79
                taille(inputssearch[i])
80
            }
81
        }
82
83
        focusInput();
84
        fold();
85
    }
86
87
    function fold(){
88
        document.getElementById('header_search').classList.add('fold');
89
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
90
        setTimeout(
91
            function(){
92
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
93
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
94
            }
95
        , 250);
96
    }
97
98
    function taille(el){
99
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
100
        el.style = "width:calc(500px - "+offsetWidth+"px)";
101
    }
102
103
    $('.btn').click(function(){
104
    if($(this).hasClass('active')){
105
        $(this).removeClass('active')
106
    } else {
107
        $(this).addClass('active')
108
    }
109
});
110
111
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-8 lines)
Lines 909-921 Link Here
909
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
909
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
910
            }
910
            }
911
911
912
<<<<<<< HEAD
913
            patrons_table.DataTable().draw();
914
            [% IF display_search_description %]
915
                update_search_description();
916
            [% END %]
917
        }
918
=======
919
    function taille(el){
912
    function taille(el){
920
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
913
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
921
        el.style = "width:calc(500px - "+offsetWidth+"px)";
914
        el.style = "width:calc(500px - "+offsetWidth+"px)";
Lines 932-938 Link Here
932
925
933
926
934
</script>
927
</script>
935
>>>>>>> Bug 30952: Search bar
936
928
937
        // modify parent window owner element
929
        // modify parent window owner element
938
        function add_user(borrowernumber, borrowername) {
930
        function add_user(borrowernumber, borrowername) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-2 / +2 lines)
Lines 8-14 Link Here
8
            <li class="has_modifications">
8
            <li class="has_modifications">
9
                <span class="circ-hlt">Pending modifications:</span>
9
                <span class="circ-hlt">Pending modifications:</span>
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
11
                    <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a>
11
                    <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]" id="lientype">Review pending modifications</a>
12
                [% ELSE %]
12
                [% ELSE %]
13
                    <span>Patron has pending modifications</span>
13
                    <span>Patron has pending modifications</span>
14
                [% END %]
14
                [% END %]
Lines 20-26 Link Here
20
                <span class="circ-hlt">Expiration:</span>
20
                <span class="circ-hlt">Expiration:</span>
21
                <span>Patron's card will expire soon.</span>
21
                <span>Patron's card will expire soon.</span>
22
                <span>Patron's card expires on [% expiry | $KohaDates %]</span>
22
                <span>Patron's card expires on [% expiry | $KohaDates %]</span>
23
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
23
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
24
            </li>
24
            </li>
25
        [% END %]
25
        [% END %]
26
26
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc (-16 / +4 lines)
Lines 4-31 Link Here
4
	<div id="patron_category_search" class="residentsearch">
4
	<div id="patron_category_search" class="residentsearch">
5
        <form action="[% script_name | html %]" method="post">
5
        <form action="[% script_name | html %]" method="post">
6
            <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" />
6
            <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" />
7
            <input type="submit" class="submit" name="search" value="" />
7
            <input type="submit" class="submit" id="submit" name="search" value="" />
8
        </form>
8
        </form>
9
	</div>
9
	</div>
10
10
11
    [% INCLUDE 'patron-search-box.inc' %]
11
    [% INCLUDE 'patron-search-box.inc' %]
12
12
13
	[% IF ( CAN_user_catalogue ) %]
13
	[% INCLUDE 'catalogue-search-box.inc' %]
14
    <div id="catalog_search" class="residentsearch">
15
		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
16
            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
17
                <label class="tip" for="search-form">Enter search keywords:</label>
18
                [% INCLUDE 'search_indexes.inc' %]
19
            [% ELSE %]
20
                <label class="tip" for="search-form">Enter search keywords:</label>
21
            [% END %]
22
            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
23
				<input type="submit" value=""  class="submit" />
24
		</form>
25
	</div>[% END %]
26
14
27
	<ul>
15
	<ul id="taille">
28
        <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-upload"></i></a></li>
16
        <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
29
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
30
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
18
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
31
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc (-2 / +2 lines)
Lines 3-10 Link Here
3
<div id="navmenu">
3
<div id="navmenu">
4
    <div id="navmenulist">
4
    <div id="navmenulist">
5
        [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %]
5
        [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %]
6
        <h5>Cash management</h5>
7
        <ul>
6
        <ul>
7
        <h5>Cash management</h5>
8
            <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li>
8
            <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li>
9
            [% IF !(Registers.session_register_name == '') %]
9
            [% IF !(Registers.session_register_name == '') %]
10
            <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li>
10
            <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li>
Lines 13-20 Link Here
13
        </ul>
13
        </ul>
14
        [% END %]
14
        [% END %]
15
        [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %]
15
        [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %]
16
        <h5>Administration</h5>
17
        <ul>
16
        <ul>
17
        <h5>Administration</h5>
18
            [% IF ( CAN_user_parameters_manage_cash_registers ) %]
18
            [% IF ( CAN_user_parameters_manage_cash_registers ) %]
19
                <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li>
19
                <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li>
20
            [% END %]
20
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc (-3 / +3 lines)
Lines 15-27 Link Here
15
15
16
    [% INCLUDE 'catalogue-search-box.inc' %]
16
    [% INCLUDE 'catalogue-search-box.inc' %]
17
17
18
    <ul>
18
    <ul id="taille">
19
        <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-upload"></i></a></li>
19
        <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-fw fa-cogs"></i></a></li>
20
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
20
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
21
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
21
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
22
22
23
        <span id="button_1" class="buttonsearch active">Search system preferences</span>
23
        <span id="button_1" class="buttonsearch active">Search system preferences</span>
24
        <span id="button_2" class="buttonsearch">Check-out</span>
24
        <span id="button_2" class="buttonsearch">Check out</span>
25
        <span id="button_3" class="buttonsearch">Search the catalog</span>
25
        <span id="button_3" class="buttonsearch">Search the catalog</span>
26
    </ul>
26
    </ul>
27
</div>
27
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-6 / +6 lines)
Lines 101-118 Link Here
101
                            &nbsp;
101
                            &nbsp;
102
                        [% ELSE %]
102
                        [% ELSE %]
103
                            <div class="btn-group">
103
                            <div class="btn-group">
104
                                <a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"> Actions <span class="caret"></span></a>
104
                                <a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="lientype"> Actions <span class="caret"></span></a>
105
                                <ul class="dropdown-menu pull-right">
105
                                <ul class="dropdown-menu pull-right">
106
                                    [% IF ( recall.requested or recall.overdue ) %]
106
                                    [% IF ( recall.requested or recall.overdue ) %]
107
                                        <li><a class="cancel_recall" data-id="[% recall.id | html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>
107
                                        <li><a class="cancel_recall" data-id="[% recall.id | html %]" data-action="cancel" id="lientype"><i class="fa fa-times"></i> Cancel</a></li>
108
                                        [% IF ( recall.should_be_overdue ) %]
108
                                        [% IF ( recall.should_be_overdue ) %]
109
                                            <li><a class="overdue_recall" data-id="[% recall.id | html %]" data-action="overdue"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li>
109
                                            <li><a class="overdue_recall" data-id="[% recall.id | html %]" data-action="overdue" id="lientype"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li>
110
                                        [% END %]
110
                                        [% END %]
111
                                    [% ELSIF ( recall.waiting ) %]
111
                                    [% ELSIF ( recall.waiting ) %]
112
                                        <li><a class="revert_recall" data-id="[% recall.id | html %]" data-action="revert"><i class="fa fa-undo"></i> Revert waiting</a></li>
112
                                        <li><a class="revert_recall" data-id="[% recall.id | html %]" data-action="revert" id="lientype"><i class="fa fa-undo"></i> Revert waiting</a></li>
113
                                        <li><a class="expire_recall" data-id="[% recall.id | html %]" data-action="expire"><i class="fa fa-times"></i> Expire</a></li>
113
                                        <li><a class="expire_recall" data-id="[% recall.id | html %]" data-action="expire" id="lientype"><i class="fa fa-times"></i> Expire</a></li>
114
                                    [% ELSIF ( recall.in_transit ) %]
114
                                    [% ELSIF ( recall.in_transit ) %]
115
                                        <li><a class="transit_recall" data-id="[% recall.id | html %]" data-action="transit"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
115
                                        <li><a class="transit_recall" data-id="[% recall.id | html %]" data-action="transit" id="lientype"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
116
                                    [% END %]
116
                                    [% END %]
117
                                </ul>
117
                                </ul>
118
                            </div>
118
                            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc (-4 / +4 lines)
Lines 1-18 Link Here
1
[% INCLUDE 'blocking_errors.inc' %]
1
[% INCLUDE 'blocking_errors.inc' %]
2
<div id="toolbar" class="btn-toolbar">
2
<div id="toolbar" class="btn-toolbar">
3
    <div class="btn-group">
3
    <div class="btn-group">
4
        <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>
4
        <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>
5
    </div>
5
    </div>
6
6
7
    [% IF ( colId ) %]
7
    [% IF ( colId ) %]
8
        <div class="btn-group">
8
        <div class="btn-group">
9
            <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a>
9
            <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a>
10
        </div>
10
        </div>
11
        <div class="btn-group">
11
        <div class="btn-group">
12
            <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a>
12
            <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a>
13
        </div>
13
        </div>
14
        <div class="btn-group">
14
        <div class="btn-group">
15
            <a class="btn btn-default confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a>
15
            <a class="btn btn-default  pat confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a>
16
        </div>
16
        </div>
17
    [% END %]
17
    [% END %]
18
</div>
18
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc (-25 / +96 lines)
Lines 1-38 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<!-- Begin Main page Resident Search Box -->
2
3
3
  <div id="header_search" class="fold">
4
<div id="header_search" class="fold">
4
5
    <div id="subscription_search" class="residentsearch">
5
    <div id="subscription_search" class="residentsearch">
6
      <p class="tip">Search subscriptions:</p>
6
        <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
7
7
            [% IF ( routing ) %]
8
      <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
8
            <input type="hidden" name="routing" value="[% routing | html %]" />
9
        [% IF ( routing ) %]
9
            [% END %]
10
          <input type="hidden" name="routing" value="[% routing | html %]" />
10
            <input type="hidden" name="searched" value="1" />
11
        [% END %]
11
            <input type="text" placeholder="ISSN" size="3" class="focus" style="display:inline;right: 225px" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
12
        <input type="hidden" name="searched" value="1" />
12
13
        <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
13
            [% IF (UNIMARC) %]
14
14
            <input type="text" placeholder="EAN" size="3" class="focus" style="display:inline;right: 130px" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
15
        [% IF (UNIMARC) %]
15
            [% END %]
16
          <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
16
            <input type="text" size="3" placeholder="Title" class="focus" style="display:inline" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
17
        [% END %]
17
            <input value="" class="submit" id="submit" type="submit" />
18
        <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
18
        </form>
19
        <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
20
      </form>
21
    </div>
19
    </div>
22
20
23
    [% INCLUDE 'patron-search-box.inc' %]
21
    [% INCLUDE 'patron-search-box.inc' %]
24
22
25
    [% INCLUDE 'catalogue-search-box.inc' %]
23
    [% INCLUDE 'catalogue-search-box.inc' %]
26
24
27
    <ul>
25
    <ul id="taille">
28
      <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-upload"></i></a></li>
26
        <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-book"></i></a></li>
29
      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
27
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
30
      [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
28
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
31
29
32
      <span id="button_1" class="buttonsearch active">Search subscriptions</span>
30
        <span id="button_1" class="buttonsearch active">Search subscriptions</span>
33
      <span id="button_2" class="buttonsearch">Check out</span>
31
        <span id="button_2" class="buttonsearch">Check out</span>
34
      <span id="button_3" class="buttonsearch">Search the catalog</span>
32
        <span id="button_3" class="buttonsearch">Search catalog</span>
35
    </ul>
33
    </ul>
34
</div><!-- /header_search -->
35
36
37
<script type="text/javascript">
38
    function focusInput(){
39
        document.getElementsByClassName('head-searchbox').focus();
40
    }
41
42
    function toggle(elem){style="width: calc(301px);"
43
        var buttonssearch = document.getElementsByClassName('active');
44
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
45
            buttonssearch[i].classList.remove('active');
46
        }
47
48
        if(elem){
49
            elem.classList.add('active');
50
            fold();
51
        }else{//Back
52
            document.getElementById('button_1').classList.add('active');
53
            document.getElementById('header_search').classList.remove('fold');
54
            document.getElementsByClassName('head-searchbox').style = '';
55
        }
56
57
        focusInput();
58
    }
59
60
    function clique(elem){
61
        var buttonssearch = document.getElementsByClassName('buttonsearch');
62
        var iconssearch = document.getElementsByClassName('iconsearch');
63
        var inputssearch = document.getElementsByClassName('head-searchbox');
64
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
65
            buttonssearch[i].classList.remove('active');
66
            if (elem == iconssearch[i]){
67
                buttonssearch[i].classList.add('active');
68
            }
69
        }
70
71
        for (var i = inputssearch.length - 1; i >= 0; i--) {
72
73
            if (elem == iconssearch[i]){
74
                inputssearch[i].classList.add('focus');
75
76
                taille(inputssearch[i])
77
            }
78
        }
79
80
        focusInput();
81
        fold();
82
    }
83
84
    function fold(){
85
        document.getElementById('header_search').classList.add('fold');
86
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
87
        setTimeout(
88
            function(){
89
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
90
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
91
            }
92
        , 250);
93
    }
94
95
    function taille(el){
96
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
97
        el.style = "width:calc(500px - "+offsetWidth+"px)";
98
    }
99
100
    $('.btn').click(function(){
101
    if($(this).hasClass('active')){
102
        $(this).removeClass('active')
103
    } else {
104
        $(this).addClass('active')
105
    }
106
});
36
107
37
  </div><!-- /header_search -->
108
</script>
38
<!-- End Serials Resident Search Box -->
109
<!-- End Serials Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc (-5 / +6 lines)
Lines 1-14 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<div id="toolbar" class="btn-toolbar">
2
<div id="toolbar" class="btn-toolbar">
3
<div>
3
    [% IF no_op_set %]
4
    [% IF no_op_set %]
4
        <a id="addrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
5
        <a id="addrota" class="btn btn-default pat" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
5
    [% END %]
6
    [% END %]
6
    [% IF op == 'manage_stages' %]
7
    [% IF op == 'manage_stages' %]
7
        <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a>
8
        <a id="editrota" class="btn btn-default pat" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a>
8
        <a class="btn btn-default" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a>
9
        <a class="btn btn-default pat" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a>
9
    [% END %]
10
    [% END %]
10
    [% IF op == 'manage_items' %]
11
    [% IF op == 'manage_items' %]
11
        <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a>
12
        <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a>
12
        <a class="btn btn-default" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a>
13
        <a class="btn btn-default pat" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a>
13
    [% END %]
14
    [% END %]
14
</div>
15
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc (-16 / +18 lines)
Lines 1-26 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<div class="gradient">
2
<div id="header_search" class="fold">
3
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Suggestions Resident Search Box -->
3
4
<div id="header_search">
5
	<div id="suggestions_search" class="residentsearch">
4
	<div id="suggestions_search" class="residentsearch">
6
    <p class="tip">Suggestions search:</p>
5
        <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
7
	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
6
            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
8
    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
7
            <input type="text" id="searchtitle" class="head-searchbox focus" placeholder="Title:" name="title" size="10" value="[% title | html %]" />
9
	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title | html %]" />
8
            <input type="text" id="searchauthor" class="head-searchbox focus" placeholder="Author:"  name="author" size="10" value="[% author | html %]" />
10
    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author | html %]" />
9
            <input type="text" class="head-searchbox focus" placeholder="Publisher:" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" />
11
    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" />
10
            <input type="submit" class="submit" id="submit" value="" />
12
    <input type="submit" class="submit" value="Search" />
13
        </form>
11
        </form>
14
	</div>
12
	</div>
15
13
16
    [% INCLUDE 'patron-search-box.inc' %]
14
    [% INCLUDE 'patron-search-box.inc' %]
15
    
17
    [% INCLUDE 'catalogue-search-box.inc' %]
16
    [% INCLUDE 'catalogue-search-box.inc' %]
18
17
19
			<ul>
18
    <ul id="taille">
20
            <li><a href="#suggestions_search">Search suggestions</a></li>
19
        <li><a id="icon_1" title="Search suggestions" onclick="clique(this)" class="iconsearch" href="#suggestions_search"><i class="fa fa-comment-o"></i></a></li>
21
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
20
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
22
            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
21
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
23
            </ul>
22
23
        <span id="button_1" class="buttonsearch active">Search suggestions</span>
24
        <span id="button_2" class="buttonsearch">Check out</span>
25
        <span id="button_3" class="buttonsearch">Search catalog</span>
26
    </ul>
24
</div>
27
</div>
25
</div><!-- /gradient -->
26
<!-- End Suggestions Resident Search Box -->
28
<!-- End Suggestions Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-2 / +3 lines)
Lines 1-5 Link Here
1
[% IF ( booksellerid ) %]
1
[% IF ( booksellerid ) %]
2
<div id="menu">
2
<div id="navmenu">
3
<div id="navmenulist">
3
    <ul>
4
    <ul>
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
Lines 11-15 Link Here
11
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
12
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
12
        [% END %] [% END %]
13
        [% END %] [% END %]
13
    </ul>
14
    </ul>
14
</div>
15
</div></div>
15
[% END %]
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-2 / +2 lines)
Lines 58-66 Link Here
58
                        <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
58
                        <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
59
                        <input type="hidden" name="tab" value="[% tab | html %]">
59
                        <input type="hidden" name="tab" value="[% tab | html %]">
60
                        [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
60
                        [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
61
                            <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
61
                            <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
62
                        [% ELSE %]
62
                        [% ELSE %]
63
                            <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold</button>
63
                            <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Cancel hold</button>
64
                        [% END %]
64
                        [% END %]
65
                   </form>
65
                   </form>
66
                </td>
66
                </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc (-3 / +3 lines)
Lines 4-10 Link Here
4
    <div id="z3950_search" class="residentsearch">
4
    <div id="z3950_search" class="residentsearch">
5
	    <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
5
	    <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
6
                <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" />
6
                <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" />
7
                <input type="submit" class="submit" name="search" value="Search" />
7
                <input type="submit" class="submit" id="submit" name="search" value="Search" />
8
        </form>
8
        </form>
9
	</div>
9
	</div>
10
10
Lines 12-19 Link Here
12
12
13
    [% INCLUDE 'catalogue-search-box.inc' %]
13
    [% INCLUDE 'catalogue-search-box.inc' %]
14
14
15
    <ul>
15
    <ul id="taille">
16
        <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-upload"></i></a></li>
16
        <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-square-z"></i></a></li>
17
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
17
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
18
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
18
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
19
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-1 / +1 lines)
Lines 40-48 Link Here
40
        <div class="col-sm-10 col-sm-push-2">
40
        <div class="col-sm-10 col-sm-push-2">
41
            <main>
41
            <main>
42
42
43
[% INCLUDE 'acquisitions-toolbar.inc' %]
44
43
45
<h2>Acquisitions</h2>
44
<h2>Acquisitions</h2>
45
[% INCLUDE 'acquisitions-toolbar.inc' %]
46
    [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
46
    [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
47
    [% UNLESS ( loop_budget ) %]
47
    [% UNLESS ( loop_budget ) %]
48
        [% IF ( CAN_user_acquisition_period_manage ) %]
48
        [% IF ( CAN_user_acquisition_period_manage ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-22 / +27 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE Price %]
4
[% USE Price %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'acquisitions-search.inc' %]
7
[% END %]
5
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Basket grouping for [% booksellername | html %] &rsaquo; Koha</title>
9
<title>Basket grouping for [% booksellername | html %] &rsaquo; Koha</title>
7
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
Lines 146-170 Link Here
146
                [% IF ( grouping ) %]
149
                [% IF ( grouping ) %]
147
                    [% IF (closedbg) %]
150
                    [% IF (closedbg) %]
148
                        <div id="toolbar" class="btn-toolbar">
151
                        <div id="toolbar" class="btn-toolbar">
149
                            <div class="btn-group"><a href="[% script_name | url %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div>
152
                            <div class="btn-group"><a href="[% script_name | url %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default pat" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div>
150
                            <div class="btn-group"><a href="[% script_name | url %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div>
153
                            <div class="btn-group"><a href="[% script_name | url %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div>
151
                            <div class="btn-group"><a href="[% script_name | url %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div>
154
                            <div class="btn-group"><a href="[% script_name | url %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div>
152
                        [% IF (ediaccount) %]
155
                        [% IF (ediaccount) %]
153
                            <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
156
                            <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
154
                        [% END %]
157
                        [% END %]
155
                        </div>
158
                        </div>
156
                    [% END %]
159
                    [% END %]
157
                    [% IF (name && closedbg) %]
160
                    [% IF (name && closedbg) %]
158
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
161
                        <h2>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2>
159
                    [% ELSIF (name) %]
162
                    [% ELSIF (name) %]
160
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
163
                        <h2>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2>
161
                    [% ELSE %]
164
                    [% ELSE %]
162
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
165
                        <h2>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2>
163
                    [% END %]
166
                    [% END %]
164
                    <div id="basketgroupcolumns" class="row">
167
                    <div id="basketgroupcolumns" class="row">
165
                        [% UNLESS (closedbg) %]
168
                        [% UNLESS (closedbg) %]
166
                            <div class="col-xs-6 col-xs-push-6">
169
                            <div class="col-xs-6 col-xs-push-6">
167
170
                                
171
                                <div id="searchresults">
168
                                    <div id="groups">
172
                                    <div id="groups">
169
                                        <div class="workarea_alt" >
173
                                        <div class="workarea_alt" >
170
                                            <h3>Ungrouped baskets</h3>
174
                                            <h3>Ungrouped baskets</h3>
Lines 205-211 Link Here
205
                                                </table>
209
                                                </table>
206
                                        </div>
210
                                        </div>
207
                                    </div>
211
                                    </div>
208
212
                                </div>
209
                            </div>
213
                            </div>
210
                        [% END %]
214
                        [% END %]
211
                        [% IF ( closedbg ) %]
215
                        [% IF ( closedbg ) %]
Lines 214-220 Link Here
214
                            <div class="col-xs-6 col-xs-pull-6">
218
                            <div class="col-xs-6 col-xs-pull-6">
215
                        [% END %]
219
                        [% END %]
216
                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)">
220
                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)">
217
                                <fieldset id="various" class="brief">
221
                                <fieldset id="various">
218
                                    <ol>
222
                                    <ol>
219
                                        [% UNLESS (closedbg) %]
223
                                        [% UNLESS (closedbg) %]
220
                                            <li>
224
                                            <li>
Lines 323-329 Link Here
323
                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
327
                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
324
                                        [% END %]
328
                                        [% END %]
325
                                        <input type="hidden" name="op" value="attachbasket" />
329
                                        <input type="hidden" name="op" value="attachbasket" />
326
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
330
                                        <input type="submit" class="principal" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
327
                                    </fieldset>
331
                                    </fieldset>
328
                                [% END %]
332
                                [% END %]
329
                            </form>
333
                            </form>
Lines 331-340 Link Here
331
                    </div>
335
                    </div>
332
                [% ELSE %]
336
                [% ELSE %]
333
                    <div id="toolbar" class="btn-toolbar">
337
                    <div id="toolbar" class="btn-toolbar">
334
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
338
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
335
                    </div>
339
                    </div>
336
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
340
                    <h2>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2>
337
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
341
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
342
                    <div id="searchresults">
338
                    <div id="basket_groups" class="toptabs">
343
                    <div id="basket_groups" class="toptabs">
339
                        <ul class="nav nav-tabs" role="tablist">
344
                        <ul class="nav nav-tabs" role="tablist">
340
                            <li role="presentation"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open</a></li>
345
                            <li role="presentation"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open</a></li>
Lines 368-377 Link Here
368
                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
373
                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
369
                                                    <td>[% basketgroup.basketsqty | html %]</td>
374
                                                    <td>[% basketgroup.basketsqty | html %]</td>
370
                                                    <td>
375
                                                    <td>
371
                                                        <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" />
376
                                                        <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" id="lientype" value="Close and export as PDF" />
372
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form>
377
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Edit" /></form>
373
                                                        [% UNLESS basketgroup.basketsqty %]
378
                                                        [% UNLESS basketgroup.basketsqty %]
374
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form>
379
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Delete" /></form>
375
                                                        [% END %]
380
                                                        [% END %]
376
                                                    </td>
381
                                                    </td>
377
                                                </tr>
382
                                                </tr>
Lines 408-419 Link Here
408
                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
413
                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
409
                                                    <td>[% basketgroup.basketsqty | html %]</td>
414
                                                    <td>[% basketgroup.basketsqty | html %]</td>
410
                                                    <td>
415
                                                    <td>
411
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form>
416
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="View" /></form>
412
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
417
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Reopen" /></form>
413
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
418
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as PDF" /></form>
414
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
419
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as CSV" /></form>
415
                                                [% IF (ediaccount) %]
420
                                                [% IF (ediaccount) %]
416
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
421
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Generate EDIFACT order" /></form>
417
                                                [% ELSE %]
422
                                                [% ELSE %]
418
                                                        <div>No EDIFACT configuration for [% booksellername | html %]</div>
423
                                                        <div>No EDIFACT configuration for [% booksellername | html %]</div>
419
                                                [% END %]
424
                                                [% END %]
Lines 425-431 Link Here
425
                                </table>
430
                                </table>
426
                            </div>
431
                            </div>
427
                        </div>
432
                        </div>
428
                    </div>
433
                    </div></div>
429
                [% END %]
434
                [% END %]
430
            </main>
435
            </main>
431
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
436
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-3 / +3 lines)
Lines 61-68 Link Here
61
61
62
    [% IF ( add_form ) %]
62
    [% IF ( add_form ) %]
63
        [% IF ( basketno ) %]
63
        [% IF ( basketno ) %]
64
            <h1>Edit basket [% basketname | html %]</h1>
64
            <h2>Edit basket [% basketname | html %]</h2>
65
        [% ELSE %]<h1>Add a basket to [% booksellername | html %]</h1>
65
        [% ELSE %]<h2>Add a basket to [% booksellername | html %]</h2>
66
        [% END %]
66
        [% END %]
67
    <form name="Aform" action="[% script_name | html %]" method="post" class="validated">
67
    <form name="Aform" action="[% script_name | html %]" method="post" class="validated">
68
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
68
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Lines 162-168 Link Here
162
162
163
        <fieldset class="action">
163
        <fieldset class="action">
164
            <input type="hidden" name="op" value="add_validate" />
164
            <input type="hidden" name="op" value="add_validate" />
165
            <input type="submit" value="Save" />
165
            <input type="submit" class="principal" value="Save" />
166
            [% IF ( basketno ) %]
166
            [% IF ( basketno ) %]
167
                <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
167
                <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
168
            [% ELSE %]
168
            [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-8 / +8 lines)
Lines 66-74 Link Here
66
        </select>
66
        </select>
67
        </p>
67
        </p>
68
        [% IF ( allbaskets ) %]
68
        [% IF ( allbaskets ) %]
69
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
69
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a>
70
        [% ELSE %]
70
        [% ELSE %]
71
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
71
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1" id="lientype">Show all baskets</a>
72
        [% END %]
72
        [% END %]
73
    [% END %]
73
    [% END %]
74
    [% UNLESS booksellerid %]
74
    [% UNLESS booksellerid %]
Lines 114-122 Link Here
114
                    [% IF ( supplier.basketcount > 0 ) %]
114
                    [% IF ( supplier.basketcount > 0 ) %]
115
                        <div>
115
                        <div>
116
                            [% IF ( allbaskets ) %]
116
                            [% IF ( allbaskets ) %]
117
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
117
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a>
118
                            [% ELSE %]
118
                            [% ELSE %]
119
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
119
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1" id="lientype">Show all baskets</a>
120
                            [% END %]
120
                            [% END %]
121
                        </div>
121
                        </div>
122
                    [% END %]
122
                    [% END %]
Lines 189-206 Link Here
189
                                            <div class="dropup">
189
                                            <div class="dropup">
190
                                                <div class="btn-group">
190
                                                <div class="btn-group">
191
                                                [%# There should be no space between these two buttons, it would render badly %]
191
                                                [%# There should be no space between these two buttons, it would render badly %]
192
                                                    <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
192
                                                    <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default lientype btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
193
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
193
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
194
                                                        [% IF basket.uncertainprices %]
194
                                                        [% IF basket.uncertainprices %]
195
                                                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li>
195
                                                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1" id="lientype"><i class="fa fa-usd"></i> Uncertain prices</a></li>
196
                                                        [% ELSIF basket.total_items && !basket.is_standing %]
196
                                                        [% ELSIF basket.total_items && !basket.is_standing %]
197
                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]"><i class="fa fa-times-circle"></i> Close this basket</a></li>
197
                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]" id="lientype"><i class="fa fa-times-circle"></i> Close this basket</a></li>
198
                                                        [% END %]
198
                                                        [% END %]
199
                                                    </ul>
199
                                                    </ul>
200
                                                </div>
200
                                                </div>
201
                                            </div>
201
                                            </div>
202
                                            [% ELSE %]
202
                                            [% ELSE %]
203
                                                <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
203
                                                <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
204
                                            [% END %]
204
                                            [% END %]
205
                                            <!-- Modal -->
205
                                            <!-- Modal -->
206
                                            <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
206
                                            <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-4 / +4 lines)
Lines 54-60 Link Here
54
        <div class="col-sm-10 col-sm-push-2">
54
        <div class="col-sm-10 col-sm-push-2">
55
            <main>
55
            <main>
56
56
57
                <h1>Order search</h1>
57
                <h2>Order search</h2>
58
58
59
                [% IF !order_loop && search_done %]
59
                [% IF !order_loop && search_done %]
60
                    <div class="dialog message">
60
                    <div class="dialog message">
Lines 67-73 Link Here
67
                [% END %]
67
                [% END %]
68
68
69
69
70
    [% IF ( order_loop ) %]<h1>Search results</h1>
70
    [% IF ( order_loop ) %]<h2>Search results</h2>
71
	<div id="acqui_histsearch">
71
	<div id="acqui_histsearch">
72
        <table id="histsearcht">
72
        <table id="histsearcht">
73
            <thead>
73
            <thead>
Lines 190-200 Link Here
190
                <h4>Search orders</h4>
190
                <h4>Search orders</h4>
191
        [% ELSE %]
191
        [% ELSE %]
192
            <fieldset class="rows">
192
            <fieldset class="rows">
193
                <legend>Search orders</legend>
193
                <h3>Search orders</h3>
194
        [% END %]
194
        [% END %]
195
            [% INCLUDE 'filter-orders.inc' %]
195
            [% INCLUDE 'filter-orders.inc' %]
196
            <input type="hidden" name="do_search" value="1" />
196
            <input type="hidden" name="do_search" value="1" />
197
            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
197
            <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset>
198
        </fieldset>
198
        </fieldset>
199
    </form>
199
    </form>
200
[% END %]
200
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-6 / +5 lines)
Lines 16-22 Link Here
16
16
17
<body id="acq_invoice" class="acq">
17
<body id="acq_invoice" class="acq">
18
[% INCLUDE 'header.inc' form=formulaire %]
18
[% INCLUDE 'header.inc' form=formulaire %]
19
[% INCLUDE 'acquisitions-search.inc' %]
20
19
21
[% SET readonly = NOT CAN_user_acquisition_edit_invoices %]
20
[% SET readonly = NOT CAN_user_acquisition_edit_invoices %]
22
21
Lines 152-158 Link Here
152
            <fieldset class="action">
151
            <fieldset class="action">
153
                <input type="submit" value="Save" />
152
                <input type="submit" value="Save" />
154
                [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
153
                [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
155
                <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
154
                <a class="cancel" href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
156
                [% END %]
155
                [% END %]
157
            </fieldset>
156
            </fieldset>
158
        [% END %]
157
        [% END %]
Lines 261-267 Link Here
261
                                  [% END %]
260
                                  [% END %]
262
                                  [% UNLESS readonly %]
261
                                  [% UNLESS readonly %]
263
                                      <td>
262
                                      <td>
264
                                         <a class="btn btn-default btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a>
263
                                         <a class="btn btn-default cancel btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a>
265
                                      </td>
264
                                      </td>
266
                                  [% END %]
265
                                  [% END %]
267
                              </tr>
266
                              </tr>
Lines 336-349 Link Here
336
                          </fieldset>
335
                          </fieldset>
337
                          <fieldset class="action">
336
                          <fieldset class="action">
338
                              <input type="hidden" name="op" value="mod_adj" />
337
                              <input type="hidden" name="op" value="mod_adj" />
339
                              <input type="submit" value="Update adjustments" />
338
                              <input type="submit" class="principal" value="Update adjustments" />
340
                          </fieldset>
339
                          </fieldset>
341
                    [% END %]
340
                    [% END %]
342
                  </fieldset>
341
                  </fieldset>
343
              </form>
342
              </form>
344
      <p>
343
      <p>
345
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a>
344
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Go to receipt page</a>
346
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %]
345
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Manage invoice files</a>[% END %]
347
      </p>
346
      </p>
348
      <h2>Invoice details</h2>
347
      <h2>Invoice details</h2>
349
      <fieldset>
348
      <fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +3 lines)
Lines 121-126 Link Here
121
</div>
121
</div>
122
[% UNLESS (invoiceclosedate) %]
122
[% UNLESS (invoiceclosedate) %]
123
    <div id="acqui_receive_search">
123
    <div id="acqui_receive_search">
124
    <div id="searchresults">
124
        <h3>Pending orders</h3>
125
        <h3>Pending orders</h3>
125
        <table id="pending_orders" class="table table-bordered table-striped">
126
        <table id="pending_orders" class="table table-bordered table-striped">
126
            <thead>
127
            <thead>
Lines 140-146 Link Here
140
                </tr>
141
                </tr>
141
            </thead>
142
            </thead>
142
        </table>
143
        </table>
143
    </div>
144
    </div></div>
144
[% ELSE %]
145
[% ELSE %]
145
    <p>
146
    <p>
146
        <span>Invoice is closed, so you can't receive orders anymore.</span>
147
        <span>Invoice is closed, so you can't receive orders anymore.</span>
Lines 329-335 Link Here
329
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
330
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
330
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
331
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
331
        <fieldset class="action">
332
        <fieldset class="action">
332
            <input type="submit" value="Finish receiving" />
333
            <input type="submit" class="principal" value="Finish receiving" />
333
        </fieldset>
334
        </fieldset>
334
    </form>
335
    </form>
335
[% END %]
336
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-6 / +5 lines)
Lines 46-52 Link Here
46
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
46
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
47
        [% END %]
47
        [% END %]
48
            <main>
48
            <main>
49
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
49
<h2>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h2>
50
50
51
[% IF ( error_failed_to_create_invoice ) %]
51
[% IF ( error_failed_to_create_invoice ) %]
52
    <div id="error" class="dialog alert">
52
    <div id="error" class="dialog alert">
Lines 76-82 Link Here
76
            <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" />
76
            <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" />
77
            <input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" />
77
            <input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" />
78
            <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" />
78
            <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" />
79
            <input type="submit" class="button" value="Create new invoice anyway" />
79
            <input type="submit" class="button principal" value="Create new invoice anyway" />
80
        </form>
80
        </form>
81
    </div>
81
    </div>
82
    [% END %]
82
    [% END %]
Lines 151-157 Link Here
151
    <div id="parcels_new_parcel">
151
    <div id="parcels_new_parcel">
152
        <form method="get" action="parcels.pl" class="validated">
152
        <form method="get" action="parcels.pl" class="validated">
153
    <fieldset class="rows">
153
    <fieldset class="rows">
154
    <legend>Receive a new shipment</legend>
154
    <h3>Receive a new shipment</h3>
155
       <ol> <li>
155
       <ol> <li>
156
            <label for="invoice" class="required">Vendor invoice:</label>
156
            <label for="invoice" class="required">Vendor invoice:</label>
157
            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
157
            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Lines 195-202 Link Here
195
195
196
        </li>
196
        </li>
197
		</ol>
197
		</ol>
198
    </fieldset>
198
<input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
199
            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
200
        </form>
199
        </form>
201
    </div>
200
    </div>
202
</main>
201
</main>
Lines 234-240 Link Here
234
                <option value="100">100</option>
233
                <option value="100">100</option>
235
                </select></li>
234
                </select></li>
236
        </ol>
235
        </ol>
237
    <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
236
    <fieldset class="action"><input type="submit" class="button principal" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
238
	</fieldset>
237
	</fieldset>
239
</form>
238
</form>
240
</aside>
239
</aside>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-17 / +20 lines)
Lines 54-60 Link Here
54
            [% END %]
54
            [% END %]
55
            <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues | html %]"></input>
55
            <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues | html %]"></input>
56
        </li>
56
        </li>
57
        [% IF contact.id %]<li><button class="btn btn-default delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %]
57
        [% IF contact.id %]<li><button class="btn btn-default delete-contact" id="lientype"><i class="fa fa-trash"></i> Delete contact</li>[% END %]
58
    </ol>
58
    </ol>
59
[% END %]
59
[% END %]
60
60
Lines 147-172 Link Here
147
147
148
    [% IF ( enter ) %]
148
    [% IF ( enter ) %]
149
        [% IF ( booksellerid ) %]
149
        [% IF ( booksellerid ) %]
150
        <h1>Update: [% name | html %]</h1>
150
        <h2>Update: [% name | html %]</h2>
151
    [% ELSE %]
151
    [% ELSE %]
152
        <h1>Add vendor</h1>
152
        <h2>Add vendor</h2>
153
    [% END %]
153
    [% END %]
154
    [% END %]
154
    [% END %]
155
[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
155
[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
156
[% IF ( enter ) %]
156
[% IF ( enter ) %]
157
    <form action="updatesupplier.pl" name="updatesupplier" style="display:block" class="validated" method="post">
157
    <form action="updatesupplier.pl" name="updatesupplier" style="display:block" class="validated" method="post">
158
        <div id="toolbar" class="btn-toolbar">
158
        <div id="toolbar" class="btn-toolbar">
159
            <button class="btn btn-default" type="submit"><i class="fa fa-save"></i> Save</button>
159
            <div>
160
            <button class="btn btn-default principal" type="submit"><i class="fa fa-save"></i> Save</button>
160
            [% IF ( booksellerid ) %]
161
            [% IF ( booksellerid ) %]
161
                <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">
162
                <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">
162
            [% ELSE %]
163
            [% ELSE %]
163
                <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
164
                <a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
164
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
165
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
165
        </div>
166
        </div></div>
166
167
167
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
168
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
168
        <fieldset class="rows">
169
        <fieldset class="rows">
169
            <legend>Company details</legend>
170
            <h3>Company details</h3>
170
            <ol><li><label for="company" class="required">Name:</label>
171
            <ol><li><label for="company" class="required">Name:</label>
171
                <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required focus" /><span class="required">Required</span></li>
172
                <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required focus" /><span class="required">Required</span></li>
172
            <li><label for="company_postal">Postal address: </label>
173
            <li><label for="company_postal">Postal address: </label>
Lines 183-196 Link Here
183
                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li></ol>
184
                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li></ol>
184
        </fieldset>
185
        </fieldset>
185
        <fieldset class="rows">
186
        <fieldset class="rows">
186
            <legend>Contacts</legend>
187
            <h3>Contacts</h3>
187
            <fieldset id="contact-template" class="supplier-contact">
188
            <fieldset id="contact-template" class="supplier-contact">
188
                <legend>Contact details</legend>
189
                <h3nd>Contact details</h3nd>
189
                [% INCLUDE edit_contact %]
190
                [% INCLUDE edit_contact %]
190
            </fieldset>
191
            </fieldset>
191
            [% FOREACH contact IN contacts %]
192
            [% FOREACH contact IN contacts %]
192
                <fieldset class="supplier-contact">
193
                <fieldset class="supplier-contact">
193
                    <legend>Contact details</legend>
194
                    <h3nd>Contact details</h3nd>
194
                    [% INCLUDE edit_contact %]
195
                    [% INCLUDE edit_contact %]
195
                </fieldset>
196
                </fieldset>
196
            [% END %]
197
            [% END %]
Lines 198-204 Link Here
198
        </fieldset>
199
        </fieldset>
199
200
200
        <fieldset class="rows">
201
        <fieldset class="rows">
201
            <legend>Ordering information</legend>
202
            <h3>Ordering information</h3>
202
            <ol><li><label for="activestatus">Vendor is:</label>
203
            <ol><li><label for="activestatus">Vendor is:</label>
203
                    [% IF ( active ) %]
204
                    [% IF ( active ) %]
204
                        <label class="radio" for="activestatus">
205
                        <label class="radio" for="activestatus">
Lines 314-320 Link Here
314
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li>
315
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li>
315
            </ol>
316
            </ol>
316
        </fieldset>
317
        </fieldset>
317
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
318
        <fieldset class="action"><input type="submit" class="principal" value="Save" /> [% IF ( booksellerid ) %]
318
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
319
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
319
        [% END %]Cancel</a></fieldset>
320
        [% END %]Cancel</a></fieldset>
320
321
Lines 323-328 Link Here
323
    <h1>[% name | html %]</h1>
324
    <h1>[% name | html %]</h1>
324
        <div class="row">
325
        <div class="row">
325
            <div id="supplier-company-details" class="col-sm-6">
326
            <div id="supplier-company-details" class="col-sm-6">
327
            <div id="searchresults">
326
                <h2>Vendor details</h2>
328
                <h2>Vendor details</h2>
327
                <p><span class="label">Company name: </span>[% name | html %]</p>
329
                <p><span class="label">Company name: </span>[% name | html %]</p>
328
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
330
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
Lines 363-371 Link Here
363
                [% IF ( notes ) %]<p><strong>Notes: </strong>
365
                [% IF ( notes ) %]<p><strong>Notes: </strong>
364
                    [% notes | html %]</p>[% END %]
366
                    [% notes | html %]</p>[% END %]
365
            </div> <!-- .supplier-ordering-information -->
367
            </div> <!-- .supplier-ordering-information -->
368
            </div>
366
            </div> <!-- /.col-sm-6 -->
369
            </div> <!-- /.col-sm-6 -->
367
370
368
            <div class="col-sm-6">
371
            <div class="col-sm-6">
372
            <div id="searchresults">
369
                <div class="supplier-contact-details">
373
                <div class="supplier-contact-details">
370
                    <h2>Contact</h2>
374
                    <h2>Contact</h2>
371
                    [% FOREACH contact IN contacts %]
375
                    [% FOREACH contact IN contacts %]
Lines 383-391 Link Here
383
                        [% END %]
387
                        [% END %]
384
                    </p>
388
                    </p>
385
                </div>
389
                </div>
386
387
            </div>
390
            </div>
388
391
</div>
389
        </div>
392
        </div>
390
393
391
        [% IF ( contracts ) %]
394
        [% IF ( contracts ) %]
Lines 414-421 Link Here
414
                        <td data-order="[% contract.contractenddate | html %]">[% contract.contractenddate | $KohaDates %]</td>
417
                        <td data-order="[% contract.contractenddate | html %]">[% contract.contractenddate | $KohaDates %]</td>
415
                        [% IF CAN_user_acquisition_contracts_manage %]
418
                        [% IF CAN_user_acquisition_contracts_manage %]
416
                            <td class="actions">
419
                            <td class="actions">
417
                                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-pencil"></i> Edit</a>
420
                                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
418
                                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-trash"></i> Delete</a>
421
                                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
419
                            </td>
422
                            </td>
420
                        [% END %]
423
                        [% END %]
421
                        </tr>
424
                        </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-3 / +5 lines)
Lines 87-93 Link Here
87
            [% END %]
87
            [% END %]
88
        [% END %]
88
        [% END %]
89
89
90
        <h1>Orders with uncertain prices</h1>
90
    <div id="searchresults">
91
        <h3>Orders with uncertain prices</h3>
91
        <form action="[% scriptname | html %]" method="post">
92
        <form action="[% scriptname | html %]" method="post">
92
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
93
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
93
        <label for="owner">Orders from:</label>
94
        <label for="owner">Orders from:</label>
Lines 100-106 Link Here
100
            <option value="1">me</option>
101
            <option value="1">me</option>
101
            [% END %]
102
            [% END %]
102
        </select>
103
        </select>
103
        <input type="submit" value="Filter" />
104
        <input type="submit" id="lientype" value="Filter" />
104
        </form>
105
        </form>
105
        <form action="[% scriptname | html %]" method="post" id="uncertainprices">
106
        <form action="[% scriptname | html %]" method="post" id="uncertainprices">
106
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
107
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Lines 158-165 Link Here
158
	    [% END %]
159
	    [% END %]
159
    </tbody>
160
    </tbody>
160
	</table>
161
	</table>
161
    <fieldset class="action"><input type="submit" value="Save" /></fieldset>
162
    <fieldset class="action"><input type="submit" value="Save" class="principal" /></fieldset>
162
	</form>
163
	</form>
164
    </div>
163
	[% END %]
165
	[% END %]
164
166
165
</main>
167
</main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-14 / +14 lines)
Lines 119-130 Link Here
119
                        <input type="hidden" name="op" value="add_validate" />
119
                        <input type="hidden" name="op" value="add_validate" />
120
                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
120
                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
121
                        <input type="hidden" name="checked" value="0" />
121
                        <input type="hidden" name="checked" value="0" />
122
                        <fieldset class="rows">
122
                        [% IF ( contractnumber ) %]
123
                        [% IF ( contractnumber ) %]
123
                            <h1>Modify contract [% contractname | html %] for [% booksellername | html %]</h1>
124
                            <h3>Modify contract [% contractname | html %] for [% booksellername | html %]</h3>
124
                        [% ELSE %]
125
                        [% ELSE %]
125
                            <h1>New contract for [% booksellername | html %]</h1>
126
                            <h3>New contract for [% booksellername | html %]</h3>
126
                        [% END %]
127
                        [% END %]
127
                        <fieldset class="rows">
128
                            <ol>
128
                            <ol>
129
                                [% IF ( contractnumber ) %]
129
                                [% IF ( contractnumber ) %]
130
                                        <li><span class="label">Contract id </span>[% contractnumber | html %]
130
                                        <li><span class="label">Contract id </span>[% contractnumber | html %]
Lines 150-170 Link Here
150
                                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
150
                                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
151
                                </li>
151
                                </li>
152
                            </ol>
152
                            </ol>
153
                        </fieldset>
153
                            <input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
154
                        <fieldset class="action">
155
                            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
156
                        </fieldset>
154
                        </fieldset>
157
                    </form>
155
                    </form>
158
            [% END %]
156
            [% END %]
159
            [% IF ( add_validate ) %]
157
            [% IF ( add_validate ) %]
160
                <h1>Data recorded</h1>
158
                <h2>Data recorded</h2>
161
                <form action="[% script_name | html %]" method="post">
159
                <form action="[% script_name | html %]" method="post">
162
                    <input type="submit" value="OK" />
160
                    <input type="submit" class="principal" value="OK" />
163
                </form>
161
                </form>
164
            [% END %]
162
            [% END %]
165
            [% IF ( delete_confirm ) %]
163
            [% IF ( delete_confirm ) %]
166
                    <div class="dialog alert">
164
                    <div class="dialog alert">
167
                        <h1>Confirm deletion of contract <em>[% contractname | html %]</em></h1>
165
                        <h2>Confirm deletion of contract <em>[% contractname | html %]</em></h2>
168
                        <table>
166
                        <table>
169
                            <tr><th scope="row">Contract number:</th><td>[% contractnumber | html %]</td></tr>
167
                            <tr><th scope="row">Contract number:</th><td>[% contractnumber | html %]</td></tr>
170
                            <tr><th scope="row">Contract name:</th><td>[% contractname | html %]</td></tr>
168
                            <tr><th scope="row">Contract name:</th><td>[% contractname | html %]</td></tr>
Lines 187-201 Link Here
187
                    </div>
185
                    </div>
188
            [% END %]
186
            [% END %]
189
            [% IF ( delete_confirmed ) %]
187
            [% IF ( delete_confirmed ) %]
190
                <h1>Contract deleted</h1>
188
                <h2>Contract deleted</h2>
191
                <form action="[% script_name | html %]" method="post">
189
                <form action="[% script_name | html %]" method="post">
192
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
190
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
193
                    <input type="submit" value="OK" />
191
                    <input type="submit" class="principal" value="OK" />
194
                </form>
192
                </form>
195
            [% END %]
193
            [% END %]
196
            [% IF ( else ) %]
194
            [% IF ( else ) %]
197
                <h1>Contract(s) of [% booksellername | html %]</h1>
195
                <h1>Contract(s) of [% booksellername | html %]</h1>
198
                [% IF ( loop ) %]
196
                [% IF ( loop ) %]
197
                <div id="searchresults">
199
                    <table>
198
                    <table>
200
                        <tr>
199
                        <tr>
201
                            <th scope="col">Name</th>
200
                            <th scope="col">Name</th>
Lines 213-229 Link Here
213
                        <td>[% loo.contractstartdate | html %]</td>
212
                        <td>[% loo.contractstartdate | html %]</td>
214
                        <td>[% loo.contractenddate | html %]</td>
213
                        <td>[% loo.contractenddate | html %]</td>
215
                        <td class="actions">
214
                        <td class="actions">
216
                            <a href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
215
                            <a id="lientype" href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
217
                            <a href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
216
                            <a id="lientype" href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
218
                        </td>
217
                        </td>
219
                        </tr>
218
                        </tr>
220
                    [% END %]
219
                    [% END %]
220
                    </div>
221
                </table>
221
                </table>
222
                [% ELSE %]
222
                [% ELSE %]
223
                    <div class="dialog message">
223
                    <div class="dialog message">
224
                        There are no contracts with this vendor.
224
                        There are no contracts with this vendor.
225
                        [% IF active %]
225
                        [% IF active %]
226
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Add a contract</a>.
226
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Add a contract</a>.
227
                        [% END %]
227
                        [% END %]
228
                    </div>
228
                    </div>
229
                [% END %]
229
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-4 / +4 lines)
Lines 159-166 Link Here
159
159
160
        <td class="actions">
160
        <td class="actions">
161
             [% UNLESS ( budget_line.budget_lock ) %]
161
             [% UNLESS ( budget_line.budget_lock ) %]
162
                    <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Auto-fill row"/>
162
                    <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Auto-fill row"/>
163
                    <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Clear">
163
                    <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Clear">
164
            [% ELSE %]
164
            [% ELSE %]
165
             <div style="color:red;">not owned</div>
165
             <div style="color:red;">not owned</div>
166
            [% END %]
166
            [% END %]
Lines 172-181 Link Here
172
172
173
    <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
173
    <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
174
    [% IF ( budget_period_locked ) %]
174
    [% IF ( budget_period_locked ) %]
175
        <!-- <input STYLE="background: gray;"   class="principal" type="submit" value="Save" disabled="disabled"/> -->
175
        <!-- <input STYLE="background: gray;" class="principal" type="submit" value="Save" disabled="disabled"/> -->
176
    [% ELSE %]
176
    [% ELSE %]
177
        <input type="hidden" name="op" class="principal" value="save" />
177
        <input type="hidden" name="op" class="principal" value="save" />
178
        <fieldset class="action"><input type="submit" value="Save"/></fieldset>
178
        <fieldset class="action"><input type="submit" class="principal" value="Save"/></fieldset>
179
    [% END %]
179
    [% END %]
180
180
181
181
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-6 / +8 lines)
Lines 187-192 Link Here
187
187
188
                <!-- MC-TYPE LIMITS -->
188
                <!-- MC-TYPE LIMITS -->
189
                <div id="advsearches" class="toptabs">
189
                <div id="advsearches" class="toptabs">
190
                <fieldset>
190
                    <ul class="nav nav-tabs" role="tablist">
191
                    <ul class="nav nav-tabs" role="tablist">
191
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
192
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
192
                            <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
193
                            <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
Lines 239-244 Link Here
239
                            </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] -->
240
                            </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] -->
240
                        [% END # /FOREACH advsearchloo %]
241
                        [% END # /FOREACH advsearchloo %]
241
                    </div> <!-- /.tab-content -->
242
                    </div> <!-- /.tab-content -->
243
                </fieldset>
242
                </div> <!-- /#advsearches -->
244
                </div> <!-- /#advsearches -->
243
                <!-- /MC-TYPE LIMIT -->
245
                <!-- /MC-TYPE LIMIT -->
244
246
Lines 281-290 Link Here
281
                    [% PROCESS 'subtype_limits.inc' %]
283
                    [% PROCESS 'subtype_limits.inc' %]
282
                    <!-- SUBTYPE LIMITS -->
284
                    <!-- SUBTYPE LIMITS -->
283
                    <fieldset id="subtype">
285
                    <fieldset id="subtype">
284
                        <legend>Subtype limits</legend><p>
286
                        <h3>Subtype limits</h3><p>
285
                        [% PROCESS subtype_dropdowns %]
287
                        [% PROCESS subtype_dropdowns %]
286
                        <fieldset id="current_subtype_limits">
288
                        <fieldset id="current_subtype_limits">
287
                            <legend>Current subtype limits</legend>
289
                            <h3>Current subtype limits</h3>
288
                            [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %]
290
                            [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %]
289
                                [% FOREACH limit IN limits.$subtype %]
291
                                [% FOREACH limit IN limits.$subtype %]
290
                                    <span>
292
                                    <span>
Lines 301-307 Link Here
301
303
302
                <!-- AVAILABILITY LIMITS -->
304
                <!-- AVAILABILITY LIMITS -->
303
                <fieldset id="availability">
305
                <fieldset id="availability">
304
                    <legend>Location and availability</legend>
306
                    <h3>Location and availability</h3>
305
                    <fieldset id="currently-avail">
307
                    <fieldset id="currently-avail">
306
                        [% IF limit_available %]
308
                        [% IF limit_available %]
307
                            <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available"  checked="checked" /></p>
309
                            <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available"  checked="checked" /></p>
Lines 345-352 Link Here
345
347
346
                <!-- OTHER LIMITS (facets, etc.) -->
348
                <!-- OTHER LIMITS (facets, etc.) -->
347
                [% IF limits.size %]
349
                [% IF limits.size %]
348
                    <fieldset id="">
350
                    <fieldset id="sortby">
349
                        <legend>Other limits</legend>
351
                        <h3>Other limits</h3>
350
                        <p>
352
                        <p>
351
                            [% FOREACH key IN limits.keys %]
353
                            [% FOREACH key IN limits.keys %]
352
                                [% FOREACH limit IN limits.$key %]
354
                                [% FOREACH limit IN limits.$key %]
Lines 364-370 Link Here
364
366
365
                <!-- RANK LIMITS -->
367
                <!-- RANK LIMITS -->
366
                <fieldset id="sortby">
368
                <fieldset id="sortby">
367
                    <legend>Sorting</legend>
369
                    <h3>Sorting</h3>
368
                    <p>
370
                    <p>
369
                        <label for="sort_by">Sort by: </label>
371
                        <label for="sort_by">Sort by: </label>
370
                        <select id="sort_by" name="sort_by">
372
                        <select id="sort_by" name="sort_by">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-6 lines)
Lines 182-194 Link Here
182
        <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">
183
183
184
    <div id="item-search-block">
184
    <div id="item-search-block">
185
<<<<<<< HEAD
186
      <h1>Item search</h1>
187
188
      <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
189
=======
190
      <h2>Item search</h2>
185
      <h2>Item search</h2>
191
>>>>>>> Bug 30952: Catalogue module restyling
192
      <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
186
      <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
193
          <div id="toolbar" class="btn-toolbar">
187
          <div id="toolbar" class="btn-toolbar">
194
              <div>
188
              <div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +5 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %][% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'cat-search.inc' %]
7
[% END %]
5
<title>[% IF ( biblionumber ) %]Editing [% title | html %] (Record number [% biblionumber | html %])[% ELSE %]Add MARC record[% END %] &rsaquo; Cataloging &rsaquo; Koha</title>
8
<title>[% IF ( biblionumber ) %]Editing [% title | html %] (Record number [% biblionumber | html %])[% ELSE %]Add MARC record[% END %] &rsaquo; Cataloging &rsaquo; Koha</title>
6
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'calendar.inc' %]
10
[% INCLUDE 'calendar.inc' %]
Lines 786-792 function PopupMARCFieldDoc(field) { Link Here
786
       <div>Loading, please wait...</div>
789
       <div>Loading, please wait...</div>
787
   </div>
790
   </div>
788
791
789
    [% INCLUDE 'header.inc' %]
792
    [% INCLUDE 'header.inc' form=formulaire %]
790
793
791
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
794
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
792
        <ol>
795
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-2 / +5 lines)
Lines 2-15 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE TablesSettings %]
4
[% USE TablesSettings %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %][% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'cat-search.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
10
<title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
8
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
9
</head>
12
</head>
10
13
11
<body id="cat_addbooks" class="cat">
14
<body id="cat_addbooks" class="cat">
12
    [% INCLUDE 'header.inc' %]
15
    [% INCLUDE 'header.inc' form=formulaire %]
13
16
14
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
    <ol>
18
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +1 lines)
Lines 4-10 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'cataloging-search.inc' %]
7
    [% INCLUDE 'cat-search.inc' %]
8
[% END %]
8
[% END %]
9
[% USE TablesSettings %]
9
[% USE TablesSettings %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt (-1 / +4 lines)
Lines 7-13 Link Here
7
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
7
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
8
[% Asset.css("css/humanmsg.css") | $raw %]
8
[% Asset.css("css/humanmsg.css") | $raw %]
9
[% Asset.js("js/cataloging.js") | $raw %]
9
[% Asset.js("js/cataloging.js") | $raw %]
10
[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
10
[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %][% SET footerjs = 1 %]
11
[% formulaire = BLOCK %]
12
    [% INCLUDE 'cat-search.inc' %]
13
[% END %]
11
</head>
14
</head>
12
<body id="cat_addbiblio" class="cat">
15
<body id="cat_addbiblio" class="cat">
13
16
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% SET footerjs = 1 %]
3
[% SET footerjs = 1 %]
4
[% formulaire = BLOCK %]
4
[% formulaire = BLOCK %]
5
    [% INCLUDE 'cataloging-search.inc' %]
5
    [% INCLUDE 'cat-search.inc' %]
6
[% END %]
6
[% END %]
7
[% PROCESS 'merge-record.inc' %]
7
[% PROCESS 'merge-record.inc' %]
8
8
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-3 / +1 lines)
Lines 34-41 Link Here
34
34
35
    <div class="main container-fluid">
35
    <div class="main container-fluid">
36
36
37
        <h1>Circulation</h1>
38
39
        <div class="row">
37
        <div class="row">
40
            <div class="col-sm-5 col-md-4">
38
            <div class="col-sm-5 col-md-4">
41
                <h1>Circulation</h1>
39
                <h1>Circulation</h1>
Lines 126-132 Link Here
126
                        <a class="menucirc"
124
                        <a class="menucirc"
127
                            href="/cgi-bin/koha/circ/branchoverdues.pl"
125
                            href="/cgi-bin/koha/circ/branchoverdues.pl"
128
                            title="Limited to your library.  See report help for other details."
126
                            title="Limited to your library.  See report help for other details."
129
                        ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues with fines</h1></a>
127
                        ><i class="fa fa-clock-o fa-2x"></i><i class="fond fa fa-dollar"></i><h1> Overdues with fines</h1></a>
130
                    </li>
128
                    </li>
131
                </ul>
129
                </ul>
132
            </div>
130
            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-4 lines)
Lines 82-97 Link Here
82
                            <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li>
82
                            <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li>
83
                        [% END %]
83
                        [% END %]
84
84
85
                        <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i></a><h7>Lists</h7></li>
86
87
                        <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li>
85
                        <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li>
88
                        
86
                        
89
                        [% IF ( UseCourseReserves ) %]
87
                        [% IF ( UseCourseReserves ) %]
90
                            <li><a class="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li>
88
                            <li><a class="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li>
91
                        [% END %]
89
                        [% END %]
92
90
93
                            <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i></a><h7>Authorities</h7></li>
94
95
                    </ul></div>
91
                    </ul></div>
96
                    <div class="menuspe"><ul class="biglinks-list">
92
                    <div class="menuspe"><ul class="biglinks-list">
97
                            
93
                            
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Asset %]
3
[% USE Asset %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'patron-search.inc' %]
6
    [% INCLUDE 'patron-search-header.inc' %]
7
[% END %]
7
[% END %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
9
<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-1 / +1 lines)
Lines 10-16 Link Here
10
[% USE Registers %]
10
[% USE Registers %]
11
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
12
[% formulaire = BLOCK %]
12
[% formulaire = BLOCK %]
13
    [% INCLUDE 'patron-search.inc' %]
13
    [% INCLUDE 'patron-search-header.inc' %]
14
[% END %]
14
[% END %]
15
[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
15
[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
16
16
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-1 / +1 lines)
Lines 4-10 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search.inc' %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
8
[% END %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] &rsaquo; Koha</title>
10
<title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<title>[% UNLESS blocking_error  %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
11
<title>[% UNLESS blocking_error  %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (-31 / +24 lines)
Lines 4-47 Link Here
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search.inc' %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
8
[% END %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Pending discharge requests &rsaquo; Patrons &rsaquo; Koha</title>
10
<title>Pending discharge requests &rsaquo; Patrons &rsaquo; Koha</title>
11
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
12
</head>
12
</head>
13
<body id="pat_discharges" class="pat">
13
<body id="pat_discharges" class="pat">
14
<<<<<<< HEAD
15
[% INCLUDE 'header.inc' %]
16
<<<<<<< HEAD
17
[% INCLUDE 'patron-search-header.inc' %]
18
=======
19
>>>>>>> Bug 30952: Patrons Module
20
=======
21
[% INCLUDE 'header.inc' form=formulaire %]
22
>>>>>>> Bug 30952: Search bar
23
14
24
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
  [% INCLUDE 'header.inc' form=formulaire %]
25
    <ol>
16
26
        <li>
17
  <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
27
            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
18
      <ol>
28
        </li>
19
          <li>
29
        <li>
20
              <a href="/cgi-bin/koha/mainpage.pl">Home</a>
30
            <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
21
          </li>
31
        </li>
22
          <li>
32
        <li>
23
              <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
33
            <a href="#" aria-current="page">
24
          </li>
34
                Pending discharge requests
25
          <li>
35
            </a>
26
              <a href="#" aria-current="page">
36
        </li>
27
                  Pending discharge requests
37
    </ol>
28
              </a>
38
        <ol>
29
          </li>
39
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
30
      </ol>
40
        </ol>
31
          <ol>
41
        <ol>
32
              [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
42
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
33
          </ol>
43
        </ol>
34
          <ol>
44
</nav>
35
              <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
36
          </ol>
37
  </nav>
45
38
46
    <div class="main container-fluid">
39
    <div class="main container-fluid">
47
        <div class="row">
40
        <div class="row">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE AuthorisedValues %]
5
[% USE AuthorisedValues %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
11
<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +1 lines)
Lines 8-14 Link Here
8
[% USE ItemTypes %]
8
[% USE ItemTypes %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% formulaire = BLOCK %]
10
[% formulaire = BLOCK %]
11
    [% INCLUDE 'patron-search.inc' %]
11
    [% INCLUDE 'patron-search-header.inc' %]
12
[% END %]
12
[% END %]
13
[% INCLUDE 'doc-head-open.inc' %]
13
[% INCLUDE 'doc-head-open.inc' %]
14
<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
14
<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
[% USE Branches %]
6
[% USE Branches %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search.inc' %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
10
[% END %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
12
<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% USE AuthorisedValues %]
10
[% USE AuthorisedValues %]
11
[% USE TablesSettings %]
11
[% USE TablesSettings %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +1 lines)
Lines 4-10 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search.inc' %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
8
[% END %]
9
9
10
[% PROCESS 'accounts.inc' %]
10
[% PROCESS 'accounts.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
10
11
[% PROCESS 'accounts.inc' %]
11
[% PROCESS 'accounts.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-2 / +6 lines)
Lines 3-9 Link Here
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'patron-search.inc' %]
6
    [% INCLUDE 'patron-search-header.inc' %]
7
[% END %]
7
[% END %]
8
[% PROCESS 'permissions.inc' %]
8
[% PROCESS 'permissions.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
Lines 52-60 Link Here
52
    <h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2>
52
    <h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2>
53
53
54
    <div id="permissionstree">
54
    <div id="permissionstree">
55
        <div id="permissions_toolbar" class="btn-toolbar">
55
        <div id="permissions_toolbar" class="btn-toolbar" style="width: 851px !important;">
56
        <div id="up">
56
            <button type="submit" class="principal"><i class="fa fa-save"></i> Save</button>
57
            <button type="submit" class="principal"><i class="fa fa-save"></i> Save</button>
57
            <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a>
58
            <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a>
59
        </div>
60
        <div id="down">
58
            <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
61
            <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
59
            <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
62
            <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
60
            <a id="CheckAllFlags" class="btn btn-link" href="#">
63
            <a id="CheckAllFlags" class="btn btn-link" href="#">
Lines 68-73 Link Here
68
                <a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a>
71
                <a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a>
69
            </div>
72
            </div>
70
        </div>
73
        </div>
74
        </div>
71
        <div class="permissions">
75
        <div class="permissions">
72
            [% FOREACH loo IN loop %]
76
            [% FOREACH loo IN loop %]
73
                [% IF ( loo.expand ) %]
77
                [% IF ( loo.expand ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-1 / +1 lines)
Lines 4-10 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search.inc' %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
8
[% END %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
<title>
10
<title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
[% USE Categories %]
6
[% USE Categories %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc.inc' %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
10
[% END %]
11
[% PROCESS 'patronfields.inc' %]
11
[% PROCESS 'patronfields.inc' %]
12
[% SET libraries = Branches.all %]
12
[% SET libraries = Branches.all %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
Lines 10-16 Link Here
10
[% PROCESS 'member-alt-contact-style.inc' %]
10
[% PROCESS 'member-alt-contact-style.inc' %]
11
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
12
[% formulaire = BLOCK %]
12
[% formulaire = BLOCK %]
13
    [% INCLUDE 'patron-search.inc' %]
13
    [% INCLUDE 'patron-search-header.inc' %]
14
[% END %]
14
[% END %]
15
[% INCLUDE 'doc-head-open.inc' %]
15
[% INCLUDE 'doc-head-open.inc' %]
16
    <title>
16
    <title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
11
<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 12-18 Link Here
12
[% PROCESS 'member-display-alt-address-style.inc' %]
12
[% PROCESS 'member-display-alt-address-style.inc' %]
13
[% SET footerjs = 1 %]
13
[% SET footerjs = 1 %]
14
[% formulaire = BLOCK %]
14
[% formulaire = BLOCK %]
15
    [% INCLUDE 'patron-search.inc' %]
15
    [% INCLUDE 'patron-search-header.inc' %]
16
[% END %]
16
[% END %]
17
[% INCLUDE 'doc-head-open.inc' %]
17
[% INCLUDE 'doc-head-open.inc' %]
18
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
18
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
[% USE KohaDates %]
6
[% USE KohaDates %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search.inc' %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
10
[% END %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
12
<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-1 / +1 lines)
Lines 8-14 Link Here
8
[% USE KohaDates %]
8
[% USE KohaDates %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% formulaire = BLOCK %]
10
[% formulaire = BLOCK %]
11
    [% INCLUDE 'patron-search.inc' %]
11
    [% INCLUDE 'patron-search-header.inc' %]
12
[% END %]
12
[% END %]
13
[% PROCESS 'accounts.inc' %]
13
[% PROCESS 'accounts.inc' %]
14
[% INCLUDE 'doc-head-open.inc' %]
14
[% INCLUDE 'doc-head-open.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
[% USE Price %]
6
[% USE Price %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search.inc' %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
10
[% END %]
11
[% PROCESS 'accounts.inc' %]
11
[% PROCESS 'accounts.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
[% USE Branches %]
6
[% USE Branches %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search.inc' %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
10
[% END %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
12
<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-1 / +1 lines)
Lines 7-13 Link Here
7
[% USE TablesSettings %]
7
[% USE TablesSettings %]
8
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
9
[% formulaire = BLOCK %]
9
[% formulaire = BLOCK %]
10
    [% INCLUDE 'patron-search.inc' %]
10
    [% INCLUDE 'patron-search-header.inc' %]
11
[% END %]
11
[% END %]
12
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
13
<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
13
<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-2 / +4 lines)
Lines 3-16 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Asset %]
4
[% USE Asset %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
10
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
8
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
9
</head>
12
</head>
10
13
11
<body id="recalls_history" class="pat">
14
<body id="recalls_history" class="pat">
12
    [% INCLUDE 'header.inc' %]
15
    [% INCLUDE 'header.inc' form=formulaire %]
13
    [% INCLUDE 'patron-search.inc' %]
14
16
15
    <div id="breadcrumbs">
17
    <div id="breadcrumbs">
16
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
18
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
11
<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (-1 / +1 lines)
Lines 5-11 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search.inc' %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
9
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<title>
11
<title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt (-2 / +4 lines)
Lines 2-14 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Asset %]
3
[% USE Asset %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'patron-search-header.inc' %]
7
[% END %]
5
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Two-factor authentication &rsaquo; Patrons &rsaquo; Koha</title>
9
<title>Two-factor authentication &rsaquo; Patrons &rsaquo; Koha</title>
7
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
8
</head>
11
</head>
9
<body id="pat_two_factor_auth" class="pat">
12
<body id="pat_two_factor_auth" class="pat">
10
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' form=formulaire %]
11
[% INCLUDE 'patron-search.inc' %]
12
14
13
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14
    <ol>
16
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt (-1 / +1 lines)
Lines 9-15 Link Here
9
        <div class="row">
9
        <div class="row">
10
            <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
10
            <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
11
                <div id="logo"><a href="#">Koha</a></div>
11
                <div id="logo"><a href="#">Koha</a></div>
12
                <h1>Web installer &rsaquo; Create a library</h1>
12
                <h2>Web installer &rsaquo; Create a library</h2>
13
13
14
                [% INCLUDE 'onboarding_messages.inc' %]
14
                [% INCLUDE 'onboarding_messages.inc' %]
15
15
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-1 / +1 lines)
Lines 19-25 Link Here
19
            <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
19
            <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
20
                <div id="logo"><a href="#">Koha</a></div>
20
                <div id="logo"><a href="#">Koha</a></div>
21
21
22
                <h1>Web installer &rsaquo; Create a patron category</h1>
22
                <h2>Web installer &rsaquo; Create a patron category</h2>
23
23
24
                [% INCLUDE 'onboarding_messages.inc' %]
24
                [% INCLUDE 'onboarding_messages.inc' %]
25
25
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt (-1 / +1 lines)
Lines 11-17 Link Here
11
        <div class="row">
11
        <div class="row">
12
            <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
12
            <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
13
                <div id="logo"><a href="#">Koha</a></div>
13
                <div id="logo"><a href="#">Koha</a></div>
14
                <h1>Web installer &rsaquo; Create Koha administrator patron</h1>
14
                <h2>Web installer &rsaquo; Create Koha administrator patron</h2>
15
15
16
                [% INCLUDE 'onboarding_messages.inc' %]
16
                [% INCLUDE 'onboarding_messages.inc' %]
17
17
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt (-1 / +1 lines)
Lines 8-14 Link Here
8
        <div class="row">
8
        <div class="row">
9
            <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
9
            <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
10
                <div id="logo"><a href="#">Koha</a></div>
10
                <div id="logo"><a href="#">Koha</a></div>
11
                <h1>Web installer &rsaquo; Create a new item type</h1>
11
                <h2>Web installer &rsaquo; Create a new item type</h2>
12
12
13
                [% INCLUDE 'onboarding_messages.inc' %]
13
                [% INCLUDE 'onboarding_messages.inc' %]
14
14
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-1 / +1 lines)
Lines 17-23 Link Here
17
17
18
                [% IF all_done %]
18
                [% IF all_done %]
19
19
20
                    <h1>Web installer &rsaquo; Complete</h1>
20
                    <h2>Web installer &rsaquo; Complete</h2>
21
                    [% INCLUDE 'onboarding_messages.inc' %]
21
                    [% INCLUDE 'onboarding_messages.inc' %]
22
22
23
                    <div id="steps">
23
                    <div id="steps">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-3 / +3 lines)
Lines 315-325 Link Here
315
    [% IF category == 'news' %]
315
    [% IF category == 'news' %]
316
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a>
316
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a>
317
    [% ELSE %]
317
    [% ELSE %]
318
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
318
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" id="lientype">News</a>
319
    [% END %]
319
    [% END %]
320
    [% IF ( CAN_user_parameters_manage_sysprefs ) %]
320
    [% IF ( CAN_user_parameters_manage_sysprefs ) %]
321
        <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS'>OPACUserJS</a>
321
        <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' id="lientype">OPACUserJS</a>
322
        <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS'>OPACUserCSS</a>
322
        <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' id="lientype">OPACUserCSS</a>
323
    [% END %]
323
    [% END %]
324
324
325
    [% IF additional_contents.count %]
325
    [% IF additional_contents.count %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-16 / +14 lines)
Lines 27-38 Link Here
27
            </a>
27
            </a>
28
        </li>
28
        </li>
29
    </ol>
29
    </ol>
30
        <ol>
31
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
32
        </ol>
33
        <ol>
34
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
35
        </ol>
36
</nav>
30
</nav>
37
31
38
<div class="main container-fluid">
32
<div class="main container-fluid">
Lines 40-46 Link Here
40
        <div class="col-sm-10 col-sm-push-2">
34
        <div class="col-sm-10 col-sm-push-2">
41
            <main>
35
            <main>
42
36
43
                <h1>[% Branches.GetName( branch ) | html %] calendar</h1>
37
                <h2>[% Branches.GetName( branch ) | html %] calendar</h2>
44
38
45
                <div class="row">
39
                <div class="row">
46
                    <div class="col-sm-6">
40
                    <div class="col-sm-6">
Lines 52-58 Link Here
52
                        <div class="panel" id="showHoliday">
46
                        <div class="panel" id="showHoliday">
53
                            <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post">
47
                            <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post">
54
                                <input type="hidden" id="showHolidayType" name="showHolidayType" value="" />
48
                                <input type="hidden" id="showHolidayType" name="showHolidayType" value="" />
55
                                <fieldset class="brief">
49
                                <fieldset>
56
                                    <h3>Edit this holiday</h3>
50
                                    <h3>Edit this holiday</h3>
57
                                    <span id="holtype"></span>
51
                                    <span id="holtype"></span>
58
                                    <ol>
52
                                    <ol>
Lines 87-93 Link Here
87
                                        <!-- showTitle is necessary for exception radio button to work properly -->
81
                                        <!-- showTitle is necessary for exception radio button to work properly -->
88
                                        <li>
82
                                        <li>
89
                                            <label for="showDescription">Description:</label>
83
                                            <label for="showDescription">Description:</label>
90
                                            <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>holiday Holiday repeating weekly Holiday repeatintion for this repeated holiday.</label>
84
                                            <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>
85
                                        </li>
86
                                        <li class="radio">
87
                                            <div class="exceptionPossibility" style="position:static">
88
                                                <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label>
91
                                                <a href="#" class="helptext">[?]</a>
89
                                                <a href="#" class="helptext">[?]</a>
92
                                                <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div>
90
                                                <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div>
93
                                            </div>
91
                                            </div>
Lines 132-149 Link Here
132
                                            <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>
130
                                            <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>
133
                                        </li>
131
                                        </li>
134
                                    </ol>
132
                                    </ol>
135
                                    <fieldset class="action">ay Unique holiday Holiday repeating weekly Holiday
133
                                    <fieldset class="action">
136
                                        <input class="principal" type="submit" name="submit" value="Save" />
134
                                        <input type="submit" class="principal" name="submit" value="Save" />
137
                                        <a href="#" class="cancel hidePanel showHoliday">Cancel</a>
135
                                        <a href="#" class="cancel hidePanel showHoliday">Cancel</a>
138
                                    </fieldset>
136
                                    </fieldset>
139
                                </fieldset> <!-- /.brief -->
137
                                </fieldset>
140
                            </form>
138
                            </form>
141
                        </div> <!-- /#showHoliday -->
139
                        </div> <!-- /#showHoliday -->
142
140
143
                        <!-- Panel to deal with new holidays -->
141
                        <!-- Panel to deal with new holidays -->
144
                        <div class="panel" id="newHoliday">
142
                        <div class="panel" id="newHoliday">
145
                            <form action="/cgi-bin/koha/tools/newHolidays.pl" method="post">
143
                            <form action="/cgi-bin/koha/tools/newHolidays.pl" method="post">
146
                                <fieldset class="brief">
144
                                <fieldset>
147
                                    <h3>Add new holiday</h3>
145
                                    <h3>Add new holiday</h3>
148
                                    <ol>
146
                                    <ol>
149
                                        <li>
147
                                        <li>
Lines 220-229 Link Here
220
                                        </li>
218
                                        </li>
221
                                    </ol>
219
                                    </ol>
222
                                    <fieldset class="action">
220
                                    <fieldset class="action">
223
                                        <input type="submit" name="submit" value="Save" />
221
                                        <input type="submit" class="principal" name="submit" value="Save" />
224
                                        <a href="#" class="cancel hidePanel newHoliday">Cancel</a>
222
                                        <a href="#" class="cancel hidePanel newHoliday">Cancel</a>
225
                                    </fieldset>
223
                                    </fieldset>
226
                                </fieldset> <!-- /.brief -->
224
                                </fieldset>œ
227
                            </form>
225
                            </form>
228
                        </div> <!-- /#newHoliday -->
226
                        </div> <!-- /#newHoliday -->
229
227
Lines 241-247 Link Here
241
                                        <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
239
                                        <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
242
                                    [% END %]
240
                                    [% END %]
243
                                </select>
241
                                </select>
244
                                <input class="principal" type="submit" value="Copy" />
242
                                <input type="submit" class="principal" value="Copy" />
245
                            </form>
243
                            </form>
246
                        </div>
244
                        </div>
247
                    </div> <!-- /.col-sm-6 -->
245
                    </div> <!-- /.col-sm-6 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-6 / +1 lines)
Lines 4-10 Link Here
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'lis-search.inc' %]
7
    [% INCLUDE 'circ-search.inc' %]
8
[% END %]
8
[% END %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
<title>
10
<title>
Lines 398-407 Link Here
398
[% END %]
398
[% END %]
399
399
400
[% IF op == 'list' %]
400
[% IF op == 'list' %]
401
<<<<<<< HEAD
402
    <h2>Lists</h2>
403
=======
404
>>>>>>> Bug 30952: Virtualshelves Module
405
    <div id="tabs" class="toptabs">
401
    <div id="tabs" class="toptabs">
406
    <fieldset class="briefgr">
402
    <fieldset class="briefgr">
407
        <ul>
403
        <ul>
408
- 

Return to bug 30952