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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-32 / +6 lines)
Lines 1436-1443 div { Link Here
1436
            clear: left;
1436
            clear: left;
1437
            float: left;
1437
            float: left;
1438
            list-style-type: none;
1438
            list-style-type: none;
1439
            padding-bottom: .2em;
1439
            padding: .275em;
1440
            padding-top: .1em;
1441
            width: 100%;
1440
            width: 100%;
1442
        }
1441
        }
1443
1442
Lines 1452-1457 div { Link Here
1452
            }
1451
            }
1453
        }
1452
        }
1454
1453
1454
        p {
1455
            margin-left: 10em;
1456
        }
1457
1455
        span {
1458
        span {
1456
            &.label {
1459
            &.label {
1457
                float: left;
1460
                float: left;
Lines 3934-3952 span { Link Here
3934
        margin: .3em 0;
3937
        margin: .3em 0;
3935
    }
3938
    }
3936
3939
3937
    h1 {
3938
        margin: 1em 0;
3939
    }
3940
3941
    h2 {
3942
        margin-bottom: 20px;
3943
    }
3944
3945
    h3 {
3946
        margin-top: 20px;
3947
3948
    }
3949
3950
    .bg-info {
3940
    .bg-info {
3951
        overflow: auto;
3941
        overflow: auto;
3952
        position: relative;
3942
        position: relative;
Lines 4000-4027 span { Link Here
4000
    }
3990
    }
4001
}
3991
}
4002
3992
4003
#ill-view-panel {
3993
.ill-view-panel {
4004
    margin-top: 15px;
3994
    margin-top: 15px;
4005
3995
4006
    h3 {
4007
        margin-bottom: 10px;
4008
    }
4009
4010
    h4 {
4011
        margin-bottom: 20px;
4012
    }
4013
4014
    .notesopac {
3996
    .notesopac {
4015
        display: inline-block;
3997
        display: inline-block;
4016
    }
3998
    }
4017
4018
    .rows {
4019
        div {
4020
            height: 1em;
4021
            margin-bottom: 1em;
4022
        }
4023
    }
4024
4025
}
3999
}
4026
4000
4027
#requestattributes {
4001
#requestattributes {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-69 / +71 lines)
Lines 10-16 Link Here
10
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
10
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
11
[% Asset.css("css/datatables.css") | $raw %]
11
[% Asset.css("css/datatables.css") | $raw %]
12
[% INCLUDE 'datatables.inc' %]
12
[% INCLUDE 'datatables.inc' %]
13
<script type="text/javascript">
13
<script>
14
    //<![CDATA[
14
    //<![CDATA[
15
    $(document).ready(function() {
15
    $(document).ready(function() {
16
16
Lines 503-509 Link Here
503
                [% ELSIF query_type == 'illview' %]
503
                [% ELSIF query_type == 'illview' %]
504
                    [% req_status = request.status %]
504
                    [% req_status = request.status %]
505
                    <h1>Manage ILL request</h1>
505
                    <h1>Manage ILL request</h1>
506
                    <div id="toolbar" class="btn-toolbar">
506
                    <div id="request-toolbar" class="btn-toolbar">
507
                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
507
                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
508
                        <span class="fa fa-pencil"></span>
508
                        <span class="fa fa-pencil"></span>
509
                        Edit request
509
                        Edit request
Lines 521-599 Link Here
521
                            Display supplier metadata
521
                            Display supplier metadata
522
                        </a>
522
                        </a>
523
                    </div>
523
                    </div>
524
                    <div id="ill-view-panel" class="panel panel-default">
524
                    <div class="ill-view-panel panel panel-default">
525
                        <div class="panel-heading">
525
                        <div class="panel-heading">
526
                            <h3>Request details</h3>
526
                            <h3>Request details</h3>
527
                        </div>
527
                        </div>
528
                        <div class="panel-body">
528
                        <div class="panel-body">
529
                            <h4>Details from library</h4>
529
                            <h4>Details from library</h4>
530
                            <div class="rows">
530
                            <div class="rows">
531
                                <div class="orderid">
531
                                <ol>
532
                                    <span class="label orderid">Order ID:</span>
532
                                    <li class="orderid">
533
                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
533
                                        <span class="label orderid">Order ID:</span>
534
                                </div>
534
                                        [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
535
                                <div class="borrowernumber">
535
                                    </li>
536
                                    <span class="label borrowernumber">Patron:</span>
536
                                    <li class="borrowernumber">
537
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
537
                                        <span class="label borrowernumber">Patron:</span>
538
                                    <a href="[% borrowerlink | url %]" title="View borrower details">
538
                                        [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
539
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
539
                                        <a href="[% borrowerlink | url %]" title="View borrower details">
540
                                    </a>
540
                                        [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
541
                                </div>
541
                                        </a>
542
                                    </li>
542
543
543
                                <div class="biblio_id">
544
                                    <li class="biblio_id">
544
                                    <span class="label biblio_id">Bibliographic record ID:</span>
545
                                        <span class="label biblio_id">Bibliographic record ID:</span>
545
                                    [% IF request.biblio_id %]
546
                                        [% IF request.biblio_id %]
546
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
547
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
547
                                    [% ELSE %]
548
                                        [% ELSE %]
548
                                        <span>N/A</span>
549
                                            <span>N/A</span>
549
                                    [% END %]
550
                                        [% END %]
550
                                </div>
551
                                    </li>
551
                                <div class="branchcode">
552
                                    <li class="branchcode">
552
                                    <span class="label branchcode">Library:</span>
553
                                        <span class="label branchcode">Library:</span>
553
                                    [% Branches.GetName(request.branchcode) | html %]
554
                                        [% Branches.GetName(request.branchcode) | html %]
554
                                </div>
555
                                    </li>
555
                                <div class="status">
556
                                    <li class="status">
556
                                    <span class="label status">Status:</span>
557
                                        <span class="label status">Status:</span>
557
                                    [% request.capabilities.$req_status.name | html %]
558
                                        [% request.capabilities.$req_status.name | html %]
558
                                </div>
559
                                    </li>
559
                                <div class="updated">
560
                                    <li class="updated">
560
                                    <span class="label updated">Last updated:</span>
561
                                        <span class="label updated">Last updated:</span>
561
                                    [% request.updated | $KohaDates with_hours => 1 | html %]
562
                                        [% request.updated | $KohaDates with_hours => 1 | html %]
562
                                </div>
563
                                    </li>
563
                                <div class="medium">
564
                                    <li class="medium">
564
                                    <span class="label medium">Request type:</span>
565
                                        <span class="label medium">Request type:</span>
565
                                    [% type = request.get_type %]
566
                                        [% type = request.get_type %]
566
                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
567
                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
567
                                </div>
568
                                    </li>
568
                                <div class="cost">
569
                                    <li class="cost">
569
                                    <span class="label cost">Cost:</span>
570
                                        <span class="label cost">Cost:</span>
570
                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
571
                                        [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
571
                                </div>
572
                                    </li>
572
                                <div class="price_paid">
573
                                    <li class="price_paid">
573
                                    <span class="label price_paid">Price paid:</span>
574
                                        <span class="label price_paid">Price paid:</span>
574
                                    [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
575
                                        [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
575
                                </div>
576
                                    </li>
576
                                <div class="req_id">
577
                                    <li class="req_id">
577
                                    <span class="label req_id">Request number:</span>
578
                                        <span class="label req_id">Request number:</span>
578
                                    [% request.id_prefix _ request.illrequest_id | html %]
579
                                        [% request.id_prefix _ request.illrequest_id | html %]
579
                                </div>
580
                                    </li>
580
                                <div class="notesstaff">
581
                                    <li class="notesstaff">
581
                                    <span class="label notes_staff">Staff notes:</span>
582
                                        <span class="label notes_staff">Staff notes:</span>
582
                                    <pre>[% request.notesstaff | html %]</pre>
583
                                        <p>[% request.notesstaff | html %]</p>
583
                                </div>
584
                                    </li>
584
                                <div class="notesopac">
585
                                    <li class="notesopac">
585
                                    <span class="label notes_opac">Notes:</span>
586
                                        <span class="label notes_opac">Notes:</span>
586
                                    <pre>[% request.notesopac | html %]</pre>
587
                                        <p>[% request.notesopac | html %]</p>
587
                                </div>
588
                                    </li>
589
                                </ol>
588
                            </div>
590
                            </div>
589
                            <div class="rows">
591
                            <div class="rows">
590
                                <h4>Details from supplier ([% request.backend | html %])</h4>
592
                                <h4>Details from supplier ([% request.backend | html %])</h4>
591
                                [% FOREACH meta IN request.metadata %]
593
                                <ol>
592
                                    <div class="requestmeta-[% meta.key.replace('\s','_') | html %]">
594
                                    [% FOREACH meta IN request.metadata %]
593
                                        <span class="label">[% meta.key | html %]:</span>
595
                                        <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
594
                                        [% meta.value | html %]
596
                                            <span class="label">[% meta.key | html %]:</span>
595
                                    </div>
597
                                            [% meta.value | html %]
596
                                [% END %]
598
                                        </li>
599
                                    [% END %]
600
                                </ol>
597
                            </div>
601
                            </div>
598
                        </div>
602
                        </div>
599
                    </div>
603
                    </div>
Lines 622-628 Link Here
622
                        </div>
626
                        </div>
623
                    </div>
627
                    </div>
624
628
625
                    <div id="ill-view-panel" class="panel panel-default">
629
                    <div class="ill-view-panel panel panel-default">
626
                        <div class="panel-heading">
630
                        <div class="panel-heading">
627
                            <h3>[% request.illcomments.count | html %] comments</h3>
631
                            <h3>[% request.illcomments.count | html %] comments</h3>
628
                        </div>
632
                        </div>
Lines 649-655 Link Here
649
                                                <ol>
653
                                                <ol>
650
                                                    <li>
654
                                                    <li>
651
                                                        <label class="required" for="comment">Comment: </label>
655
                                                        <label class="required" for="comment">Comment: </label>
652
                                                        <textarea type="text" class="required" required="required" value="" cols="80" rows="10" id="comment" name="comment"></textarea>
656
                                                        <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
653
                                                        <span class="required">Required</span>
657
                                                        <span class="required">Required</span>
654
                                                    </li>
658
                                                    </li>
655
                                                </ol>
659
                                                </ol>
Lines 697-703 Link Here
697
            </div>
701
            </div>
698
        </div>
702
        </div>
699
    </div>
703
    </div>
700
</div>
701
704
702
[% TRY %]
705
[% TRY %]
703
[% PROCESS backend_jsinclude %]
706
[% PROCESS backend_jsinclude %]
704
- 

Return to bug 21516