Link to the surnames page from the surnames popularity page

nigelhorne · Jul 28, 2024 · 7cd3e50 · 7cd3e50
1 parent f3e111c
commit 7cd3e50
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dynamic-site/lib/Ged2site/Display/graphs.pm b/dynamic-site/lib/Ged2site/Display/graphs.pm
@@ -1207,9 +1207,14 @@ sub create_cloud
 		foreach my $name(@all) {
 			my $count = $name->{'count'};
 			if($count == 1) {
+				# Go straight to the person
 				$cloud->add($name->{'name'}, "/cgi-bin/page.fcgi?page=people&amp;entry=$name->{people}", 1);
-			} else {
+			} elsif($sex) {
+				# First names - no links
 				$cloud->add_static($name->{'name'}, $count);
+			} else {
+				# Surnames - add links
+				$cloud->add($name->{'name'}, "/cgi-bin/page.fcgi?page=surnames&amp;surname=$name->{name}", $count);
 			}
 		}
 

diff --git a/dynamic-site/templates/en/mobile/Ged2site/Display/surnames.tmpl b/dynamic-site/templates/en/mobile/Ged2site/Display/surnames.tmpl
@@ -48,7 +48,7 @@
 						[% END %]
 						<dt>[% initial %]</dt><dd>
 					[% END %]
-					<a href="?page=surnames&amp;filename=[%- surname.filename | uri -%]&amp;surname=[%- surname.surname | uri -%]">[% surname.surname %]</a>
+					<a href="?page=surnames&amp;surname=[%- surname.surname | uri -%]">[% surname.surname %]</a>
 				[% END %]
 			</dd></dl>
 		[% ELSIF people %]

diff --git a/dynamic-site/templates/en/web/Ged2site/Display/surnames.tmpl b/dynamic-site/templates/en/web/Ged2site/Display/surnames.tmpl
@@ -49,6 +49,7 @@
 		</div>
 		<div id="container">
 			<center>
+				[ <a href="?page=home">Home</a> ] |
 				[ <a href="?page=people&amp;home=1">Home Person</a> ] |
 				[ <a href="?page=censuses">Census Index</a> ] |
 				[% IF surname %]
@@ -78,7 +79,7 @@
 						<ul id="nav">
 					[% END %]
 					<li>
-						<a href="?page=surnames&amp;filename=[%- surname.filename | uri -%]&amp;surname=[%- surname.surname | uri -%]">[% surname.surname %]</a>
+						<a href="?page=surnames&amp;surname=[%- surname.surname | uri -%]">[% surname.surname %]</a>
 					</li>
 				[% END %]
 				</ul>

diff --git a/ged2site b/ged2site
@@ -800,7 +800,7 @@ my %censusmaps = (
 
 # $ged->validate();
 
-my $home = $opts{h};
+my $home = $opts{'h'};
 if((!defined($home)) && defined($config)) {
 	$home = $config->{'home'};
 	if(ref($home) eq 'ARRAY') {