Skip to content

Commit

Permalink
Item12192: HTMLValidation Tests are failing
Browse files Browse the repository at this point in the history 
<meta tags must be closed
All <link tags must include a type=

git-svn-id: http://svn.foswiki.org/trunk@17531 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Apr 16, 2014
1 parent f9451a7 commit fe3f92e
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
18 changes: 9 additions & 9 deletions PatternSkin/templates/css.pattern.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
%TMPL:DEF{"styles:default"}%%TMPL:P{"styles:screen"}%
%TMPL:P{"styles:print"}%%TMPL:END%

%TMPL:DEF{"styles:screen"}%%IF{ "$ FOSWIKI_LAYOUT_URL" then="<link rel='stylesheet' href='%FOSWIKI_LAYOUT_URL%' media='all' />"}%
%IF{ "$ FOSWIKI_STYLE_URL" then="<link rel='stylesheet' href='%FOSWIKI_STYLE_URL%' media='all' />"}%
%IF{ "$ FOSWIKI_COLORS_URL" then="<link rel='stylesheet' href='%FOSWIKI_COLORS_URL%' media='all' />"}%
%TMPL:DEF{"styles:screen"}%%IF{ "$ FOSWIKI_LAYOUT_URL" then="<link rel='stylesheet' href='%FOSWIKI_LAYOUT_URL%' media='all' type='text/css' />"}%
%IF{ "$ FOSWIKI_STYLE_URL" then="<link rel='stylesheet' href='%FOSWIKI_STYLE_URL%' media='all' type='text/css' />"}%
%IF{ "$ FOSWIKI_COLORS_URL" then="<link rel='stylesheet' href='%FOSWIKI_COLORS_URL%' media='all' type='text/css' />"}%
%TMPL:P{"styles:custom_skin"}%%IF{ "$ USERLAYOUTURL or $ USERSTYLEURL or $ USERCOLORSURL" then="$percntTMPL:P{$quotstyles:user_defined$quot}$percnt"}%%TMPL:P{"styles:dynamic"}%%TMPL:END%


%TMPL:DEF{"styles:print"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/print.css' media='%IF{"$'URLPARAM{cover}'='print'" then="all" else="print"}%' />%TMPL:END%
%TMPL:DEF{"styles:print"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/print.css' media='%IF{"$'URLPARAM{cover}'='print'" then="all" else="print"}%' type='text/css' />%TMPL:END%

%TMPL:DEF{"styles:dynamic"}%<style type="text/css" media="all">
/* Styles that are set using variables */
Expand All @@ -21,13 +21,13 @@
</style>%TMPL:END%


%TMPL:DEF{"styles:user_defined"}%%{ "kept for compatibility with TWiki 4.2" }%%IF{ "$ USERLAYOUTURL" then="<link rel='stylesheet' href='%USERLAYOUTURL%' media='all' />"}%
%IF{ "$ USERSTYLEURL" then="<link rel='stylesheet' href='%USERSTYLEURL%' media='all' />"}%
%IF{ "$ USERCOLORSURL" then="<link rel='stylesheet' href='%USERCOLORSURL%' media='all' />"}%%TMPL:END%
%TMPL:DEF{"styles:user_defined"}%%{ "kept for compatibility with TWiki 4.2" }%%IF{ "$ USERLAYOUTURL" then="<link rel='stylesheet' href='%USERLAYOUTURL%' media='all' type='text/css' />"}%
%IF{ "$ USERSTYLEURL" then="<link rel='stylesheet' href='%USERSTYLEURL%' media='all' type='text/css' />"}%
%IF{ "$ USERCOLORSURL" then="<link rel='stylesheet' href='%USERCOLORSURL%' media='all' type='text/css' />"}%%TMPL:END%


%TMPL:DEF{"styles:custom_skin"}%%IF{ "$ PATTERNSKIN_COLUMNS" then="<link rel='stylesheet' href='%PATTERNSKIN_COLUMNS%' media='all' />"}%
%IF{ "$ PATTERNSKIN_THEME_VARIANT" then="<link rel='stylesheet' href='%PATTERNSKIN_THEME_VARIANT%' media='all' />"}%%TMPL:END%
%TMPL:DEF{"styles:custom_skin"}%%IF{ "$ PATTERNSKIN_COLUMNS" then="<link rel='stylesheet' href='%PATTERNSKIN_COLUMNS%' media='all' type='text/css' />"}%
%IF{ "$ PATTERNSKIN_THEME_VARIANT" then="<link rel='stylesheet' href='%PATTERNSKIN_THEME_VARIANT%' media='all' type='text/css' />"}%%TMPL:END%


%TMPL:DEF{"styles:iespecific"}%<!--[if IE 7 ]><style type="text/css" media="screen">
Expand Down
10 changes: 5 additions & 5 deletions PatternSkin/templates/foswiki.pattern.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
%TMPL:P{"head:meta"}%%RENDERZONE{"head"}%%TMPL:P{"head:css"}%%TMPL:P{"head:script"}%%RENDERZONE{"script"}%</head>%TMPL:END%

%TMPL:DEF{"head:meta"}%<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-status-bar-style" content="black-translucent">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<link rel="icon" href="%FAVICON%" type="image/x-icon" />
<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
Expand Down
2 changes: 1 addition & 1 deletion SlideShowPlugin/templates/view.slideshow.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%TMPL:DEF{"sidebar"}%%TMPL:END%

%TMPL:DEF{"slideshow::js"}%<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/SlideShowPlugin/slideshow.js'></script>%TMPL:END%
%TMPL:DEF{"slideshow::css"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SlideShowPlugin/slideshow.css' media='all' />%TMPL:END%
%TMPL:DEF{"slideshow::css"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SlideShowPlugin/slideshow.css' media='all' type='text/css' />%TMPL:END%

%TMPL:DEF{"content"}%%TEXT%
#TopicEnd
Expand Down
4 changes: 2 additions & 2 deletions core/templates/css.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
%TMPL:P{"styles:iespecific"}%
%TMPL:P{"templatestyle"}%%TMPL:END%
%{}%
%TMPL:DEF{"styles:base"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css' media='all' />%TMPL:END%
%TMPL:DEF{"styles:base"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css' media='all' type='text/css' />%TMPL:END%
%{}%
%TMPL:DEF{"styles:default"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/default.css' media='all' />%TMPL:END%
%TMPL:DEF{"styles:default"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/default.css' media='all' type='text/css' />%TMPL:END%
%{}%
%TMPL:DEF{"styles:iespecific"}%<!--[if IE]><style type="text/css" media="screen">
pre {
Expand Down
10 changes: 5 additions & 5 deletions core/templates/foswiki.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ JQUERYPLUGIN is not a hard requirement, but it must sort earlier.
}%%TMPL:DEF{"head"}%<head>
%TMPL:P{"windowtitle"}%
<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" /> <meta name="robots" content="noindex" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-status-bar-style" content="black-translucent">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> %HTTP_EQUIV_ON_VIEW%
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> %HTTP_EQUIV_ON_VIEW%
<link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
<meta name="description" content="%TOPIC%" />
Expand Down

0 comments on commit fe3f92e

Please sign in to comment.