From febdee2820e6527fb4f5f5843f951a01c24c8ba9 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Fri, 18 Jan 2019 14:43:11 -0500 Subject: Style Account pages Adds some prettiness to the account pages that list bookings, etc Change-Id: I90508cfafba00380d67965a038dc54d1fac43f60 Signed-off-by: Parker Berberian --- src/templates/account/booking_list.html | 63 +++++++++++---------------- src/templates/account/configuration_list.html | 33 +++++--------- src/templates/account/details.html | 8 ++-- src/templates/account/image_list.html | 38 ++++++++++------ src/templates/account/resource_list.html | 31 ++++--------- 5 files changed, 73 insertions(+), 100 deletions(-) (limited to 'src/templates/account') diff --git a/src/templates/account/booking_list.html b/src/templates/account/booking_list.html index c7c5e00..9c6f3db 100644 --- a/src/templates/account/booking_list.html +++ b/src/templates/account/booking_list.html @@ -1,52 +1,41 @@ {% extends "base.html" %} {% block content %} -

Bookings I Own

+
{% for booking in bookings %}
-
    -
  • id: {{booking.id}}
  • -
  • lab: {{booking.resource.template.lab.lab_user.username}}
  • -
  • resource: {{booking.resource.template.name}}
  • -
  • start: {{booking.start}}
  • -
  • end: {{booking.end}}
  • -
  • purpose: {{booking.purpose}}
  • -
-
- - +
+

Booking {{booking.id}}

+
    +
  • id: {{booking.id}}
  • +
  • lab: {{booking.resource.template.lab.lab_user.username}}
  • +
  • resource: {{booking.resource.template.name}}
  • +
  • start: {{booking.start}}
  • +
  • end: {{booking.end}}
  • +
  • purpose: {{booking.purpose}}
  • +
+ Details
{% endfor %} +

Bookings I Collaborate On

+
{% for booking in collab_bookings %}
-
    -
  • id: {{booking.id}}
  • -
  • lab: {{booking.lab}}
  • -
  • resource: {{booking.resource_name}}
  • -
  • start: {{booking.start}}
  • -
  • end: {{booking.end}}
  • -
  • purpose: {{booking.purpose}}
  • -
-
- - +
+

Booking {{booking.id}}

+
    +
  • id: {{booking.id}}
  • +
  • lab: {{booking.lab}}
  • +
  • resource: {{booking.resource_name}}
  • +
  • start: {{booking.start}}
  • +
  • end: {{booking.end}}
  • +
  • purpose: {{booking.purpose}}
  • +
+ Details
{% endfor %} +
{% endblock %} diff --git a/src/templates/account/configuration_list.html b/src/templates/account/configuration_list.html index 9dcec07..14d0472 100644 --- a/src/templates/account/configuration_list.html +++ b/src/templates/account/configuration_list.html @@ -1,31 +1,18 @@ {% extends "base.html" %} {% block content %} - +
{% for config in configurations %}
-
    -
  • id: {{config.id}}
  • -
  • name: {{config.name}}
  • -
  • description: {{config.description}}
  • -
  • resource: {{config.bundle}}
  • -
-
- +
+

Configuration {{config.id}}

+
    +
  • id: {{config.id}}
  • +
  • name: {{config.name}}
  • +
  • description: {{config.description}}
  • +
  • resource: {{config.bundle}}
  • +
{% endfor %} +
{% endblock %} diff --git a/src/templates/account/details.html b/src/templates/account/details.html index acf3eb1..3092ad0 100644 --- a/src/templates/account/details.html +++ b/src/templates/account/details.html @@ -2,8 +2,8 @@ {% load staticfiles %} {% block content %}

Account Details

-My Resources -My Bookings -My Configurations -My Snapshots +My Resources +My Bookings +My Configurations +My Snapshots {% endblock content %} diff --git a/src/templates/account/image_list.html b/src/templates/account/image_list.html index 72ea1f5..7566a9c 100644 --- a/src/templates/account/image_list.html +++ b/src/templates/account/image_list.html @@ -1,27 +1,37 @@ {% extends "base.html" %} {% block content %}

Images I Own

+
{% for image in images %}
-
    -
  • id: {{image.id}}
  • -
  • lab: {{image.from_lab.name}}
  • -
  • name: {{image.name}}
  • -
  • description: {{image.description}}
  • -
  • host profile: {{image.host_type.name}}
  • -
+
+

Image {{image.id}}

+
    +
  • id: {{image.id}}
  • +
  • lab: {{image.from_lab.name}}
  • +
  • name: {{image.name}}
  • +
  • description: {{image.description}}
  • +
  • host profile: {{image.host_type.name}}
  • +
+
{% endfor %} +

Public Images

+
{% for image in public_images %}
-
    -
  • id: {{image.id}}
  • -
  • lab: {{image.from_lab.name}}
  • -
  • name: {{image.name}}
  • -
  • description: {{image.description}}
  • -
  • host profile: {{image.host_type.name}}
  • -
+
+

Image {{image.id}}

+
    +
  • id: {{image.id}}
  • +
  • lab: {{image.from_lab.name}}
  • +
  • name: {{image.name}}
  • +
  • description: {{image.description}}
  • +
  • host profile: {{image.host_type.name}}
  • +
+
{% endfor %} +
{% endblock %} diff --git a/src/templates/account/resource_list.html b/src/templates/account/resource_list.html index 7e4194b..cdacdd6 100644 --- a/src/templates/account/resource_list.html +++ b/src/templates/account/resource_list.html @@ -1,30 +1,17 @@ {% extends "base.html" %} {% block content %} - +
{% for resource in resources %}
-
    -
  • id: {{resource.id}}
  • -
  • name: {{resource.name}}
  • -
  • description: {{resource.description}}
  • -
-
- +
+

Resource {{resource.id}}

+
    +
  • id: {{resource.id}}
  • +
  • name: {{resource.name}}
  • +
  • description: {{resource.description}}
  • +
{% endfor %} +
{% endblock %} -- cgit 1.2.3-korg