diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index d9af29416..cb1494b8d 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -13,6 +13,7 @@ - fixed #10184: Matrix 2.0 - Version Tag Duplicate Type - fixed #10182: Matrix 2.0 - Comparison view broken in IE 6 & 7 - Added individual shipping requirements to the Sku. + - added #10145: Global Head Tags in Settings 7.7.4 - rfe: Extend DateTime for Week-Nrs (#9151) diff --git a/docs/upgrades/upgrade_7.7.4-7.7.5.pl b/docs/upgrades/upgrade_7.7.4-7.7.5.pl index af9d6840c..ad92dd222 100644 --- a/docs/upgrades/upgrade_7.7.4-7.7.5.pl +++ b/docs/upgrades/upgrade_7.7.4-7.7.5.pl @@ -40,7 +40,7 @@ sm_updateDailyWorkflow($session); turnOffAdmin($session); correctEventTemplateVariables($session); - +addGlobalHeadTags( $session ); addShipsSeparateToSku($session); finish($session); # this line required @@ -59,6 +59,13 @@ sub turnOffAdmin { print "OK\n" unless $quiet; } +sub addGlobalHeadTags { + my ( $session ) = @_; + print "\tAdding Global HEAD tags setting... " unless $quiet; + $session->setting->add('globalHeadTags',''); + print "OK\n" unless $quiet; +} + sub installStoryManagerTables { my ($session) = @_; print "\tAdding Story Manager tables... " unless $quiet; diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 41677cc83..aeafba539 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -262,6 +262,14 @@ sub definition { label => $i18n->get('recaptcha private key'), defaultValue => $setting->get('recaptchaPrivateKey'), }); + push @fields, { + tab => "ui", + fieldType => "codearea", + name => "globalHeadTags", + label => $i18n->get('global head tags label'), + hoverHelp => $i18n->get('global head tags description'), + defaultValue => $setting->get('globalHeadTags'), + }; # messaging settings push(@fields, { tab=>"messaging", diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm index 50eab9f23..81102d288 100644 --- a/lib/WebGUI/Session/Style.pm +++ b/lib/WebGUI/Session/Style.pm @@ -181,6 +181,7 @@ props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'"; return props[propName]; } +' . $self->session->setting->get('globalHeadTags') . ' '; diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index a03ff435a..710534b2b 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -4349,6 +4349,17 @@ Users may override this setting in their profile. lastUpdated => 0, context => q|name for the Ad Space control| }, + + 'global head tags label' => { + message => 'Global Head Tags', + lastUpdated => 0, + context => "Label for setting", + }, + 'global head tags description' => { + message => ' tags for every page on the site (including admin pages)', + lastUpdated => 0, + context => 'Description of setting', + }, };