diff --git a/VERSION b/VERSION index a6dad91d..e12db2ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-24 22:52:42) dev +Version 2.00.0 (2012-08-24 23:11:41) dev diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css index 13f24237..54b1cbce 100644 --- a/applications/admin/static/css/web2py.css +++ b/applications/admin/static/css/web2py.css @@ -80,11 +80,11 @@ fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4p td.w2p_fw {padding-bottom:1px} td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} -td.w2p_fl {text-align:right} +td.w2p_fl {text-align:left} 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} @@ -294,8 +294,14 @@ div.error { margin-bottom:18px; } -.web2py_breadcrumbs ul li { +li.w2p_grid_breadcrumb_elem { display:inline-block; } .ie9 #query_panel {padding-bottom:2px} + +#wiki_page_body { + width: 600px; + height: auto; + min-height: 400px; +} \ No newline at end of file diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css index 13f24237..54b1cbce 100644 --- a/applications/examples/static/css/web2py.css +++ b/applications/examples/static/css/web2py.css @@ -80,11 +80,11 @@ fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4p td.w2p_fw {padding-bottom:1px} td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} -td.w2p_fl {text-align:right} +td.w2p_fl {text-align:left} 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} @@ -294,8 +294,14 @@ div.error { margin-bottom:18px; } -.web2py_breadcrumbs ul li { +li.w2p_grid_breadcrumb_elem { display:inline-block; } .ie9 #query_panel {padding-bottom:2px} + +#wiki_page_body { + width: 600px; + height: auto; + min-height: 400px; +} \ No newline at end of file diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index d6f06391..54b1cbce 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -80,7 +80,7 @@ fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4p td.w2p_fw {padding-bottom:1px} td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} -td.w2p_fl {text-align:right} +td.w2p_fl {text-align:left} 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} @@ -299,3 +299,9 @@ li.w2p_grid_breadcrumb_elem { } .ie9 #query_panel {padding-bottom:2px} + +#wiki_page_body { + width: 600px; + height: auto; + min-height: 400px; +} \ No newline at end of file diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 02314221..0436ce0d 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -238,8 +238,10 @@ class ListWidget(StringWidget): if field.type=='list:integer': _class = 'integer' else: _class = 'string' requires = field.requires if isinstance(field.requires, (IS_NOT_EMPTY, IS_LIST_OF)) else None - items=[LI(INPUT(_id=_id, _class=_class, _name=_name, value=v, hideerror=True, requires=requires)) \ - for v in value or ['']] + attributes['_style'] = 'list-style:none' + items=[LI(INPUT(_id=_id, _class=_class, _name=_name, + value=v, hideerror=True, requires=requires), + **attributes) for v in value or ['']] script=SCRIPT(""" // from http://refactormycode.com/codes/694-expanding-input-list-using-jquery (function(){ @@ -270,7 +272,8 @@ function rel(ul) { })(); jQuery(document).ready(function(){jQuery('#%s_grow_input').grow_input();}); """ % _id) - attributes['_id']=_id+'_grow_input' + attributes['_id'] = _id+'_grow_input' + attributes['_style'] = 'list-style:none' return TAG[''](UL(*items,**attributes),script) diff --git a/gluon/tools.py b/gluon/tools.py index a983869b..25f48d07 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4662,7 +4662,8 @@ class Wiki(object): vars = current.request.post_vars if vars.body: vars.body=vars.body.replace('://%s' % self.host,'://HOSTNAME') - form = SQLFORM(db.wiki_page,page,deletable=True,showid=False).process() + form = SQLFORM(db.wiki_page,page,deletable=True, + formstyle='table2cols',showid=False).process() if form.deleted: current.session.flash = 'page deleted' redirect(URL())