From 20fb102e1b2b014af1a4da974d0add5a4ce4a7c5 Mon Sep 17 00:00:00 2001 From: Brian Duggan Date: Tue, 29 May 2018 13:39:29 -0400 Subject: [PATCH 1/3] Added request placeholders --- atst/app.py | 4 +++- atst/handlers/main.py | 2 +- atst/handlers/request.py | 19 +++++++++++++++++++ templates/requests.html.to | 16 ++++++++++++++-- templates/requests/screen-1.html.to | 7 +++++++ templates/requests/screen-2.html.to | 7 +++++++ templates/requests/screen-3.html.to | 10 ++++++++++ templates/requests/sidebar.html.to | 14 ++++++++++++++ 8 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 atst/handlers/request.py create mode 100644 templates/requests/screen-1.html.to create mode 100644 templates/requests/screen-2.html.to create mode 100644 templates/requests/screen-3.html.to create mode 100644 templates/requests/sidebar.html.to 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..d8431ade --- /dev/null +++ b/atst/handlers/request.py @@ -0,0 +1,19 @@ +from atst.handler import BaseHandler + +class Request(BaseHandler): + screens = [ + { 'title' : 'first screen', }, + { 'title' : 'second screen', }, + { 'title' : 'third screen', } + ] + + 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..5c182628 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,8 +4,20 @@
-jedi requests - + + + + +
+{% include 'requests/sidebar.html.to' %} + +{% 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..bb56aa9b --- /dev/null +++ b/templates/requests/screen-3.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..e5ebe75c --- /dev/null +++ b/templates/requests/sidebar.html.to @@ -0,0 +1,14 @@ +this is the sidebar +{% for i,s in enumerate(screens) %} +
  • + {% if i+1==current %} + {{ s['title'] }} + {% else %} + + {{ s['title'] }} + + {% end %} +
    • +{% end %} + From 73d88c6aad5259a7c73026a1927befefbb0bb92b Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 29 May 2018 14:48:27 -0400 Subject: [PATCH 2/3] Add nested menu items and update main region with divs instead of tables --- atst/handlers/request.py | 6 ++-- templates/requests.html.to | 26 ++++++++--------- templates/requests/sidebar.html.to | 45 +++++++++++++++++++++--------- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/atst/handlers/request.py b/atst/handlers/request.py index d8431ade..70d42b8d 100644 --- a/atst/handlers/request.py +++ b/atst/handlers/request.py @@ -2,9 +2,9 @@ from atst.handler import BaseHandler class Request(BaseHandler): screens = [ - { 'title' : 'first screen', }, - { 'title' : 'second screen', }, - { 'title' : 'third screen', } + { 'title' : 'Application Details', }, + { 'title' : 'Computation', }, + { 'title' : 'Storage', } ] def initialize(self, page): diff --git a/templates/requests.html.to b/templates/requests.html.to index 5c182628..397cf060 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,20 +4,18 @@
    - - - - -
    -{% include 'requests/sidebar.html.to' %} - -{% block form %} -form goes here -{% end %} -{% block next %} -next page -{% end %} -
    + +
    + + {% block form %} + form goes here + {% end %} + {% block next %} + next page + {% end %} +
    {% end %} diff --git a/templates/requests/sidebar.html.to b/templates/requests/sidebar.html.to index e5ebe75c..95fb3245 100644 --- a/templates/requests/sidebar.html.to +++ b/templates/requests/sidebar.html.to @@ -1,14 +1,33 @@ -this is the sidebar -{% for i,s in enumerate(screens) %} -
  • - {% if i+1==current %} - {{ s['title'] }} - {% else %} - - {{ s['title'] }} - - {% end %} -
    • -{% end %} - \ No newline at end of file