Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/1.2001_01'

  • Loading branch information...
commit bfbbb6d1ca415b2e025cde3bfe0ebc0075fc7ee1 2 parents e9069a5 + 959da5a
@xsawyerx xsawyerx authored
Showing with 16 additions and 7 deletions.
  1. +7 −0 CHANGES
  2. +1 −1  lib/Dancer.pm
  3. +8 −6 script/dancer
View
7 CHANGES
@@ -1,3 +1,10 @@
+Dancer 1.2001_01
+ [ David Precious, Ivan Bessarabov ]
+ * Fixing TT example config.
+
+ [ Danijel Tasov ]
+ * Default layout now validates.
+
Dancer 1.2001
[ Sawyer X ]
* Fix clash with KiokuDB because of Dancer::Serializer::Dumper.
View
2  lib/Dancer.pm
@@ -31,7 +31,7 @@ use File::Basename 'basename';
use base 'Exporter';
$AUTHORITY = 'SUKRIA';
-$VERSION = '1.2001';
+$VERSION = '1.2001_01';
@EXPORT = qw(
after
any
View
14 script/dancer
@@ -442,15 +442,17 @@ WriteMakefile(
'main.tt' =>
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-type" content="text/html; charset=<% settings.charset %>" />
<title>'.$appname.'</title>
<link rel="stylesheet" href="<% request.base %>/css/style.css" />
<!-- Grab Google CDN\'s jQuery. fall back to local if necessary -->
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script>!window.jQuery && document.write(\'<script src="<% request.base%>/javascripts/jquery.js"><\/script>\')</script>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+<script type="text/javascript">/* <![CDATA[ */
+ !window.jQuery && document.write(\'<script type="text/javascript" src="<% request.base%>/javascripts/jquery.js"><\/script>\')
+/* ]]> */</script>
</head>
<body>
@@ -834,9 +836,9 @@ template: \"simple\"
# template: \"template_toolkit\"
# engines:
# template_toolkit:
-# ENCODING: 'utf8'
-# START_TAG: '[%'
-# END_TAG: '%]
+# encoding: 'utf8'
+# start_tag: '[%'
+# end_tag: '%]'
",
Please sign in to comment.
Something went wrong with that request. Please try again.