Permalink
Browse files

Merge pull request #722 from pulletsforever/dwk/html5-rhtml

Removed self-closing HTML since they don't really mean anything anymore
  • Loading branch information...
2 parents 873befc + 4113734 commit 568e63f07c8f0fd030a14b5c3ce839e7ff452400 Wesley Workman committed Mar 26, 2012
Showing with 20 additions and 19 deletions.
  1. +20 −19 lib/index.rhtml
View
39 lib/index.rhtml
@@ -8,37 +8,38 @@
# See the comments in this file for more information on what you can
# change.
-%>
-<!DOCTYPE html>
-<html<% unless @content_for_html5_manifest.blank? %> manifest="app.manifest"<% end %>>
+<!doctype html>
+<html<% unless @content_for_html5_manifest.blank? %> manifest="manifest.appcache"<% end %> class="no-js" lang="<%=language%>">
<head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge<%= config.chrome_frame ? ',chrome=1' : '' %>" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge<%= config.chrome_frame ? ',chrome=1' : '' %>" >
<script>
- var SC_benchmarkPreloadEvents = { headStart: new Date().getTime() };
+ var SC_benchmarkPreloadEvents = { headStart: new Date().getTime() };
+ window.documentElement.className = window.documentElement.className.replace(/(^|\s)no-js(\s|$)/, '$1js$2');
</script>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
- <meta name="apple-mobile-web-app-capable" content="yes" />
- <meta name="apple-mobile-web-app-status-bar-style" content="<%= config.status_bar_style || 'default' %>" />
- <meta name="viewport" content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8" >
+ <meta http-equiv="Content-Script-Type" content="text/javascript" >
+ <meta name="apple-mobile-web-app-capable" content="yes" >
+ <meta name="apple-mobile-web-app-status-bar-style" content="<%= config.status_bar_style || 'default' %>" >
+ <meta name="viewport" content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" >
<% if config.touch_enabled %>
<% if config.precomposed_icon %>
- <link rel="apple-touch-icon-precomposed" href="<%= sc_static(config.precomposed_icon) %>" />
+ <link rel="apple-touch-icon-precomposed" href="<%= sc_static(config.precomposed_icon) %>" >
<% elsif config.icon %>
- <link rel="apple-touch-icon" href="<%= sc_static(config.icon) %>" />
+ <link rel="apple-touch-icon" href="<%= sc_static(config.icon) %>" >
<% end %>
<% if config.startup_image_portrait %>
- <link rel="apple-touch-startup-image" media="screen and (orientation:portrait)" href="<%= sc_static(config.startup_image_portrait) %>" />
+ <link rel="apple-touch-startup-image" media="screen and (orientation:portrait)" href="<%= sc_static(config.startup_image_portrait) %>" >
<% end %>
<% if config.startup_image_landscape %>
- <link rel="apple-touch-startup-image" media="screen and (orientation:landscape)" href="<%= sc_static(config.startup_image_landscape) %>" />
+ <link rel="apple-touch-startup-image" media="screen and (orientation:landscape)" href="<%= sc_static(config.startup_image_landscape) %>" >
<% end %>
<% end %>
<% if config.favicon %>
- <link rel="shortcut icon" href="<%= sc_static(config.favicon) %>" type="image/x-icon" />
+ <link rel="shortcut icon" href="<%= sc_static(config.favicon) %>" type="image/x-icon" >
<% end %>
@@ -74,9 +75,9 @@
SC.APP_IMAGE_ASSETS = <%= image_urls_for_client(nil, { :sprited => true, :x2 => true }).to_json %>;
} else {
styles = <%= stylesheet_urls_for_client.to_json %>;
- SC.APP_IMAGE_ASSETS = <%= image_urls_for_client(nil, { :sprited => true }).to_json %>;
+ SC.APP_IMAGE_ASSETS = <%= image_urls_for_client(nil, { :sprited => true }).to_json %>;
}
-
+
var head = document.getElementsByTagName("head")[0],
len = styles.length, idx, css;
@@ -102,7 +103,7 @@
-%>
<body class="<%= [theme_name(:default => 'sc-theme'), 'sc-focus'].compact.join(' ') %>">
<script>
- SC.benchmarkPreloadEvents['bodyStart'] = new Date().getTime();
+ SC.benchmarkPreloadEvents['bodyStart'] = new Date().getTime();
</script>
<% # This section is used to setup additional optional class names on the
# body content based on JS-selected conditions. Use this to make sure you
@@ -188,7 +189,7 @@
<%= @content_for_designer -%>
<script>
- SC.benchmarkPreloadEvents['bodyEnd'] = new Date().getTime();
+ SC.benchmarkPreloadEvents['bodyEnd'] = new Date().getTime();
</script>
- </body>
+ </body>
</html>

0 comments on commit 568e63f

Please sign in to comment.