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

(-)a/C4/Auth.pm (+2 lines)
Lines 437-442 sub get_template_and_user { Link Here
437
            OpacCloud                 => C4::Context->preference("OpacCloud"),
437
            OpacCloud                 => C4::Context->preference("OpacCloud"),
438
            OpacMainUserBlock         => "" . C4::Context->preference("OpacMainUserBlock"),
438
            OpacMainUserBlock         => "" . C4::Context->preference("OpacMainUserBlock"),
439
            OpacNav                   => "" . C4::Context->preference("OpacNav"),
439
            OpacNav                   => "" . C4::Context->preference("OpacNav"),
440
            OpacNavBottom             => "" . C4::Context->preference("OpacNavBottom"),
440
            OpacPasswordChange        => C4::Context->preference("OpacPasswordChange"),
441
            OpacPasswordChange        => C4::Context->preference("OpacPasswordChange"),
441
            OPACPatronDetails        => C4::Context->preference("OPACPatronDetails"),
442
            OPACPatronDetails        => C4::Context->preference("OPACPatronDetails"),
442
            OPACPrivacy               => C4::Context->preference("OPACPrivacy"),
443
            OPACPrivacy               => C4::Context->preference("OPACPrivacy"),
Lines 956-961 sub checkauth { Link Here
956
        LibraryName          => C4::Context->preference("LibraryName"),
957
        LibraryName          => C4::Context->preference("LibraryName"),
957
        opacuserlogin        => C4::Context->preference("opacuserlogin"),
958
        opacuserlogin        => C4::Context->preference("opacuserlogin"),
958
        OpacNav              => C4::Context->preference("OpacNav"),
959
        OpacNav              => C4::Context->preference("OpacNav"),
960
        OpacNavBottom        => C4::Context->preference("OpacNavBottom"),
959
        opaccredits          => C4::Context->preference("opaccredits"),
961
        opaccredits          => C4::Context->preference("opaccredits"),
960
        OpacFavicon          => C4::Context->preference("OpacFavicon"),
962
        OpacFavicon          => C4::Context->preference("OpacFavicon"),
961
        opacreadinghistory   => C4::Context->preference("opacreadinghistory"),
963
        opacreadinghistory   => C4::Context->preference("opacreadinghistory"),
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 81-86 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
81
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMaintenance',0,'If ON, enables maintenance warning in OPAC','','YesNo');
81
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMaintenance',0,'If ON, enables maintenance warning in OPAC','','YesNo');
82
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','A user-defined block of HTML  in the main content area of the opac main page','70|10','Textarea');
82
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','A user-defined block of HTML  in the main content area of the opac main page','70|10','Textarea');
83
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea');
83
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea');
84
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNavBottom','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea');
84
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACNoResultsFound','','Display this HTML when no results are found for a search in the OPAC','70|10','Textarea');
85
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACNoResultsFound','','Display this HTML when no results are found for a search in the OPAC','70|10','Textarea');
85
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo');
86
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo');
86
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo');
87
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 4447-4452 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4447
}
4447
}
4448
4448
4449
4449
4450
$DBversion = "3.05.00.XXX";
4451
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4452
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNavBottom','','Links after OpacNav links','70|10','Textarea')");
4453
    print "Upgrade to $DBversion done (add OpacNavBottom syspref (enh 6825): if appropriate, you can split OpacNav into OpacNav and OpacNavBottom)\n";
4454
    SetVersion($DBversion);
4455
}
4456
4457
4450
=head1 FUNCTIONS
4458
=head1 FUNCTIONS
4451
4459
4452
=head2 DropAllForeignKeys($table)
4460
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+5 lines)
Lines 143-148 OPAC: Link Here
143
              type: textarea
143
              type: textarea
144
              class: code
144
              class: code
145
        -
145
        -
146
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC, after OpacNav, and before patron account links if available:"
147
            - pref: OpacNavBottom
148
              type: textarea
149
              class: code
150
        -
146
            - "Include the following HTML in the header of all pages in the OPAC:"
151
            - "Include the following HTML in the header of all pages in the OPAC:"
147
            - pref: opacheader
152
            - pref: opacheader
148
              type: textarea
153
              type: textarea
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc (-1 / +6 lines)
Line 1 Link Here
1
[% OpacNav %]
1
[% OpacNav %]
2
[% IF IsPatronPage %]
3
[% INCLUDE usermenu.inc %]
4
[% END %]
5
[% OpacNavBottom %]
6
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt (-2 / +1 lines)
Lines 54-61 Link Here
54
</div>
54
</div>
55
<div class="yui-b">
55
<div class="yui-b">
56
<div id="leftmenus" class="container">
56
<div id="leftmenus" class="container">
57
[% INCLUDE 'navigation.inc' %]
57
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
58
[% INCLUDE 'usermenu.inc' %]
59
</div>
58
</div>
60
</div>
59
</div>
61
</div>
60
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt (-2 / +1 lines)
Lines 115-122 Link Here
115
</div>
115
</div>
116
<div class="yui-b">
116
<div class="yui-b">
117
<div id="leftmenus" class="container">
117
<div id="leftmenus" class="container">
118
[% INCLUDE 'navigation.inc' %]
118
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
119
[% INCLUDE 'usermenu.inc' %]
120
</div>
119
</div>
121
</div>
120
</div>
122
</div>
121
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt (-2 / +1 lines)
Lines 54-61 Link Here
54
</div>
54
</div>
55
<div class="yui-b">
55
<div class="yui-b">
56
<div id="leftmenus" class="container">
56
<div id="leftmenus" class="container">
57
[% INCLUDE 'navigation.inc' %]
57
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
58
[% INCLUDE 'usermenu.inc' %]
59
</div>
58
</div>
60
</div>
59
</div>
61
</div>
60
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt (-2 / +1 lines)
Lines 64-71 Link Here
64
</div>
64
</div>
65
<div class="yui-b">
65
<div class="yui-b">
66
<div id="leftmenus" class="container">
66
<div id="leftmenus" class="container">
67
[% INCLUDE 'navigation.inc' %]
67
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
68
[% INCLUDE 'usermenu.inc' %]
69
</div>
68
</div>
70
</div>
69
</div>
71
</div>
70
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt (-2 / +1 lines)
Lines 95-102 You have never borrowed anything from this library. Link Here
95
</div>
95
</div>
96
<div class="yui-b">
96
<div class="yui-b">
97
<div id="leftmenus" class="container">
97
<div id="leftmenus" class="container">
98
[% INCLUDE 'navigation.inc' %]
98
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
99
[% INCLUDE 'usermenu.inc' %]
100
</div>
99
</div>
101
</div>
100
</div>
102
</div>
101
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt (-4 / +2 lines)
Lines 82-94 Link Here
82
82
83
[% IF ( OpacNav ) %]
83
[% IF ( OpacNav ) %]
84
<div class="yui-b"><div id="leftmenus" class="container">
84
<div class="yui-b"><div id="leftmenus" class="container">
85
[% INCLUDE 'navigation.inc' %]
85
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
86
[% INCLUDE 'usermenu.inc' %]
87
</div></div>
86
</div></div>
88
[% ELSIF ( loggedinusername ) %]
87
[% ELSIF ( loggedinusername ) %]
89
<div class="yui-b"><div id="leftmenus" class="container">
88
<div class="yui-b"><div id="leftmenus" class="container">
90
[% INCLUDE 'navigation.inc' %]
89
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
91
[% INCLUDE 'usermenu.inc' %]
92
</div></div>
90
</div></div>
93
[% ELSE %]
91
[% ELSE %]
94
[% END %]
92
[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt (-2 / +1 lines)
Lines 601-608 $(function() { Link Here
601
      [% IF ( OpacNav||loggedinusername ) %]
601
      [% IF ( OpacNav||loggedinusername ) %]
602
        <div class="yui-b">
602
        <div class="yui-b">
603
          <div is="leftmenus" class="container">
603
          <div is="leftmenus" class="container">
604
            [% INCLUDE 'navigation.inc' %]
604
            [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
605
            [% INCLUDE 'usermenu.inc' %]
606
          </div>
605
          </div>
607
        </div>
606
        </div>
608
      [% END %]
607
      [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt (-2 / +1 lines)
Lines 212-219 $.tablesorter.addParser({ Link Here
212
</div>
212
</div>
213
<div class="yui-b">
213
<div class="yui-b">
214
<div id="leftmenus" class="container">
214
<div id="leftmenus" class="container">
215
[% INCLUDE 'navigation.inc' %]
215
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
216
[% INCLUDE 'usermenu.inc' %]
217
</div>
216
</div>
218
</div>
217
</div>
219
</div>
218
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt (-2 / +1 lines)
Lines 131-138 Link Here
131
</div>
131
</div>
132
[% IF ( OpacNav||loggedinusername ) %]
132
[% IF ( OpacNav||loggedinusername ) %]
133
<div class="yui-b"><div id="leftmenus" class="container">
133
<div class="yui-b"><div id="leftmenus" class="container">
134
[% INCLUDE 'navigation.inc' %]
134
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
135
[% INCLUDE 'usermenu.inc' %]
136
</div></div>
135
</div></div>
137
[% END %]
136
[% END %]
138
</div>
137
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-2 / +1 lines)
Lines 423-430 $.tablesorter.addParser({ Link Here
423
</div>
423
</div>
424
<div class="yui-b">
424
<div class="yui-b">
425
<div id="leftmenus" class="container">
425
<div id="leftmenus" class="container">
426
[% INCLUDE 'navigation.inc' %]
426
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
427
[% INCLUDE 'usermenu.inc' %]
428
</div>
427
</div>
429
</div>
428
</div>
430
</div>
429
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt (-3 / +1 lines)
Lines 180-187 Link Here
180
</div>
180
</div>
181
<div class="yui-b">
181
<div class="yui-b">
182
<div id="leftmenus" class="container">
182
<div id="leftmenus" class="container">
183
[% INCLUDE 'navigation.inc' %]
183
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
184
[% INCLUDE 'usermenu.inc' %]
185
</div>
184
</div>
186
</div>
185
</div>
187
</div>
186
</div>
188
- 

Return to bug 6825