dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better style in wiki search and tagcloud

Browse Source
This commit is contained in:
mdipierro
2012-08-23 14:52:45 -05:00
parent 33ce161e20
commit b400d3844d
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-23 14:33:39) dev Version 2.00.0 (2012-08-23 14:52:42) dev
applications/welcome/static/css/web2py.css
+1 -1
View File
@@ -84,7 +84,7 @@ td.w2p_fl {text-align:right}
td.w2p_fl, td.w2p_fw {padding-right:7px} td.w2p_fl, td.w2p_fw {padding-right:7px}
td.w2p_fl,td.w2p_fc {padding-top:4px} td.w2p_fl,td.w2p_fc {padding-top:4px}
div.w2p_export_menu {margin:5px 0} div.w2p_export_menu {margin:5px 0}
div.w2p_export_menu a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px;} div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px;}
/* tr#submit_record__row {border-top:1px solid #E5E5E5} */ /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
#submit_record__row td {padding-top:.5em} #submit_record__row td {padding-top:.5em}
gluon/tools.py
+17 -13
View File
@@ -4684,10 +4684,11 @@ class Wiki(object):
def create(self): def create(self):
if not self.can_edit(): return self.not_authorized() if not self.can_edit(): return self.not_authorized()
db = self.auth.db db = self.auth.db
form = SQLFORM.factory( form = FORM(INPUT(_name='slug',value=current.request.args(1),
Field('slug',default=current.request.args(1), requires=(IS_SLUG(),
label = 'New Page', IS_NOT_IN_DB(db,db.wiki_page.slug))),
requires=(IS_SLUG(),IS_NOT_IN_DB(db,db.wiki_page.slug)))) INPUT(_type='submit',
_value=current.T('Create Page from Slug')))
if form.process().accepted: if form.process().accepted:
redirect(URL(args=('_edit',form.vars.slug))) redirect(URL(args=('_edit',form.vars.slug)))
return dict(content=form) return dict(content=form)
@@ -4781,9 +4782,10 @@ class Wiki(object):
request = current.request request = current.request
content = CAT() content = CAT()
if tags is None and query is None: if tags is None and query is None:
form = SQLFORM.factory(Field('tags',requires=IS_NOT_EMPTY(), form = FORM(INPUT(_name='tags',requires=IS_NOT_EMPTY(),
default=request.vars.tags, value=request.vars.tags),
label=current.T('Search'))) INPUT(_type="submit",_value=current.T('Search')),
_method='GET')
content.append(DIV(form,_class='w2p_wiki_form')) content.append(DIV(form,_class='w2p_wiki_form'))
if request.vars: if request.vars:
tags = [v.strip() for v in request.vars.tags.split(',')] tags = [v.strip() for v in request.vars.tags.split(',')]
@@ -4799,6 +4801,7 @@ class Wiki(object):
if query is None: if query is None:
query = (db.wiki_page.id==db.wiki_tag.wiki_page)&\ query = (db.wiki_page.id==db.wiki_tag.wiki_page)&\
(db.wiki_tag.name.belongs(tags)) (db.wiki_tag.name.belongs(tags))
query = query|db.wiki_page.title.startswith(request.vars.tags)
pages = db(query).select( pages = db(query).select(
*fields,**dict(orderby=orderby or ~count, *fields,**dict(orderby=orderby or ~count,
groupby=db.wiki_page.id, groupby=db.wiki_page.id,
@@ -4812,9 +4815,10 @@ class Wiki(object):
items = [DIV(H3(A(p.title,_href=URL(args=p.slug))), items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),
MARKMIN(self.first_paragraph(p)) \ MARKMIN(self.first_paragraph(p)) \
if preview else '', if preview else '',
SPAN(*[link(t.strip()) for t in \ DIV(_class='w2p_wiki_tags',
p.tags or [] if t.strip()]), *[link(t.strip()) for t in \
_class='w2p_wiki_tags') p.tags or [] if t.strip()]),
_class='w2p_wiki_search_item')
for p in pages] for p in pages]
content.append(DIV(_class='w2p_wiki_pages',*items)) content.append(DIV(_class='w2p_wiki_pages',*items))
else: else:
@@ -4836,9 +4840,9 @@ class Wiki(object):
a,b = ids[0](count), ids[-1](count) a,b = ids[0](count), ids[-1](count)
def scale(c): def scale(c):
return '%.2f' % (3.0*(c-b)/max(a-b,1)+1) return '%.2f' % (3.0*(c-b)/max(a-b,1)+1)
items = [A(item.wiki_tag.name,_class='w2p_cloud_tag', items = [A(item.wiki_tag.name,
_style='padding-right:0.2em;font-size:%sem' \ _style='padding:0.2em;font-size:%sem' \
% scale(item(count)), % scale(item(count)),
_href=URL(args='_search', _href=URL(args='_search',
vars=dict(tags=item.wiki_tag.name))) vars=dict(tags=item.wiki_tag.name)))
for item in ids] for item in ids]