[rhmessaging-commits] rhmessaging commits: r3212 - in mgmt/trunk: cumin/python/cumin and 1 other directories.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-03-25 17:54:50 -0400 (Wed, 25 Mar 2009)
New Revision: 3212

Modified:
   mgmt/trunk/basil/python/basil/server.py
   mgmt/trunk/cumin/python/cumin/__init__.py
   mgmt/trunk/wooly/python/wooly/pages.py
   mgmt/trunk/wooly/python/wooly/pages.strings
Log:
Restore the .html extension to all the HtmlPage instances

Modified: mgmt/trunk/basil/python/basil/server.py
===================================================================
--- mgmt/trunk/basil/python/basil/server.py	2009-03-25 21:40:28 UTC (rev 3211)
+++ mgmt/trunk/basil/python/basil/server.py	2009-03-25 21:54:50 UTC (rev 3212)
@@ -16,7 +16,7 @@
         self.model = BasilModel()
         self.model.add_broker_url("amqp://mrg2.lab.bos.redhat.com")
 
-        self.main_page = BasilPage(self, "index")
+        self.main_page = BasilPage(self, "index.html")
 
         self.add_page(self.main_page)
         self.set_default_page(self.main_page)

Modified: mgmt/trunk/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/__init__.py	2009-03-25 21:40:28 UTC (rev 3211)
+++ mgmt/trunk/cumin/python/cumin/__init__.py	2009-03-25 21:54:50 UTC (rev 3212)
@@ -41,7 +41,7 @@
 
         self.model = CuminModel(self, self.config.data)
 
-        self.main_page = MainPage(self, "index")
+        self.main_page = MainPage(self, "index.html")
         self.add_page(self.main_page)
         self.set_default_page(self.main_page)
 
@@ -58,7 +58,7 @@
         unprotected.add(self.main_page.javascript_page)
         unprotected.add(self.resource_page)
 
-        self.login_page = LoginPage(self, "login")
+        self.login_page = LoginPage(self, "login.html")
         self.add_page(self.login_page)
         unprotected.add(self.login_page)
 

Modified: mgmt/trunk/wooly/python/wooly/pages.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/pages.py	2009-03-25 21:40:28 UTC (rev 3211)
+++ mgmt/trunk/wooly/python/wooly/pages.py	2009-03-25 21:54:50 UTC (rev 3212)
@@ -1,3 +1,5 @@
+import os
+
 from datetime import datetime
 
 from wooly import *
@@ -76,19 +78,22 @@
     def __init__(self, app, name):
         super(HtmlPage, self).__init__(app, name)
 
+        self.base_name = os.path.splitext(name)[0]
+
         self.updates = self.UpdatesAttribute(app, "updates")
         self.add_attribute(self.updates)
 
         self.update_script = UpdateScript(app, "update_script", self)
         self.add_child(self.update_script)
 
-        self.update_page = UpdatePage(app, name + ".update", self)
+        self.update_page = UpdatePage(app, self.base_name + ".update", self)
         self.app.add_page(self.update_page)
 
-        self.css_page = CssPage(app, name + ".css", self)
+        self.css_page = CssPage(app, self.base_name + ".css", self)
         self.app.add_page(self.css_page)
 
-        self.javascript_page = JavascriptPage(app, name + ".js", self)
+        self.javascript_page = JavascriptPage \
+            (app, self.base_name + ".js", self)
         self.app.add_page(self.javascript_page)
 
     def get_content_type(self, session):
@@ -114,6 +119,9 @@
 
         return sess.marshal()
 
+    def render_base_name(self, session):
+        return self.base_name
+
     class UpdatesAttribute(Attribute):
         def get_default(self, session):
             return list()

Modified: mgmt/trunk/wooly/python/wooly/pages.strings
===================================================================
--- mgmt/trunk/wooly/python/wooly/pages.strings	2009-03-25 21:40:28 UTC (rev 3211)
+++ mgmt/trunk/wooly/python/wooly/pages.strings	2009-03-25 21:54:50 UTC (rev 3212)
@@ -11,12 +11,12 @@
 
     <link rel="stylesheet" type="text/css" href="resource?name=wooly.css"/>
     <link rel="stylesheet" type="text/css" href="resource?name=app.css"/>
-    <link rel="stylesheet" type="text/css" href="{id}.css"/>
+    <link rel="stylesheet" type="text/css" href="{base_name}.css"/>
     <!--[if IE]><link rel="stylesheet" type="text/css" href="resource?name=ie.css"/><![endif]-->
 
     <script type="text/javascript" src="resource?name=wooly.js"> </script>
     <script type="text/javascript" src="resource?name=app.js"> </script>
-    <script type="text/javascript" src="{id}.js"> </script>
+    <script type="text/javascript" src="{base_name}.js"> </script>
     {update_script}
   </head>
   <body class="{class}">