moksha/api/widgets/__init__.py | 3 - moksha/api/widgets/containers/__init__.py | 1 moksha/api/widgets/containers/dashboardcontainer.py | 16 +++--- moksha/api/widgets/containers/tabbedcontainer.py | 16 +++--- moksha/api/widgets/containers/templates/dashboardcontainer.mak | 12 ++-- moksha/api/widgets/containers/templates/layout_applist.mak | 26 +++++----- moksha/api/widgets/grid.py | 17 +++--- moksha/api/widgets/util.py | 4 - 8 files changed, 48 insertions(+), 47 deletions(-)
New commits: commit d299d2f6e521e205dab790a11077866fd3ad2036 Author: John (J5) Palmieri johnp@redhat.com Date: Mon Feb 2 16:58:37 2009 -0500
remove trailing whitespace
diff --git a/moksha/api/widgets/__init__.py b/moksha/api/widgets/__init__.py index ceac0de..38b79ba 100644 --- a/moksha/api/widgets/__init__.py +++ b/moksha/api/widgets/__init__.py @@ -1,3 +1,4 @@ from live import LiveWidget from util import * -from grid import Grid \ No newline at end of file +from grid import Grid + diff --git a/moksha/api/widgets/containers/__init__.py b/moksha/api/widgets/containers/__init__.py index 930fb99..3e3baa2 100644 --- a/moksha/api/widgets/containers/__init__.py +++ b/moksha/api/widgets/containers/__init__.py @@ -1,2 +1,3 @@ from dashboardcontainer import * from tabbedcontainer import * + diff --git a/moksha/api/widgets/containers/dashboardcontainer.py b/moksha/api/widgets/containers/dashboardcontainer.py index 3cd1b75..41732bf 100644 --- a/moksha/api/widgets/containers/dashboardcontainer.py +++ b/moksha/api/widgets/containers/dashboardcontainer.py @@ -1,4 +1,4 @@ -from moksha.api.widgets.layout.layout import layout_js, layout_css, ui_core_js, ui_draggable_js, ui_droppable_js, ui_sortable_js +from moksha.api.widgets.layout.layout import layout_js, layout_css, ui_core_js, ui_draggable_js, ui_droppable_js, ui_sortable_js
from tw.api import Widget from tw.jquery import jquery_js @@ -8,10 +8,10 @@ from tg import config class AppListWidget(Widget): template = 'mako:moksha.api.widgets.containers.templates.layout_applist' properties = ['layout', 'category'] - - def update_params(self, d): + + def update_params(self, d): super(AppListWidget, self).update_params(d) - + # we want to error out if there is no category c = d['category'] if isinstance(c, basestring): @@ -30,7 +30,7 @@ class DashboardContainer(Widget): config_key = None layout = []
- def update_params(self, d): + def update_params(self, d): super(DashboardContainer, self).update_params(d) layout = eval_app_config(config.get(self.config_key, "None"))
@@ -39,12 +39,12 @@ class DashboardContainer(Widget): layout = eval_app_config(self.layout) else: layout = self.layout - + # Filter out any None's in the layout which signify apps which are # not allowed to run with the current session's authorization level - + l = ConfigWrapper.process_wrappers(layout) - + d['layout'] = l d['applist_widget'] = applist_widget return d \ No newline at end of file diff --git a/moksha/api/widgets/containers/tabbedcontainer.py b/moksha/api/widgets/containers/tabbedcontainer.py index f83bf97..247cd98 100644 --- a/moksha/api/widgets/containers/tabbedcontainer.py +++ b/moksha/api/widgets/containers/tabbedcontainer.py @@ -5,21 +5,21 @@ from moksha.lib.helpers import eval_app_config, ConfigWrapper
import urllib
-""" +""" :Name: TabbedContainer :Type: Container
:Notes: We may need to create a tab javascript object that inherits from jQuery.ui.tabs -""" +""" class TabbedContainer(JQueryUITabs): """ :tabs: An ordered list of application tabs to display Application descriptors can come is a couple of forms - + * tuple - (label, url, {request parameters}) - * App class - App(label = label, - url = url, + * App class - App(label = label, + url = url, req_params = {request parameters}) * MokshaApp class - MokshaApp(label = label, application = moksha app name, @@ -29,11 +29,11 @@ class TabbedContainer(JQueryUITabs): template = 'mako:moksha.api.widgets.containers.templates.tabbedcontainer' config_key = None # if set load config tabs = () - + def update_params(self, d): - + super(TabbedContainer, self).update_params(d) - + tabs = eval_app_config(config.get(self.config_key, "None")) if not tabs: if isinstance(self.tabs, str): diff --git a/moksha/api/widgets/containers/templates/dashboardcontainer.mak b/moksha/api/widgets/containers/templates/dashboardcontainer.mak index dfd40ca..265bfa1 100644 --- a/moksha/api/widgets/containers/templates/dashboardcontainer.mak +++ b/moksha/api/widgets/containers/templates/dashboardcontainer.mak @@ -1,12 +1,12 @@ <div> Sample Template - you should subclass and create your own layout - <div id="container"> - % for c in layout: + <div id="container"> + % for c in layout: ${applist_widget(category = c)} % endfor </div> - - <div id="overlay"> - <div id="preloader"><img src="/toscawidgets/resources/moksha.widgets.layout.layout/static/loader.gif" alt="" /></div> - </div> + + <div id="overlay"> + <div id="preloader"><img src="/toscawidgets/resources/moksha.widgets.layout.layout/static/loader.gif" alt="" /></div> + </div> </div> diff --git a/moksha/api/widgets/containers/templates/layout_applist.mak b/moksha/api/widgets/containers/templates/layout_applist.mak index 8791153..0fa4464 100644 --- a/moksha/api/widgets/containers/templates/layout_applist.mak +++ b/moksha/api/widgets/containers/templates/layout_applist.mak @@ -1,21 +1,21 @@ - <div id="${category['id']}" class="ui-sortable ${category['css_class']}"> - % for app in category['apps']: - <dl class="sort"> - % if app['label']: - <dt>${app['label']}</dt> - % endif - <dd id="${app['id']}"> + <div id="${category['id']}" class="ui-sortable ${category['css_class']}"> + % for app in category['apps']: + <dl class="sort"> + % if app['label']: + <dt>${app['label']}</dt> + % endif + <dd id="${app['id']}"> % if app.has_key('widget'): ${app['widget'](app['params'])} % endif </dd> - + % if app.has_key('url'): <script type="text/javascript"> $("#${app['id']}").load("${app['url']}"); </script> - % endif - - </dl> - % endfor - </div> + % endif + + </dl> + % endfor + </div> diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py index d380e4e..7469c3a 100644 --- a/moksha/api/widgets/grid.py +++ b/moksha/api/widgets/grid.py @@ -4,13 +4,13 @@ from tw.jquery.ui_core import jquery_ui_core_js from tw.jquery import jQuery, jquery_js import simplejson as json
-jquery_json_js = JSLink(filename='public/javascript/jquery.json.js', +jquery_json_js = JSLink(filename='public/javascript/jquery.json.js', modname='moksha', javascript=[jquery_js]) -jquery_template_js = JSLink(filename='public/javascript/jquery.template.js', +jquery_template_js = JSLink(filename='public/javascript/jquery.template.js', modname='moksha', javascript=[jquery_js]) -moksha_ui_grid_js = JSLink(filename='public/javascript/ui/moksha.ui.grid.js', - modname='moksha', - javascript=[jquery_ui_core_js, +moksha_ui_grid_js = JSLink(filename='public/javascript/ui/moksha.ui.grid.js', + modname='moksha', + javascript=[jquery_ui_core_js, jquery_template_js, jquery_json_js])
@@ -20,7 +20,7 @@ class Grid(FormField): 'filters', 'unique_key', 'sort_key', 'sort_order', 'row_template', 'resource', 'resource_path', 'loading_throbber'] - + rows_per_page = 10 page_num = 1 total_rows = 0 @@ -32,12 +32,12 @@ class Grid(FormField): resource = None resource_path = None loading_throbber = None - + def update_params(self, d): super(Grid, self).update_params(d) if not getattr(d,"id",None): raise ValueError, "Moksha Grid is supposed to have id" - + grid_d = {} for p in self.params: v = d.get(p) @@ -51,4 +51,3 @@ class Grid(FormField): if d.get('uid'): id += d.uid self.add_call(jQuery("#%s" % id).mokshagrid(grid_d)) - \ No newline at end of file diff --git a/moksha/api/widgets/util.py b/moksha/api/widgets/util.py index a41f375..384a585 100644 --- a/moksha/api/widgets/util.py +++ b/moksha/api/widgets/util.py @@ -5,8 +5,8 @@ class ContextAwareWidget(Widget): '''Inherit from this widget class if you want your widget to automatically get the pylons.tmpl_context in its dictionary ''' - + def update_params(self, d): super(ContextAwareWidget, self).update_params(d) - + d['tmpl_context'] = tmpl_context \ No newline at end of file