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

(-)a/admin/branches.pl (+5 lines)
Lines 53-58 if ( $op eq 'add_form' ) { Link Here
53
        library      => Koha::Libraries->find($branchcode),
53
        library      => Koha::Libraries->find($branchcode),
54
        smtp_servers => Koha::SMTP::Servers->search,
54
        smtp_servers => Koha::SMTP::Servers->search,
55
    );
55
    );
56
} elsif ( $branchcode && $op eq 'view' ) {
57
    my $library = Koha::Libraries->find($branchcode);
58
    $template->param(
59
        library      => $library,
60
    );
56
} elsif ( $op eq 'add_validate' ) {
61
} elsif ( $op eq 'add_validate' ) {
57
    my @fields = qw(
62
    my @fields = qw(
58
      branchname
63
      branchname
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-3 / +153 lines)
Lines 58-63 Libraries › Administration › Koha Link Here
58
                </a>
58
                </a>
59
            </li>
59
            </li>
60
60
61
        [% ELSIF op == 'view' %]
62
            <li>
63
                <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a>
64
            </li>
65
            <li>
66
                <a href="#" aria-current="page">
67
                    [% library.branchname | html %]
68
                </a>
69
            </li>
70
61
        [% ELSE %]
71
        [% ELSE %]
62
            <li>
72
            <li>
63
                <a href="#" aria-current="page">
73
                <a href="#" aria-current="page">
Lines 117-125 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
117
    </div>
127
    </div>
118
[% END %]
128
[% END %]
119
129
120
[% IF op == 'list' %]
130
[% IF op == 'list' || op == 'view' %]
121
    <div id="toolbar" class="btn-toolbar">
131
    <div id="toolbar" class="btn-toolbar">
122
        <a class="btn btn-default" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>
132
        <a class="btn btn-default" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>
133
        [% IF op == 'view' %]
134
            <a class="btn btn-default" id="editbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode | uri %]"><i class="fa fa-pencil"></i> Edit library</a>
135
        [% END %]
123
    </div>
136
    </div>
124
[% END %]
137
[% END %]
125
138
Lines 324-329 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
324
    [% END %]
337
    [% END %]
325
[% END %]
338
[% END %]
326
339
340
[% IF op == 'view' %]
341
    <h1>[% library.branchname | html %]</h1>
342
    <div class="row">
343
        <div class="col-sm-6">
344
            <div class="rows">
345
                <ol>
346
                    <li>
347
                        <span class="label">Library code: </span>
348
                        [% library.branchcode | html %]
349
                    </li>
350
                    <li>
351
                        <span class="label">Name: </span>
352
                        [% library.branchname | html %]
353
                    </li>
354
                    <li>
355
                        <span class="label">Category:</span>
356
                        [% category.categoryname | html %]
357
                    </li>
358
                    <li>
359
                        <span class="label">Address line 1: </span>
360
                        [% library.branchaddress1 | html %]
361
                    </li>
362
                    <li>
363
                        <span class="label">Address line 2: </span>
364
                        [% library.branchaddress2 | html %]
365
                    </li>
366
                    <li>
367
                        <span class="label">Address line 3: </span>
368
                        [% library.branchaddress3 | html %]
369
                    </li>
370
                    <li>
371
                        <span class="label">City: </span>
372
                        [% library.branchcity | html %]
373
                    </li>
374
                    <li>
375
                        <span class="label">State: </span>
376
                        [% library.branchstate | html %]
377
                    </li>
378
                    <li>
379
                        <span class="label">ZIP/Postal code: </span>
380
                        [% library.branchzip | html %]
381
                    </li>
382
                    <li>
383
                        <span class="label">Country: </span>
384
                        [% library.branchcountry | html %]
385
                    </li>
386
                    <li>
387
                        <span class="label">Phone: </span>
388
                        [% library.branchphone | html %]
389
                    </li>
390
                    <li>
391
                        <span class="label">Fax: </span>
392
                        [% library.branchfax | html %]
393
                    </li>
394
                </ol>
395
            </div>
396
        </div>
397
        <div class="col-sm-6">
398
            <div class="rows">
399
                <ol>
400
                    <li>
401
                        <span class="label">Email: </span>
402
                        [% IF ( library.branchemail ) %]
403
                            <a href="mailto:[% library.branchemail | url %]">[% library.branchemail | html %]</a>
404
                        [% END %]
405
                    </li>
406
                    <li>
407
                        <span class="label">ILL staff email: </span>
408
                        [% IF ( library.branchillemail ) %]
409
                            <a href="mailto:[% library.branchillemail | url %]">[% library.branchillemail | html %]</a>
410
                        [% END %]
411
                    </li>
412
                    <li>
413
                        <span class="label">Reply-To: </span>
414
                        [% IF ( library.branchreplyto ) %]
415
                            <a href="mailto:[% library.branchreplyto | url %]">[% library.branchreplyto | html %]</a>
416
                        [% END %]
417
                    </li>
418
                    <li>
419
                        <span class="label">Return-Path: </span>
420
                        [% library.branchreturnpath | html %]
421
                    </li>
422
                    <li>
423
                        <span class="label">SMTP server: </span>
424
                        [% smtp_server.name | html %]
425
                    </li>
426
                    <li>
427
                        <span class="label">URL: </span>
428
                        [% IF ( library.branchurl ) %]
429
                            <a href="[% library.branchurl | url %]" target="_blank">[% library.branchurl | html %]</a>
430
                        [% END %]
431
                    </li>
432
                    <li>
433
                        <span class="label">IP: </span>
434
                        [% library.branchip | html %]
435
                    </li>
436
                    <li>
437
                        <span class="label">MARC organization code</span>
438
                        [% library.marcorgcode | html %]
439
                    </li>
440
                    <li>
441
                        <span class="label">Notes: </span>
442
                        [% library.branchnotes | html %]
443
                    </li>
444
                    <li>
445
                        <span class="label">Pickup location: </span>
446
                        [% IF ( library.pickup_location ) %]
447
                            Yes
448
                        [% ELSE %]
449
                            No
450
                        [% END %]
451
                    </li>
452
                    <li>
453
                        <span class="label">Public: </span>
454
                        [% IF ( library.public ) %]
455
                            Yes
456
                        [% ELSE %]
457
                            No
458
                        [% END %]
459
                    </li>
460
                </ol>
461
            </div> <!-- /.rows -->
462
        </div> <!-- /.col-sm-6 -->
463
    </div> <!-- /.row -->
464
    [% IF ( library.opac_info ) %]
465
        <hr />
466
        <div class="row">
467
            <div class="col-sm-12">
468
                <h2>OPAC information</h2>
469
                [% library.opac_info | $raw %]
470
            </div>
471
        </div>
472
    [% END %]
473
[% END %]
474
327
            </main>
475
            </main>
328
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
476
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
329
477
Lines 369-375 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
369
                    {
517
                    {
370
                        "data": "name",
518
                        "data": "name",
371
                        "searchable": true,
519
                        "searchable": true,
372
                        "orderable": true
520
                        "orderable": true,
521
                        "render": function( data, type, row, meta ) {
522
                            return "<a href=\"/cgi-bin/koha/admin/branches.pl?op=view&branchcode=" + encodeURIComponent( row.library_id ) + "\">" + row.name.escapeHtml() + "</a>";
523
                        }
373
                    },
524
                    },
374
                    {
525
                    {
375
                        "data": "library_id",
526
                        "data": "library_id",
376
- 

Return to bug 30937