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

(-)a/C4/Auth.pm (-3 lines)
Lines 460-466 sub get_template_and_user { Link Here
460
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
460
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
461
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
461
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
462
        KohaAdminEmailAddress                                              => "" . C4::Context->preference("KohaAdminEmailAddress"),
462
        KohaAdminEmailAddress                                              => "" . C4::Context->preference("KohaAdminEmailAddress"),
463
        LoginBranchcode => ( C4::Context->userenv ? C4::Context->userenv->{"branch"}    : undef ),
464
        LoginFirstname  => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),
463
        LoginFirstname  => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),
465
        LoginSurname    => C4::Context->userenv ? C4::Context->userenv->{"surname"}      : "Inconnu",
464
        LoginSurname    => C4::Context->userenv ? C4::Context->userenv->{"surname"}      : "Inconnu",
466
        emailaddress    => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,
465
        emailaddress    => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,
Lines 488-494 sub get_template_and_user { Link Here
488
            IntranetNav                                                                => C4::Context->preference("IntranetNav"),
487
            IntranetNav                                                                => C4::Context->preference("IntranetNav"),
489
            IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"),
488
            IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"),
490
            LibraryName                                                                => C4::Context->preference("LibraryName"),
489
            LibraryName                                                                => C4::Context->preference("LibraryName"),
491
            LoginBranchname                                                            => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ),
492
            advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"),
490
            advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"),
493
            canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'),
491
            canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'),
494
            intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"),
492
            intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"),
Lines 557-563 sub get_template_and_user { Link Here
557
            opac_name                             => $opac_name,
555
            opac_name                             => $opac_name,
558
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
556
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
559
            LibraryNameTitle                      => "" . $LibraryNameTitle,
557
            LibraryNameTitle                      => "" . $LibraryNameTitle,
560
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
561
            OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"),
558
            OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"),
562
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
559
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
563
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
560
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
(-)a/circ/selectbranchprinter.pl (-2 lines)
Lines 58-65 my @updated; Link Here
58
if ( $branch and my $library = Koha::Libraries->find($branch) ) {
58
if ( $branch and my $library = Koha::Libraries->find($branch) ) {
59
    if (! $userenv_branch or $userenv_branch ne $branch ) {
59
    if (! $userenv_branch or $userenv_branch ne $branch ) {
60
        my $branchname = $library->branchname;
60
        my $branchname = $library->branchname;
61
        $template->param(LoginBranchname => $branchname);   # update template for new branch
62
        $template->param(LoginBranchcode => $branch);       # update template for new branch
63
        $session->param('branchname', $branchname);         # update sesssion in DB
61
        $session->param('branchname', $branchname);         # update sesssion in DB
64
        $session->param('branch', $branch);                 # update sesssion in DB
62
        $session->param('branch', $branch);                 # update sesssion in DB
65
        $session->flush();
63
        $session->flush();
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-6 / +7 lines)
Lines 63-68 Link Here
63
    </div>
63
    </div>
64
        <ul id="user-menu" class="nav navbar-nav navbar-right">
64
        <ul id="user-menu" class="nav navbar-nav navbar-right">
65
            [% IF ( loggedinusername ) %]
65
            [% IF ( loggedinusername ) %]
66
            [% SET logged_in_library = logged_in_user.library %]
66
            <li class="dropdown">
67
            <li class="dropdown">
67
                <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
68
                <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
68
                    <span id="logged-in-info-brief">
69
                    <span id="logged-in-info-brief">
Lines 74-85 Link Here
74
                        <span class="separator">|</span>
75
                        <span class="separator">|</span>
75
                        [% IF ( AutoLocation ) %]
76
                        [% IF ( AutoLocation ) %]
76
                            <brand>
77
                            <brand>
77
                                [% LoginBranchname | html %]
78
                                [% logged_in_library.branchname | html %]
78
                            </brand>
79
                            </brand>
79
                        [% ELSE %]
80
                        [% ELSE %]
80
                            <strong>
81
                            <strong>
81
                                <span class="logged-in-branch-name">[% LoginBranchname | html %]</span>
82
                                <span class="logged-in-branch-name">[% logged_in_library.branchname | html %]</span>
82
                                <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
83
                                <span class="logged-in-branch-code content_hidden">[% logged_in_library.branchcode | html %]</span>
83
                            </strong>
84
                            </strong>
84
                        [% END %]
85
                        [% END %]
85
                    </span>
86
                    </span>
Lines 94-105 Link Here
94
                    <li class="loggedin-menu-label">
95
                    <li class="loggedin-menu-label">
95
                        [% IF ( AutoLocation ) %]
96
                        [% IF ( AutoLocation ) %]
96
                            <brand>
97
                            <brand>
97
                                [% LoginBranchname | html %]
98
                                [% logged_in_library.branchname | html %]
98
                            </brand>
99
                            </brand>
99
                        [% ELSE %]
100
                        [% ELSE %]
100
                            Location: <br />
101
                            Location: <br />
101
                            <span class="logged-in-branch-name">[% LoginBranchname | html %]</span>
102
                            <span class="logged-in-branch-name">[% logged_in_library.branchname | html %]</span>
102
                            <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
103
                            <span class="logged-in-branch-code content_hidden">[% logged_in_library.branchcode | html %]</span>
103
                        [% END %]
104
                        [% END %]
104
                    </li>
105
                    </li>
105
106
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
Lines 121-127 Link Here
121
                    </div>
121
                    </div>
122
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
122
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
123
                    <input type="hidden" name="batch" value="[% batch | html %]" />
123
                    <input type="hidden" name="batch" value="[% batch | html %]" />
124
                    <input type="hidden" name="branchcode" value="[% LoginBranchcode | html %]" />
124
                    <input type="hidden" name="branchcode" value="[% logged_in_user.branchcode | html %]" />
125
                </div>
125
                </div>
126
                <div class="modal-footer">
126
                <div class="modal-footer">
127
                    <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
127
                    <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-1 / +1 lines)
Lines 64-70 Link Here
64
64
65
[% IF ( loop_budget ) %]
65
[% IF ( loop_budget ) %]
66
66
67
    <h3>All available funds[% IF LoginBranchname %] for [% LoginBranchname | html %][% END %]</h3>
67
    <h3>All available funds for [% logged_in_user.library.branchname | html %]</h3>
68
68
69
    <div id="BudgetsAndFunds">
69
    <div id="BudgetsAndFunds">
70
    <table id="accounts">
70
    <table id="accounts">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 172-178 Link Here
172
<ul>
172
<ul>
173
    [% IF (SeparateHoldings) %]
173
    [% IF (SeparateHoldings) %]
174
        <li>
174
        <li>
175
            <a href="#holdings">[% LoginBranchname | html %] holdings ([% itemloop.size() || 0 | html %])</a>
175
            <a href="#holdings">[% logged_in_user.library.branchname | html %] holdings ([% itemloop.size() || 0 | html %])</a>
176
        </li>
176
        </li>
177
        <li>
177
        <li>
178
            <a href="#otherholdings">Other holdings ([% otheritemloop.size() || 0 | html %])</a>
178
            <a href="#otherholdings">Other holdings ([% otheritemloop.size() || 0 | html %])</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-3 / +3 lines)
Lines 1-14 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname | html %]</title>
4
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% logged_in_user.library.branchname | html %]</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
</head>
6
</head>
7
<body id="circ_branchoverdues" class="circ">
7
<body id="circ_branchoverdues" class="circ">
8
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'circ-search.inc' %]
9
[% INCLUDE 'circ-search.inc' %]
10
10
11
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues at [% LoginBranchname | html %]</div>
11
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues at [% logged_in_user.library.branchname | html %]</div>
12
12
13
<div class="main container-fluid">
13
<div class="main container-fluid">
14
    <div class="row">
14
    <div class="row">
Lines 19-25 Link Here
19
        [% END %]
19
        [% END %]
20
            <main>
20
            <main>
21
21
22
<h1>Circulation: Overdues at [% LoginBranchname | html %]</h1>
22
<h1>Circulation: Overdues at [% logged_in_user.library.branchname | html %]</h1>
23
23
24
<form name="selectlocation" action="branchoverdues.pl" method="post">
24
<form name="selectlocation" action="branchoverdues.pl" method="post">
25
    <label for="location">Shelving location selected: </label><select id="location" name="location">
25
    <label for="location">Shelving location selected: </label><select id="location" name="location">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +1 lines)
Lines 314-320 Link Here
314
314
315
        function synchronize() {
315
        function synchronize() {
316
            kohadb.saveSetting("userid", "[% logged_in_user.userid | html %]");
316
            kohadb.saveSetting("userid", "[% logged_in_user.userid | html %]");
317
            kohadb.saveSetting("branchcode", "[% LoginBranchcode | html %]");
317
            kohadb.saveSetting("branchcode", "[% logged_in_user.branchcode | html %]");
318
            showSyncInfo();
318
            showSyncInfo();
319
            [% UNLESS (AllowOfflineCirculation) %]
319
            [% UNLESS (AllowOfflineCirculation) %]
320
                reloadRecords();
320
                reloadRecords();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-1 / +1 lines)
Lines 36-42 Link Here
36
Updated:<ul>
36
Updated:<ul>
37
    [% FOREACH update IN updated %]
37
    [% FOREACH update IN updated %]
38
    [% IF ( update.updated_branch ) %]
38
    [% IF ( update.updated_branch ) %]
39
        <li>Library: [% update.old_branch or "?" | html %] &rArr; [% update.LoginBranchcode or "?" | html %]</li>
39
        <li>Library: [% update.old_branch or "?" | html %] &rArr; [% logged_in_user.branchcode | html %]</li>
40
    [% ELSIF ( update.updated_printer ) %]
40
    [% ELSIF ( update.updated_printer ) %]
41
      <!-- FIXME:  <li>Printer: [% update.old_printer or "?" | html %] &rArr; [% update.new_printer or "?" | html %]</li> -->
41
      <!-- FIXME:  <li>Printer: [% update.old_printer or "?" | html %] &rArr; [% update.new_printer or "?" | html %]</li> -->
42
    [% ELSE %]
42
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt (-1 / +1 lines)
Lines 57-63 Link Here
57
                        [% END %]
57
                        [% END %]
58
58
59
                        <div id="manage-label-batches">
59
                        <div id="manage-label-batches">
60
                            <div class="hint">Current library: [% LoginBranchname | html %]</div>
60
                            <div class="hint">Current library: [% logged_in_user.library.branchname | html %]</div>
61
                            <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
61
                            <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
62
                                <div>
62
                                <div>
63
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
63
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt (-1 / +1 lines)
Lines 42-48 Link Here
42
                        [% END %]
42
                        [% END %]
43
43
44
                        <div id="manage-label-layouts">
44
                        <div id="manage-label-layouts">
45
                            <div class="hint">Current library: [% LoginBranchname | html %]</div>
45
                            <div class="hint">Current library: [% logged_in_user.library.branchname | html %]</div>
46
                            [% IF ( table_loop ) %]
46
                            [% IF ( table_loop ) %]
47
                            <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]">
47
                            <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]">
48
                            [% IF    ( label_element == 'layout' ) %]
48
                            [% IF    ( label_element == 'layout' ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-1 / +1 lines)
Lines 38-44 Link Here
38
38
39
                    [% INCLUDE 'patroncards-errors.inc' %]
39
                    [% INCLUDE 'patroncards-errors.inc' %]
40
                    <div id="manage-patroncard-batches">
40
                    <div id="manage-patroncard-batches">
41
                        <div class="hint">Current library: [% LoginBranchname | html %]</div>
41
                        <div class="hint">Current library: [% logged_in_user.library.branchname | html %]</div>
42
                            <form name="add_by_bor_num" action="/cgi-bin/koha/patroncards/edit-batch.pl" method="post">
42
                            <form name="add_by_bor_num" action="/cgi-bin/koha/patroncards/edit-batch.pl" method="post">
43
                                <div>
43
                                <div>
44
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
44
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt (-1 / +1 lines)
Lines 45-51 Link Here
45
                    [% INCLUDE 'patroncards-toolbar.inc' %]
45
                    [% INCLUDE 'patroncards-toolbar.inc' %]
46
                    [% INCLUDE 'patroncards-errors.inc' %]
46
                    [% INCLUDE 'patroncards-errors.inc' %]
47
                        <div id="manage-patroncards-layouts">
47
                        <div id="manage-patroncards-layouts">
48
                            <div class="hint">Current library: [% LoginBranchname | html %]</div>
48
                            <div class="hint">Current library: [% logged_in_user.library.branchname | html %]</div>
49
                            [% IF ( table_loop ) %]
49
                            [% IF ( table_loop ) %]
50
                            <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element | html %]">
50
                            <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element | html %]">
51
                            <h2>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h2>
51
                            <h2>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h2>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc (-2 / +2 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% SET classprop  = 'class="' %]
2
[% SET classprop  = 'class="' %]
3
[% IF LoginBranchcode.defined %]
3
[% IF logged_in_user %]
4
    [% classprop = classprop _ 'branch-' _ LoginBranchcode %]
4
    [% classprop = classprop _ 'branch-' _ logged_in_user.branchcode %]
5
[% ELSE %]
5
[% ELSE %]
6
    [% classprop = classprop _ 'branch-default' %]
6
    [% classprop = classprop _ 'branch-default' %]
7
[% END %]
7
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-2 / +1 lines)
Lines 556-562 Link Here
556
                        [% ELSE %]
556
                        [% ELSE %]
557
                            <li id="tab_holdings">
557
                            <li id="tab_holdings">
558
                        [% END %]
558
                        [% END %]
559
                        [% BLOCK holding_tab_title %][% IF SeparateHoldings %]<span>[% LoginBranchname | html %] holdings</span>[% ELSE %]<span>Holdings</span>[% END %][% END %]
559
                        [% BLOCK holding_tab_title %][% IF SeparateHoldings %]<span>[% logged_in_user.library.branchname | html %] holdings</span>[% ELSE %]<span>Holdings</span>[% END %][% END %]
560
                            <a href="#holdings">[% PROCESS holding_tab_title %] [% UNLESS too_many_items %][% ' ( ' _ (itemloop.size || 0) _ ' )' | html %][% END %]</a>
560
                            <a href="#holdings">[% PROCESS holding_tab_title %] [% UNLESS too_many_items %][% ' ( ' _ (itemloop.size || 0) _ ' )' | html %][% END %]</a>
561
                        </li>
561
                        </li>
562
                        [% IF (SeparateHoldings) %]
562
                        [% IF (SeparateHoldings) %]
563
- 

Return to bug 21746