Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move h1 tags to template #6654

Merged
merged 2 commits into from
Apr 21, 2022
Merged

fix: move h1 tags to template #6654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3ece2
fix: move h1 tags to template
stephanegigandet Apr 20, 2022
0fde0fa
non greedy match for h1 tag
stephanegigandet Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 15 additions & 30 deletions lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,6 @@ sub display_text($)
# Replace included texts
$html =~ s/\[\[(.*?)\]\]/$replace_file->($1)/eg;


while ($html =~ /<scripts>(.*?)<\/scripts>/s) {
$html = $` . $';
$scripts .= $1;
Expand All @@ -1434,10 +1433,10 @@ sub display_text($)
# wikipedia style links [url text]
$html =~ s/\[(http\S*?) ([^\]]+)\]/<a href="$1">$2<\/a>/g;


if ($html =~ /<h1>(.*)<\/h1>/) {
# Remove the title from the content to put it in the title field
if ($html =~ /<h1>(.*?)<\/h1>/) {
$title = $1;
#$html =~ s/<h1>(.*)<\/h1>//;
$html = $` . $';
}

# Generate a table of content
Expand Down Expand Up @@ -1565,20 +1564,15 @@ sub display_mission($)

open(my $IN, "<:encoding(UTF-8)", "$data_root/lang/$lang/missions/$missionid.html");
my $html = join('', (<$IN>));
my $title = undef;
if ($html =~ /<h1>(.*)<\/h1>/) {
$title = $1;
#$html =~ s/<h1>(.*)<\/h1>//;
}

$request_ref->{title} = lang("mission_") . $title;
$request_ref->{content_ref} = \$html;
$request_ref->{canon_url} = canonicalize_tag_link("missions", $missionid);

display_page($request_ref);
exit();
}


sub get_cache_results($$){

my $key = shift;
Expand Down Expand Up @@ -4153,14 +4147,15 @@ HTML
$request_ref->{title} = $title;
}

my $itemtype = "https://schema.org/Thing";
if ($tagtype eq "brands") {
$itemtype = "https://schema.org/Brand";
$request_ref->{schema_org_itemtype} = "https://schema.org/Brand";
}
else {
$request_ref->{schema_org_itemtype} = "https://schema.org/Thing";
}

# TODO: Producer

$html = "<div itemscope itemtype=\"" . $itemtype . "\"><h1 itemprop=\"name\">" . $title ."</h1>" . $html . "</div>";
${$request_ref->{content_ref}} .= $html . search_and_display_products($request_ref, $query_ref, $sort_by, undef, undef);
}

Expand Down Expand Up @@ -6773,7 +6768,6 @@ sub display_page($) {
my $content_ref = $request_ref->{content_ref};
my $blocks_ref = $request_ref->{blocks_ref};


my $meta_description = '';

my $content_header = '';
Expand All @@ -6784,7 +6778,6 @@ sub display_page($) {
my $type;
my $id;


$log->debug("displaying blocks") if $log->is_debug();

display_login_register($blocks_ref);
Expand All @@ -6810,12 +6803,6 @@ sub display_page($) {

$title =~ s/<([^>]*)>//g;

my $h1_title= '';

if ((${$content_ref} !~ /<h1/) and (defined $title)) {
$h1_title = "<h1>$title</h1>";
}

my $textid = undef;
if ((defined $description) and ($description =~ /^textid:/)) {
$textid = $';
Expand All @@ -6831,8 +6818,6 @@ sub display_page($) {
$meta_description = "<meta name=\"description\" content=\"$description\">";
}



my $canon_title = '';
if (defined $title) {
$title = remove_tags_and_quote($title);
Expand Down Expand Up @@ -6910,6 +6895,11 @@ sub display_page($) {
$template_data_ref->{formatted_subdomain} = $formatted_subdomain;
$template_data_ref->{css_timestamp} = $file_timestamps{'css/dist/app-' . lang('text_direction') . '.css'};
$template_data_ref->{header} = $header;
$template_data_ref->{page_type} = $request_ref->{page_type};

if ($request_ref->{schema_org_itemtype}) {
$template_data_ref->{schema_org_itemtype} = $request_ref->{schema_org_itemtype};
}

my $site_name = $Lang{site_name}{$lang};
if ($server_options{producers_platform}) {
Expand Down Expand Up @@ -7098,8 +7088,8 @@ JS
$template_data_ref->{aside_blocks} = $aside_blocks;
$template_data_ref->{tagline} = $tagline;
$template_data_ref->{blocks} = $blocks;
$template_data_ref->{h1_title} = $h1_title;
$template_data_ref->{content_ref} = $$content_ref;
$template_data_ref->{title} = $title;
$template_data_ref->{content} = $$content_ref;
$template_data_ref->{join_us_on_slack} = $join_us_on_slack;

# init javascript code
Expand Down Expand Up @@ -8258,11 +8248,6 @@ sub display_product_jqm ($) # jquerymobile

my @fields = qw(generic_name quantity packaging br brands br categories br labels br origins br manufacturing_places br emb_codes purchase_places stores);




$html .= "<h1>$product_ref->{product_name}</h1>";

if ($code =~ /^2000/) { # internal code
}
else {
Expand Down
16 changes: 12 additions & 4 deletions templates/web/common/site_layout.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,18 @@ <h2><a href="/" style="font-size:1rem;">[% site_name %]</a></h2>

[% INCLUDE 'web/common/includes/donate_banner.tt.html' %]

[% h1_title %]

[% content_ref %]

[% IF page_type == "product" %]
<!-- product page content contains its own h1 title -->
[% content %]
[% ELSIF schema_org_itemtype.defined %]
<div itemscope itemtype="[% schema_org_itemtype %]">
<h1 itemprop="name">[% title %]</h1>
[% content %]
</div>
[% ELSE %]
<h1>[% title %]</h1>
[% content %]
[% END %]
</div>
</div>
</div>
Expand Down