diff --git a/templates/home.html.to b/templates/home.html.to index 4003234c..e5f7c8f7 100644 --- a/templates/home.html.to +++ b/templates/home.html.to @@ -1,5 +1,9 @@ {% extends "base.html.to" %} +{% block sidenav %} +{% include 'nav-side.html.to' %} +{% end %} + {% block content %}
@@ -10,3 +14,5 @@ {% end %} + + diff --git a/templates/nav-side.html.to b/templates/nav-side.html.to index 547ee714..4c17c7f6 100644 --- a/templates/nav-side.html.to +++ b/templates/nav-side.html.to @@ -1,40 +1,14 @@ - + + + \ No newline at end of file diff --git a/templates/requests.html.to b/templates/requests.html.to index 431d9175..ff1835ce 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -1,39 +1,57 @@ {% extends "base.html.to" %} +{% block sidenav %} +{% include 'nav-side.html.to' %} +{% end %} + {% block content %} -
- -

Requests New Request

- - - - - - - - - - - - - - {% for r in requests %} - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New{{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
-
+ +
+ +
+ +
+ +
+

Requests New Request

+
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+ + + +
+
+
{% end %} diff --git a/templates/requests_new.html.to b/templates/requests_new.html.to index 5437a8a6..2fe33e54 100644 --- a/templates/requests_new.html.to +++ b/templates/requests_new.html.to @@ -16,9 +16,7 @@

New Request

- - - + {% if request_id %}
{% else %} @@ -33,10 +31,7 @@ {% end %}
- - - - +