Item12481:

* improved browser deprecation process * removed border attr deprecated in html5 git-svn-id: http://svn.foswiki.org/trunk/NatSkinPlugin@16722 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 13, 2013 · de92f4b · de92f4b
1 parent e34146d
commit de92f4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/Foswiki/Plugins/NatSkinPlugin.pm b/lib/Foswiki/Plugins/NatSkinPlugin.pm
@@ -30,8 +30,8 @@ use Foswiki::Plugins::NatSkinPlugin::WebComponent ();
 our $baseWeb;
 our $baseTopic;
 
-our $VERSION = '3.99_003';
-our $RELEASE = '3.99_003';
+our $VERSION = '3.99_004';
+our $RELEASE = '3.99_004';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Support plugin for <nop>NatSkin';
 our $themeEngine;

diff --git a/lib/Foswiki/Plugins/NatSkinPlugin/ThemeEngine.pm b/lib/Foswiki/Plugins/NatSkinPlugin/ThemeEngine.pm
@@ -404,6 +404,13 @@ sub init {
     $context->{UnsupportedBrowser} = 1 if $context->{msie7} && $Foswiki::cfg{NatSkin}{DeprecateIE7};
     $context->{UnsupportedBrowser} = 1 if $context->{msie8} && $Foswiki::cfg{NatSkin}{DeprecateIE8};
     $context->{UnsupportedBrowser} = 1 if $context->{msie9} && $Foswiki::cfg{NatSkin}{DeprecateIE9};
+
+    my %deprecatedBrowsers = map {$_ => 1} split(/\s*,\s*/, Foswiki::Func::getPreferencesValue('DEPRECATEDBROWSERS') || '');
+    $deprecatedBrowsers{msie6} = 1 if $Foswiki::cfg{NatSkin}{DeprecateIE6};
+    $deprecatedBrowsers{msie7} = 1 if $Foswiki::cfg{NatSkin}{DeprecateIE7};
+    $deprecatedBrowsers{msie8} = 1 if $Foswiki::cfg{NatSkin}{DeprecateIE8};
+    $deprecatedBrowsers{msie9} = 1 if $Foswiki::cfg{NatSkin}{DeprecateIE9};
+    Foswiki::Func::setPreferencesValue("DEPRECATEDBROWSERS", join(", ", sort keys %deprecatedBrowsers));
   }
 
   # SMELL: these misc helper contexts should be core

diff --git a/lib/Foswiki/Plugins/NatSkinPlugin/WebLogo.pm b/lib/Foswiki/Plugins/NatSkinPlugin/WebLogo.pm
@@ -77,7 +77,7 @@ sub renderAlt {
     Foswiki::Func::getPreferencesValue('WEBLOGOALT') || 
     Foswiki::Func::getPreferencesValue('WIKILOGOALT') || 
     Foswiki::Func::getPreferencesValue('WIKITOOLNAME') || 
-    'Foswiki';
+    'Logo';
 }
 
 ###############################################################################
@@ -144,7 +144,7 @@ sub renderLogo {
   } else {
     my $image = renderSrc();
     if ($image) {
-      $result = '<img class="natWebLogo natWebLogoImage" src="$src" alt="$alt" border="0" />';
+      $result = '<img class="natWebLogo natWebLogoImage" src="$src" alt="$alt" />';
     } else {
       $result = '<span class="natWebLogo natWebLogoName">%WIKITOOLNAME%</span>';
     }