That was a bad idea. Remove it.

[xonotic/xonstat.git] / xonstat / templates / merge.mako

diff --git a/xonstat/templates/merge.mako b/xonstat/templates/merge.mako
index 49d389b8d5302a37d71f6c93453ecab3defe120a..d1fc10f4cc976b3527c00d4170a17ef6e7ab0174 100644 (file)
--- a/xonstat/templates/merge.mako
+++ b/xonstat/templates/merge.mako
@@ -9,6 +9,26 @@ ${nav.nav('players')}
 
 <h2>Merge two players below.</h2>
 
+% if len(request.session.peek_flash("failure")) > 0:
+<div class="row">
+  <div class="span6">
+    <div class="alert alert-error">
+      <button type="button" class="close" data-dismiss="alert">&times;</button>
+      ${request.session.pop_flash("failure")[0]}
+    </div>
+  </div>
+</div>
+% endif
+
+% if len(request.session.peek_flash("success")) > 0:
+<div class="row">
+  <div class="alert alert-success">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    ${request.session.pop_flash("success")[0]}
+  </div>
+</div>
+% endif
+
 <div class="row">
   <div class="span6">
     <form style="margin-top:20px;" class="form-horizontal">
@@ -33,7 +53,7 @@ ${nav.nav('players')}
         <!-- Form submitted? -->
         <input type="hidden" name="fs" />
 
-        <input type="hidden" name="csrf_token" value=${request.session.get_csrf_token()}/>
+        <input type="hidden" name="csrf_token" value="${request.session.get_csrf_token()}"/>
 
         <!-- Button -->
         <div class="control-group">