From b400d3844dbf350f4e0553bf978941f400fcf142 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 23 Aug 2012 14:52:45 -0500 Subject: [PATCH] better style in wiki search and tagcloud --- VERSION | 2 +- applications/welcome/static/css/web2py.css | 2 +- gluon/tools.py | 30 ++++++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/VERSION b/VERSION index dd19eb63..2ed84402 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-23 14:33:39) dev +Version 2.00.0 (2012-08-23 14:52:42) dev diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 2ac5c115..d6f06391 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -84,7 +84,7 @@ td.w2p_fl {text-align:right} td.w2p_fl, td.w2p_fw {padding-right:7px} td.w2p_fl,td.w2p_fc {padding-top:4px} 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} */ #submit_record__row td {padding-top:.5em} diff --git a/gluon/tools.py b/gluon/tools.py index 15776aca..59ff9e64 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4684,10 +4684,11 @@ class Wiki(object): def create(self): if not self.can_edit(): return self.not_authorized() db = self.auth.db - form = SQLFORM.factory( - Field('slug',default=current.request.args(1), - label = 'New Page', - requires=(IS_SLUG(),IS_NOT_IN_DB(db,db.wiki_page.slug)))) + form = FORM(INPUT(_name='slug',value=current.request.args(1), + 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: redirect(URL(args=('_edit',form.vars.slug))) return dict(content=form) @@ -4781,9 +4782,10 @@ class Wiki(object): request = current.request content = CAT() if tags is None and query is None: - form = SQLFORM.factory(Field('tags',requires=IS_NOT_EMPTY(), - default=request.vars.tags, - label=current.T('Search'))) + form = FORM(INPUT(_name='tags',requires=IS_NOT_EMPTY(), + value=request.vars.tags), + INPUT(_type="submit",_value=current.T('Search')), + _method='GET') content.append(DIV(form,_class='w2p_wiki_form')) if request.vars: tags = [v.strip() for v in request.vars.tags.split(',')] @@ -4799,6 +4801,7 @@ class Wiki(object): if query is None: query = (db.wiki_page.id==db.wiki_tag.wiki_page)&\ (db.wiki_tag.name.belongs(tags)) + query = query|db.wiki_page.title.startswith(request.vars.tags) pages = db(query).select( *fields,**dict(orderby=orderby or ~count, groupby=db.wiki_page.id, @@ -4812,9 +4815,10 @@ class Wiki(object): items = [DIV(H3(A(p.title,_href=URL(args=p.slug))), MARKMIN(self.first_paragraph(p)) \ if preview else '', - SPAN(*[link(t.strip()) for t in \ - p.tags or [] if t.strip()]), - _class='w2p_wiki_tags') + DIV(_class='w2p_wiki_tags', + *[link(t.strip()) for t in \ + p.tags or [] if t.strip()]), + _class='w2p_wiki_search_item') for p in pages] content.append(DIV(_class='w2p_wiki_pages',*items)) else: @@ -4836,9 +4840,9 @@ class Wiki(object): a,b = ids[0](count), ids[-1](count) def scale(c): return '%.2f' % (3.0*(c-b)/max(a-b,1)+1) - items = [A(item.wiki_tag.name,_class='w2p_cloud_tag', - _style='padding-right:0.2em;font-size:%sem' \ - % scale(item(count)), + items = [A(item.wiki_tag.name, + _style='padding:0.2em;font-size:%sem' \ + % scale(item(count)), _href=URL(args='_search', vars=dict(tags=item.wiki_tag.name))) for item in ids]