layout fixes

Author: backface

app/turtlestitch.py

@@ -31,7 +31,8 @@
 @app.route('/page')
 def index(db):
 	userinfo = is_logged_in(db)
-	return template('index', userinfo=userinfo)
+	return page_view(db,"index")
+	#return template('index', userinfo=userinfo)
 
 
 ###################      
@@ -603,7 +604,6 @@ def is_admin(userinfo):
 @app.route('/login')
 def login(db):
     userinfo = is_logged_in(db)
-    print userinfo
     if userinfo:
         redirect("/gallery")
     else:
@@ -616,6 +616,9 @@ def do_login(db):
 
     c = db.execute('select id, password from users where username = ?', (submitted_username,))
     row = c.fetchone()
+    if not row:
+		return template('user/login', userinfo=False, message="username or password do not match")
+		
     cryptedpassword = row[1]
     if not crypt.crypt(submitted_password,cryptedpassword) == cryptedpassword or not row:
         return template('user/login', userinfo=False, message="username or password do not match")
@@ -657,7 +660,7 @@ def page_new(db):
 
 @app.route('/page/create',method="POST")
 def page_create(db):
-	return page_update(db,True)
+	return page_update(db,"",True)
 
 @app.route('/page/edit/<slug>')
 def page_edit(db,slug=""):
@@ -677,18 +680,19 @@ def page_edit(db,slug=""):
 		new_page=False,
 		message="")		
 	else:
-		return render_error("Page not found")   
+		return render_error(db,"Page not found")   
 
-@app.route('/page/update',method="POST")
-def page_update(db,new_page=False):
+@app.route('/page/update/<old_slug>',method="POST")
+def page_update(db,old_slug,new_page=False,):
 	userinfo = is_logged_in(db) 
 	if not is_admin(userinfo):
 		return render_error(db,"NOT ALLOWED")
 	else:
+		
 		import re
 		submitted_title = request.forms.get('title').decode("utf-8")
 		submitted_content = request.forms.get('content').decode("utf-8")
-		submitted_slug = request.forms.get('slug')
+		submitted_slug = request.forms.get('slug').decode("utf-8")
 
 		message = []
 		error = False	
@@ -698,25 +702,26 @@ def page_update(db,new_page=False):
 			error = True
 			message.append("Title is required")			
 
-		print submitted_title;
 		if not error:
 			if submitted_slug == "" or submitted_slug== None:
 				slug = re.sub(r"[^a-zA-Z0-9\n\.]", "_", submitted_title)
 			else:		
 				slug = re.sub(r"[^a-zA-Z0-9\n\.]", "_", submitted_slug)	
-			
+		 
 			if not new_page:			
 				c = db.execute('update pages set title=?, slug=?, content=? where slug=?', 
-					(submitted_title, slug, submitted_content.decode("utf-8"), slug))
+					(submitted_title, slug, submitted_content, old_slug))
 			else:				
 				c = db.execute('insert into pages (title,slug, content) values (?, ?, ?)', 
-					(submitted_title, slug, submitted_content.decode("utf-8")))			
+					(submitted_title, slug, submitted_content))	
 
 			return template('page/view',
 				userinfo = userinfo,
 				new_page=new_page,
 				pagetitle=submitted_title,
 				content=submitted_content,
+				is_admin = True,
+				slug=slug,
 				message="page updated.",
 				message_header="Success")		
 		else:
@@ -740,6 +745,8 @@ def page_view(db,slug=""):
 		userinfo=userinfo,
 		pagetitle=row[0],
 		content=row[1],
+		is_admin = is_admin(userinfo),
+		slug = slug,
 		message="")		
 	else:
 		return render_error(db,"Page not found")   
@@ -858,7 +865,7 @@ def profile_show(db,username=""):
 			order by designs.timestamp desc
 			''',(username,))
 		rows = c.fetchall()
-		print rows
+
 		items = []
 		for row in rows:
 			item = {}
@@ -874,8 +881,7 @@ def profile_show(db,username=""):
 			item["exp_file"] = "%s.exp" % (row[0])
 			item["media_path"] = upload_www_path
 			items.append(item)
-	
-		print items
+
 		return template('user/profile',
 			items=items, 
 			userinfo=userinfo, 

app/views/base.tpl

@@ -50,9 +50,6 @@
       </div>
     </nav>
 
-	<div class="container">
-		{{!base}}
-	</div>
-
+	{{!base}}
 </body>
 </html>

app/views/gallery/view.tpl

@@ -100,7 +100,6 @@
 			<a href="/delete/{{item['id']}}"><span class="glyphicon glyphicon-remove"></span> delete</a>		
 			% end
 			</p>
-			
 
 		</div>
 

app/views/user/change_password.tpl

@@ -1,5 +1,6 @@
 % rebase('base.tpl', title=' - Change Password')
 
+<div class="container">
 
 <h3 class="form-signup-heading">Change Password</h3> 
 
@@ -56,7 +57,7 @@
 	  </div>	  
 	</div> 
 
-  <div class="form-group">
+  <div class=orm-group">
 	<div class="col-md-3">  
 	   <div class="btn-group">    
 		<button class="btn btn-lg btn-primary btn-block" type="submit" id="update">Update</button>     
@@ -67,9 +68,9 @@
   
   </div>
     
- 
 </form>
 
+</div>
 <script>
 	$(document).ready(function() {
 		$("input").keyup(function () {

app/views/user/edit_profile.tpl

@@ -1,5 +1,6 @@
 % rebase('base.tpl', title=' - Edit profile')
 
+<div class="container">
 
 <h3 class="form-signup-heading">Edit profile</h3> 
 
@@ -93,3 +94,5 @@
   <div class="col-md-6">
 		Profile images via <a href="http://www.gravatar.com">gravatar.com</a>
   </div>
+
+</div>

app/views/user/login.tpl

@@ -1,6 +1,10 @@
 % rebase('base.tpl', title=' - Login')
 
+
+
+<div class="container">
 <h3 class="form-signin-heading">Sign in</h3>
+</div>
 
 % if message: 
 
@@ -14,22 +18,22 @@
 
 % end
 
-
+<div class="container">
 <form class="form-horizontal" method="post" action="/login">
   <div class="form-group">
 	<div class="col-md-3">
 	  <div class="input-group">
 		<div class="input-group-addon">
 		  <span class="glyphicon glyphicon-user"></span>
 		</div>
-		<input type="text" class="form-control" name="username" id="username" placeholder="Username" autofocus />
+		<input type="text" required class="form-control" name="username" id="username" placeholder="Username" autofocus />
 	  </div>
 
 	  <div class="input-group">
 		<div class="input-group-addon">
 		  <span class="glyphicon glyphicon-lock"></span>
 		</div>
-		<input type="password" class="form-control" name="password" id="password" placeholder="Password" autofocus />
+		<input type="password" required class="form-control" name="password" id="password" placeholder="Password" />
 	  </div>
 	</div> 
   </div>
@@ -43,6 +47,28 @@
   </div>
 
 </form>
+</div>
+
+
+
+<script>
+	$(document).ready(function() {
+		$("input").keyup(function () {
+			var formGroup = $(this).parents(".form-group");
+			var glyphicon = formGroup.find(".glyphicon");
+			
+			if (this.checkValidity()) {
+				formGroup.addClass("has-success").removeClass("has-error");
+				glyphicon.addClass("glyphicon-ok").removeClass("glyphicon-remove");
+			} else {
+				formGroup.addClass("has-error").removeClass("has-success");
+				glyphicon.addClass("glyphicon-remove").removeClass("glyphicon-ok");
+			}
+			
+	});
+});		
+</script>
+
 
 
 

app/views/user/signup.tpl

@@ -1,5 +1,5 @@
 % rebase('base.tpl', title=' - Signup')
-
+<div class="container">
 
 <h3 class="form-signup-heading">Sign up</h3> 
 
@@ -95,6 +95,8 @@
 
 
 </form>
+</div>
+
 
 <script>
 	$(document).ready(function() {