Changeset 12919 for trunk/cic-hcap/perllib/plugins

Timestamp:

2006-09-28T17:16:04+12:00 (18 years ago)

Author:

mdewsnip

Message:

More changes for HTML compliance and to improve the formatting of the collection pages.

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (5 diffs)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -380 +380 @@
         my $institution_place_id = $institution_places_match_hashref->{"Entry_ID"};
         my $institution_place_name = $institution_places_match_hashref->{"Current_name"};
-        $institution_places_list_html .= "<span class=\"cictext\"><a href=\"_gwcgi_?a=d&amp;d=p$institution_place_id\">$institution_place_name</a></span><br />\n";
+        $institution_places_list_html .= "<a href=\"_gwcgi_?a=d&amp;d=p$institution_place_id\">$institution_place_name</a><br />\n";
     }
     &new_metadata_entry($institution_doc_obj, "InstitutionPlacesListHTML", $institution_places_list_html);
@@ -423 +423 @@
         my $institution_best_place_id = $institution_best_place_image_hashref->{"Entry_ID"};
         my $institution_best_place_image_medium_file_href = $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "medium");
-        &new_metadata_entry($institution_doc_obj, "InstitutionBestPlaceImageHTML", "<a href=\"_gwcgi_?a=d&amp;d=p$institution_best_place_id\"><img src=\"$institution_best_place_image_medium_file_href\"/><br /><span class=\"cictext\">$institution_best_place_image_name</span></a>");
+        &new_metadata_entry($institution_doc_obj, "InstitutionBestPlaceImageHTML", "<a href=\"_gwcgi_?a=d&amp;d=p$institution_best_place_id\"><img alt=\"$institution_best_place_image_location\" src=\"$institution_best_place_image_medium_file_href\"/><br /><span class=\"cictext\">$institution_best_place_image_name</span></a>");
     }
 
@@ -1242 +1242 @@
     foreach my $letter (sort(keys %letter_to_ids_mapping)) {
     my @letter_ids = @{$letter_to_ids_mapping{$letter}};
-    &write_static_browser_macros_chunk($letter, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
+    my $anchor_name;
+    if ($letter =~ /^[A-Z]$/) {
+        $anchor_name = $letter;
+    }
+    &write_static_browser_macros_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
     }
     print BROWSER_MACROFILE "</table>\n";
@@ -1253 +1257 @@
 {
     my $chunk_title = shift(@_);
+    my $anchor_name = shift(@_);
     my $chunk_ids_ref = shift(@_);
     my $id_to_name_mapping = shift(@_);
     my $id_to_extra_mapping = shift(@_);
 
-    my $chunk_title_sans_spaces = $chunk_title;
-    $chunk_title_sans_spaces =~ s/ //g;
-    print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$chunk_title_sans_spaces\"/><span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>";
+    print BROWSER_MACROFILE "<tr><td width=\"50%\"><br />";
+    if (defined($anchor_name) && $anchor_name ne "") {
+    print BROWSER_MACROFILE "<a name=\"$anchor_name\"/>";
+    }
+    print BROWSER_MACROFILE "<span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>";
 
     my %full_name_to_id_mapping;
@@ -1356 +1363 @@
         @state_ids = @{$state_to_ids_mapping->{$state}};
     }
-    &write_static_browser_macros_chunk($state, \@state_ids, $id_to_name_mapping, undef);
+    my $state_sans_spaces = $state;
+    $state_sans_spaces =~ s/ //g;
+    &write_static_browser_macros_chunk($state, $state_sans_spaces, \@state_ids, $id_to_name_mapping, undef);
     if (!defined($state_to_ids_mapping->{$state})) {
         print BROWSER_MACROFILE "<tr><td colspan=\"2\" valign=\"top\">No institutions for this state</td></tr>";