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

Merge pull request #373 from timrichardson/grid_search_widget_labels

Browse Source 
Better button labels for grid search widget
This commit is contained in:
mdipierro
2014-02-02 14:33:08 -08:00
parent 1b12bcb5d9 99d64722a1
commit 4c3ab339cd
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+8 -7
View File
@@ -1747,13 +1747,13 @@ class SQLFORM(FORM):
_type='text', _id=_id, _class=field.type) _type='text', _id=_id, _class=field.type)
new_button = INPUT( new_button = INPUT(
_type="button", _value=T('Add'), _class="btn", _title = T('Add clause to search terms'), _type="button", _value=T('New Search'), _class="btn", _title = T('Start building a new search'),
_onclick="%s_build_query('new','%s')" % (prefix,field)) _onclick="%s_build_query('new','%s')" % (prefix,field))
and_button = INPUT( and_button = INPUT(
_type="button", _value=T('And'), _class="btn", _type="button", _value=T('+ And'), _class="btn", _title = T('Add this to the search as an AND term'),
_onclick="%s_build_query('and','%s')" % (prefix, field)) _onclick="%s_build_query('and','%s')" % (prefix, field))
or_button = INPUT( or_button = INPUT(
_type="button", _value=T('Or'), _class="btn", _type="button", _value=T('+ Or'), _class="btn",_title = T('Add this to the search as an OR term'),
_onclick="%s_build_query('or','%s')" % (prefix, field)) _onclick="%s_build_query('or','%s')" % (prefix, field))
close_button = INPUT( close_button = INPUT(
_type="button", _value=T('Close'), _class="btn", _type="button", _value=T('Close'), _class="btn",
@@ -1960,10 +1960,10 @@ class SQLFORM(FORM):
def gridbutton(buttonclass='buttonadd', buttontext=T('Add'), def gridbutton(buttonclass='buttonadd', buttontext=T('Add'),
buttonurl=url(args=[]), callback=None, buttonurl=url(args=[]), callback=None,
delete=None, trap=True, noconfirm=None): delete=None, trap=True, noconfirm=None, title=None):
if showbuttontext: if showbuttontext:
return A(SPAN(_class=ui.get(buttonclass)), return A(SPAN(_class=ui.get(buttonclass)),
SPAN(T(buttontext), _title=T(buttontext), SPAN(T(buttontext), _title=title or T(buttontext),
_class=ui.get('buttontext')), _class=ui.get('buttontext')),
_href=buttonurl, _href=buttonurl,
callback=callback, callback=callback,
@@ -1977,7 +1977,7 @@ class SQLFORM(FORM):
callback=callback, callback=callback,
delete=delete, delete=delete,
noconfirm=noconfirm, noconfirm=noconfirm,
_title=T(buttontext), _title=title or T(buttontext),
_class=ui.get('buttontext'), _class=ui.get('buttontext'),
cid=request.cid) cid=request.cid)
@@ -2238,7 +2238,8 @@ class SQLFORM(FORM):
if create: if create:
add = gridbutton( add = gridbutton(
buttonclass='buttonadd', buttonclass='buttonadd',
buttontext=T('Add'), buttontext=T('Add Record'),
title=T("Add record to database"),
buttonurl=url(args=['new', tablename])) buttonurl=url(args=['new', tablename]))
if not searchable: if not searchable:
console.append(add) console.append(add)