docs/main/MokshaApplications.rst | 2 +- docs/main/MokshaContainerWidgets.rst | 2 +- moksha/api/menus/widgets.py | 2 +- moksha/api/widgets/chat/chat.py | 2 +- moksha/api/widgets/chat/templates/bootstrap.mak | 4 ++-- moksha/controllers/root.py | 2 +- moksha/lib/helpers.py | 4 ++-- moksha/middleware/middleware.py | 2 +- moksha/templates/header.mak | 2 +- moksha/widgets/feedtree/controllers/demo.py | 2 +- moksha/widgets/feedtree/widgets.py | 10 +++++----- 11 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit 909188db0f6383298745f769d95431f52afa12bc Author: Luke Macken lmacken@redhat.com Date: Sun Mar 22 10:59:21 2009 -0400
s/appz/apps/
diff --git a/docs/main/MokshaApplications.rst b/docs/main/MokshaApplications.rst index c58207a..de2acd8 100644 --- a/docs/main/MokshaApplications.rst +++ b/docs/main/MokshaApplications.rst @@ -18,7 +18,7 @@ in the ``setup.py`` on the ``[moksha.wsgiapp]`` entry-point. [moksha.wsgiapp] mywsgiapp = mywsgiapp.wsgiapp:MyWSGIApplication
-Your WSGI application will then be accessable via ``/appz/mywsgiapp`` in Moksha. +Your WSGI application will then be accessable via ``/apps/mywsgiapp`` in Moksha.
Using an existing TurboGears application ------------------------------------------- diff --git a/docs/main/MokshaContainerWidgets.rst b/docs/main/MokshaContainerWidgets.rst index 5abd9a3..0387a19 100644 --- a/docs/main/MokshaContainerWidgets.rst +++ b/docs/main/MokshaContainerWidgets.rst @@ -28,7 +28,7 @@ Here is an example of what a configuration line could look like: 'moksha.helloworld', {'name':'J5'}), App('Hello World 2', - '/appz/moksha.helloworld', + '/apps/moksha.helloworld', {'name':'Luke'}), MokshaWidget('Hello World 3', 'moksha.helloworldwidget', diff --git a/moksha/api/menus/widgets.py b/moksha/api/menus/widgets.py index feac9c4..5dc50bf 100644 --- a/moksha/api/menus/widgets.py +++ b/moksha/api/menus/widgets.py @@ -57,7 +57,7 @@ class MokshaMenuBase(Widget):
rootMenuSelector = 'rootVoices' menuSelector = 'menuContainer' - callback = '/appz/menu' + callback = '/apps/menu' iconPath = '/toscawidgets/resources/moksha.api.menus.widgets/static/images/' additionalData = "" menus = [] diff --git a/moksha/api/widgets/chat/chat.py b/moksha/api/widgets/chat/chat.py index 39b8b36..b149bc6 100644 --- a/moksha/api/widgets/chat/chat.py +++ b/moksha/api/widgets/chat/chat.py @@ -39,7 +39,7 @@ willowchat_css = CSSLink(filename='static/style.css', modname=__name__) class LiveChatWidget(Widget): name = 'Chat' params = ['bootstrap'] - bootstrap = JSLink(link='/appz/chat/bootstrap') + bootstrap = JSLink(link='/apps/chat/bootstrap') template = '<div id="willowchat" reposition="true">${bootstrap}</div>' visible = False
diff --git a/moksha/api/widgets/chat/templates/bootstrap.mak b/moksha/api/widgets/chat/templates/bootstrap.mak index 1e85f5d..65ab577 100644 --- a/moksha/api/widgets/chat/templates/bootstrap.mak +++ b/moksha/api/widgets/chat/templates/bootstrap.mak @@ -49,7 +49,7 @@ var loaded = function() { var roomClass= roomClass ? roomClass : 'default' s = document.createElement('script') var baseurl = 'http://' + WillowChat.hostHeader - s.src = baseurl + '/appz/chat/rooms?jsonp=WillowChat.util.optionsCallback&op=info&roomClass=' + roomClass + s.src = baseurl + '/apps/chat/rooms?jsonp=WillowChat.util.optionsCallback&op=info&roomClass=' + roomClass
WillowChat.util.optionsCallback = function(result) { success = result[0] @@ -60,7 +60,7 @@ var loaded = function() { var opts = gatherOptions(room, container); ifr = document.createElement('iframe') var staticurl = baseurl + '/toscawidgets/resources/moksha.api.widgets.chat.chat/static' - ifr.src = '/appz/chat/index?json=1&opts=' + escape(JSON.stringify(opts)) + ifr.src = '/apps/chat/index?json=1&opts=' + escape(JSON.stringify(opts)) ifr.style.border = "0px"; ifr.style.width = "100%"; ifr.style.height = "100%"; diff --git a/moksha/controllers/root.py b/moksha/controllers/root.py index 4a3a1a2..941ec62 100644 --- a/moksha/controllers/root.py +++ b/moksha/controllers/root.py @@ -45,7 +45,7 @@ os.environ['TW_BROWSER_PREFIX'] = '/docs'
class RootController(BaseController):
- appz = AppController() + apps = AppController() widgets = WidgetController() error = ErrorController() moksha_admin = SecureController() diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index afc9261..13f04b4 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -187,7 +187,7 @@ class App(ConfigWrapper):
:Example: hello_app = App('Hello World App', - '/appz/moksha.helloworld', + '/apps/moksha.helloworld', params={'greeter_name': 'J5'}, auth=not_anonymous()) """ @@ -309,7 +309,7 @@ class MokshaApp(App): app = moksha_app.split('/')[0] self.app = app super(MokshaApp, self).__init__(label, - '/appz/' + moksha_app, + '/apps/' + moksha_app, content_id, params, auth, css_class)
diff --git a/moksha/middleware/middleware.py b/moksha/middleware/middleware.py index a90f340..0438e71 100644 --- a/moksha/middleware/middleware.py +++ b/moksha/middleware/middleware.py @@ -73,7 +73,7 @@ class MokshaMiddleware(object): def __call__(self, environ, start_response): self.register_stomp(environ) request = Request(environ) - if request.path.startswith('/appz/') or \ + if request.path.startswith('/apps/') or \ request.path.startswith('/widget') or \ request.path.startswith('/docs/') or \ request.path.startswith('/moksha_admin/'): diff --git a/moksha/templates/header.mak b/moksha/templates/header.mak index c6ea760..3622cd8 100644 --- a/moksha/templates/header.mak +++ b/moksha/templates/header.mak @@ -14,7 +14,7 @@ ## </div> ##% else: ## <div id="login-toolbar"> -## <form onSubmit="$('#main_app').load('/appz/login?view=canvas'); return false;"> +## <form onSubmit="$('#main_app').load('/apps/login?view=canvas'); return false;"> ## You are not logged in yet <input type="submit" value="Login" class="button"/> ## </form> ## </div> diff --git a/moksha/widgets/feedtree/controllers/demo.py b/moksha/widgets/feedtree/controllers/demo.py index cc64b56..5509141 100644 --- a/moksha/widgets/feedtree/controllers/demo.py +++ b/moksha/widgets/feedtree/controllers/demo.py @@ -25,6 +25,6 @@ from moksha.controllers.apps import AppController
app_controller = WSGIAppController(AppController())
-@WidgetBrowser.register_controller(moksha_feedreader, '/appz/feeds/init_tree') +@WidgetBrowser.register_controller(moksha_feedreader, '/apps/feeds/init_tree') def init_tree(self, key, fresh=False, **kw): return app_controller diff --git a/moksha/widgets/feedtree/widgets.py b/moksha/widgets/feedtree/widgets.py index 8e5489a..be0ae0c 100644 --- a/moksha/widgets/feedtree/widgets.py +++ b/moksha/widgets/feedtree/widgets.py @@ -47,12 +47,12 @@ class MokshaAjaxFeedTree(Dynatree): rootVisible = True persist = True initAjax = { - 'url': '/appz/feeds/init_tree', + 'url': '/apps/feeds/init_tree', 'data': {'key': 'root'} } onActivate = js_callback(""" function(dtnode) { - $('#TopPane').load('/appz/feeds/get_entries?key=' + dtnode.data.key.replace(/ /, '')); + $('#TopPane').load('/apps/feeds/get_entries?key=' + dtnode.data.key.replace(/ /, '')); } """.replace('\n', ''))
@@ -60,7 +60,7 @@ class MokshaAjaxFeedTree(Dynatree): class MokshaAjaxFeedEntriesTree(Dynatree): rootVisible = False persist = True - onActivate = js_callback("""function(dtnode) { $('#BottomPane').load('/appz/feeds/get_entry?key=' + dtnode.data.key); }""") + onActivate = js_callback("""function(dtnode) { $('#BottomPane').load('/apps/feeds/get_entry?key=' + dtnode.data.key); }""")
class MokshaLiveFeedTree(Dynatree, LiveWidget): @@ -69,7 +69,7 @@ class MokshaLiveFeedTree(Dynatree, LiveWidget): persist = True fx = {'height': 'toggle', 'duration': 200} initAjax = { - 'url': '/appz/feeds/init_tree', + 'url': '/apps/feeds/init_tree', 'data': {'key': 'root'} } onActivate = js_callback("function(dtnode) { stomp.send(dtnode.data.key, 'feeds', {topic: moksha_feed_topic, action: 'get_feed'}); }") @@ -103,7 +103,7 @@ class MokshaLiveFeedTree(Dynatree, LiveWidget): #LiveWidget.update_params(self, d)
#onLazyRead = js_callback("""function(dtnode) { - # dtnode.appendAjax({url: '/appz/feeds/get_feed', + # dtnode.appendAjax({url: '/apps/feeds/get_feed', # data: {key: dtnode.data.key, mode: 'all'}, # cache: false # });
moksha-commits@lists.fedorahosted.org