content and archive bug resolved, changes cdns for jquery and bootstrap

fuser (fossix host user) · santoshs · commit 506de4f0e831 · 2013-07-19T22:15:17.000+05:30
Signed-off-by: fuser (fossix host user) &lt;fuser@server.fossix.org&gt;
diff --git a/alembic.ini b/alembic.ini
@@ -11,7 +11,7 @@ script_location = dbvc
 # the 'revision' command, regardless of autogenerate
 # revision_environment = false
 
-sqlalchemy.url = postgresql://fossguy:DarkHat2414@localhost/fossixdb
+sqlalchemy.url = postgresql://fossuser:DarkHat2414@localhost/fossixdb
 
 
 # Logging configuration
diff --git a/fossix/config.py b/fossix/config.py
@@ -3,10 +3,10 @@
 class DefaultConfig(object):
     DATABASE_CONNECT_OPTIONS = {}
 
-    SECRET_KEY = 'SecretKeyForSessionSigning'
+    SECRET_KEY = 'SOME_SECURE_PHRASE'
 
     CSRF_ENABLED = True
-    CSRF_SESSION_KEY = "somethingimpossibletoguess"
+    CSRF_SESSION_KEY = "A_SECURE_PHRASE_TO_PROTECT_FORMS"
 
     CACHE_TYPE = 'memcached'
     CACHE_MEMCACHED_SERVERS = ['127.0.0.1:11211']
@@ -46,7 +46,7 @@ class DebugConfig(DefaultConfig):
     DB_SERVER = 'localhost'
     DB_PORT = 5432
     DB_NAME = 'fossix'
-    DB_USER = 'fossguy'
+    DB_USER = 'user'
     DB_PASSWD  = 'db_password'
 
     SQLALCHEMY_DATABASE_URI = get_dburi('postgresql', DB_SERVER, DB_PORT,
diff --git a/fossix/templates/base.html b/fossix/templates/base.html
@@ -64,7 +64,7 @@ <h1> {{ pagetitle }}
     {% block __block_3 %}
       <div id="rsb" class="span5" style="margin-top:30px;">
         {% block rsb_content %}
-        <div id="rsb1" class="span8">
+        <div id="rsb1" class="span7">
           {% block rsb1 %}
           {% if recent %}
           <ul class="nav nav-list">
diff --git a/fossix/templates/master.html b/fossix/templates/master.html
@@ -1,17 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <link href="{{ config['SITE_CDN'] }}/css/bootstrap.min.css" rel="stylesheet"
-          media="screen">
-    <link href="{{ config['SITE_CDN'] }}/css/bootstrap-responsive.min.css" rel="stylesheet"
-          media="screen">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
     <link href="{{ config['SITE_CDN'] }}/css/fossix.css" rel="stylesheet"
           media="screen">
     <!-- <link href="{{ config['SITE_CDN'] }}/css/zocial/zocial.css" rel="stylesheet" -->
     <!--       media="screen"> -->
-    <script src="{{ config['SITE_CDN'] }}/js/jquery-latest.js"></script>
-    <script src="{{ config['SITE_CDN'] }}/js/jquery-ui.min.js"></script>
-    <script src="{{ config['SITE_CDN'] }}/js/bootstrap.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
     <script src="/static/js/fossix.js"></script>
 
     {% block master_head %}{% endblock %}
diff --git a/fossix/views/content.py b/fossix/views/content.py
@@ -137,7 +137,11 @@ def preview(self):
 
 class TagsView(FlaskView):
     def index(self):
-	page = int(request.args.get('page'))
+	page = request.args.get('page')
+	if page is None:
+	    page = 1
+	else:
+	    page = int(page)
 	limit = 20
 	start = (page - 1) * limit
 	tags = db.session.query(Keywords).order_by(asc(Keywords.keyword)).all()
@@ -194,7 +198,11 @@ def watched(self):
 class ContentView(FlaskView):
     route_base = '/'
     def index(self):
-	c = Content.get_recent(1)[0]
+	c = Content.get_recent(1)
+	if c is None:
+	    abort(404)
+
+	c = c[0]
 	form = None
 	if c is None:
 	    flash(u'Nothing exists :-(.')
@@ -370,7 +378,11 @@ def get(self, page):
 	start = end - page_limit
 
 	c = content=db.session.query(Content).filter(
-	    Content.category=='article').all()
+	    Content.category=='article')
+	if c.count() == 0:
+	    abort(404)
+
+	c = c.all()
 	contents = c[start:end]
 
 	if not contents:
