Attachment #3401 for bug #5641

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




            advancedMARCEditor          => C4::Context->preference("advancedMARCEditor"),
            canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
            intranetcolorstylesheet     => C4::Context->preference("intranetcolorstylesheet"),
            IntranetFavicon             => C4::Context->preference("IntranetFavicon"),
            intranetreadinghistory      => C4::Context->preference("intranetreadinghistory"),
            intranetstylesheet          => C4::Context->preference("intranetstylesheet"),
            IntranetUserCSS             => C4::Context->preference("IntranetUserCSS"),

            opacstylesheet            => "" . C4::Context->preference("opacstylesheet"),
            opacbookbag               => "" . C4::Context->preference("opacbookbag"),
            opaccredits               => "" . C4::Context->preference("opaccredits"),
            OpacFavicon               => C4::Context->preference("OpacFavicon"),
            opacheader                => "" . C4::Context->preference("opacheader"),
            opaclanguagesdisplay      => "" . C4::Context->preference("opaclanguagesdisplay"),
            opacreadinghistory        => C4::Context->preference("opacreadinghistory"),

        opacuserlogin        => C4::Context->preference("opacuserlogin"),
        OpacNav              => C4::Context->preference("OpacNav"),
        opaccredits          => C4::Context->preference("opaccredits"),
        OpacFavicon          => C4::Context->preference("OpacFavicon"),
        opacreadinghistory   => C4::Context->preference("opacreadinghistory"),
        opacsmallimage       => C4::Context->preference("opacsmallimage"),
        opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),

Lines 294-296 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (+2 lines)
294	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	294	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
		297	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		298	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 294-296 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+2 lines)
294	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	294	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
		297	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		298	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 296-298 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (+2 lines)
296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
297	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	297	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
298	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FacetLabelTruncationLength',20,'Specify the facet max length in OPAC',NULL,'Integer');	298	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FacetLabelTruncationLength',20,'Specify the facet max length in OPAC',NULL,'Integer');
		299	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		300	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 281-284 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (-1 / +2 lines)
281	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	281	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
282	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	282	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
283	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	283	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
284		284	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		285	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 293-296 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (-1 / +2 lines)
293	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	293	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
294	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	294	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	295	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
296		296	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		297	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 348-350 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (+2 lines)
348	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	348	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
349	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	349	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
350	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	350	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
		351	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		352	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 373-375 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (+2 lines)
373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');	373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
374	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');	374	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
375	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');	375	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
		376	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
		377	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

Lines 4105-4110 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
4105	SetVersion ($DBversion);	4105	SetVersion ($DBversion);
4106	}	4106	}
4107		4107
		4108	$DBversion = "3.03.00.XXX";
		4109	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4110	$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free')");
		4111	$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free')");
		4112	print "Upgrade to $DBversion done (Add sysprefs to control custom favicons)\n";
		4113	SetVersion ($DBversion);
		4114	}
4108		4115
4109	=head1 FUNCTIONS	4116	=head1 FUNCTIONS
4110		4117

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc (-1 / +1 lines)
1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	2	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
3	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />	3	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />
4		4

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (-1 / +1 lines)
1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	2	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
3	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/jquery/plugins/ui.tabs.css" />	3	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/jquery/plugins/ui.tabs.css" />
4	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />	4	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />
5	<!-- TMPL_IF name="intranetstylesheet" -->	5	<!-- TMPL_IF name="intranetstylesheet" -->

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc (-1 / +1 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Online Help</title>	2	<title>Online Help</title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />	5	<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/print.css" />
6	<!-- TMPL_IF name="intranetstylesheet" -->	6	<!-- TMPL_IF name="intranetstylesheet" -->
7	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="intranetstylesheet" -->" />	7	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="intranetstylesheet" -->" />

Lines 97-102 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+5 lines)
97	class: url	97	class: url
98	- in the OPAC header, instead of the Koha logo. If this image is a different size than the Koha logo, you will need to customize the CSS. (This should be a complete URL, starting with <code>http://</code>.)	98	- in the OPAC header, instead of the Koha logo. If this image is a different size than the Koha logo, you will need to customize the CSS. (This should be a complete URL, starting with <code>http://</code>.)
99	-	99	-
		100	- Use the image at
		101	- pref: OpacFavicon
		102	class: url
		103	- for the OPAC's favicon. (This should be a complete URL, starting with <code>http://</code>.)
		104	-
100	- "Include the following JavaScript on all pages in the OPAC:"	105	- "Include the following JavaScript on all pages in the OPAC:"
101	- pref: opacuserjs	106	- pref: opacuserjs
102	type: textarea	107	type: textarea

Lines 46-51 Staff Client: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (+5 lines)
46	type: textarea	46	type: textarea
47	class: code	47	class: code
48	-	48	-
		49	- Use the image at
		50	- pref: IntranetFavicon
		51	class: url
		52	- for the Staff Client's favicon. (This should be a complete URL, starting with <code>http://</code>.)
		53	-
49	- Show biblio records on result page in the staff client	54	- Show biblio records on result page in the staff client
50	- pref: XSLTResultsDisplay	55	- pref: XSLTResultsDisplay
51	choices:	56	choices:

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl (-1 / +1 lines)
3	<!-- TMPL_IF NAME="print_basket" -->	3	<!-- TMPL_IF NAME="print_basket" -->
4		4
5	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	5	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	6	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
7	<meta http-equiv="Content-Language" content="en-us" />	7	<meta http-equiv="Content-Language" content="en-us" />
8	<style type="text/css">	8	<style type="text/css">
9	@import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);	9	@import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl (-1 / +1 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</title>	2	<title>Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />	5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />
6	</head>	6	</head>
7	<body>	7	<body>

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl (-1 / +1 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>	2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />	5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />
6		6
7	<script language="javascript">	7	<script language="javascript">

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl (-2 / +2 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>	2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />	5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
6	<script language="javascript">	6	<script language="javascript">
7	window.print();	7	window.print();
Lines 58-61 Link Here
58	</tfoot>	58	</tfoot>
59	</table>	59	</table>
60	</div>	60	</div>
61	<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->	61	<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl (-1 / +1 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>	2	<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="IntranetFavicon" --><!-- TMPL_VAR NAME="IntranetFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />	5	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
6	<script language="javascript">	6	<script language="javascript">
7	window.print();	7	window.print();

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc (-2 / +1 lines)
1	</title>	1	</title>
2	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	2	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3	<meta name="generator" content="Koha <!-- TMPL_VAR NAME="Version" -->" /> <!-- leave this for stats -->	3	<meta name="generator" content="Koha <!-- TMPL_VAR NAME="Version" -->" /> <!-- leave this for stats -->
4	<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />	4	<link rel="shortcut icon" href="<!-- TMPL_IF NAME="OpacFavicon" --><!-- TMPL_VAR NAME="OpacFavicon" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico<!-- /TMPL_IF -->" type="image/x-icon" />
5	<!-- TMPL_IF name="opacstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="opacstylesheet" -->" /><!-- TMPL_ELSE -->	5	<!-- TMPL_IF name="opacstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="opacstylesheet" -->" /><!-- TMPL_ELSE -->
6	<!-- TMPL_IF name="opaclayoutstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->" /><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" /><!-- /TMPL_IF --><!-- /TMPL_IF -->	6	<!-- TMPL_IF name="opaclayoutstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->" /><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
7	<!-- TMPL_IF name="opaccolorstylesheet" -->	7	<!-- TMPL_IF name="opaccolorstylesheet" -->
8	-

Return to bug 5641

Lines 359-364 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (+3 lines)
359	advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),	359	advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
360	canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),	360	canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
361	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),	361	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
		362	IntranetFavicon => C4::Context->preference("IntranetFavicon"),
362	intranetreadinghistory => C4::Context->preference("intranetreadinghistory"),	363	intranetreadinghistory => C4::Context->preference("intranetreadinghistory"),
363	intranetstylesheet => C4::Context->preference("intranetstylesheet"),	364	intranetstylesheet => C4::Context->preference("intranetstylesheet"),
364	IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),	365	IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),
Lines 428-433 sub get_template_and_user { Link Here
428	opacstylesheet => "" . C4::Context->preference("opacstylesheet"),	429	opacstylesheet => "" . C4::Context->preference("opacstylesheet"),
429	opacbookbag => "" . C4::Context->preference("opacbookbag"),	430	opacbookbag => "" . C4::Context->preference("opacbookbag"),
430	opaccredits => "" . C4::Context->preference("opaccredits"),	431	opaccredits => "" . C4::Context->preference("opaccredits"),
		432	OpacFavicon => C4::Context->preference("OpacFavicon"),
431	opacheader => "" . C4::Context->preference("opacheader"),	433	opacheader => "" . C4::Context->preference("opacheader"),
432	opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"),	434	opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"),
433	opacreadinghistory => C4::Context->preference("opacreadinghistory"),	435	opacreadinghistory => C4::Context->preference("opacreadinghistory"),
Lines 920-925 sub checkauth { Link Here
920	opacuserlogin => C4::Context->preference("opacuserlogin"),	922	opacuserlogin => C4::Context->preference("opacuserlogin"),
921	OpacNav => C4::Context->preference("OpacNav"),	923	OpacNav => C4::Context->preference("OpacNav"),
922	opaccredits => C4::Context->preference("opaccredits"),	924	opaccredits => C4::Context->preference("opaccredits"),
		925	OpacFavicon => C4::Context->preference("OpacFavicon"),
923	opacreadinghistory => C4::Context->preference("opacreadinghistory"),	926	opacreadinghistory => C4::Context->preference("opacreadinghistory"),
924	opacsmallimage => C4::Context->preference("opacsmallimage"),	927	opacsmallimage => C4::Context->preference("opacsmallimage"),
925	opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),	928	opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),