fix #28 -- fallback for non-html posts

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 12, 2015 · 9341eee · 9341eee
1 parent 66f22cc
commit 9341eee
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 65 deletions.
diff --git a/SITE/comet_users.json b/SITE/comet_users.json
diff --git a/comet/data/comet_assets/css/comet.css b/comet/data/comet_assets/css/comet.css
@@ -3,6 +3,8 @@
  * See /LICENSE for licensing information.
  */
 
+/* global styles */
+
 .save-btn, .save-icon {
     transition: all 0.5s ease;
 }
@@ -11,10 +13,14 @@
     text-align: center;
 }
 
+/* index */
+
 .list-group.posts, .list-group.pages {
     margin-top: 22px;
 }
 
+/* edit */
+
 #post-meta-line, #toolbar, #post-meta-panel, #content-area {
     margin-top: 10px;
 }
@@ -49,6 +55,13 @@
     border-color: #66afe9;
 }
 
+.markup-warning {
+    vertical-align: middle;
+    float: none !important;
+}
+
+/* user management */
+
 .inactive-user .username, .inactive-user .realname {
     text-decoration: line-through;
 }
@@ -61,10 +74,14 @@ table.users .uid {
     vertical-align: middle !important;
 }
 
+/* permission management */
+
 .perm, .select_all {
     text-align: center;
 }
 
+/* login (copied from Bootstrap example) */
+
 .form-signin {
   max-width: 330px;
   padding: 15px;

diff --git a/comet/data/comet_users.json b/comet/data/comet_users.json
diff --git a/comet/data/templates/mako/comet_account.tmpl b/comet/data/templates/mako/comet_account.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 % if action == 'save':

diff --git a/comet/data/templates/mako/comet_error.tmpl b/comet/data/templates/mako/comet_error.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_head">
 </%block>

diff --git a/comet/data/templates/mako/comet_index.tmpl b/comet/data/templates/mako/comet_index.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 <script>

diff --git a/comet/data/templates/mako/comet_login.tmpl b/comet/data/templates/mako/comet_login.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="content">
 % if alert:

diff --git a/comet/data/templates/mako/comet_post_edit.tmpl b/comet/data/templates/mako/comet_post_edit.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 % if action == 'save':
@@ -45,6 +46,7 @@
         <div id="toolbar" class="btn-toolbar">
         <div class="btn-group"><button type="submit" class="btn btn-sm btn-primary save-btn"><i class="fa fa-save fa-fw save-icon"></i> Save</button></div>
 
+% if is_html:
         <div class="btn-group">
           <a class="btn btn-default btn-sm" data-wysihtml5-command="bold" title="CTRL+B"><i class="fa fa-bold"></i></a>
           <a class="btn btn-default btn-sm" data-wysihtml5-command="italic" title="CTRL+I"><i class="fa fa-italic"></i></a>
@@ -96,10 +98,14 @@
               </select>
             </label>
           </div>
-        </div>
+% else:
+<div class="btn-group btn btn-sm disabled markup-warning text-warning"><i class="fa fa-warning"></i> Format: <strong>${post.compiler.name}</strong> — editor unavailable</div>
+% endif
+</div>
 
 <textarea name="content" id="content-area" class="form-control" rows="24">${post_content}</textarea>
 </form>
+% if is_html:
 <script src="/bower_components/wysihtml/dist/wysihtml5x-toolbar.min.js"></script>
 <script src="/bower_components/wysihtml/parser_rules/advanced_and_extended.js"></script>
 <script type="text/javascript">
@@ -109,4 +115,5 @@
     stylesheets: ['/comet_assets/css/wysihtml5x.css']
   });
 </script>
+% endif
 </%block>
diff --git a/comet/data/templates/mako/comet_users.tmpl b/comet/data/templates/mako/comet_users.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 % if action == 'save':

diff --git a/comet/data/templates/mako/comet_users_edit.tmpl b/comet/data/templates/mako/comet_users_edit.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 % if action == 'save':

diff --git a/comet/data/templates/mako/comet_users_permissions.tmpl b/comet/data/templates/mako/comet_users_permissions.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <%inherit file="base.tmpl"/>
 <%block name="extra_js">
 <script>

diff --git a/comet/web.py b/comet/web.py
@@ -565,6 +565,7 @@ def edit(path):
     context['current_auid'] = int(post.meta('author.uid') or current_user.uid)
     context['title'] = 'Editing {0}'.format(post.title())
     context['permalink'] = '/edit/' + path
+    context['is_html'] = post.compiler.name == 'html'
     return render('comet_post_edit.tmpl', context)