quickly implement index page / new form distinction for requests

atst/app.py

@@ -1,6 +1,7 @@
 import tornado.web
 from atst.handlers.main import MainHandler
 from atst.handlers.request import Request
+from atst.handlers.request_new import RequestNew
 from atst.home import home
 from tornado.web import url
 
@@ -10,8 +11,8 @@ def make_app(**kwargs):
             url( r"/home",       MainHandler, {'page': 'home'},       name='home' ),
             url( r"/accounts",   MainHandler, {'page': 'accounts'},   name='accounts' ),
             url( r"/requests",   Request,     {'page': 'requests'},   name='requests' ),
-            url( r"/requests/new",   Request, {'page': 'requests_new'},   name='request_new' ),
-            url( r"/requests/([0-9])", Request, {'page': 'requests'}, name='request_form' ),
+            url( r"/requests/new",   RequestNew, {'page': 'requests_new'},   name='request_new' ),
+            url( r"/requests/new/([0-9])", RequestNew, {'page': 'requests_new'}, name='request_form' ),
             url( r"/users",      MainHandler, {'page': 'users'},      name='users' ),
             url( r"/reports",    MainHandler, {'page': 'reports'},    name='reports' ),
             url( r"/calculator", MainHandler, {'page': 'calculator'}, name='calculator' ),

atst/handlers/request.py

@@ -1,31 +1,9 @@
 from atst.handler import BaseHandler
 
 class Request(BaseHandler):
-    screens = [
-            { 'title' : 'Details of Use', 
-              'subitems' : [
-                {'title' : 'Application Details',
-                 'id' : 'application-details'},
-                {'title' : 'Computation',
-                  'id' : 'computation' },
-                {'title' : 'Storage',
-                  'id' : 'storage' },
-                {'title' : 'Usage',
-                  'id' : 'usage' },
-            ]},
-            { 'title' : 'Organizational Info', },
-            { 'title' : 'Funding/Contracting', },
-            { 'title' : 'Readiness Survey', },
-            { 'title' : 'Review & Submit', }
-     ]
-
     def initialize(self, page):
         self.page = page
 
-    def get(self, screen = 1):
-        self.render( 'requests/screen-%d.html.to' % int(screen),
-                    page = self.page,
-                    screens = self.screens,
-                    current = int(screen),
-                    next_screen = int(screen) + 1 )
+    def get(self):
+        self.render('requests.html.to', page = self.page)
 

atst/handlers/request_new.py

@@ -0,0 +1,31 @@
+from atst.handler import BaseHandler
+
+class RequestNew(BaseHandler):
+    screens = [
+            { 'title' : 'Details of Use',
+              'subitems' : [
+                {'title' : 'Application Details',
+                 'id' : 'application-details'},
+                {'title' : 'Computation',
+                  'id' : 'computation' },
+                {'title' : 'Storage',
+                  'id' : 'storage' },
+                {'title' : 'Usage',
+                  'id' : 'usage' },
+            ]},
+            { 'title' : 'Organizational Info', },
+            { 'title' : 'Funding/Contracting', },
+            { 'title' : 'Readiness Survey', },
+            { 'title' : 'Review & Submit', }
+     ]
+
+    def initialize(self, page):
+        self.page = page
+
+    def get(self, screen = 1):
+        self.render( 'requests/screen-%d.html.to' % int(screen),
+                    page = self.page,
+                    screens = self.screens,
+                    current = int(screen),
+                    next_screen = int(screen) + 1 )
+