# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1418720615 -3600
# Node ID 1be0b3bf8677f8048533a12b38a2492e99d7d1e0
# Parent  beba0d4262c2c8aaa29d73891bc4de2c879736cc# Parent  ea0f5cbc525d156e089b759ff5829a8766f01fa5
Redirect to relative URL in logout form

diff -r ea0f5cbc525d -r 1be0b3bf8677 .hgtags
--- a/.hgtags	Wed Oct 29 14:34:26 2014 +0100
+++ b/.hgtags	Tue Dec 16 10:03:35 2014 +0100
@@ -7,4 +7,4 @@
 eaa27399ce71fd86f75d86f60b3871e491428c0b 0.1.6
 6461321696622f47a504c2ec2aa5f097ac3646cd 0.1.7
 d6076389062284353e943d17d8044df9b7e4b0f2 0.1.8
-62fa715ef961e62a6e51cc2d220e33e6cd365295 0.1.9
+01102909c5e409f90107769dda4344e9449d4380 0.1.9
diff -r ea0f5cbc525d -r 1be0b3bf8677 docs/HISTORY.txt
--- a/docs/HISTORY.txt	Wed Oct 29 14:34:26 2014 +0100
+++ b/docs/HISTORY.txt	Tue Dec 16 10:03:35 2014 +0100
@@ -3,6 +3,8 @@
 
 0.1.9
 -----
+ - added optional form's title attribute
+ - updated Google Analytics code
  - redirect to relative URL in logout view
 
 0.1.8
diff -r ea0f5cbc525d -r 1be0b3bf8677 src/ztfy.myams.egg-info/PKG-INFO
--- a/src/ztfy.myams.egg-info/PKG-INFO	Wed Oct 29 14:34:26 2014 +0100
+++ b/src/ztfy.myams.egg-info/PKG-INFO	Tue Dec 16 10:03:35 2014 +0100
@@ -38,6 +38,8 @@
         
         0.1.9
         -----
+         - added optional form's title attribute
+         - updated Google Analytics code
          - redirect to relative URL in logout view
         
         0.1.8
diff -r ea0f5cbc525d -r 1be0b3bf8677 src/ztfy/myams/templates/forms/form.pt
--- a/src/ztfy/myams/templates/forms/form.pt	Wed Oct 29 14:34:26 2014 +0100
+++ b/src/ztfy/myams/templates/forms/form.pt	Tue Dec 16 10:03:35 2014 +0100
@@ -9,7 +9,7 @@
 			<img tal:condition="config/logo"
 				 tal:attributes="src string:${config/logo/@@absolute_url}/++display++w200.png;
 								 alt config/logo_title;">
-			<span class="title" tal:content="config/title">Title</span>
+			<span class="title" tal:content="view/title | config/title">Title</span>
 		</h3>
 	</div>
 	<div class="modal-body no-padding">
diff -r ea0f5cbc525d -r 1be0b3bf8677 src/ztfy/myams/templates/fullpage-layout.pt
--- a/src/ztfy/myams/templates/fullpage-layout.pt	Wed Oct 29 14:34:26 2014 +0100
+++ b/src/ztfy/myams/templates/fullpage-layout.pt	Tue Dec 16 10:03:35 2014 +0100
@@ -24,18 +24,19 @@
 
 	<!-- Content -->
 	<div id="content" style="opacity: 1;">
-		<!--[if IE 8]>
+		<!--[if lt IE 9]>
 		<h1>Votre navigateur est trop ancien. Veuillez installer une version 9 ou sup&eacute;rieure d'Internet Explorer.</h1>
 		<![endif]-->
 		<tal:var content="structure provider:pagelet" />
 	</div>
+	<!-- end content -->
 
 	<tal:if condition="config/google_analytics_key">
 		<!-- Google Analytics -->
-		<script type="text/javascript">
+		<script type="text/javascript" tal:content="python:'''
 
 		  var _gaq = _gaq || [];
-		  _gaq.push(['_setAccount', 'UA-xxxxxx-y']);
+		  _gaq.push(['_setAccount', '%(key)s']);
 		  _gaq.push(['_trackPageview']);
 
 		  (function() {
@@ -44,7 +45,8 @@
 			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 		  })();
 
-		</script>
+		''' % {'key': config.google_analytics_key}"></script>
+		<!-- end Google Analytics -->
 	</tal:if>
 </body>
 </html>
diff -r ea0f5cbc525d -r 1be0b3bf8677 src/ztfy/myams/templates/fullpage-modal-layout.pt
--- a/src/ztfy/myams/templates/fullpage-modal-layout.pt	Wed Oct 29 14:34:26 2014 +0100
+++ b/src/ztfy/myams/templates/fullpage-modal-layout.pt	Tue Dec 16 10:03:35 2014 +0100
@@ -24,7 +24,7 @@
 
 	<!-- Content -->
 	<div id="content" style="opacity: 1;">
-		<!--[if IE 8]>
+		<!--[if lt IE 9]>
 		<h1>Your browser is too old. Please use Internet Explorer version 9 or later.</h1>
 		<![endif]-->
 		<div class="modal-dialog modal-medium"
@@ -35,10 +35,10 @@
 
 	<tal:if condition="config/google_analytics_key">
 		<!-- Google Analytics -->
-		<script type="text/javascript">
+		<script type="text/javascript" tal:content="python:'''
 
 		  var _gaq = _gaq || [];
-		  _gaq.push(['_setAccount', 'UA-xxxxxx-y']);
+		  _gaq.push(['_setAccount', '%(key)s']);
 		  _gaq.push(['_trackPageview']);
 
 		  (function() {
@@ -47,7 +47,8 @@
 			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 		  })();
 
-		</script>
+		''' % {'key': config.google_analytics_key}"></script>
+		<!-- end Google Analytics -->
 	</tal:if>
 </body>
 </html>
diff -r ea0f5cbc525d -r 1be0b3bf8677 src/ztfy/myams/templates/layout.pt
--- a/src/ztfy/myams/templates/layout.pt	Wed Oct 29 14:34:26 2014 +0100
+++ b/src/ztfy/myams/templates/layout.pt	Tue Dec 16 10:03:35 2014 +0100
@@ -157,7 +157,7 @@
 
 		<!-- Content -->
 		<div id="content" style="opacity: 1;">
-			<!--[if IE 8]>
+			<!--[if lt IE 9]>
 			<h1>Votre navigateur est trop ancien. Veuillez installer une version 9 ou sup&eacute;rieure d'Internet Explorer.</h1>
 			<![endif]-->
 			<tal:var content="structure provider:pagelet" />