Migrate templates to Bootstrap 3 markup. Use Kotti's default means fo…

…r success / error messages.
Kotti · Nov 11, 2014 · 4b02d09 · 4b02d09
1 parent 1c51a3d
commit 4b02d09
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/kotti_contactform/templates/contactform-view-one-column.pt b/kotti_contactform/templates/contactform-view-one-column.pt
@@ -7,15 +7,10 @@
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
   <article metal:fill-slot="content" class="contactform-view content">
     <h1>${api.context.title}</h1>
-    <p class="description">
+    <p class="lead">
       ${api.context.description}
     </p>
     ${structure: api.context.body}
-    <div tal:condition="form">
-      ${structure: form}
-    </div>
-    <div tal:condition="appstruct">
-      <p class="alert alert-success" i18n:translate="">Thanks for your submission!</p>
-    </div>
+    <div tal:condition="form" tal:content="structure form"></div>
   </article>
 </html>
diff --git a/kotti_contactform/templates/contactform-view-two-columns.pt b/kotti_contactform/templates/contactform-view-two-columns.pt
@@ -7,20 +7,15 @@
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
   <article metal:fill-slot="content" class="contactform-view content">
     <h1>${api.context.title}</h1>
-    <p class="description">
+    <p class="lead">
       ${api.context.description}
     </p>
-    <div class="row-fluid">
-      <div class="span5">
+    <div class="row">
+      <div class="col-md-6">
         ${structure: api.context.body}
       </div>
-      <div class="span7">
-        <div tal:condition="form">
-          ${structure: form}
-        </div>
-        <div tal:condition="appstruct">
-          <p class="alert alert-success" i18n:translate="">Thanks for your submission!</p>
-        </div>
+      <div class="col-md-6">
+        <div tal:condition="form" tal:content="structure form"></div>
       </div>
     </div>
   </article>

diff --git a/kotti_contactform/views.py b/kotti_contactform/views.py
@@ -166,6 +166,7 @@ class SubmissionSchema(colander.MappingSchema):
         try:
             appstruct = form.validate(controls)
             mail_submission(context, request, appstruct)
+            request.session.flash(_('Thanks for your submission!'), 'success')
         except ValidationFailure, e:
             appstruct = None
             rendered_form = e.render()