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

(-)a/C4/Auth.pm (+2 lines)
Lines 426-431 sub get_template_and_user { Link Here
426
            OpacKohaUrl               => C4::Context->preference("OpacKohaUrl"),
426
            OpacKohaUrl               => C4::Context->preference("OpacKohaUrl"),
427
            OpacMainUserBlock         => "" . C4::Context->preference("OpacMainUserBlock"),
427
            OpacMainUserBlock         => "" . C4::Context->preference("OpacMainUserBlock"),
428
            OpacNav                   => "" . C4::Context->preference("OpacNav"),
428
            OpacNav                   => "" . C4::Context->preference("OpacNav"),
429
            OpacRightSidebar          => "" . C4::Context->preference("OpacRightSidebar"),
429
            OpacNavBottom             => "" . C4::Context->preference("OpacNavBottom"),
430
            OpacNavBottom             => "" . C4::Context->preference("OpacNavBottom"),
430
            OpacPasswordChange        => C4::Context->preference("OpacPasswordChange"),
431
            OpacPasswordChange        => C4::Context->preference("OpacPasswordChange"),
431
            OPACPatronDetails        => C4::Context->preference("OPACPatronDetails"),
432
            OPACPatronDetails        => C4::Context->preference("OPACPatronDetails"),
Lines 962-967 sub checkauth { Link Here
962
        LibraryName          => C4::Context->preference("LibraryName"),
963
        LibraryName          => C4::Context->preference("LibraryName"),
963
        opacuserlogin        => C4::Context->preference("opacuserlogin"),
964
        opacuserlogin        => C4::Context->preference("opacuserlogin"),
964
        OpacNav              => C4::Context->preference("OpacNav"),
965
        OpacNav              => C4::Context->preference("OpacNav"),
966
        OpacRightSidebar     => C4::Context->preference("OpacRightSidebar"),
965
        OpacNavBottom        => C4::Context->preference("OpacNavBottom"),
967
        OpacNavBottom        => C4::Context->preference("OpacNavBottom"),
966
        opaccredits          => C4::Context->preference("opaccredits"),
968
        opaccredits          => C4::Context->preference("opaccredits"),
967
        OpacFavicon          => C4::Context->preference("OpacFavicon"),
969
        OpacFavicon          => C4::Context->preference("OpacFavicon"),
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 82-87 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
82
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('OpacMaintenance',0,'If ON, enables maintenance warning in OPAC','','YesNo');
83
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('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');
84
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('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea');
85
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacRightSidebar','','Show the following HTML in the right hand column of the main page under the main login form','70|10','Textarea');
85
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');
86
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');
86
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');
87
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');
87
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');
88
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');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 5307-5312 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5307
    SetVersion ($DBversion);
5307
    SetVersion ($DBversion);
5308
}
5308
}
5309
5309
5310
5311
$DBversion = "3.09.00.XXX";
5312
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
5313
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacRightSidebar', '', '70|10', 'Show the following HTML in the right hand column of the main page under the main login form', 'Textarea');");
5314
    print "Upgrade to $DBversion done (Add customizable OpacRightSidebar region to the OPAC main page)\n";
5315
    SetVersion ($DBversion);
5316
}
5317
5310
=head1 FUNCTIONS
5318
=head1 FUNCTIONS
5311
5319
5312
=head2 TableExists($table)
5320
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+5 lines)
Lines 165-170 OPAC: Link Here
165
              type: textarea
165
              type: textarea
166
              class: code
166
              class: code
167
        -
167
        -
168
            - "Show the following HTML in the right hand column of the main page under the main login form:"
169
            - pref: OpacRightSidebar
170
              type: textarea
171
              class: code
172
        -
168
            - "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:"
173
            - "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:"
169
            - pref: OpacNavBottom
174
            - pref: OpacNavBottom
170
              type: textarea
175
              type: textarea
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt (-13 / +11 lines)
Lines 12-28 Link Here
12
	<div class="yui-b">
12
	<div class="yui-b">
13
     [% IF ( opacuserlogin ) %]
13
     [% IF ( opacuserlogin ) %]
14
	 [% IF ( loggedinusername ) %]
14
	 [% IF ( loggedinusername ) %]
15
	     <div id="loggedin" class="yui-g">
15
         <div id="loggedin" class="yui-ge">
16
	     <div>
17
	 [% ELSE %]
16
	 [% ELSE %]
18
	     <div id="notloggedin" class="yui-ge">
17
        <div id="notloggedin" class="yui-ge">
19
	     <div class="yui-u first">
20
         [% END %]
18
         [% END %]
21
     [% ELSE %]
19
     [% ELSE %]
22
         <div id="notloggedin" class="yui-g">
20
        <div id="notloggedin" class="yui-ge">
23
	 <div>
24
    [% END %]
21
    [% END %]
25
	
22
        <div class="yui-u first">
26
	[% IF ( koha_news_count ) %]
23
	[% IF ( koha_news_count ) %]
27
<div id="news" class="container">
24
<div id="news" class="container">
28
    <table>
25
    <table>
Lines 43-52 Link Here
43
40
44
</div>
41
</div>
45
		
42
		
46
	[% IF ( opacuserlogin ) %]
43
    [% IF ( opacuserlogin || OpacRightSidebar ) %]
44
    <div class="yui-u">
45
    [% IF ( opacuserlogin ) %]
47
    [% UNLESS ( loggedinusername ) %]
46
    [% UNLESS ( loggedinusername ) %]
48
    [% UNLESS ( casAuthentication ) %]
47
    [% UNLESS ( casAuthentication ) %]
49
    <div class="yui-u">
50
	<div id="login" class="container">
48
	<div id="login" class="container">
51
	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
49
	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
52
    <input type="hidden" name="koha_login_context" value="opac" />
50
    <input type="hidden" name="koha_login_context" value="opac" />
Lines 60-70 Link Here
60
	 </fieldset></fieldset>
58
	 </fieldset></fieldset>
61
	</form>
59
	</form>
62
	</div>
60
	</div>
63
	 </div>
64
    [% END %]
61
    [% END %]
65
    [% END %]
62
    [% END %]
66
	
63
    [% END %]
67
[% END %]
64
    [% IF ( OpacRightSidebar ) %]<div id="opacrightsidebar" class="container">[% OpacRightSidebar %]</div>[% END %]
65
    </div>
66
    [% END %]
68
</div>
67
</div>
69
</div>
68
</div>
70
</div>
69
</div>
71
- 

Return to bug 3708