aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/account
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates/account')
-rw-r--r--src/templates/account/booking_list.html55
-rw-r--r--src/templates/account/configuration_list.html11
-rw-r--r--src/templates/account/image_list.html17
-rw-r--r--src/templates/account/resource_list.html10
-rw-r--r--src/templates/account/userprofile_update_form.html17
5 files changed, 60 insertions, 50 deletions
diff --git a/src/templates/account/booking_list.html b/src/templates/account/booking_list.html
index ed59b81..98ab5c8 100644
--- a/src/templates/account/booking_list.html
+++ b/src/templates/account/booking_list.html
@@ -3,9 +3,11 @@
<h2>Bookings I Own</h2>
<div class="card_container">
{% for booking in bookings %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Booking {{booking.id}}</h3>
+ </div>
+ <div class="card-body">
<ul class="list-group">
<li class="list-group-item">id: {{booking.id}}</li>
<li class="list-group-item">lab: {{booking.lab}}</li>
@@ -15,8 +17,8 @@
<li class="list-group-item">purpose: {{booking.purpose}}</li>
</ul>
</div>
- <div class="detail_button_container">
- <a class="btn btn-primary" href="/booking/detail/{{booking.id}}/">Details</a>
+ <div class="card-footer d-flex">
+ <a class="btn btn-primary ml-auto mr-2" href="/booking/detail/{{booking.id}}/">Details</a>
<button
class="btn btn-danger"
onclick='cancel_booking({{booking.id}});'
@@ -29,32 +31,37 @@
</div>
<h2>Bookings I Collaborate On</h2>
<div class="card_container">
- {% for booking in collab_bookings %}
- <div class="detail_card">
- <div>
- <h3>Booking {{booking.id}}</h3>
- <ul class="list-group">
- <li class="list-group-item">id: {{booking.id}}</li>
- <li class="list-group-item">lab: {{booking.lab}}</li>
- <li class="list-group-item">resource: {{booking.resource.template.name}}</li>
- <li class="list-group-item">start: {{booking.start}}</li>
- <li class="list-group-item">end: {{booking.end}}</li>
- <li class="list-group-item">purpose: {{booking.purpose}}</li>
- </ul>
+ {% for booking in collab_bookings %}
+ <div class="card">
+ <div class="card-header">
+ <h3>Booking {{booking.id}}</h3>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">id: {{booking.id}}</li>
+ <li class="list-group-item">lab: {{booking.lab}}</li>
+ <li class="list-group-item">resource: {{booking.resource.template.name}}</li>
+ <li class="list-group-item">start: {{booking.start}}</li>
+ <li class="list-group-item">end: {{booking.end}}</li>
+ <li class="list-group-item">purpose: {{booking.purpose}}</li>
+ </ul>
+ </div>
+ <div class="card-footer d-flex">
+ <a class="btn btn-primary ml-auto" href="/booking/detail/{{booking.id}}/">Details</a>
+ </div>
</div>
- <a class="btn btn-primary" href="/booking/detail/{{booking.id}}/">Details</a>
- </div>
- {% endfor %}
+ {% endfor %}
</div>
-
<h2>Expired Bookings
<i class="fa fa-fw fa-caret-down" onclick='toggle_display("expired_bookings");'></i>
</h2>
<div id="expired_bookings" class="card_container" style="display:none;">
{% for booking in expired_bookings %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Booking {{booking.id}}</h3>
+ </div>
+ <div class="card-body">
<ul class="list-group">
<li class="list-group-item">id: {{booking.id}}</li>
<li class="list-group-item">lab: {{booking.lab}}</li>
@@ -65,7 +72,9 @@
<li class="list-group-item">owner: {{booking.owner.userprofile.email_addr}}</li>
</ul>
</div>
- <a class="btn btn-primary" href="/booking/detail/{{booking.id}}/">Details</a>
+ <div class="card-footer d-flex">
+ <a class="btn btn-primary ml-auto" href="/booking/detail/{{booking.id}}/">Details</a>
+ </div>
</div>
{% endfor %}
</div>
diff --git a/src/templates/account/configuration_list.html b/src/templates/account/configuration_list.html
index b920ba6..6f7844a 100644
--- a/src/templates/account/configuration_list.html
+++ b/src/templates/account/configuration_list.html
@@ -2,9 +2,11 @@
{% block content %}
<div class="card_container">
{% for config in configurations %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Configuration {{config.id}}</h3>
+ </div>
+ <div class="card-body">
<ul class="list-group">
<li class="list-group-item">id: {{config.id}}</li>
<li class="list-group-item">name: {{config.name}}</li>
@@ -12,10 +14,9 @@
<li class="list-group-item">resource: {{config.bundle}}</li>
</ul>
</div>
- <div class="detail_button_container">
+ <div class="card-footer">
<button
- class="btn btn-danger"
- style="width:49%;float:right;"
+ class="btn btn-danger w-100"
onclick='delete_config({{config.id}});'
data-toggle="modal"
data-target="#configModal"
diff --git a/src/templates/account/image_list.html b/src/templates/account/image_list.html
index cd83dcf..068e096 100644
--- a/src/templates/account/image_list.html
+++ b/src/templates/account/image_list.html
@@ -3,9 +3,11 @@
<h2>Images I Own</h2>
<div class="card_container">
{% for image in images %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Image {{image.id}}</h3>
+ </div>
+ <div class="card-body">
<ul class="list-group">
<li class="list-group-item">id: {{image.id}}</li>
<li class="list-group-item">lab: {{image.from_lab.name}}</li>
@@ -14,10 +16,9 @@
<li class="list-group-item">host profile: {{image.host_type.name}}</li>
</ul>
</div>
- <div class="detail_button_container">
+ <div class="card-footer">
<button
- class="btn btn-danger"
- style="width:49%;float:right;"
+ class="btn btn-danger w-100"
onclick='delete_image({{image.id}});'
data-toggle="modal"
data-target="#imageModal"
@@ -29,9 +30,11 @@
<h2>Public Images</h2>
<div class="card_container">
{% for image in public_images %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Image {{image.id}}</h3>
+ </div>
+ <div class="card-body">
<ul class="list-group">
<li class="list-group-item">id: {{image.id}}</li>
<li class="list-group-item">lab: {{image.from_lab.name}}</li>
diff --git a/src/templates/account/resource_list.html b/src/templates/account/resource_list.html
index 1391e8e..f92f78e 100644
--- a/src/templates/account/resource_list.html
+++ b/src/templates/account/resource_list.html
@@ -2,18 +2,20 @@
{% block content %}
<div class="card_container">
{% for resource in resources %}
- <div class="detail_card">
- <div>
+ <div class="card">
+ <div class="card-header">
<h3>Resource {{resource.id}}</h3>
+ </div>
+ <div class="card-body p-4">
<ul class="list-group">
<li class="list-group-item">id: {{resource.id}}</li>
<li class="list-group-item">name: {{resource.name}}</li>
<li class="list-group-item">description: {{resource.description}}</li>
</ul>
</div>
- <div class="detail_button_container">
+ <div class="card-footer">
<button
- class="btn btn-danger"
+ class="btn btn-danger w-100"
onclick='delete_resource({{resource.id}});'
data-toggle="modal"
data-target="#resModal"
diff --git a/src/templates/account/userprofile_update_form.html b/src/templates/account/userprofile_update_form.html
index f1d2852..6ab8242 100644
--- a/src/templates/account/userprofile_update_form.html
+++ b/src/templates/account/userprofile_update_form.html
@@ -1,17 +1,12 @@
-{% extends "layout.html" %}
-{% load bootstrap3 %}
+{% extends "base.html" %}
+{% load bootstrap4 %}
-{% block basecontent %}
- <div class="container">
+{% block content %}
+ <div class="container-fluid">
<div class="row">
- <div class="col-md-4 col-md-offset-4">
+ <div class="col-12 col-xl-6">
{% bootstrap_messages %}
<div class="login-panel panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">
- {{ title }}
- </h3>
- </div>
<div class="panel-body">
<form enctype="multipart/form-data" method="post">
{% csrf_token %}
@@ -35,4 +30,4 @@
</div>
</div>
</div>
-{% endblock basecontent %}
+{% endblock content %}