[Hejes-devel] [956] blog: added new field: posts.lead + modified views
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Wed Sep 25 16:27:17 CEST 2013
Revision: 956
Author: mihaltz
Date: 2013-09-25 16:27:17 +0200 (Wed, 25 Sep 2013)
Log Message:
-----------
blog: added new field: posts.lead + modified views
Modified Paths:
--------------
trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table
trunk/web2py/applications/helyesiras_webdev/databases/sql.log
trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
trunk/web2py/applications/helyesiras_webdev/progress.log
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/show.html
Modified: trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/databases/blog_posts.table 2013-09-25 14:27:17 UTC (rev 956)
@@ -39,7 +39,7 @@
sg10
S'reference categories'
p15
-ssS'author'
+ssS'lead'
p16
(dp17
S'length'
@@ -50,7 +50,7 @@
I00
sS'sortable'
p20
-I9
+I5
sS'sql'
p21
S'VARCHAR(255)'
@@ -62,14 +62,37 @@
p24
S'string'
p25
-ssS'title'
+ssS'author'
p26
(dp27
+S'sortable'
+p28
+I9
+sS'sql'
+p29
+S'VARCHAR(255)'
+p30
+sS'length'
+p31
+I255
+sS'notnull'
+p32
+I00
+sS'unique'
+p33
+I00
+sS'type'
+p34
+S'string'
+p35
+ssS'title'
+p36
+(dp37
g4
I3
sg5
S'VARCHAR(255)'
-p28
+p38
sg7
I255
sg8
@@ -78,15 +101,15 @@
I00
sg10
S'string'
-p29
-ssS'tags'
-p30
-(dp31
+p39
+ssS'id'
+p40
+(dp41
g4
-I6
+I1
sg5
-S'LONGTEXT'
-p32
+S'INT AUTO_INCREMENT NOT NULL'
+p42
sg7
I255
sg8
@@ -94,49 +117,49 @@
sg9
I00
sg10
-S'list:string'
-p33
-ssS'slug'
-p34
-(dp35
+S'id'
+p43
+ssS'created_on'
+p44
+(dp45
g4
-I2
+I8
sg5
-S'VARCHAR(255) UNIQUE'
-p36
+S'DATETIME'
+p46
sg7
I255
sg8
I00
sg9
-I01
+I00
sg10
-g29
-ssS'created_on'
-p37
-(dp38
+S'datetime'
+p47
+ssS'slug'
+p48
+(dp49
g4
-I8
+I2
sg5
-S'DATETIME'
-p39
+S'VARCHAR(255) UNIQUE'
+p50
sg7
I255
sg8
I00
sg9
-I00
+I01
sg10
-S'datetime'
-p40
-ssS'id'
-p41
-(dp42
+g39
+ssS'tags'
+p51
+(dp52
g4
-I1
+I6
sg5
-S'INT AUTO_INCREMENT NOT NULL'
-p43
+S'LONGTEXT'
+p53
sg7
I255
sg8
@@ -144,29 +167,29 @@
sg9
I00
sg10
-S'id'
-p44
+S'list:string'
+p54
ssS'image_filename'
-p45
-(dp46
+p55
+(dp56
S'sortable'
-p47
+p57
I4
sS'sql'
-p48
+p58
S'VARCHAR(255)'
-p49
+p59
sS'length'
-p50
+p60
I255
sS'notnull'
-p51
+p61
I00
sS'unique'
-p52
+p62
I00
sS'type'
-p53
+p63
S'string'
-p54
+p64
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-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/databases/sql.log 2013-09-25 14:27:17 UTC (rev 956)
@@ -130,3 +130,6 @@
timestamp: 2013-09-25T12:45:20.083338
ALTER TABLE categories ADD ordering INT UNIQUE;
success!
+timestamp: 2013-09-25T15:56:57.441677
+ALTER TABLE posts ADD lead VARCHAR(255);
+success!
Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)
Modified: trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-09-25 14:27:17 UTC (rev 956)
@@ -115,6 +115,7 @@
Field('slug', unique=True),
Field('title'),
Field('image_filename'),
+ Field('lead'),
Field('body', 'text'),
Field('tags', 'list:string'),
Field('category', 'reference categories'),
@@ -126,6 +127,7 @@
dbblog.posts.slug.requires = [IS_SLUG(), IS_NOT_IN_DB(dbblog, dbblog.posts.slug)]
dbblog.posts.title.requires = IS_NOT_EMPTY()
dbblog.posts.image_filename.requires = IS_IN_SET(list_image_files('applications/'+URL('static', 'blog')))
+dbblog.posts.lead.requires = IS_NOT_EMPTY()
dbblog.posts.body.requires = IS_NOT_EMPTY()
dbblog.posts.category.requires = IS_IN_DB(dbblog, dbblog.categories.id, '%(name)s')
dbblog.posts.tags.requires = IS_LIST_OF(IS_LOWER())
Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log 2013-09-25 14:27:17 UTC (rev 956)
@@ -866,3 +866,6 @@
[2013-09-25 12:50:34] EDIT helyesiras_webdev/controllers/blog.py: 0
[2013-09-25 12:50:46] EDIT helyesiras_webdev/controllers/blog.py: 0
[2013-09-25 14:31:20] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-09-25 15:54:32] EDIT helyesiras_webdev/models/dbblog.py: 2
+[2013-09-25 16:03:27] EDIT helyesiras_webdev/views/blog/index.html: 0
+[2013-09-25 16:08:01] EDIT helyesiras_webdev/views/blog/show.html: 3
Modified: trunk/web2py/applications/helyesiras_webdev/static/css/main.css
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-09-25 14:27:17 UTC (rev 956)
@@ -1847,6 +1847,10 @@
margin: 0 10px 8px 0;
}
+.blog-lead {
+ font-weight: bold;
+}
+
.blog-body blockquote {
margin: 5px 0;
padding: 5px;
Modified: trunk/web2py/applications/helyesiras_webdev/views/blog/index.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/index.html 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/index.html 2013-09-25 14:27:17 UTC (rev 956)
@@ -72,7 +72,7 @@
<div class="blog-cat-name"><span>{{=row.categories.name}}</span></div>
<h2>{{=A(row.posts.title, _href=URL(c='blog', f='show', args=[row.posts.slug]))}}</h2>
<div class="blog-date">{{=pretty_hu_date(row.posts.created_on).encode('utf8')}}</div>
- <div class="blog-body">{{=MARKMIN(row.posts.body.split('\n')[0])}}</div>
+ <div class="blog-lead_index">{{=MARKMIN(row.posts.lead)}}</div>
<div class="blog-read-more">{{=A('Tovább', _href=URL(c='blog', f='show', args=[row.posts.slug]))}}</div>
</div>
</div>
Modified: trunk/web2py/applications/helyesiras_webdev/views/blog/show.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/show.html 2013-09-25 13:24:41 UTC (rev 955)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/show.html 2013-09-25 14:27:17 UTC (rev 956)
@@ -58,8 +58,11 @@
})();
</script>
</div>
+<div class="blog-lead">
+ {{=MARKMIN(post.posts.lead)}}
+</div>
<div class="blog-body">
- <img src="{{=URL('static', 'blog/' + post.posts.image_filename)}}" width=100 height=100 class="blog-index-image" />
+ <img src="{{=URL('static', 'blog/' + post.posts.image_filename)}}" width=100 height=100 class="blog-index-image" />
{{=MARKMIN(post.posts.body)}}
</div>
<div class="clr-l"></div>
More information about the Hejes-devel
mailing list