diff --git a/atst/app.py b/atst/app.py index 19ebe727..85584fca 100644 --- a/atst/app.py +++ b/atst/app.py @@ -1,5 +1,6 @@ import tornado.web from atst.handlers.main import MainHandler +from atst.handlers.request import Request from atst.home import home from tornado.web import url @@ -7,7 +8,8 @@ def make_app(**kwargs): app = tornado.web.Application([ url( r"/", MainHandler, {'page': 'login'}, name='login' ), url( r"/home", MainHandler, {'page': 'home'}, name='home' ), - url( r"/requests", MainHandler, {'page': 'requests'}, name='requests' ), + url( r"/requests", Request, {'page': 'requests'}, name='requests' ), + url( r"/requests/([0-9])", Request, {'page': 'requests'}, 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' ), diff --git a/atst/handlers/main.py b/atst/handlers/main.py index 10b6780e..62c6fa7e 100644 --- a/atst/handlers/main.py +++ b/atst/handlers/main.py @@ -2,7 +2,7 @@ from atst.handler import BaseHandler class MainHandler(BaseHandler): - def initialize(self,page): + def initialize(self, page): self.page = page def get(self): diff --git a/atst/handlers/request.py b/atst/handlers/request.py new file mode 100644 index 00000000..6f8bfc1d --- /dev/null +++ b/atst/handlers/request.py @@ -0,0 +1,31 @@ +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 ) + diff --git a/templates/requests.html.to b/templates/requests.html.to index eae9b51c..397cf060 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,8 +4,18 @@
-jedi requests + +
+ {% block form %} + form goes here + {% end %} + {% block next %} + next page + {% end %} +
{% end %} diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to new file mode 100644 index 00000000..5aea65cf --- /dev/null +++ b/templates/requests/screen-1.html.to @@ -0,0 +1,7 @@ +{% extends '../requests.html.to' %} + +{% block form %} +

What is your name?

+ +{% end %} + diff --git a/templates/requests/screen-2.html.to b/templates/requests/screen-2.html.to new file mode 100644 index 00000000..0bf97f43 --- /dev/null +++ b/templates/requests/screen-2.html.to @@ -0,0 +1,7 @@ +{% extends '../requests.html.to' %} + +{% block form %} +

What is your quest?

+ +{% end %} + diff --git a/templates/requests/screen-3.html.to b/templates/requests/screen-3.html.to new file mode 100644 index 00000000..0bf97f43 --- /dev/null +++ b/templates/requests/screen-3.html.to @@ -0,0 +1,7 @@ +{% extends '../requests.html.to' %} + +{% block form %} +

What is your quest?

+ +{% end %} + diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to new file mode 100644 index 00000000..0bf97f43 --- /dev/null +++ b/templates/requests/screen-4.html.to @@ -0,0 +1,7 @@ +{% extends '../requests.html.to' %} + +{% block form %} +

What is your quest?

+ +{% end %} + diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to new file mode 100644 index 00000000..bb56aa9b --- /dev/null +++ b/templates/requests/screen-5.html.to @@ -0,0 +1,10 @@ +{% extends '../requests.html.to' %} + +{% block form %} +

What is your favorite color?

+ +{% end %} + +{% block next %} +MAKE THE REQUEST +{% end %} diff --git a/templates/requests/sidebar.html.to b/templates/requests/sidebar.html.to new file mode 100644 index 00000000..9b77acf0 --- /dev/null +++ b/templates/requests/sidebar.html.to @@ -0,0 +1,23 @@ + \ No newline at end of file