Added submodule main and removed left-col

Author: toxicafunk

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "main"]
+	path = main
+	url = ./main

app.yaml

@@ -8,4 +8,4 @@ handlers:
   static_dir: static
 
 - url: /.*
-  script: blog.py
+  script: main/blog.py

blog.py

@@ -1,15 +1,16 @@
 import functools
-import markdown
 import re
-import tornado.web
 import unicodedata
 import datetime
 import logging
 
+import tornado.web
+
 from google.appengine.api import users
 from google.appengine.ext import db
 
-import buzz
+import blogzz.buzz as buzz
+import blogzz.markdown as markdown
 import blogzz.models as models
 import blogzz.importer as importer
 
@@ -19,7 +20,6 @@ def administrator(method):
     """Decorate with this method to restrict to site admins."""
     @functools.wraps(method)
     def wrapper(self, *args, **kwargs):
-        logging.debug("Entro al wrapper")
         if not self.current_user:
             if self.request.method == "GET":
                 self.redirect(self.get_login_url())

buzz.py renamed to blogzz/buzz.py

@@ -1,9 +1,9 @@
 import logging,unicodedata,re,datetime
-import markdown
 
 from google.appengine.ext import db
 
 import blogzz.models as models
+import blogzz.markdown as markdown
 
 #logging.basicConfig(level=logging.DEBUG, format='%(asctime)s:%(msecs)03d %(levelname)-8s %(name)-8s %(message)s', datefmt='%H:%M:%S')
 

blogzz/handlers.py

@@ -30,7 +30,6 @@ img { max-width:630px;}
 #header h1 { margin-top: 20px; }
 #header h1 a { color: #f78d1d; text-shadow: 2px 3px 7px #000; }
 
-#left-col {float: left; width: 165px; margin-top: 25px; }
 #categories { height: 320px; }
 #categories h4{ margin-top: 15px; text-align: center; text-decoration:underline;}
 #catbox { margin-top:10px; width:160px;  height:280px; background: #dbd9d9;}

blogzz/importer.py

@@ -26,32 +26,35 @@
         </div>
         <h1><a href="/">{{ escape(handler.settings["blog_title"]) }}</a></h1>
       </div>
+              
+      <div id="main">
+        
+        <h2><a href="/" class="orange button navlinks">Home</a></h2>
+        <h2><a href="#" class="orange button navlinks">Settings</a></h2>
+        
+        <a href="/feed"><img id="rss" src="/static/imgs/rss.png" /></a>
+
+        <div id="boxcontent">{% block body %}{% end %}</div>
+      </div>
+      
+      <div class="division">
+        <img src="/static/imgs/div.png" />
+      </div>
 
-      <div id="left-col">
+      <div id="right-col">
         {% if current_user and current_user.administrator %}
           <a href="/compose" class="orange button">{{ _("New Blogzz") }}</a>
         {% end %}
-        
-        <div id="categories">
-          <h4>Categories</h4>
-          <div id="catbox">
-            <ul>
-              <li><a href="#">categoria 1</a></li>
-              <li><a href="#">categoria 2</a></li>
-              <li><a href="#">categoria 3</a></li>
-
-              <li><a href="#">categoria 4</a></li>
-              <li><a href="#">categoria 5</a></li>
-              <li><a href="#">categoria 6</a></li>
-              <li><a href="#">categoria 7</a></li>
-              <li><a href="#">categoria 8</a></li>
-              <li><a href="#">categoria 9</a></li>
 
-              <li><a href="#">categoria 10</a></li>
-            </ul> 
+        <div id="twitter">
+          <h4>Tweets</h4>
+          <div id="tweets">
+            <p>Ejemplo de un tweet</p>
+            <p>Segundo tweet</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
           </div>
         </div>
-            
+        
         <div id="tags">
           <h4>Tags</h4>
           <div id="tagbox">
@@ -69,39 +72,8 @@ <h4>Tags</h4>
               <li><a href="#">tag 10</a></li>
             </ul> 
           </div>
-        </div>         
-      </div>
-
-      
-      <div class="division">
-        <img src="/static/imgs/div.png" />
-      </div>
-      
-      <div id="main">
-        
-        <h2><a href="/" class="orange button navlinks">Home</a></h2>
-        <h2><a href="#" class="orange button navlinks">Settings</a></h2>
-        
-        <a href="/feed"><img id="rss" src="/static/imgs/rss.png" /></a>
-
-        <div id="boxcontent">{% block body %}{% end %}</div>
-      </div>
-      
-      <div class="division">
-        <img src="/static/imgs/div.png" />
-      </div>
-      
-      <div id="right-col">
-
-          <div id="twitter">
-            <h4>Tweets</h4>
-            <div id="tweets">
-              <p>Ejemplo de un tweet</p>
-              <p>Segundo tweet</p>
-              <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-            </div>
+        </div>
 
-          </div>
       </div>
 
       <div id="footer">