details: http://www.bx.psu.edu/hg/galaxy/rev/6d217bad7496 changeset: 3378:6d217bad7496 user: jeremy goecks <jeremy.goecks@emory.edu> date: Fri Feb 12 12:41:21 2010 -0500 description: Make it possible to place grids in panels; specifically, make it possible to display a grid with the Galaxy masthead. diffstat: lib/galaxy/web/framework/helpers/grids.py | 4 +++- templates/grid_base.mako | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diffs (51 lines): diff -r 465daec3fb8f -r 6d217bad7496 lib/galaxy/web/framework/helpers/grids.py --- a/lib/galaxy/web/framework/helpers/grids.py Fri Feb 12 12:13:37 2010 -0500 +++ b/lib/galaxy/web/framework/helpers/grids.py Fri Feb 12 12:41:21 2010 -0500 @@ -234,7 +234,8 @@ else: new_kwargs[ 'id' ] = trans.security.encode_id( id ) return url_for( **new_kwargs ) - + + use_panels = ( 'use_panels' in kwargs ) and ( kwargs['use_panels'] == True ) async_request = ( ( self.use_async ) and ( 'async' in kwargs ) and ( kwargs['async'] in [ 'True', 'true'] ) ) return trans.fill_template( iff( async_request, self.async_template, self.template), grid=self, @@ -251,6 +252,7 @@ url = url, message_type = status, message = message, + use_panels=use_panels, # Pass back kwargs so that grid template can set and use args without grid explicitly having to pass them. kwargs=kwargs ) diff -r 465daec3fb8f -r 6d217bad7496 templates/grid_base.mako --- a/templates/grid_base.mako Fri Feb 12 12:13:37 2010 -0500 +++ b/templates/grid_base.mako Fri Feb 12 12:41:21 2010 -0500 @@ -10,6 +10,16 @@ %> <%inherit file="${inherit(context)}"/> +<%def name="init()"> +<% + self.has_left_panel=False + self.has_right_panel=False + self.message_box_visible=False + self.active_view="user" + self.overlay_visible=False +%> +</%def> + ## ## Override methods from base.mako and base_panels.mako ## @@ -666,7 +676,8 @@ </%def> <%def name="stylesheets()"> - ${h.css( "base", "autocomplete_tagging" )} + ${parent.stylesheets()} + ${h.css( "autocomplete_tagging" )} <style> ## Not generic to all grids -- move to base? .count-box {