Moksha-commits April 2009

moksha-commits@lists.fedorahosted.org

3 participants
77 discussions

2 commits - moksha/public
by John (J5) Palmieri 28 Apr '09

28 Apr '09

moksha/public/javascript/ui/moksha.ui.tabs.js | 76 +++++++++++++++++--------- 1 file changed, 51 insertions(+), 25 deletions(-) New commits: commit 6e0e8e476289c94b5c5f9ed251d41b2439b93224 Merge: 599c329... 8fb06dc... Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Tue Apr 28 18:09:18 2009 -0400 Merge branch 'master' of git+ssh://johnp@git.fedorahosted.org/git/moksha commit 599c329f5ff563230207335bf62f861a6ec02447 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Tue Apr 28 18:04:46 2009 -0400 tabs now work with middle click and open in new window/tab menu items * set the link to a static url * set dynamic_href on the link * on normal click we use the dynamic href * on browser controlled nav (middle click, "open in" context menu) the browser only sees the static href and uses that * we still need to fix this across the board for all links diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js index 5b05e8c..70c33f2 100644 --- a/moksha/public/javascript/ui/moksha.ui.tabs.js +++ b/moksha/public/javascript/ui/moksha.ui.tabs.js @@ -18,6 +18,13 @@ $.widget("ui.mokshatabs", { _init: function() { this.options.event += '.tabs'; // namespace event + this._findParentNav(); + + // create tabs + this.tabify(true); + }, + + _findParentNav: function() { var parent = this.element.parent(); var container_level = 0; var nav_class = this.options.navContainerClass; @@ -30,10 +37,25 @@ $.widget("ui.mokshatabs", { } this.options.container_level = container_level; + }, - // create tabs - this.tabify(true); + _stripUUID: function(id) { + return id.split("-uuid")[0]; }, + + _generateTabLink: function(tab_path, attach_query_string) { + o = this.options; + var container_path = location.hash.substr(1); + var tab_link = container_path.split('/'); + tab_link[o.container_level] = tab_path; + + tab_link = tab_link.splice(0, o.container_level + 1).join('/'); + if (attach_query_string && location.search) + tab_link += location.search; + + return tab_link; + }, + setData: function(key, value) { if ((/^selected/).test(key)) this.select(value); @@ -42,15 +64,18 @@ $.widget("ui.mokshatabs", { this.tabify(); } }, + length: function() { return this.$tabs.length; }, + tabId: function(a) { var panel = $(a).attr('panel'); return panel && panel.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '') || this.options.idPrefix + $.data(a); }, + ui: function(tab, panel) { return { options: this.options, @@ -59,6 +84,7 @@ $.widget("ui.mokshatabs", { index: this.$tabs.index(tab) }; }, + tabify: function(init) { var tab_id = this.element.attr('id') + '_tabs'; @@ -70,9 +96,6 @@ $.widget("ui.mokshatabs", { var self = this, o = this.options; - - self.path_remainder = ''; - var first_non_static_tab = -1; this.$tabs.each(function(i, a) { // inline tab @@ -81,7 +104,7 @@ $.widget("ui.mokshatabs", { if (first_non_static_tab == -1) first_non_static_tab = i; // static link - } else if ($(a).hasClass('static_link')) { + } else if ($(a).hasClass('static_link') || o.staticLinkOnClick) { $.data(a, 'href.tabs', href); $.data(a, 'load.tabs', href); // remote tab @@ -93,7 +116,10 @@ $.widget("ui.mokshatabs", { $.data(a, 'href.tabs', href); // required for restore on destroy $.data(a, 'load.tabs', href); // mutable var id = self.tabId(a); - a.href = '#' + id; + + $(a).data('dynamic_href.tabs', '#' + id); + a.href = self._generateTabLink(self._stripUUID(id), true); + var $panel = $('#' + id + ':first', self.element); if (!$panel.length) { $panel = $(o.panelTemplate).attr('id', id).addClass(o.panelClass) @@ -197,7 +223,7 @@ $.widget("ui.mokshatabs", { var l = this.$lis.eq(o.selected).addClass(o.selectedClass); var a = $('a', l)[0]; - var $show = $(a.hash + ':first', self.element) + var $show = $($(a).data('dynamic_href.tabs') + ':first', self.element) $show.show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before // seems to be expected behavior that the show callback is fired @@ -289,7 +315,7 @@ $.widget("ui.mokshatabs", { //var trueClick = e.clientX; // add to history only if true click occured, not a triggered click var $li = $(this).parents('li:eq(0)'), $hide = self.$panels.filter(':visible'), - $show = $(this.hash + ':first', self.element), + $show = $($(this).data('dynamic_href.tabs') + ':first', self.element), isStaticLink = $(this).hasClass('static_link'); // If tab disabled or @@ -307,8 +333,11 @@ $.widget("ui.mokshatabs", { self.options.selected = self.$tabs.index(this); var $el = $(this) - var href = $el.attr('href'); - href = href.split("-uuid")[0]; + + // we don't get the actual href but the dynamic one + var href = $el.data('dynamic_href.tabs'); + + href = self._stripUUID(href); if (isStaticLink) { moksha.goto(href); @@ -317,22 +346,18 @@ $.widget("ui.mokshatabs", { //only update the hash level we care about if (o.container_level != 0) { - var hash = location.hash.substr(1); - hash = hash.split('/'); - hash[o.container_level] = href.substr(1); - - hash = hash.splice(0, o.container_level + 1).join('/'); + var hash = self._generateTabLink(href.substr(1), false); if (o.staticLoadOnClick) { moksha.goto(hash); - return; + return false; } else { location.hash = '#' + hash; } } else { if (o.staticLoadOnClick) { moksha.goto(href.substr(1)); - return; + return false; } else { location.hash = href; } @@ -407,7 +432,6 @@ $.widget("ui.mokshatabs", { //return o.bookmarkable && !!trueClick; // convert trueClick == undefined to Boolean required in IE return false; - }); // disable click if event is configured to something else @@ -546,8 +570,12 @@ $.widget("ui.mokshatabs", { var index = -1; var l = id.length; for(var i=0; i < this.$tabs.length; i++) { - var h = $(this.$tabs[i]).attr('href'); - h = h.split('-uuid')[0] + var h = $(this.$tabs[i]).data('dynamic_href.tabs'); + // static links do not count + if (!h) + continue; + + h = this._stripUUID(h); if (h == id) { index = i; break; @@ -596,11 +624,9 @@ $.widget("ui.mokshatabs", { .find('em').data('label.tabs', label).html(o.spinner); } - //if (o.passPathRemainder) - // url += self.path_remainder; - var success_cb = function(r, s) { - var $panel = $(a.hash + ':first', self.element); + var id = $(a).data('dynamic_href.tabs') + var $panel = $(id + ':first', self.element); var $stripped = moksha.filter_resources(r); $panel.html($stripped);

1 0

2 commits - moksha/public
by Máirín Duffy 28 Apr '09

28 Apr '09

moksha/public/javascript/ui/moksha.ui.grid.js | 1 + 1 file changed, 1 insertion(+) New commits: commit 8fb06dc41623d9f5ea612d48c2c1f4e35a77c5c0 Merge: 94f9b83... a60c8cb... Author: Máirín Duffy <duffy(a)redhat.com> Date: Tue Apr 28 17:46:00 2009 -0400 Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha commit 94f9b836a9bdacd268d57944de18a9c86b9c86c6 Author: Máirín Duffy <duffy(a)redhat.com> Date: Tue Apr 28 17:45:29 2009 -0400 fix for fedora community ticket #137, adding a clearing div to the pagers diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index f373eee..1db6403 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -375,6 +375,7 @@ $pager_bottom_placeholder.append($("<div></div>").addClass('pager')); $pager_bottom_placeholder.insertAfter(self.element); self.$pager_bottom_placeholder = $pager_bottom_placeholder; + $("<div></div>").addClass('clear').insertAfter($pager_bottom_placeholder); self.request_data_refresh(); },

1 0

moksha/lib
by John (J5) Palmieri 28 Apr '09

28 Apr '09

moksha/lib/helpers.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) New commits: commit a60c8cb0b4b751f879126dfdcbb8d0bebb361f5e Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Tue Apr 28 15:29:17 2009 -0400 enums are now refrenced by category.id instead of category_indexnum * This allows us to setup different categories with similar id's (e.g. people.BUILDS_FAILED and profile.BUILDS_FAILED). diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 75f2b0f..49e0e9c 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -811,9 +811,15 @@ class CategoryEnum(object): self._prefix = prefix self._code_map = {} - for number, d in enumerate(data): - # we prefix the code so we can validate - code = '%s_%d' % (prefix, number) + for d in data: + # data should be a tuple of (id, url) + # id can not have any dots in them + id = d[0] + if id.find('.') != -1: + raise ValueError('The enumeration id %s can not contain dots', id) + + # code is prefix.id + code = '%s.%s' % (prefix, d[0]) dob = EnumDataObj(code, d[1]) setattr(self, d[0], dob) setattr(self, code, dob) @@ -840,5 +846,20 @@ class CategoryEnum(object): def get_data(self, attr): return self.attr_to_data(attr) + def get_category(self): + return self._prefix + def __call__(self, code): return self.get_data(code) + +class EnumGroup(object): + def __init__(self): + self._enums = {} + + def add(self, enum): + self._enums[enum.get_category()] = enum + + def __getitem__(self, key): + (category, enum_id) = key.rsplit('.', 1) + enum = self._enums[category] + return enum.get_data(key) \ No newline at end of file

1 0

2 commits - docs/main start-moksha
by Luke Macken 28 Apr '09

28 Apr '09

docs/main/Topics.rst | 2 +- docs/main/Widgets.rst | 12 ++++++++++++ start-moksha | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) New commits: commit 30dfdf1416289daa10452f6f1c08f5d3fe6290a8 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 28 12:26:41 2009 -0400 Switch from pip to easy_installing the tg2 current. *Crosses fingers* diff --git a/start-moksha b/start-moksha index 2292e48..7667b07 100755 --- a/start-moksha +++ b/start-moksha @@ -6,8 +6,9 @@ if [ ! $VIRTUAL_ENV ]; then echo "Initializing a TurboGears2 virtual environment" virtualenv --no-site-packages tg2env source tg2env/bin/activate - easy_install -U setuptools - ./pip.py install -E tg2env -r normal-reqs.txt --extra-index-url=http://www.turbogears.org/2.0/downloads/current/index + #easy_install -U setuptools + #./pip.py install -E tg2env -r normal-reqs.txt --extra-index-url=http://www.turbogears.org/2.0/downloads/current/index + easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools pushd moksha/widgetbrowser; python setup.py develop; popd else source tg2env/bin/activate commit 2bead87e4d546dc9a1087f71ffe433a977d5300b Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 28 12:25:06 2009 -0400 Some widget documentation improvements, and another minor fix diff --git a/docs/main/Topics.rst b/docs/main/Topics.rst index 79e7180..f38f949 100644 --- a/docs/main/Topics.rst +++ b/docs/main/Topics.rst @@ -7,7 +7,7 @@ A `"Topic"` in Moksha is basically just a message queue. By abstracting out the low-level messaging protocols and brokers, Moksha applications can interact with `"topics"` without having to worry about the underlying protocols that are involved. For example, a `topic` could -potentially be represented by a a STOMP destination, or even an AMQP message +potentially be represented by a STOMP destination, or even an AMQP message queue. These messaging backends can be swapped out and configured without having to alter the applications that care about those `topics`. diff --git a/docs/main/Widgets.rst b/docs/main/Widgets.rst index 5ceb18a..b7232d0 100644 --- a/docs/main/Widgets.rst +++ b/docs/main/Widgets.rst @@ -1,6 +1,18 @@ Widgets ======= +A ``Widget`` in Moksha is simply a `ToscaWidget <http://toscawidgets.org>`_. +ToscaWidgets is a framework for building reusable web components, and is fully +integrated into TurboGears2, and thus Moksha, out of the box. Along with their +official documentation, you can also find great ToscaWidgets tutorials in the +`TurboGears2 http://www.turbogears.org/2.0/docs/toc.html>`_ docs. + + * `ToscaWidgets <http://toscawidgets.org>`_ + * `Writing Widget Demos <http://toscawidgets.org/documentation/WidgetBrowser>`_ + * `TurboGears2 Documentation <http://www.turbogears.org/2.0/docs/toc.html>`_ + +Moksha also provides a number of Widgets in its API, some of which include: + .. toctree:: :maxdepth: 2

1 0

6 commits - docs/main
by Luke Macken 24 Apr '09

24 Apr '09

docs/main/MokshaApplications.rst | 15 ++++++-- docs/main/MokshaContainerWidgets.rst | 59 +++++++++++++++++------------------ docs/main/Topics.rst | 2 - 3 files changed, 42 insertions(+), 34 deletions(-) New commits: commit d1a3ea99db352d964275161654a9d634c548e309 Merge: a0ea17d... 3b96563... Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Apr 24 20:04:12 2009 -0400 Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha commit a0ea17d8d95cc13c3183b1bc183c48ac81535876 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 21 00:00:37 2009 -0400 Mention how moksha looks for the model module in your apps diff --git a/docs/main/MokshaApplications.rst b/docs/main/MokshaApplications.rst index 25ab445..82ea7e0 100644 --- a/docs/main/MokshaApplications.rst +++ b/docs/main/MokshaApplications.rst @@ -32,6 +32,9 @@ your ``setup.py`` under the ``[moksha.application]`` entry-point. myapp = myapplication.controllers.root:RootController Your TG application will then be accessable via ``/apps/myapp`` in Moksha. +Moksha will also look for a ``model`` module in your application, and will call +the ``init_model`` method within it, if it exists. This is a convention used to +initialize TurboGears2 models. Installing a ToscaWidget ------------------------ commit 6edbc9c3bb88f8372eba8287ee57bab791c45bdf Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 20 23:58:40 2009 -0400 Minor updates to our app documentation diff --git a/docs/main/MokshaApplications.rst b/docs/main/MokshaApplications.rst index de2acd8..25ab445 100644 --- a/docs/main/MokshaApplications.rst +++ b/docs/main/MokshaApplications.rst @@ -7,8 +7,8 @@ and store them in ``moksha.apps`` and ``moksha._widgets`` dictionaries. These can then be accessed at any time by any application or widget during any request. -Mounting an existing WSGI application -------------------------------------- +Mounting a WSGI application +--------------------------- You can mount an existing WSGI application by pointing to it in the ``setup.py`` on the ``[moksha.wsgiapp]`` entry-point. @@ -20,8 +20,8 @@ in the ``setup.py`` on the ``[moksha.wsgiapp]`` entry-point. Your WSGI application will then be accessable via ``/apps/mywsgiapp`` in Moksha. -Using an existing TurboGears application -------------------------------------------- +Mounting a TurboGears application +---------------------------------- You can easily mount TurboGears Controllers within Moksha by pointing to them in your ``setup.py`` under the ``[moksha.application]`` entry-point. @@ -31,6 +31,8 @@ your ``setup.py`` under the ``[moksha.application]`` entry-point. [moksha.application] myapp = myapplication.controllers.root:RootController +Your TG application will then be accessable via ``/apps/myapp`` in Moksha. + Installing a ToscaWidget ------------------------ @@ -41,6 +43,8 @@ You can plug an existing ToscaWidget into Moksha by adding it to the ``[moksha.w [moksha.widget] jquery = tw.jquery:jquery_js +Your Widget will then be accessable via ``/widgets/mywidget`` in Moksha. + Configuration ------------- commit cf51e32b77c4e2e997e8a2ce66fc98bab0dbafcd Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 20 23:39:30 2009 -0400 Fix some of the code formatting of our container examples to get syntax highlighting to work. diff --git a/docs/main/MokshaContainerWidgets.rst b/docs/main/MokshaContainerWidgets.rst index cf6532f..b7bbce6 100644 --- a/docs/main/MokshaContainerWidgets.rst +++ b/docs/main/MokshaContainerWidgets.rst @@ -22,20 +22,21 @@ Here is an example of what a configuration line could look like: .. code-block:: python - dashboard_layout = - [Category('Test Applications', [ - MokshaApp('Hello World 1', - 'moksha.helloworld', - {'name':'J5'}), - App('Hello World 2', - '/apps/moksha.helloworld', - {'name':'Luke'}), - MokshaWidget('Hello World 3', + dashboard_layout = [ + Category('Test Applications', [ + MokshaApp('Hello World 1', + 'moksha.helloworld', + {'name': 'J5'}), + App('Hello World 2', + '/apps/moksha.helloworld', + {'name': 'Luke'}), + MokshaWidget('Hello World 3', 'moksha.helloworldwidget', - {'name':'Anonymous'}, auth=Not(not_anonymous())) - ] - ) - ] + {'name': 'Anonymous'}, + auth=Not(not_anonymous())), + ] + ) + ] This would be a configuration for the dashboard container discussed bellow. It defines one category, two applications and a widget. How this is laid out commit bebf051c0c1e320ffe8b08b9ac5e93ad719dc565 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 20 23:35:48 2009 -0400 Fix some whitespace problems in our container code documentation diff --git a/docs/main/MokshaContainerWidgets.rst b/docs/main/MokshaContainerWidgets.rst index 0387a19..cf6532f 100644 --- a/docs/main/MokshaContainerWidgets.rst +++ b/docs/main/MokshaContainerWidgets.rst @@ -156,22 +156,22 @@ homepage.py from moksha.api.widgets.containers import DashboardContainer class HomePageContainer(DashboardContainer): - template = 'mako:myapp.templates.homepagecontainer' - layout = [Category('left-content-column', - [App('Banner', '/static-html/sitebanner.html'), - MokshaApp('Stable Updates','myapp.updates/table', - {"some_json":'{"status":"stable"}'} - ), - MokshaApp('Testing Updates','myapp.updates/table', - {"some_json":'{"status":"testing"}'} - ), - ]), - Category('right-content-column', - MokshaWidget(None, 'myapp.loginwidget', - auth=Not(not_anonymous()) - ) - ) - ] + template = 'mako:myapp.templates.homepagecontainer' + layout = [Category('left-content-column', + [App('Banner', '/static-html/sitebanner.html'), + MokshaApp('Stable Updates','myapp.updates/table', + {"some_json":'{"status":"stable"}'} + ), + MokshaApp('Testing Updates','myapp.updates/table', + {"some_json":'{"status":"testing"}'} + ), + ]), + Category('right-content-column', + MokshaWidget(None, 'myapp.loginwidget', + auth=Not(not_anonymous()) + ) + ) + ] homepagecontainer.mak commit d27356060577e8465878add652beb8f75c216e1b Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 20 23:34:20 2009 -0400 Some more inter-doc linkage diff --git a/docs/main/Topics.rst b/docs/main/Topics.rst index 4709036..79e7180 100644 --- a/docs/main/Topics.rst +++ b/docs/main/Topics.rst @@ -11,4 +11,4 @@ potentially be represented by a a STOMP destination, or even an AMQP message queue. These messaging backends can be swapped out and configured without having to alter the applications that care about those `topics`. -For details on how to interact with topics, see the documentation on `Consumers`, `DataStreams`, and the `MokshaHub`. +For details on how to interact with topics, see the documentation on :doc:`Consumers`, :doc:`DataStreams`, and :doc:`MokshaHub`.

1 0

moksha/connector
by John (J5) Palmieri 24 Apr '09

24 Apr '09

moksha/connector/connector.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 3b965632c2f543c4ce35bca35611f7fe571dceec Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Fri Apr 24 10:36:45 2009 -0400 don't define path variable in the base class and namespace our cache diff --git a/moksha/connector/connector.py b/moksha/connector/connector.py index a1f9522..ccb300e 100644 --- a/moksha/connector/connector.py +++ b/moksha/connector/connector.py @@ -38,8 +38,6 @@ class IConnector(object): All connectors must derive from this interface """ - _method_paths = {} - def __init__(self, environ=None, request=None): super(IConnector, self).__init__() self._environ = environ @@ -338,7 +336,7 @@ class ISearch(IQuery): default_sort_order = None, can_paginate = True): - cls._search_cache = fas_cache = Cache('moksha_search_cache_ ' + path) + cls._search_cache = Cache('moksha_search_cache_%s_%s ' %( cls.__name__, path)) def query_func(conn=None, start_row=0,

1 0

moksha/public
by John (J5) Palmieri 23 Apr '09

23 Apr '09

moksha/public/javascript/ui/moksha.ui.tabs.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) New commits: commit d8f85436e66ba414d83ee7b2ab024d67e4da86c9 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu Apr 23 17:01:20 2009 -0400 a better fix for the static vs. dynamic link indexing issue * instead of going off relative indexes when showing and hiding panes we always use the id's so we are sure we are matching up the right panel to the right tab * The issue only arises on first load because the selected tab's corrasponding panel is shown based on the position of the tab in the tab list. Since we don't bother to output static tab panels (they will never be populated) there can be less panels in the panel list than there are tabs in the tabs list so indexing is inacurrate. * Clicking on a tab always used the id's to identify the correct panel so we use the same method on first load now. diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js index ad92011..5b05e8c 100644 --- a/moksha/public/javascript/ui/moksha.ui.tabs.js +++ b/moksha/public/javascript/ui/moksha.ui.tabs.js @@ -66,14 +66,6 @@ $.widget("ui.mokshatabs", { this.$tabs = this.$lis.map(function() { return $('a', this)[0]; }); - // filter out static link list items after we have extracted their - // actual links. We still want to control the linking but $lis is - // used for mapping dynamic tabs to panels - this.$lis = this.$lis.map(function() { - if (!$('a', this).hasClass('static_link')) - return this; - } - ); this.$panels = $([]); var self = this, o = this.options; @@ -203,9 +195,10 @@ $.widget("ui.mokshatabs", { this.$lis.removeClass(o.selectedClass); if (o.selected !== null) { - - var p = this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before - this.$lis.eq(o.selected).addClass(o.selectedClass); + var l = this.$lis.eq(o.selected).addClass(o.selectedClass); + var a = $('a', l)[0]; + var $show = $(a.hash + ':first', self.element) + $show.show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before // seems to be expected behavior that the show callback is fired var onShow = function() {

1 0

moksha/public
by John (J5) Palmieri 23 Apr '09

23 Apr '09

moksha/public/javascript/ui/moksha.ui.tabs.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 553ac2dd5428b406e04280425213619099e20d55 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu Apr 23 16:29:11 2009 -0400 fix it so we still control static links (for filtering purposes) diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js index c18824c..ad92011 100644 --- a/moksha/public/javascript/ui/moksha.ui.tabs.js +++ b/moksha/public/javascript/ui/moksha.ui.tabs.js @@ -63,13 +63,17 @@ $.widget("ui.mokshatabs", { var tab_id = this.element.attr('id') + '_tabs'; this.$lis = $('#' + tab_id + ' ul li:has(>a[href])', this.element); - // filter out static links + + this.$tabs = this.$lis.map(function() { return $('a', this)[0]; }); + + // filter out static link list items after we have extracted their + // actual links. We still want to control the linking but $lis is + // used for mapping dynamic tabs to panels this.$lis = this.$lis.map(function() { if (!$('a', this).hasClass('static_link')) return this; } ); - this.$tabs = this.$lis.map(function() { return $('a', this)[0]; }); this.$panels = $([]); var self = this, o = this.options;

1 0

2 commits - moksha/api moksha/lib moksha/public
by John (J5) Palmieri 23 Apr '09

23 Apr '09

moksha/api/widgets/containers/templates/tabbedcontainer_panes.mak | 2 moksha/api/widgets/containers/templates/tabbedcontainer_tabs.mak | 11 +++ moksha/lib/helpers.py | 4 + moksha/public/javascript/ui/moksha.ui.tabs.js | 32 ++++++++-- 4 files changed, 42 insertions(+), 7 deletions(-) New commits: commit 9377c4b46782b02589a7b247d9fb2d7ea55f2d79 Merge: 121e792... 797632f... Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu Apr 23 16:20:53 2009 -0400 Merge branch 'master' of git+ssh://johnp@git.fedorahosted.org/git/moksha commit 121e792a79da9ab63bfb02948167637de38fece0 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu Apr 23 16:20:10 2009 -0400 add static links to the grid diff --git a/moksha/api/widgets/containers/templates/tabbedcontainer_panes.mak b/moksha/api/widgets/containers/templates/tabbedcontainer_panes.mak index 5b3abd1..d3aa02a 100644 --- a/moksha/api/widgets/containers/templates/tabbedcontainer_panes.mak +++ b/moksha/api/widgets/containers/templates/tabbedcontainer_panes.mak @@ -2,6 +2,8 @@ % for t in tabgroup: % if t['type'] == 'Category': ${add_panel(t['apps'])} + % elif t['type'] == 'StaticLink': + <% pass %> % else: <div id="${t['content_id']}"> % if t.has_key('widget'): diff --git a/moksha/api/widgets/containers/templates/tabbedcontainer_tabs.mak b/moksha/api/widgets/containers/templates/tabbedcontainer_tabs.mak index 9e194d0..62874d8 100644 --- a/moksha/api/widgets/containers/templates/tabbedcontainer_tabs.mak +++ b/moksha/api/widgets/containers/templates/tabbedcontainer_tabs.mak @@ -16,8 +16,17 @@ <%def name="display_tab(tab)"> % if tab['type'] == 'Category': ${display_category(tab)} + % elif tab['type'] == 'StaticLink': + <a href="${tab['url']}${tab['query_string']}" + title="${tab['label']}" + class="static_link" + > + ${tab['label']} + </a> % else: - <a href="${tab['url']}${tab['query_string']}" title="${tab['label']}" panel="${tab['content_id']}"> + <a href="${tab['url']}${tab['query_string']}" + title="${tab['label']}" + panel="${tab['content_id']}"> ${tab['label']} </a> % endif diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 2abe9ca..75f2b0f 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -315,6 +315,10 @@ class App(ConfigWrapper): return results +class StaticLink(App): + """A configuration wrapper class that shows up as a static link in nav + elements""" + class MokshaApp(App): """A configuration wrapper class that displays a Moksa application selected by name. This differes from App in that you don't have to diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js index afa27df..c18824c 100644 --- a/moksha/public/javascript/ui/moksha.ui.tabs.js +++ b/moksha/public/javascript/ui/moksha.ui.tabs.js @@ -63,8 +63,12 @@ $.widget("ui.mokshatabs", { var tab_id = this.element.attr('id') + '_tabs'; this.$lis = $('#' + tab_id + ' ul li:has(>a[href])', this.element); - console.log(this.$lis) - console.log(this.element); + // filter out static links + this.$lis = this.$lis.map(function() { + if (!$('a', this).hasClass('static_link')) + return this; + } + ); this.$tabs = this.$lis.map(function() { return $('a', this)[0]; }); this.$panels = $([]); @@ -73,12 +77,22 @@ $.widget("ui.mokshatabs", { self.path_remainder = ''; + var first_non_static_tab = -1; this.$tabs.each(function(i, a) { // inline tab - if (a.hash && a.hash.replace('#', '')) // Safari 2 reports '#' for an empty hash + if (a.hash && a.hash.replace('#', '')) { // Safari 2 reports '#' for an empty hash self.$panels = self.$panels.add(a.hash); + if (first_non_static_tab == -1) + first_non_static_tab = i; + // static link + } else if ($(a).hasClass('static_link')) { + $.data(a, 'href.tabs', href); + $.data(a, 'load.tabs', href); // remote tab - else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#" + } else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#" + if (first_non_static_tab == -1) + first_non_static_tab = i; + var href = $(a).attr('href') $.data(a, 'href.tabs', href); // required for restore on destroy $.data(a, 'load.tabs', href); // mutable @@ -168,7 +182,7 @@ $.widget("ui.mokshatabs", { else if (self.$lis.filter('.' + o.selectedClass).length) o.selected = self.$lis.index( self.$lis.filter('.' + o.selectedClass)[0] ); } - o.selected = o.selected === null || o.selected !== undefined ? o.selected : 0; // first tab selected by default + o.selected = o.selected === null || o.selected !== undefined ? o.selected : first_non_static_tab; // first non-static tab selected by default // Take disabling tabs via class attribute from HTML // into account and update option properly. @@ -278,7 +292,8 @@ $.widget("ui.mokshatabs", { //var trueClick = e.clientX; // add to history only if true click occured, not a triggered click var $li = $(this).parents('li:eq(0)'), $hide = self.$panels.filter(':visible'), - $show = $(this.hash + ':first', self.element); + $show = $(this.hash + ':first', self.element), + isStaticLink = $(this).hasClass('static_link'); // If tab disabled or // or is already loading or click callback returns false stop here. @@ -298,6 +313,11 @@ $.widget("ui.mokshatabs", { var href = $el.attr('href'); href = href.split("-uuid")[0]; + if (isStaticLink) { + moksha.goto(href); + return false; + } + //only update the hash level we care about if (o.container_level != 0) { var hash = location.hash.substr(1);

1 0

moksha/public
by Luke Macken 23 Apr '09

23 Apr '09

moksha/public/javascript/moksha.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 797632f7832b1a23e6c384f49780f132de779541 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Apr 23 09:50:24 2009 -0400 Fix a typo in our moksha.js diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js index eaeca92..62c404d 100644 --- a/moksha/public/javascript/moksha.js +++ b/moksha/public/javascript/moksha.js @@ -448,7 +448,7 @@ moksha = { get_base_url: function(obj) { var burl = '/'; - if (typeof(moksha_base_url != 'undefined')) + if (typeof(moksha_base_url) != 'undefined') burl = moksha_base_url; return burl;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Moksha-commits April 2009