[Hejes-devel] [882] blog: ready for formatting (with fake pager)
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Thu Aug 1 15:49:37 CEST 2013
Revision: 882
Author: mihaltz
Date: 2013-08-01 15:49:36 +0200 (Thu, 01 Aug 2013)
Log Message:
-----------
blog: ready for formatting (with fake pager)
Modified Paths:
--------------
trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
trunk/web2py/applications/helyesiras_webdev/controllers/default.py
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_cas.table
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_event.table
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_group.table
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_membership.table
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_permission.table
trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_user.table
trunk/web2py/applications/helyesiras_webdev/databases/sql.log
trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
trunk/web2py/applications/helyesiras_webdev/models/db.py
trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
trunk/web2py/applications/helyesiras_webdev/static/css/main.css
trunk/web2py/applications/helyesiras_webdev/views/blog/index.html
trunk/web2py/applications/helyesiras_webdev/views/blog/manage.html
trunk/web2py/applications/helyesiras_webdev/views/layout.html
Added Paths:
-----------
trunk/web2py/applications/helyesiras_webdev/databases/blog_categories.table
trunk/web2py/applications/helyesiras_webdev/databases/blog_images.table
trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table
trunk/web2py/applications/helyesiras_webdev/databases/blog_tags.table
Removed Paths:
-------------
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table
Modified: trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/controllers/blog.py 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/controllers/blog.py 2013-08-01 13:49:36 UTC (rev 882)
@@ -5,6 +5,7 @@
@author MM
"""
+
def index():
"""Starting page for the blog.
returns following keys:
@@ -14,10 +15,10 @@
TODO:
check GET vars (category, tag(s?)) and filter posts accordingly
"""
- # all categories, tags for sidebar
+ # all categories & tags for sidebar
cats = dbblog().select(dbblog.categories.ALL, orderby=dbblog.categories.id)
tags = dbblog().select(dbblog.tags.ALL, orderby=dbblog.tags.name)
- # get posts (last 5, filtered by category or tag)
+ # assemble query: last 5 posts, filtered by category or tag specified via args
query = dbblog.posts.category == dbblog.categories.id
usercat = request.vars.get('category')
if usercat:
@@ -27,9 +28,9 @@
query &= (dbblog.posts.tags.contains(usertag))
# execute query
posts = dbblog(query).select(orderby=~dbblog.posts.created_on, limitby=(0, 5))
- # return
return dict(categories=cats, tags=tags, posts=posts)
+
def show():
"""Show a selected blog post.
slug of post to show is passed as an unnamed argument with HTTP GET.
@@ -45,8 +46,19 @@
if slug == None: # no arg: redirect to index
redirect(URL(c='blog', f='index'))
# query TODO: all tables all data as text
- rows = dbblog( (dbblog.posts.category==dbblog.categories.id) & (dbblog.posts.slug==slug)).select(
- left=dbblog.images.on(dbblog.posts.image==dbblog.images.id) )
+ #rows = dbblog( (dbblog.posts.category==dbblog.categories.id) & (dbblog.posts.slug==slug)).select(
+ # left=dbblog.images.on(dbblog.posts.image==dbblog.images.id) )
+ rows = dbblog( (dbblog.posts.category==dbblog.categories.id) & (dbblog.posts.slug==slug)).select()
if len(rows) == 0: # post not found: redirect to index
redirect(URL(c='blog', f='index')) # TODO: add message to flash as a var?
return dict(categories=cats, tags=tags, post=rows.first())
+
+
+ at auth.requires_login()
+def manage():
+ """Show an SQLFORM.smartgrid to manage dbblog.posts
+ """
+ grid = SQLFORM.grid(dbblog.posts)
+ return dict(grid=grid)
+
+
Modified: trunk/web2py/applications/helyesiras_webdev/controllers/default.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/controllers/default.py 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/controllers/default.py 2013-08-01 13:49:36 UTC (rev 882)
@@ -472,3 +472,60 @@
return dict(form=form, result=None, status=None, ntotal=0, page=0, perpage=1)
else: # form not submitted
return dict(form=form, result=None, status=None, ntotal=0, page=0, perpage=1)
+
+
+# ----------------------------------------------------------------------
+# Functions required for user authentication
+
+def user():
+ """
+ exposes:
+ http://..../[app]/default/user/login
+ http://..../[app]/default/user/logout
+ http://..../[app]/default/user/register
+ http://..../[app]/default/user/profile
+ http://..../[app]/default/user/retrieve_password
+ http://..../[app]/default/user/change_password
+ use @auth.requires_login()
+ @auth.requires_membership('group name')
+ @auth.requires_permission('read','table name',record_id)
+ to decorate functions that need access control
+ """
+ return dict(form=auth())
+
+
+def download():
+ """
+ allows downloading of uploaded files
+ http://..../[app]/default/download/[filename]
+ """
+ return response.download(request, db)
+
+
+def call():
+ """
+ exposes services. for example:
+ http://..../[app]/default/call/jsonrpc
+ decorate with @services.jsonrpc the functions to expose
+ supports xml, json, xmlrpc, jsonrpc, amfrpc, rss, csv
+ """
+ return service()
+
+
+ at auth.requires_signature()
+def data():
+ """
+ http://..../[app]/default/data/tables
+ http://..../[app]/default/data/create/[table]
+ http://..../[app]/default/data/read/[table]/[id]
+ http://..../[app]/default/data/update/[table]/[id]
+ http://..../[app]/default/data/delete/[table]/[id]
+ http://..../[app]/default/data/select/[table]
+ http://..../[app]/default/data/search/[table]
+ but URLs must be signed, i.e. linked with
+ A('table',_href=URL('data/tables',user_signature=True))
+ or with the signed load operator
+ LOAD('default','data.load',args='tables',ajax=True,user_signature=True)
+ """
+ return dict(form=crud())
+
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table 2013-08-01 13:44::43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,41 +0,0 @@
-(dp1
-S'id'
-p2
-(dp3
-S'length'
-p4
-I255
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I1
-sS'sql'
-p7
-S'INT AUTO_INCREMENT NOT NULL'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-g2
-ssS'name'
-p11
-(dp12
-g4
-I255
-sg5
-I01
-sg6
-I2
-sg7
-S'VARCHAR(255) UNIQUE'
-p13
-sg9
-I00
-sg10
-S'string'
-p14
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table 2013-08-01 13:44:43 UUTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,58 +0,0 @@
-(dp1
-S'id'
-p2
-(dp3
-S'length'
-p4
-I255
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I1
-sS'sql'
-p7
-S'INT AUTO_INCREMENT NOT NULL'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-g2
-ssS'file'
-p11
-(dp12
-g4
-I255
-sg5
-I00
-sg6
-I2
-sg7
-S'VARCHAR(255)'
-p13
-sg9
-I00
-sg10
-S'upload'
-p14
-ssS'title'
-p15
-(dp16
-g4
-I255
-sg5
-I01
-sg6
-I3
-sg7
-S'VARCHAR(255) UNIQUE'
-p17
-sg9
-I00
-sg10
-S'string'
-p18
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table 2013-08-01 13:44:43 UTTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,142 +0,0 @@
-(dp1
-S'body'
-p2
-(dp3
-S'length'
-p4
-I32768
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I5
-sS'sql'
-p7
-S'LONGTEXT'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'text'
-p11
-ssS'category'
-p12
-(dp13
-g4
-I255
-sg5
-I00
-sg6
-I7
-sg7
-S'INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE'
-p14
-sg9
-I00
-sg10
-S'reference categories'
-p15
-ssS'title'
-p16
-(dp17
-g4
-I255
-sg5
-I00
-sg6
-I3
-sg7
-S'VARCHAR(255)'
-p18
-sg9
-I00
-sg10
-S'string'
-p19
-ssS'image'
-p20
-(dp21
-g4
-I255
-sg5
-I00
-sg6
-I4
-sg7
-S'INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE'
-p22
-sg9
-I00
-sg10
-S'reference images'
-p23
-ssS'tags'
-p24
-(dp25
-g4
-I255
-sg5
-I00
-sg6
-I6
-sg7
-S'LONGTEXT'
-p26
-sg9
-I00
-sg10
-S'list:string'
-p27
-ssS'slug'
-p28
-(dp29
-g4
-I255
-sg5
-I01
-sg6
-I2
-sg7
-S'VARCHAR(255) UNIQUE'
-p30
-sg9
-I00
-sg10
-g19
-ssS'created_on'
-p31
-(dp32
-g4
-I255
-sg5
-I00
-sg6
-I8
-sg7
-S'DATETIME'
-p33
-sg9
-I00
-sg10
-S'datetime'
-p34
-ssS'id'
-p35
-(dp36
-g4
-I255
-sg5
-I00
-sg6
-I1
-sg7
-S'INT AUTO_INCREMENT NOT NULL'
-p37
-sg9
-I00
-sg10
-g35
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table 2013-08-01 13:44:43 UTCC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,58 +0,0 @@
-(dp1
-S'posts'
-p2
-(dp3
-S'length'
-p4
-I255
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I3
-sS'sql'
-p7
-S'LONGTEXT'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'list:reference posts'
-p11
-ssS'id'
-p12
-(dp13
-g4
-I255
-sg5
-I00
-sg6
-I1
-sg7
-S'INT AUTO_INCREMENT NOT NULL'
-p14
-sg9
-I00
-sg10
-g12
-ssS'name'
-p15
-(dp16
-g4
-I255
-sg5
-I01
-sg6
-I2
-sg7
-S'VARCHAR(255) UNIQUE'
-p17
-sg9
-I00
-sg10
-S'string'
-p18
-ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/blog_categories.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/blog_categories.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/blog_categories.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -0,0 +1,41 @@
+(dp1
+S'id'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I1
+sS'sql'
+p7
+S'INT AUTO_INCREMENT NOT NULL'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+g2
+ssS'name'
+p11
+(dp12
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p13
+sg9
+I00
+sg10
+S'string'
+p14
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/blog_images.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/blog_images.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/blog_images.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -0,0 +1,58 @@
+(dp1
+S'id'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I1
+sS'sql'
+p7
+S'INT AUTO_INCREMENT NOT NULL'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+g2
+ssS'file'
+p11
+(dp12
+g4
+I255
+sg5
+I00
+sg6
+I2
+sg7
+S'VARCHAR(255)'
+p13
+sg9
+I00
+sg10
+S'upload'
+p14
+ssS'title'
+p15
+(dp16
+g4
+I255
+sg5
+I01
+sg6
+I3
+sg7
+S'VARCHAR(255) UNIQUE'
+p17
+sg9
+I00
+sg10
+S'string'
+p18
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -0,0 +1,141 @@
+(dp1
+S'body'
+p2
+(dp3
+S'length'
+p4
+I32768
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I5
+sS'sql'
+p7
+S'LONGTEXT'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'text'
+p11
+ssS'category'
+p12
+(dp13
+g4
+I255
+sg5
+I00
+sg6
+I7
+sg7
+S'INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE'
+p14
+sg9
+I00
+sg10
+S'reference categories'
+p15
+ssS'title'
+p16
+(dp17
+g4
+I255
+sg5
+I00
+sg6
+I3
+sg7
+S'VARCHAR(255)'
+p18
+sg9
+I00
+sg10
+S'string'
+p19
+ssS'tags'
+p20
+(dp21
+g4
+I255
+sg5
+I00
+sg6
+I6
+sg7
+S'LONGTEXT'
+p22
+sg9
+I00
+sg10
+S'list:string'
+p23
+ssS'slug'
+p24
+(dp25
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p26
+sg9
+I00
+sg10
+g19
+ssS'created_on'
+p27
+(dp28
+g4
+I255
+sg5
+I00
+sg6
+I8
+sg7
+S'DATETIME'
+p29
+sg9
+I00
+sg10
+S'datetime'
+p30
+ssS'image_url'
+p31
+(dp32
+g4
+I255
+sg5
+I00
+sg6
+I4
+sg7
+S'VARCHAR(255)'
+p33
+sg9
+I00
+sg10
+g19
+ssS'id'
+p34
+(dp35
+g4
+I255
+sg5
+I00
+sg6
+I1
+sg7
+S'INT AUTO_INCREMENT NOT NULL'
+p36
+sg9
+I00
+sg10
+g34
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/blog_tags.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/blog_tags.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/blog_tags.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -0,0 +1,58 @@
+(dp1
+S'posts'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I3
+sS'sql'
+p7
+S'LONGTEXT'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'list:reference posts'
+p11
+ssS'id'
+p12
+(dp13
+g4
+I255
+sg5
+I00
+sg6
+I1
+sg7
+S'INT AUTO_INCREMENT NOT NULL'
+p14
+sg9
+I00
+sg10
+g12
+ssS'name'
+p15
+(dp16
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p17
+sg9
+I00
+sg10
+S'string'
+p18
+ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_cas.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_cas.table 2013-08-01 13:44:433 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_cas.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,58 +1,108 @@
(dp1
-S'url'
+S'user_id'
p2
(dp3
-S'type'
+S'length'
p4
-S'string'
+I512
+sS'unique'
p5
+I00
sS'sortable'
p6
-I4
+I2
sS'sql'
p7
-S'CHAR(512)'
+S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
p8
-ssS'created_on'
+sS'notnull'
p9
-(dp10
-g4
-S'datetime'
+I00
+sS'type'
+p10
+S'reference auth_user'
p11
-sg6
-I3
-sg7
-S'TIMESTAMP'
+ssS'service'
p12
-ssS'user_id'
-p13
-(dp14
+(dp13
g4
-S'reference auth_user'
-p15
+I512
+sg5
+I00
sg6
-I2
+I4
sg7
-S'INTEGER REFERENCES auth_user(id) ON DELETE CASCADE'
+S'CHAR(512)'
+p14
+sg9
+I00
+sg10
+S'string'
+p15
+ssS'renew'
p16
-ssS'id'
-p17
-(dp18
+(dp17
g4
-g17
+I512
+sg5
+I00
sg6
-I1
+I6
sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
+S'CHAR(1)'
+p18
+sg9
+I00
+sg10
+S'boolean'
p19
-ssS'uuid'
+ssS'created_on'
p20
(dp21
g4
-g5
+I512
+sg5
+I00
sg6
+I3
+sg7
+S'TIMESTAMP'
+p22
+sg9
+I00
+sg10
+S'datetime'
+p23
+ssS'ticket'
+p24
+(dp25
+g4
+I512
+sg5
+I00
+sg6
I5
sg7
S'CHAR(512)'
-p22
+p26
+sg9
+I00
+sg10
+g15
+ssS'id'
+p27
+(dp28
+g4
+I512
+sg5
+I00
+sg6
+I1
+sg7
+S'INTEGER PRIMARY KEY AUTOINCREMENT'
+p29
+sg9
+I00
+sg10
+g27
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_event.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_event.table 2013-08-01 13:44::43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_event.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -2,10 +2,12 @@
S'origin'
p2
(dp3
-S'type'
+S'length'
p4
-S'string'
+I512
+sS'unique'
p5
+I00
sS'sortable'
p6
I5
@@ -13,57 +15,94 @@
p7
S'CHAR(512)'
p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'string'
+p11
ssS'client_ip'
-p9
-(dp10
+p12
+(dp13
g4
-g5
+I512
+sg5
+I00
sg6
I3
sg7
S'CHAR(512)'
-p11
+p14
+sg9
+I00
+sg10
+g11
ssS'user_id'
-p12
-(dp13
+p15
+(dp16
g4
-S'reference auth_user'
-p14
+I512
+sg5
+I00
sg6
I4
sg7
-S'INTEGER REFERENCES auth_user(id) ON DELETE CASCADE'
-p15
+S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
+p17
+sg9
+I00
+sg10
+S'reference auth_user'
+p18
ssS'description'
-p16
-(dp17
+p19
+(dp20
g4
-S'text'
-p18
+I32768
+sg5
+I00
sg6
I6
sg7
S'TEXT'
-p19
+p21
+sg9
+I00
+sg10
+S'text'
+p22
ssS'time_stamp'
-p20
-(dp21
+p23
+(dp24
g4
-S'datetime'
-p22
+I512
+sg5
+I00
sg6
I2
sg7
S'TIMESTAMP'
-p23
+p25
+sg9
+I00
+sg10
+S'datetime'
+p26
ssS'id'
-p24
-(dp25
+p27
+(dp28
g4
-g24
+I512
+sg5
+I00
sg6
I1
sg7
S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p26
+p29
+sg9
+I00
+sg10
+g27
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_group.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_group.table 2013-08-01 13:44::43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_group.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -2,10 +2,12 @@
S'role'
p2
(dp3
-S'type'
+S'length'
p4
-S'string'
+I512
+sS'unique'
p5
+I00
sS'sortable'
p6
I2
@@ -13,25 +15,44 @@
p7
S'CHAR(512)'
p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'string'
+p11
ssS'id'
-p9
-(dp10
+p12
+(dp13
g4
-g9
+I512
+sg5
+I00
sg6
I1
sg7
S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p11
+p14
+sg9
+I00
+sg10
+g12
ssS'description'
-p12
-(dp13
+p15
+(dp16
g4
-S'text'
-p14
+I32768
+sg5
+I00
sg6
I3
sg7
S'TEXT'
-p15
+p17
+sg9
+I00
+sg10
+S'text'
+p18
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_membership.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_membership.table 2013-08-01 113:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_membership.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -2,36 +2,57 @@
S'group_id'
p2
(dp3
-S'type'
+S'length'
p4
-S'reference auth_group'
+I512
+sS'unique'
p5
+I00
sS'sortable'
p6
I3
sS'sql'
p7
-S'INTEGER REFERENCES auth_group(id) ON DELETE CASCADE'
+S'INTEGER REFERENCES auth_group (id) ON DELETE CASCADE'
p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'reference auth_group'
+p11
ssS'user_id'
-p9
-(dp10
+p12
+(dp13
g4
-S'reference auth_user'
-p11
+I512
+sg5
+I00
sg6
I2
sg7
-S'INTEGER REFERENCES auth_user(id) ON DELETE CASCADE'
-p12
+S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
+p14
+sg9
+I00
+sg10
+S'reference auth_user'
+p15
ssS'id'
-p13
-(dp14
+p16
+(dp17
g4
-g13
+I512
+sg5
+I00
sg6
I1
sg7
S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p15
+p18
+sg9
+I00
+sg10
+g16
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_permission.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_permission.table 2013-08-01 113:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_permission.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -2,10 +2,12 @@
S'record_id'
p2
(dp3
-S'type'
+S'length'
p4
-S'integer'
+I512
+sS'unique'
p5
+I00
sS'sortable'
p6
I5
@@ -13,46 +15,77 @@
p7
S'INTEGER'
p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'integer'
+p11
ssS'group_id'
-p9
-(dp10
+p12
+(dp13
g4
-S'reference auth_group'
-p11
+I512
+sg5
+I00
sg6
I2
sg7
-S'INTEGER REFERENCES auth_group(id) ON DELETE CASCADE'
-p12
+S'INTEGER REFERENCES auth_group (id) ON DELETE CASCADE'
+p14
+sg9
+I00
+sg10
+S'reference auth_group'
+p15
ssS'table_name'
-p13
-(dp14
+p16
+(dp17
g4
-S'string'
-p15
+I512
+sg5
+I00
sg6
I4
sg7
S'CHAR(512)'
-p16
+p18
+sg9
+I00
+sg10
+S'string'
+p19
ssS'id'
-p17
-(dp18
+p20
+(dp21
g4
-g17
+I512
+sg5
+I00
sg6
I1
sg7
S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p19
+p22
+sg9
+I00
+sg10
+g20
ssS'name'
-p20
-(dp21
+p23
+(dp24
g4
-g15
+I512
+sg5
+I00
sg6
I3
sg7
S'CHAR(512)'
-p22
+p25
+sg9
+I00
+sg10
+g19
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_user.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_user.table 2013-08-01 13:44:443 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/c8b669d15150d7109e5f7ab36744a5b7_auth_user.table 2013-08-01 13:49:36 UTC (rev 882)
@@ -2,10 +2,12 @@
S'first_name'
p2
(dp3
-S'type'
+S'length'
p4
-S'string'
+I128
+sS'unique'
p5
+I00
sS'sortable'
p6
I2
@@ -13,80 +15,123 @@
p7
S'CHAR(128)'
p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'string'
+p11
ssS'last_name'
-p9
-(dp10
+p12
+(dp13
g4
-g5
+I128
+sg5
+I00
sg6
I3
sg7
S'CHAR(128)'
-p11
+p14
+sg9
+I00
+sg10
+g11
ssS'registration_id'
-p12
-(dp13
-S'sortable'
-p14
+p15
+(dp16
+g4
+I512
+sg5
+I00
+sg6
I8
-sS'type'
-p15
-S'string'
-p16
-sS'sql'
+sg7
+S'CHAR(512)'
p17
-S'CHAR(512)'
+sg9
+I00
+sg10
+g11
+ssS'email'
p18
-ssS'id'
-p19
-(dp20
+(dp19
g4
-S'id'
-p21
+I512
+sg5
+I00
sg6
-I1
+I4
sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p22
+S'CHAR(512)'
+p20
+sg9
+I00
+sg10
+g11
ssS'reset_password_key'
-p23
-(dp24
+p21
+(dp22
g4
-g5
+I512
+sg5
+I00
sg6
I7
sg7
S'CHAR(512)'
-p25
+p23
+sg9
+I00
+sg10
+g11
ssS'password'
-p26
-(dp27
+p24
+(dp25
g4
-S'password'
-p28
+I512
+sg5
+I00
sg6
I5
sg7
S'CHAR(512)'
-p29
+p26
+sg9
+I00
+sg10
+g24
ssS'registration_key'
-p30
-(dp31
+p27
+(dp28
g4
-g5
+I512
+sg5
+I00
sg6
I6
sg7
S'CHAR(512)'
-p32
-ssS'email'
-p33
-(dp34
+p29
+sg9
+I00
+sg10
+g11
+ssS'id'
+p30
+(dp31
g4
-g5
+I512
+sg5
+I00
sg6
-I4
+I1
sg7
-S'CHAR(512)'
-p35
+S'INTEGER PRIMARY KEY AUTOINCREMENT'
+p32
+sg9
+I00
+sg10
+g30
ss.
\ No newline at end of file
Modified: trunk/web2py/applications/helyesiras_webdev/databases/sql.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/sql.log 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/databases/sql.log 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,61 +1,66 @@
-timestamp: 2013-03-27T16:44:09.187951
-CREATE TABLE queries(
+timestamp: 2013-07-31T12:56:24.712979
+CREATE TABLE auth_user(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- id2 CHAR(512),
- kerdeses_szo CHAR(512),
- kerdes CHAR(512),
- valasz CHAR(512),
- problema_kategoria CHAR(512),
- akh CHAR(512)
+ first_name CHAR(128),
+ last_name CHAR(128),
+ email CHAR(512),
+ password CHAR(512),
+ registration_key CHAR(512),
+ reset_password_key CHAR(512),
+ registration_id CHAR(512)
);
success!
-timestamp: 2013-03-27T16:44:09.190418
-CREATE TABLE problem_categories(
+timestamp: 2013-07-31T12:56:24.759171
+CREATE TABLE auth_group(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- id2 CHAR(512),
- kategoria CHAR(512),
- megjegyzes CHAR(512)
+ role CHAR(512),
+ description TEXT
);
success!
-timestamp: 2013-03-27T16:44:09.191856
-CREATE TABLE query_remark(
+timestamp: 2013-07-31T12:56:24.779739
+CREATE TABLE auth_membership(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- query_id CHAR(512),
- other_remark_id CHAR(512)
+ user_id INTEGER REFERENCES auth_user (id) ON DELETE CASCADE,
+ group_id INTEGER REFERENCES auth_group (id) ON DELETE CASCADE
);
success!
-timestamp: 2013-03-27T16:44:09.193315
-CREATE TABLE query_prof_category(
+timestamp: 2013-07-31T12:56:24.801641
+CREATE TABLE auth_permission(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- query_id CHAR(512),
- prof_category_id CHAR(512)
+ group_id INTEGER REFERENCES auth_group (id) ON DELETE CASCADE,
+ name CHAR(512),
+ table_name CHAR(512),
+ record_id INTEGER
);
success!
-timestamp: 2013-03-27T16:44:09.194818
-CREATE TABLE prof_categories(
+timestamp: 2013-07-31T12:56:24.821732
+CREATE TABLE auth_event(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- id2 CHAR(512),
- szakmai_besorolas_rov CHAR(512),
- szakmai_besorolas CHAR(512)
+ time_stamp TIMESTAMP,
+ client_ip CHAR(512),
+ user_id INTEGER REFERENCES auth_user (id) ON DELETE CASCADE,
+ origin CHAR(512),
+ description TEXT
);
success!
-timestamp: 2013-03-27T16:44:09.196497
-CREATE TABLE other_remarks(
+timestamp: 2013-07-31T12:56:24.844086
+CREATE TABLE auth_cas(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- id2 CHAR(512),
- jelzes_rov CHAR(512),
- jelzes CHAR(512),
- megjegyzes CHAR(512)
+ user_id INTEGER REFERENCES auth_user (id) ON DELETE CASCADE,
+ created_on TIMESTAMP,
+ service CHAR(512),
+ ticket CHAR(512),
+ renew CHAR(1)
);
success!
-timestamp: 2013-07-26T16:00:30.309634
+timestamp: 2013-07-31T17:30:08.190470
CREATE TABLE images(
id INT AUTO_INCREMENT NOT NULL,
file VARCHAR(255),
title VARCHAR(255) UNIQUE,
PRIMARY KEY(id)
) ENGINE=InnoDB CHARACTER SET utf8;
-timestamp: 2013-07-26T16:02:00.330574
+timestamp: 2013-07-31T17:37:26.824716
CREATE TABLE images(
id INT AUTO_INCREMENT NOT NULL,
file VARCHAR(255),
@@ -63,26 +68,27 @@
PRIMARY KEY(id)
) ENGINE=InnoDB CHARACTER SET utf8;
success!
-timestamp: 2013-07-26T16:02:00.356293
+timestamp: 2013-07-31T17:37:26.888481
CREATE TABLE tags(
id INT AUTO_INCREMENT NOT NULL,
name VARCHAR(255) UNIQUE,
+ posts LONGTEXT,
PRIMARY KEY(id)
) ENGINE=InnoDB CHARACTER SET utf8;
success!
-timestamp: 2013-07-26T16:02:00.381256
+timestamp: 2013-07-31T17:37:26.925808
CREATE TABLE categories(
id INT AUTO_INCREMENT NOT NULL,
name VARCHAR(255) UNIQUE,
PRIMARY KEY(id)
) ENGINE=InnoDB CHARACTER SET utf8;
success!
-timestamp: 2013-07-26T16:02:00.387060
+timestamp: 2013-07-31T17:37:40.691873
CREATE TABLE posts(
id INT AUTO_INCREMENT NOT NULL,
slug VARCHAR(255) UNIQUE,
title VARCHAR(255),
- image INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE,
+ image_url VARCHAR(255),
body LONGTEXT,
tags LONGTEXT,
category INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE,
@@ -90,62 +96,9 @@
PRIMARY KEY(id)
) ENGINE=InnoDB CHARACTER SET utf8;
success!
-timestamp: 2013-07-26T18:14:08.738370
-CREATE TABLE images(
- id INT AUTO_INCREMENT NOT NULL,
- file VARCHAR(255),
- title VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
+TRUNCATE TABLE tags ;
success!
-timestamp: 2013-07-26T18:14:08.810763
-CREATE TABLE tags(
- id INT AUTO_INCREMENT NOT NULL,
- name VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
+TRUNCATE TABLE tags ;
success!
-timestamp: 2013-07-26T18:14:08.861272
-CREATE TABLE categories(
- id INT AUTO_INCREMENT NOT NULL,
- name VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
+TRUNCATE TABLE tags ;
success!
-timestamp: 2013-07-26T18:14:08.867740
-CREATE TABLE posts(
- id INT AUTO_INCREMENT NOT NULL,
- slug VARCHAR(255) UNIQUE,
- title VARCHAR(255),
- image INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE,
- body LONGTEXT,
- tags LONGTEXT,
- category INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE,
- created_on DATETIME,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
-success!
-timestamp: 2013-07-30T16:25:30.444596
-CREATE TABLE images(
- id INT AUTO_INCREMENT NOT NULL,
- file VARCHAR(255),
- title VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
-timestamp: 2013-07-30T16:26:01.650869
-CREATE TABLE images(
- id INT AUTO_INCREMENT NOT NULL,
- file VARCHAR(255),
- title VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
-timestamp: 2013-07-30T16:26:36.271767
-ALTER TABLE tags DROP COLUMN posts;
-success!
-timestamp: 2013-07-30T16:33:18.094824
-CREATE TABLE images(
- id INT AUTO_INCREMENT NOT NULL,
- file VARCHAR(255),
- title VARCHAR(255) UNIQUE,
- PRIMARY KEY(id)
-) ENGINE=InnoDB CHARACTER SET utf8;
Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)
Modified: trunk/web2py/applications/helyesiras_webdev/models/db.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/db.py 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/models/db.py 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-''' # commented by MM
+
#########################################################################
## This scaffolding model makes your app work on Google App Engine too
## File is released under public domain and you can use without limitations
@@ -23,6 +23,7 @@
## none otherwise. a pattern can be 'controller/function.extension'
response.generic_patterns = ['*'] if request.is_local else []
+
#########################################################################
## Here is sample code if you need for
## - email capabilities
@@ -41,10 +42,10 @@
auth.define_tables()
## configure email
-mail=auth.settings.mailer
-mail.settings.server = 'logging' or 'smtp.gmail.com:587'
-mail.settings.sender = 'you at gmail.com'
-mail.settings.login = 'username:password'
+#mail=auth.settings.mailer
+#mail.settings.server = 'logging' or 'smtp.gmail.com:587'
+#mail.settings.sender = 'you at gmail.com'
+#mail.settings.login = 'username:password'
## configure auth policy
auth.settings.registration_requires_verification = False
@@ -53,10 +54,10 @@
## if you need to use OpenID, Facebook, MySpace, Twitter, Linkedin, etc.
## register with janrain.com, write your domain:api_key in private/janrain.key
-from gluon.contrib.login_methods.rpx_account import use_janrain
-use_janrain(auth,filename='private/janrain.key')
-'''
+#from gluon.contrib.login_methods.rpx_account import use_janrain
+#use_janrain(auth,filename='private/janrain.key')
+
#########################################################################
## Define your tables below (or better in another model file) for example
##
@@ -75,4 +76,5 @@
#########################################################################
+# Note by MM: all user databases are defined in separate files in the models directory: models/db*.py
Modified: trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-08-01 13:49:36 UTC (rev 882)
@@ -25,33 +25,38 @@
# Define the table names and the fields + add restrictions.
dbblog.define_table('images',
Field('file', 'upload'),
- Field('title', unique=True)
+ Field('title', unique=True),
+ migrate='blog_images.table'
)
dbblog.define_table('tags',
Field('name', unique=True),
- Field('posts', 'list:reference posts')
+ Field('posts', 'list:reference posts'),
+ migrate='blog_tags.table'
)
dbblog.define_table('categories',
- Field('name', unique=True)
+ Field('name', unique=True),
+ format = '%(name)s',
+ migrate='blog_categories.table'
)
dbblog.define_table('posts',
Field('slug', unique=True),
Field('title'),
- Field('image', 'reference images'),
+ Field('image_url'),
Field('body', 'text'),
Field('tags', 'list:string'),
Field('category', 'reference categories'),
- Field('created_on', 'datetime', default=request.now)
+ Field('created_on', 'datetime', default=request.now),
+ migrate='blog_posts.table'
)
dbblog.posts.slug.requires = IS_NOT_EMPTY()
dbblog.posts.title.requires = IS_NOT_EMPTY()
dbblog.posts.body.requires = IS_NOT_EMPTY()
dbblog.posts.slug.requires = IS_NOT_EMPTY()
-dbblog.posts.image.requires = IS_IN_DB(dbblog, dbblog.images.id, '%(title)s')
+dbblog.posts.category.requires = IS_IN_DB(dbblog, dbblog.categories.id, '%(name)s')
dbblog.commit()
Modified: trunk/web2py/applications/helyesiras_webdev/static/css/main.css
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-08-01 13:49:36 UTC (rev 882)
@@ -1656,6 +1656,13 @@
#fblike {margin: 10px 0 0 50px; float: left;}
+
+
+#blog_manage {margin: 0 -260px;}
+
+
+
+
/*******************
/* RESPONSIVE
/*******************
Modified: trunk/web2py/applications/helyesiras_webdev/views/blog/index.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/index.html 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/index.html 2013-08-01 13:49:36 UTC (rev 882)
@@ -46,4 +46,13 @@
{{pass}}
{{pass}}
+{{ # pager: TODO }}
+<div>
+<span>◂</span>
+<span>1</span>
+<span>|</span>
+<span><a href="{{=URL(c='blog', f='index')}}">2</a></span>
+<span><a href="{{=URL(c='blog', f='index')}}">▸</a></span>
+</div>
+
</div> <!-- <div id="blog-container"> -->
Modified: trunk/web2py/applications/helyesiras_webdev/views/blog/manage.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/manage.html 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/manage.html 2013-08-01 13:49:36 UTC (rev 882)
@@ -1,4 +1,12 @@
{{extend 'layout.html'}}
-{{=grid}}
+<div id="blog_manage">
+ <h1>Blogbejegyzések szerkesztése</h1>
+
+ <div><a href="{{=URL(c='blog', f='index')}}" target="_blank">Blog megnyitása új ablakban</a></div>
+
+ {{=grid}}
+
+</div>
+
Modified: trunk/web2py/applications/helyesiras_webdev/views/layout.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-08-01 13:44:43 UTC (rev 881)
+++ trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-08-01 13:49:36 UTC (rev 882)
@@ -112,7 +112,7 @@
{{block header}} <!-- this is default header -->
<h1 class="page-title-header">helyesírás</h1>
<h2 class="page-title-header">Helyesírási tanácsadó portál</h2>
- <a id="helyesiras-logo" href={{=URL(f='index')}}><img src="{{=URL('static', 'images/helyesiras_mta_hu_logo.png')}}" title="Helyesírási tanácsadó portál" alt="helyesírás.mta.hu"></a>
+ <a id="helyesiras-logo" href={{=URL(c='default', f='index')}}><img src="{{=URL('static', 'images/helyesiras_mta_hu_logo.png')}}" title="Helyesírási tanácsadó portál" alt="helyesírás.mta.hu"></a>
<iframe id="fblike" src="//www.facebook.com/plugins/like.php?href=https%3A%2F%2Ffacebook.com%2Fhelyesiras.hu&send=false&layout=button_count&width=140&show_faces=false&font&colorscheme=light&action=like&height=35&appId=253453841466415" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:140px; height:35px;" allowTransparency="true"></iframe>
<a id="nytud-logo" href="http://www.nytud.hu/"><img src="{{=URL('static', 'images/mta_nyti_logo.png')}}" alt="MTA Nyelvtudományi Intézet"></a>
<div style="clear: both;"></div><!-- Clear the divs -->
@@ -137,7 +137,7 @@
</div></div><!-- statusbar -->
<div id="page"{{if request.function=='index' and request.controller=='default':}} class="front"{{pass}}><div class="wrapper"> <!-- Here my central body -->
-{{if not (request.controller == 'default' and request.function == 'index'):}}
+{{if not ((request.controller == 'default' and request.function == 'index') or (request.controller == 'blog' and request.function == 'manage')):}}
<div id="sidebar-first">
{{if request.controller == 'default' and request.function not in ['akh', 'gyik', 'hqa', 'howitworks']:}}
<ul>
More information about the Hejes-devel
mailing list