Dirk Stoecker
3a1a1ad326
Add some of my local changes as patch, as they affect probably every SUSE system. OBS-URL: https://build.opensuse.org/request/show/400889 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Apache-Gallery?expand=0&rev=1
109 lines
4.3 KiB
Diff
109 lines
4.3 KiB
Diff
diff -ur Apache-Gallery-1.0.2/lib/Apache/Gallery.pm Apache-Gallery-1.0.2_fix/lib/Apache/Gallery.pm
|
|
--- Apache-Gallery-1.0.2/lib/Apache/Gallery.pm 2011-06-08 20:47:46.000000000 +0200
|
|
+++ Apache-Gallery-1.0.2_fix/lib/Apache/Gallery.pm 2016-06-09 22:28:47.590435743 +0200
|
|
@@ -104,7 +104,7 @@
|
|
if ($cgi->param('selection')) {
|
|
my @selected = $cgi->param('selection');
|
|
my $content = join "<br />\n",@selected;
|
|
- $r->content_type('text/html');
|
|
+ $r->content_type('text/html; charset=utf-8');
|
|
$r->headers_out->{'Content-Length'} = length($content);
|
|
|
|
if (!$::MP2) {
|
|
@@ -494,7 +494,7 @@
|
|
}
|
|
my %info = (
|
|
URL => "../".$neighbour_directories[$neightbour_counter-1],
|
|
- LINK_NAME => "<<< $linktext",
|
|
+ LINK_NAME => "<<< $linktext",
|
|
DIR_FILES => "",
|
|
);
|
|
$tpl_vars{PREV_DIR_FILES} = $templates{navdirectory}->fill_in(HASH=> {%info});
|
|
@@ -508,7 +508,7 @@
|
|
}
|
|
my %info = (
|
|
URL => "../".$neighbour_directories[$neightbour_counter+1],
|
|
- LINK_NAME => "$linktext >>>",
|
|
+ LINK_NAME => "$linktext >>>",
|
|
DIR_FILES => "",
|
|
);
|
|
$tpl_vars{NEXT_DIR_FILES} = $templates{navdirectory}->fill_in(HASH=> {%info});
|
|
@@ -536,7 +536,7 @@
|
|
} else {
|
|
$tpl_vars{MAIN} = $templates{index}->fill_in(HASH => \%tpl_vars);
|
|
$tpl_vars{MAIN} = $templates{layout}->fill_in(HASH => \%tpl_vars);
|
|
- $r->content_type('text/html');
|
|
+ $r->content_type('text/html; charset=utf-8');
|
|
}
|
|
|
|
$r->headers_out->{'Content-Length'} = length($tpl_vars{MAIN});
|
|
@@ -834,7 +834,7 @@
|
|
$tpl_vars{MAIN} = $templates{picture}->fill_in(HASH => \%tpl_vars);
|
|
$tpl_vars{MAIN} = $templates{layout}->fill_in(HASH => \%tpl_vars);
|
|
|
|
- $r->content_type('text/html');
|
|
+ $r->content_type('text/html; charset=utf-8');
|
|
$r->headers_out->{'Content-Length'} = length($tpl_vars{MAIN});
|
|
|
|
if (!$::MP2) {
|
|
@@ -1422,7 +1422,7 @@
|
|
$tpl_vars{PAGE} = $templates{layout}->fill_in(HASH => \%tpl_vars);
|
|
|
|
$r->status($statuscode);
|
|
- $r->content_type('text/html');
|
|
+ $r->content_type('text/html; charset=utf-8');
|
|
|
|
$r->print($tpl_vars{PAGE});
|
|
|
|
diff -ur Apache-Gallery-1.0.2/templates/bright/gallery.css Apache-Gallery-1.0.2_fix/templates/bright/gallery.css
|
|
--- Apache-Gallery-1.0.2/templates/bright/gallery.css 2011-06-08 19:47:59.000000000 +0200
|
|
+++ Apache-Gallery-1.0.2_fix/templates/bright/gallery.css 2016-06-09 22:30:41.454807075 +0200
|
|
@@ -104,6 +104,7 @@
|
|
border: 4px solid #ddd;
|
|
padding: 20px;
|
|
text-align: left;
|
|
+ word-wrap: break-word;
|
|
top: 0px;
|
|
width: 620px;
|
|
}
|
|
diff -ur Apache-Gallery-1.0.2/templates/bright/layout.tpl Apache-Gallery-1.0.2_fix/templates/bright/layout.tpl
|
|
--- Apache-Gallery-1.0.2/templates/bright/layout.tpl 2011-06-08 19:47:59.000000000 +0200
|
|
+++ Apache-Gallery-1.0.2_fix/templates/bright/layout.tpl 2016-06-09 22:32:13.115882108 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-<?xml version='1.0' encoding='iso-8859-1'?>
|
|
+<?xml version='1.0' encoding='utf-8'?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" >
|
|
|
|
@@ -6,7 +6,7 @@
|
|
<head>
|
|
<title>{ $TITLE }</title>
|
|
<link rel="stylesheet" href="/gallery.css" type="text/css" />
|
|
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
|
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
{ $META }
|
|
<!--[if gte IE 5.5000]>
|
|
<link rel="stylesheet" href="/galleryIE.css" type="text/css" />
|
|
diff -ur Apache-Gallery-1.0.2/templates/default/layout.tpl Apache-Gallery-1.0.2_fix/templates/default/layout.tpl
|
|
--- Apache-Gallery-1.0.2/templates/default/layout.tpl 2011-06-08 19:48:00.000000000 +0200
|
|
+++ Apache-Gallery-1.0.2_fix/templates/default/layout.tpl 2016-06-09 22:25:20.297036457 +0200
|
|
@@ -5,6 +5,7 @@
|
|
<head>
|
|
<title>{ $TITLE }</title>
|
|
<link rel="stylesheet" href="/gallery.css">
|
|
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
{ $META }
|
|
</head>
|
|
|
|
diff -ur Apache-Gallery-1.0.2/templates/new/layout.tpl Apache-Gallery-1.0.2_fix/templates/new/layout.tpl
|
|
--- Apache-Gallery-1.0.2/templates/new/layout.tpl 2011-06-08 19:48:01.000000000 +0200
|
|
+++ Apache-Gallery-1.0.2_fix/templates/new/layout.tpl 2016-06-09 22:25:29.536741248 +0200
|
|
@@ -5,6 +5,7 @@
|
|
<head>
|
|
<title>{ $TITLE }</title>
|
|
<link rel="stylesheet" href="/gallery.css">
|
|
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
{ $META }
|
|
</head>
|
|
|