moksha/api/widgets/containers/templates/tabbedcontainer.mak | 4 ++-- moksha/lib/helpers.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit c826f945035fa501158c2adc3cc496ce6b8f1aa1 Author: John (J5) Palmieri johnp@redhat.com Date: Thu Mar 12 15:04:55 2009 -0400
fix some issues with duplicate ids
diff --git a/moksha/api/widgets/containers/templates/tabbedcontainer.mak b/moksha/api/widgets/containers/templates/tabbedcontainer.mak index a2664d2..22a27f5 100644 --- a/moksha/api/widgets/containers/templates/tabbedcontainer.mak +++ b/moksha/api/widgets/containers/templates/tabbedcontainer.mak @@ -1,6 +1,6 @@ <!-- Default Template --> -<div> - <ul id="${id}"> +<div id="${id}"> + <ul> % for t in tabs: <li><a href="${t['url']}" title="${t['label']} Page"> ${t['label']} diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 40142a6..535a40d 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -310,8 +310,9 @@ class MokshaApp(App): return MokshaWidget(self.label, 'placeholder', self.content_id, {'appname':self.app}, self.auth).process(d) - - return super(MokshaApp, self).process(d) + else: + results = super(MokshaApp, self).process(d) + return results
class Widget(ConfigWrapper): """A configuration wrapper class that displays a ToscaWidget. Use this @@ -381,7 +382,7 @@ class Widget(ConfigWrapper): url = '#' + content_id results.update({'label': self.label, 'url': url,'widget': self.widget , 'params':_update_params(self.params, d), 'id': results['id'], - 'content_id': self.content_id, 'css_class': self.css_class}) + 'content_id': content_id, 'css_class': self.css_class})
return results
@@ -418,7 +419,7 @@ class MokshaWidget(Widget): for this wrapper """ widget = moksha._widgets[moksha_widget]['widget'] - super(MokshaWidget, self).__init__(label=label, widget=widget, + return super(MokshaWidget, self).__init__(label=label, widget=widget, content_id=content_id, params=params, auth=auth, css_class=css_class)
moksha-commits@lists.fedorahosted.org