jinjify; show build details if failure occurs

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 14, 2015 · 70e48be · 70e48be
1 parent 75187a4
commit 70e48be
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 4 deletions.
diff --git a/comet/data/templates/jinja/comet_account.tmpl b/comet/data/templates/jinja/comet_account.tmpl
@@ -66,9 +66,10 @@
 
     {% if current_user.is_admin %}
     <p class="text-muted">You can edit your permissions in the <a
-    href="/users/permissions">permissions panel</a>.
+    href="/users/permissions">permissions panel</a>.</p>
     {% endif %}
 
+    {{ form.csrf_token }}
     <div style="text-align: center;">
         <button type="submit" class="btn btn-primary btn-lg save-btn"><i class="fa fa-save fa-fw save-icon"></i> Save</button>
     </div>

diff --git a/comet/data/templates/jinja/comet_index.tmpl b/comet/data/templates/jinja/comet_index.tmpl
@@ -36,6 +36,7 @@ Show posts of:
         <h2>Posts</h2>
         </div>
         <form method="POST" action="/new/post" class="input-group">
+              {{ postform.csrf_token }}
               <input class="form-control" name="title" id="title" placeholder="Title">
               <span class="input-group-btn"><button type="submit" class="btn btn-success"><i class="fa fa-file-o"></i> Create Post</button></span>
         </form>
@@ -60,6 +61,7 @@ Show posts of:
         </div>
         <form method="POST" action="/new/page" class="input-group">
               <input class="form-control" name="title" id="title" placeholder="Title">
+              {{ pageform.csrf_token }}
               <span class="input-group-btn"><button type="submit" class="btn btn-success"><i class="fa fa-file-o"></i> Create Page</button></span>
         </form>
         <div class="list-group pages">
@@ -92,6 +94,7 @@ Show posts of:
       <div class="modal-footer">
         <form method="POST" action="/delete" class="delete-button">
         <input type="hidden" name="path" class="sourcepath">
+        {{ delform.csrf_token }}
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
         <button type="submit" class="btn btn-danger">Delete</button>
       </div>

diff --git a/comet/data/templates/jinja/comet_login.tmpl b/comet/data/templates/jinja/comet_login.tmpl
@@ -13,9 +13,10 @@
         <input name="password" type="password" id="inputPassword" class="form-control" placeholder="Password" required>
         <div class="checkbox">
           <label>
-            <input type="checkbox" name="remember-me" value="remember-me"> Remember me
+            <input type="checkbox" name="remember" value="remember"> Remember me
           </label>
         </div>
+        {{ form.csrf_token }}
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
 {% endblock %}
diff --git a/comet/data/templates/jinja/comet_post_edit.tmpl b/comet/data/templates/jinja/comet_post_edit.tmpl
@@ -104,6 +104,7 @@
 </div>
 
 <textarea name="content" id="content-area" class="form-control" rows="24">{{ post_content }}</textarea>
+{{ form.csrf_token }}
 </form>
 {% if is_html %}
 <script src="/bower_components/wysihtml/dist/wysihtml5x-toolbar.min.js"></script>

diff --git a/comet/data/templates/jinja/comet_rebuild.tmpl b/comet/data/templates/jinja/comet_rebuild.tmpl
@@ -67,6 +67,9 @@ $(document).ready(function() {
                 fs.removeClass('fa-cog');
                 fs.addClass('fa-times');
                 fsc.addClass('text-danger');
+                $("#collapseOutput").collapse({
+                    show: true
+                });
             }
         });
     }, 500);

diff --git a/comet/data/templates/jinja/comet_users.tmpl b/comet/data/templates/jinja/comet_users.tmpl
@@ -66,7 +66,7 @@ $('#deleteModal').on('show.bs.modal', function (event) {
     {% endif %}
     </td>
     <td class="actions">
-    <form action="/users/edit" method="POST">
+    <form action="/users/edit" method="POST">{{ editform.csrf_token }}
     <input type="hidden" name="uid" value="{{ uid }}">
     <input type="hidden" name="action" value="edit">
     <div class="btn-group" role="group">
@@ -89,7 +89,7 @@ $('#deleteModal').on('show.bs.modal', function (event) {
     <td></td>
     <td><input name="username" placeholder="New user" class="form-control"></td>
     <td><input name="action" value="new" type="hidden"></td>
-    <td></td>
+    <td>{{ editform.csrf_token }}</td>
     <td></td>
     <td><button type="submit" class="btn btn-sm btn-primary"><i class="fa fa-plus-square fa-fw"></i> Create</button></td>
 </form></tr>
@@ -110,6 +110,7 @@ $('#deleteModal').on('show.bs.modal', function (event) {
         <input type="hidden" name="uid" class="del-uid">
         <input type="hidden" name="direction" class="del-direction">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        {{ delform.csrf_token }}
         <button type="submit" class="btn del-verb-capital">Delete</button>
       </div>
     </div>

diff --git a/comet/data/templates/jinja/comet_users_edit.tmpl b/comet/data/templates/jinja/comet_users_edit.tmpl
@@ -123,6 +123,7 @@
         </div>
     </div>
 
+    {{ form.csrf_token }}
     <div style="text-align: center;">
         <button type="submit" class="btn btn-primary btn-lg save-btn"><i class="fa fa-save fa-fw save-icon"></i> Save</button>
     </div>

diff --git a/comet/data/templates/jinja/comet_users_permissions.tmpl b/comet/data/templates/jinja/comet_users_permissions.tmpl
@@ -108,6 +108,7 @@ is_active
 {% endfor %}
 </table>
 
+{{ form.csrf_token }}
 <div style="text-align: center;"><button type="submit" class="btn btn-primary btn-lg save-btn"><i class="fa fa-save fa-fw save-icon"></i> Save</button></div>
 
 </form>

diff --git a/comet/data/templates/mako/comet_rebuild.tmpl b/comet/data/templates/mako/comet_rebuild.tmpl
@@ -67,6 +67,9 @@ $(document).ready(function() {
                 fs.removeClass('fa-cog');
                 fs.addClass('fa-times');
                 fsc.addClass('text-danger');
+                $("#collapseOutput").collapse({
+                    show: true
+                });
             }
         });
     }, 500);