rename everything to comet and add setup

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 5, 2015 · c0237dd · c0237dd
1 parent 0814762
commit c0237dd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/COMET/__init__.py b/COMET/__init__.py
@@ -204,7 +204,7 @@ def index():
 
 @app.route('/setup')
 def setup():
-    needs_setup = os.path.exists(os.path.join(_site.config["OUTPUT_FOLDER"], 'assets'))
+    needs_setup = not os.path.exists(os.path.join(_site.config["OUTPUT_FOLDER"], 'assets'))
     return render("comet_setup.tmpl", context={'needs_setup': needs_setup})
 
 @app.route('/edit/<path:path>', methods=['GET', 'POST'])

diff --git a/COMET/templates/mako/comet_setup.tmpl b/COMET/templates/mako/comet_setup.tmpl
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+## -*- coding: utf-8 -*-
+>>>>>>> rename everything to comet and add setup
 <!DOCTYPE html>
 <html>
     <head>
@@ -14,8 +18,15 @@
 
         a {
             text-decoration: none;
+<<<<<<< HEAD
             border-radius: 3px;
             border-color: #ccc;
+=======
+            border-radius: 5px;
+            border: solid #ccc 1px;
+            padding: 10px;
+            color: #000;
+>>>>>>> rename everything to comet and add setup
         }
         </style>
     </head>
@@ -25,8 +36,15 @@
         <p>Welcome to Comet CMS!</p>
         <p>In order to start using Comet CMS, you must run <kbd>nikola build</kbd> first.</p>
         <p><a href="/">→ Try again</a></p>
+<<<<<<< HEAD
         % else
         <p>Comet CMS is good to go!</p>
         <p><a href="/">→ Continue</a></p>
+=======
+        % else:
+        <p>Comet CMS is good to go!</p>
+        <p><a href="/">→ Continue</a></p>
+        % endif
+>>>>>>> rename everything to comet and add setup
     </body>
 </html>