You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2011/06/17 07:43:53 UTC
svn commit: r1136775 - /shindig/site/trunk/src/site/site.vm
Author: lindner
Date: Fri Jun 17 05:43:53 2011
New Revision: 1136775
URL: http://svn.apache.org/viewvc?rev=1136775&view=rev
Log:
step1 - basic html5 fixes
Modified:
shindig/site/trunk/src/site/site.vm
Modified: shindig/site/trunk/src/site/site.vm
URL: http://svn.apache.org/viewvc/shindig/site/trunk/src/site/site.vm?rev=1136775&r1=1136774&r2=1136775&view=diff
==============================================================================
--- shindig/site/trunk/src/site/site.vm (original)
+++ shindig/site/trunk/src/site/site.vm Fri Jun 17 05:43:53 2011
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
+<!doctype html>
#macro ( link $href $name $target $img $position $alt $border $width $height )
#set ( $linkTitle = ' title="' + $name + '"' )
#if( $target )
@@ -10,7 +9,7 @@
#if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
$href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
$href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
- #set ( $linkClass = ' class="externalLink"' )
+ #set ( $linkClass = ' rel="external" class="externalLink"' )
#else
#set ( $linkClass = "" )
#end
@@ -446,26 +445,46 @@
#macro ( googleAnalytics $accountId )
#if( $accountId && $accountId != "" )
<!-- Google Analytics -->
+ <!-- See mathiasbynens.be/notes/async-analytics-snippet -->
<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '$accountId']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
+ var _gaq=[['_setAccount','$accountId'],['_trackPageview'],['_trackPageLoadTime']];
+ (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+ g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+ s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
#end
#end
##
-<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
+<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
+<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end><!--<![endif]-->
<head>
+ <!-- START html5-boilerplate -->
+ <meta charset="${outputEncoding}">
+ <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
+ Remove this if you use the .htaccess -->
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <!-- Mobile viewport optimized: j.mp/bplateviewport -->
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
+
+ <!-- CSS: implied media="all" -->
+ <link rel="stylesheet" href="$relativePath/css/style.css">
+
+ <!-- More ideas for your <head> here: h5bp.com/docs/#head-Tips -->
+
+ <!-- All JavaScript at the bottom, except for Modernizr and Respond.
+ Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries -->
+ <script src="$relativePath/js/libs/modernizr-1.7.min.js"></script>
+ <script src="$relativePath/js/libs/respond.min.js"></script>
+
+ <!-- END html5-boilerplate -->
+
<meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
<title>$title</title>
+
<style type="text/css" media="all">
@import url("$relativePath/css/maven-base.css");
@import url("$relativePath/css/maven-theme.css");
@@ -498,40 +517,42 @@
#end
#end
$headContent
- #googleAnalytics( $decoration.googleAnalyticsAccountId )
</head>
<body class="composite">
+ <header>
<div id="banner">
#banner( $decoration.bannerLeft "bannerLeft" )
#banner( $decoration.bannerRight "bannerRight" )
- <div class="clear">
+ <div class="clearfix">
<hr/>
</div>
</div>
- <div id="breadcrumbs">
+ <nav id="breadcrumbs">
#publishDate( "left" $decoration.publishDate $decoration.version )
<div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
+ <div class="clearfix">
<hr/>
</div>
- </div>
- <div id="leftColumn">
+ </nav>
+ <nav id="leftColumn">
<div id="navcolumn">
#publishDate( "navigation-top" $decoration.publishDate $decoration.version )
#mainMenu( $decoration.body.menus )
#poweredByLogo( $decoration.poweredBy )
#publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
</div>
- </div>
- <div id="bodyColumn">
+ </nav>
+ </header>
+
+ <div id="main" role="main">
<div id="contentBox">
$bodyContent
</div>
</div>
- <div class="clear">
+ <div class="clearfix">
<hr/>
</div>
- <div id="footer">
+ <footer>
<div class="xright">
#if($decoration.body.footer)
$decoration.body.footer
@@ -539,9 +560,16 @@
Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )
#end
</div>
- <div class="clear">
+ <div class="clearfix">
<hr/>
</div>
- </div>
+ </footer>
+ <!-- JavaScript at the bottom for fast page loading -->
+ <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+ <script>window.jQuery || document.write('<script src="$relativePath/js/libs/jquery-1.6.1.min.js">\x3C/script>')</script>
+
+ #googleAnalytics( $decoration.googleAnalyticsAccountId )
</body>
</html>
+<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->