From e0870bbdb2287877f4ffc78133d43124c2c87eaa Mon Sep 17 00:00:00 2001 From: Tim Richardson Date: Sat, 1 Mar 2014 12:25:08 +1100 Subject: [PATCH 1/2] change buttons classes for bootstrap 3 --- gluon/sqlhtml.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index b65d9f0c..141886ab 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1747,16 +1747,16 @@ class SQLFORM(FORM): _type='text', _id=_id, _class=field.type) new_button = INPUT( - _type="button", _value=T('New Search'), _class="btn", _title = T('Start building a new search'), + _type="button", _value=T('New Search'), _class="btn btn-default", _title = T('Start building a new search'), _onclick="%s_build_query('new','%s')" % (prefix,field)) and_button = INPUT( - _type="button", _value=T('+ And'), _class="btn", _title = T('Add this to the search as an AND term'), + _type="button", _value=T('+ And'), _class="btn btn-default", _title = T('Add this to the search as an AND term'), _onclick="%s_build_query('and','%s')" % (prefix, field)) or_button = INPUT( - _type="button", _value=T('+ Or'), _class="btn",_title = T('Add this to the search as an OR term'), + _type="button", _value=T('+ Or'), _class="btn btn-default",_title = T('Add this to the search as an OR term'), _onclick="%s_build_query('or','%s')" % (prefix, field)) close_button = INPUT( - _type="button", _value=T('Close'), _class="btn", + _type="button", _value=T('Close'), _class="btn btn-default", _onclick="jQuery('#%s').slideUp()" % panel_id) criteria.append(DIV( @@ -1872,7 +1872,7 @@ class SQLFORM(FORM): cornerall='', cornertop='', cornerbottom='', - button='button btn', + button='button btn btn-default', buttontext='buttontext button', buttonadd='icon plus icon-plus', buttonback='icon leftarrow icon-arrow-left', @@ -2260,8 +2260,8 @@ class SQLFORM(FORM): INPUT(_name='keywords', _value=request.vars.keywords, _id=skeywords_id, _onfocus="jQuery('#%s').change();jQuery('#%s').slideDown();" % (spanel_id, sfields_id)), - INPUT(_type='submit', _value=T('Search'), _class="btn"), - INPUT(_type='submit', _value=T('Clear'), _class="btn", + INPUT(_type='submit', _value=T('Search'), _class="btn btn-default"), + INPUT(_type='submit', _value=T('Clear'), _class="btn btn-default", _onclick="jQuery('#%s').val('');" % skeywords_id), _method="GET", _action=url), search_menu) form = search_widget and search_widget(sfields, url()) or '' @@ -2605,7 +2605,7 @@ class SQLFORM(FORM): order=request.vars.order or '', _export_type=k, keywords=request.vars.keywords or '')) - export_links.append(A(T(label), _href=link,_title=title,_class='btn')) + export_links.append(A(T(label), _href=link,_title=title,_class='btn btn-default')) export_menu = \ DIV(T('Export:'), _class="w2p_export_menu", *export_links) else: From 832d6c2e97108804c7277fe986d7edb609c3f849 Mon Sep 17 00:00:00 2001 From: Tim Richardson Date: Mon, 3 Mar 2014 06:16:09 +1100 Subject: [PATCH 2/2] bootstrap 3 icons for SQLFORM.grid --- gluon/sqlhtml.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 141886ab..ad60baa6 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1874,13 +1874,13 @@ class SQLFORM(FORM): cornerbottom='', button='button btn btn-default', buttontext='buttontext button', - buttonadd='icon plus icon-plus', - buttonback='icon leftarrow icon-arrow-left', - buttonexport='icon downarrow icon-download', - buttondelete='icon trash icon-trash', - buttonedit='icon pen icon-pencil', - buttontable='icon rightarrow icon-arrow-right', - buttonview='icon magnifier icon-zoom-in', + buttonadd='icon plus icon-plus glyphicon glyphicon-plus', + buttonback='icon leftarrow icon-arrow-left glyphicon glyphicon-arrow-left', + buttonexport='icon downarrow icon-download glyphicon glyphicon-download', + buttondelete='icon trash icon-trash glyphicon glyphicon-trash', + buttonedit='icon pen icon-pencil glyphicon glyphicon-arrow-pencil', + buttontable='icon rightarrow icon-arrow-right glyphicon glyphicon-arrow-right', + buttonview='icon magnifier icon-zoom-in glyphicon glyphicon-arrow-zoom-in', ) elif not isinstance(ui, dict): raise RuntimeError('SQLFORM.grid ui argument must be a dictionary')