Use updated "absolute_url" extension
authorThierry Florac <thierry.florac@onf.fr>
Wed, 20 May 2015 12:32:56 +0200
changeset 59 3b9c4d71b30a
parent 58 0fe2f8f8b90b
child 60 b3d22ddef5cc
Use updated "absolute_url" extension
src/pyams_skin/templates/layout.pt
--- a/src/pyams_skin/templates/layout.pt	Wed May 20 12:32:12 2015 +0200
+++ b/src/pyams_skin/templates/layout.pt	Wed May 20 12:32:56 2015 +0200
@@ -24,7 +24,7 @@
 	<tal:var replace="extension:resources" />
 
 </head>
-<body tal:attributes="class static.body_css_class">
+<body tal:attributes="class static.body_css_class" i18n:domain="pyams_skin">
 
 	<!-- Page header -->
 	<header id="header">
@@ -34,9 +34,8 @@
 			<span id="logo"
 				  tal:define="logo config.logo | nothing"
 				  tal:condition="logo">
-				<a tal:attributes="href string:${extension:absolute_url(context)}/@@index.html">
-					<img tal:attributes="src string:${extension:absolute_url(logo)}/++thumb++w200.png;
-										 alt config.logo_title;" />
+				<a tal:attributes="href extension:absolute_url(context, '@@index.html')">
+					<img tal:attributes="src extension:absolute_url(logo, '++thumb++200x36.png');" />
 				</a>
 			</span>
 		</div>
@@ -60,7 +59,7 @@
 			<!-- collapse menu button -->
 			<div id="hide-menu" class="btn-header pull-right" tal:condition="static.include_menus">
 				<span>
-					<a href="javascript:void(0);" title="Hide menu" class="hint" i18n:attributes="title"
+					<a href="#" title="Hide menu" class="hint" i18n:attributes="title"
 					   data-ams-hint-gravity="ne"><i class="fa fa-bars"></i></a>
 				</span>
 			</div>
@@ -140,6 +139,8 @@
 	<aside id="left-panel">
 
 		<tal:if condition="static.include_menus">
+			<!-- AJAX progress gear -->
+			<div id="ajax-gear"><i class="fa fa-2x fa-spin fa-gear"></i></div>
 			<!-- Navigation menus -->
 			<nav tal:content="structure provider:pyams.menus"></nav>
 			<span class="minifyme" style=""> <i class="fa fa-arrow-circle-left hit"></i> </span>
@@ -157,6 +158,7 @@
 
 		<!-- Ribbon -->
 		<div id="ribbon">
+			<!-- Refresh button -->
 			<span class="ribbon-button-alignment">
 				<span id="refresh" class="btn btn-ribbon hint" data-ams-hint-gravity="w" data-ams-hint-html="true"
 					  title="&lt;span&gt;&lt;i class=&#39;text-warning fa fa-warning&#39;&gt;&lt;/i&gt; WARNING: this will reset all your widgets status!&lt;/span&gt;"
@@ -174,7 +176,7 @@
 		<!-- Content -->
 		<div id="content" style="opacity: 1;">
 			<!--[if lt IE 9]>
-			<h1>Votre navigateur est trop ancien. Veuillez installer une version 9 ou sup&eacute;rieure d'Internet Explorer.</h1>
+			<h1 i18n:translate="">Your browser is too old. Please install version 9 or higher of Internet Explorer.</h1>
 			<![endif]-->
 			<tal:var content="structure provider:pagelet" />
 		</div>
@@ -185,6 +187,6 @@
 
 	<!-- Javascript extensions -->
 	<tal:var content="structure provider:pyams.jsextensions" />
-	<!-- end Javascript extensions -->
+	<!-- end javascript extensions -->
 </body>
 </html>