Commits

Shlomi Fish committed c0bd274

Steps towards validation as XHTML 5.

These are steps towards validation as XHTML 5.

  • Participants
  • Parent commits 5757617
  • Branches xhtml5_compatibility

Comments (0)

Files changed (4)

 upload_backup: upload_deps
 	( cd $(T2_DEST) && $(RSYNC) -r * shlomif@alberni.textdrive.com:domains/www-backup.shlomifish.org/web/public )
 
-upload: upload_remote
+upload: upload_beta
 
 upload_remote: upload_local upload_remote_only
 
 upload_var_without_deps:
 	( cd $(T2_DEST) && $(RSYNC) -a --inplace . /var/www/html/shlomif/homepage-local/ )
 
-upload_beta: upload_deps
+upload_beta: upload_deps upload_local
 	( cd $(T2_DEST) && $(RSYNC) --inplace -a * $${__HOMEPAGE_REMOTE_PATH}/__Beta-kmor/ )
 clean:
 	rm -fr $(T2_DEST)/*

File lib/local-defs.wml

 <set-var latemp_with_favicon="<latemp_mynot "$(PRINTABLE)" />" />
 <set-var latemp_with_xml_declaration="1" />
 <set-var latemp_with_breadcrumbs_trail="1" />
-<set-var latemp_html_standard="xhtml1.1" />
+<set-var latemp_html_standard="xhtml5" />
 <set-var latemp_nav_links_allowed_places="top-left" />
 <set-var latemp_gen_plain_page="$(PRINTABLE)" />
 <set-var latemp_with_head_meta_tags="<latemp_mynot "$(PRINTABLE)" />" />

File lib/rest-of-template.wml

 <!-- End of Project Wonderful ad code. -->
 </define-tag>
 
+
+<define-tag project_wonderful_top_proto__noscript>
+<noscript><div><map id="admap42457"><area href="http://www.projectwonderful.com/out_nojs.php?r=0&amp;c=0&amp;id=42457&amp;type=1" shape="rect" coords="0,0,468,60" title="" alt="" /></map></div>
+<table><tr><td><img src="http://www.projectwonderful.com/nojs.php?id=42457&amp;type=1" height="60" usemap="admap42457" alt="" /></td></tr><tr><td colspan="1"><div class="cen"><a style="font-size:10px;color:#0000ff;text-decoration:none;line-height:1.2;font-weight:bold;font-family:Tahoma, verdana,arial,helvetica,sans-serif;text-transform: none;letter-spacing:normal;text-shadow:none;white-space:normal;word-spacing:normal;" href="http://www.projectwonderful.com/advertisehere.php?id=42457&amp;type=1">Ads by Project Wonderful!  Your ad here, right now: $0.02</a></div></td></tr><tr><td colspan="1" style="height:3px;font-size:1px;padding:0px;max-height:3px;vertical-align:top;"></td></tr></table>
+</noscript>
+</define-tag>
+
+<define-tag on_not_xhtml5 endtag="required">
+<if "<latemp_mynot "<latemp_is_xhtml5 />" />" "%body" />
+</define-tag>
+
 <define-tag project_wonderful_top_proto>
 <!-- Project Wonderful Ad Box Loader -->
 <script type="text/javascript">
 <!-- Project Wonderful Ad Box Code -->
 <div id="pw_adbox_42457_1_0"></div>
 <script type="text/javascript"></script>
-<noscript><div><map id="admap42457"><area href="http://www.projectwonderful.com/out_nojs.php?r=0&amp;c=0&amp;id=42457&amp;type=1" shape="rect" coords="0,0,468,60" title="" alt="" /></map></div>
-<table><tr><td><img src="http://www.projectwonderful.com/nojs.php?id=42457&amp;type=1" height="60" usemap="admap42457" alt="" /></td></tr><tr><td colspan="1"><div class="cen"><a style="font-size:10px;color:#0000ff;text-decoration:none;line-height:1.2;font-weight:bold;font-family:Tahoma, verdana,arial,helvetica,sans-serif;text-transform: none;letter-spacing:normal;text-shadow:none;white-space:normal;word-spacing:normal;" href="http://www.projectwonderful.com/advertisehere.php?id=42457&amp;type=1">Ads by Project Wonderful!  Your ad here, right now: $0.02</a></div></td></tr><tr><td colspan="1" style="height:3px;font-size:1px;padding:0px;max-height:3px;vertical-align:top;"></td></tr></table>
-</noscript>
+<on_not_xhtml5>
+<project_wonderful_top_proto__noscript />
+</on_not_xhtml5>
 <!-- End Project Wonderful Ad Box Code -->
 <script type="text/javascript" src="http://www.projectwonderful.com/ad_display.js"></script>
 <!-- End of Project Wonderful ad code. -->
 <!-- Project Wonderful Ad Box Code -->
 <div id="pw_adbox_42545_3_0"></div>
 <script type="text/javascript"></script>
+<on_not_xhtml5>
 <noscript><div><map id="admap42545"><area href="http://www.projectwonderful.com/out_nojs.php?r=0&amp;c=0&amp;id=42545&amp;type=3" shape="rect" coords="0,0,160,600" title="" alt="" /></map></div>
 <table><tr><td><img src="http://www.projectwonderful.com/nojs.php?id=42545&amp;type=3" width="160" height="600" usemap="admap42545" alt="" /></td></tr><tr><td colspan="1"><div class="cen"><a style="font-size:10px;color:#0000ff;text-decoration:none;line-height:1.2;font-weight:bold;font-family:Tahoma, verdana,arial,helvetica,sans-serif;text-transform: none;letter-spacing:normal;text-shadow:none;white-space:normal;word-spacing:normal;" href="http://www.projectwonderful.com/advertisehere.php?id=42545&amp;type=3">Ads by Project Wonderful!  Your ad here, right now: $0.02</a></div></td></tr><tr><td colspan="1" style="height:3px;font-size:1px;padding:0px;max-height:3px;vertical-align:top;"></td></tr></table>
 </noscript>
+</on_not_xhtml5>
 <!-- End Project Wonderful Ad Box Code -->
 </define-tag>
 
 </define-tag>
 
 <define-tag disqus_thread>
-<div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/shlomifish/embed.js"></script><noscript><p><a href="http://shlomifish.disqus.com/?url=ref">View the discussion thread.</a></p></noscript><p><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a></p>
+<div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/shlomifish/embed.js"></script>
+<on_not_xhtml5>
+<noscript><p><a href="http://shlomifish.disqus.com/?url=ref">View the discussion thread.</a></p></noscript>
+</on_not_xhtml5>
+<p><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a></p>
 <br />
 <br />
 </define-tag>

File t2/index.html.wml

 ;;; OpenID-enabling http://www.shlomifish.org/ - see:
 ;;; http://blog.woobling.org/2009/05/your-openid-sucks.html
 <set-var openid="http://shlomif.livejournal.com/">
-<meta http-equiv="X-XRDS-Location" content="http://shlomif.livejournal.com/data/yadis" />
+<if "<latemp_mynot "<latemp_is_xhtml5 />" />"
+    "<meta http-equiv="X-XRDS-Location" content="http://shlomif.livejournal.com/data/yadis" />" />
 <link rel="openid2.provider" href="http://www.livejournal.com/openid/server.bml" />
 <link rel="openid.server" href="http://www.livejournal.com/openid/server.bml" />
 <link rel="openid.delegate" href="<get-var openid />" />