Merge pull request #4 from Mika64/master

patch for flash messages
paulla · Aug 10, 2013 · e3068fc · e3068fc
2 parents 28c3b5c + 485a7c8
commit e3068fc
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/paulla/paste/templates/layout.pt b/paulla/paste/templates/layout.pt
@@ -14,36 +14,35 @@
     <link rel="alternate" href="${request.route_url('rss2')}" title="paulla.paste rss2" type="application/rss+xml" />
   </head>
   <body>
-    <div class="container-fluid"
+    <div class="container-fluid">
-	 tal:condition="request.session.peek_flash()"
+       <tal:message condition="request.session.peek_flash()">
-	 tal:define="flashes request.session.pop_flash()">
+         <div class="alert"
-
+             tal:repeat="message request.session.pop_flash()">
-      <div tal:repeat="flash flashes" class="alert ${flash['status']}" >
+           <button type="button" class="close" data-dismiss="alert">&times;</button>
-	<button type="button" class="close" data-dismiss="alert">&times;</button>
+           <tal:alert replace="structure message" />
-	<span>
+         </div>
-	  ${flash['message']}
+       </tal:message>
-	</span>
-      </div>
     </div>
 
     <div class="row-fluid">
       <div class="span3">
-	<ul class="nav nav-tabs nav-stacked">
+    <ul class="nav nav-tabs nav-stacked">
-	  <li tal:condition='request.path != "/"'>
+      <li tal:condition='request.path != "/"'>
-	    <a href="${request.route_path('home')}" i18n:translate=''>new</a>
+        <a href="${request.route_path('home')}" i18n:translate=''>new</a>
-	  </li>
+      </li>
-	    <li tal:repeat="current request.previous">
+        <li tal:repeat="current request.previous">
-	      <a href="${request.route_path('oneContent', idContent=current._id)}">${current.title} </a>
+          <a href="${request.route_path('oneContent', idContent=current._id)}">${current.title} </a>
-	    </li>
+        </li>
 
-	</ul>
+    </ul>
-	</div>
+    </div>
-	<div class="span9">
+    <div class="span9">
-	  <div id="content" metal:define-slot="content">
+      <div id="content" metal:define-slot="content">
 
-	  </div>
+      </div>
-	</div>
+    </div>
     </div>
 
   </body>
 </html>
+