From ff30b14a212f38cf59084d30e9f13f9f92d2be3b Mon Sep 17 00:00:00 2001 From: maxbr Date: Mon, 26 Sep 2016 16:36:11 +0200 Subject: Restructure dashboard project for docker deploying Change-Id: I13cad51270504ee4bed8558598a8891af58a26ab Signed-off-by: maxbr --- .../templates/account/user_list.html | 46 ------ .../templates/account/userprofile_update_form.html | 30 ---- tools/pharos-dashboard/templates/base.html | 109 ------------ .../templates/booking/booking_calendar.html | 94 ----------- .../templates/booking/booking_detail.html | 26 --- .../templates/booking/booking_table.html | 33 ---- .../templates/dashboard/ci_pods.html | 60 ------- .../templates/dashboard/dev_pods.html | 69 -------- .../templates/dashboard/jenkins_slaves.html | 45 ----- .../templates/dashboard/resource.html | 58 ------- .../templates/dashboard/resource_all.html | 73 -------- .../templates/dashboard/resource_detail.html | 184 --------------------- .../templates/dashboard/server_table.html | 30 ---- .../templates/dashboard/table.html | 50 ------ tools/pharos-dashboard/templates/layout.html | 73 -------- .../templates/rest_framework/api.html | 9 - 16 files changed, 989 deletions(-) delete mode 100644 tools/pharos-dashboard/templates/account/user_list.html delete mode 100644 tools/pharos-dashboard/templates/account/userprofile_update_form.html delete mode 100644 tools/pharos-dashboard/templates/base.html delete mode 100644 tools/pharos-dashboard/templates/booking/booking_calendar.html delete mode 100644 tools/pharos-dashboard/templates/booking/booking_detail.html delete mode 100644 tools/pharos-dashboard/templates/booking/booking_table.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/ci_pods.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/dev_pods.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/resource.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/resource_all.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/resource_detail.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/server_table.html delete mode 100644 tools/pharos-dashboard/templates/dashboard/table.html delete mode 100644 tools/pharos-dashboard/templates/layout.html delete mode 100644 tools/pharos-dashboard/templates/rest_framework/api.html (limited to 'tools/pharos-dashboard/templates') diff --git a/tools/pharos-dashboard/templates/account/user_list.html b/tools/pharos-dashboard/templates/account/user_list.html deleted file mode 100644 index c2b81938..00000000 --- a/tools/pharos-dashboard/templates/account/user_list.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "dashboard/table.html" %} -{% load staticfiles %} - -{% block table %} - - - Username - Company - SSH Key - GPG Key - - - - {% for user in users %} - - - {{ user.username }} - - - {{ user.userprofile.company }} - - - {% if user.userprofile.ssh_public_key %} - SSH - {% endif %} - - - {% if user.userprofile.pgp_public_key %} - GPG - {% endif %} - - - {% endfor %} - -{% endblock table %} - - -{% block tablejs %} - -{% endblock tablejs %} diff --git a/tools/pharos-dashboard/templates/account/userprofile_update_form.html b/tools/pharos-dashboard/templates/account/userprofile_update_form.html deleted file mode 100644 index 542ea81e..00000000 --- a/tools/pharos-dashboard/templates/account/userprofile_update_form.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "layout.html" %} -{% load bootstrap3 %} - -{% block basecontent %} -
-
-
- {% bootstrap_messages %} - -
-
-
-{% endblock basecontent %} diff --git a/tools/pharos-dashboard/templates/base.html b/tools/pharos-dashboard/templates/base.html deleted file mode 100644 index c5da483d..00000000 --- a/tools/pharos-dashboard/templates/base.html +++ /dev/null @@ -1,109 +0,0 @@ -{% extends "layout.html" %} -{% load bootstrap3 %} - -{% block basecontent %} -
- - - - -
-
-
-

{{ title }}

-
- -
- - {% bootstrap_messages %} - - {% block content %} - - {% endblock content %} -
- -
- -{% endblock basecontent %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/booking/booking_calendar.html b/tools/pharos-dashboard/templates/booking/booking_calendar.html deleted file mode 100644 index de3e3b3d..00000000 --- a/tools/pharos-dashboard/templates/booking/booking_calendar.html +++ /dev/null @@ -1,94 +0,0 @@ -{% extends "dashboard/table.html" %} -{% load staticfiles %} - -{% load bootstrap3 %} - -{% block extrahead %} - - -{% endblock extrahead %} - -{% block content %} -
-
-
-
- Calendar -
-
-
-
-
- -
- -
-
- -
-
-
- Booking -
-
-
- {% bootstrap_form_errors form type='non_fields' %} -
- {% csrf_token %} - -
- {% bootstrap_field form.start addon_after='' %} -
-
- {% bootstrap_field form.end addon_after='' %} -
- {% bootstrap_field form.purpose %} - - {% buttons %} - - {% endbuttons %} -
-
-
-
-
- - -{% endblock content %} - -{% block extrajs %} - - - - - - - - -{% endblock extrajs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/booking/booking_detail.html b/tools/pharos-dashboard/templates/booking/booking_detail.html deleted file mode 100644 index d3f47538..00000000 --- a/tools/pharos-dashboard/templates/booking/booking_detail.html +++ /dev/null @@ -1,26 +0,0 @@ -{% load jira_filters %} - -

- Resource: - - {{ booking.resource.name }} - -

-

- User: {{ booking.user.username }} -

-

- Start: {{ booking.start }} -

-

- End: {{ booking.end }} -

-

- Purpose: {{ booking.purpose }} -

-

- Jira: - - {{ jira_issue }} - -

\ No newline at end of file diff --git a/tools/pharos-dashboard/templates/booking/booking_table.html b/tools/pharos-dashboard/templates/booking/booking_table.html deleted file mode 100644 index 216eaf57..00000000 --- a/tools/pharos-dashboard/templates/booking/booking_table.html +++ /dev/null @@ -1,33 +0,0 @@ -{% load jira_filters %} - - - - - User - Purpose - Start - End - Jira - - - -{% for booking in bookings %} - - - {{ booking.user.username }} - - - {{ booking.purpose }} - - - {{ booking.start }} - - - {{ booking.end }} - - {{ booking.get_jira_issue }} - - -{% endfor %} - \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/ci_pods.html b/tools/pharos-dashboard/templates/dashboard/ci_pods.html deleted file mode 100644 index 7ef62a43..00000000 --- a/tools/pharos-dashboard/templates/dashboard/ci_pods.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "dashboard/table.html" %} -{% load staticfiles %} -{% load jenkins_filters %} - -{% block table %} - - - Name - Slave Name - Status - Installer - Scenario - Branch - Job - - - - {% for pod in ci_pods %} - - - {{ pod.name }} - - - {{ pod.slave.name }} - - - {{ pod.slave.status }} - - - {{ pod.slave.last_job_installer }} - - - {{ pod.slave.last_job_scenario }} - - - {{ pod.slave.last_job_branch }} - - {{ pod.slave.last_job_name }} - - - {% endfor %} - -{% endblock table %} - - -{% block tablejs %} - -{% endblock tablejs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/dev_pods.html b/tools/pharos-dashboard/templates/dashboard/dev_pods.html deleted file mode 100644 index 2b4b0177..00000000 --- a/tools/pharos-dashboard/templates/dashboard/dev_pods.html +++ /dev/null @@ -1,69 +0,0 @@ -{% extends "dashboard/table.html" %} -{% load staticfiles %} -{% load jenkins_filters %} - -{% block table %} - - - Name - Slave Name - Booked by - Booked until - Purpose - Utilization - Status - - - - - - {% for pod, booking, utilization in dev_pods %} - - - {{ pod.name }} - - - {{ pod.slave.name }} - - - {{ booking.user.username }} - - - {{ booking.end }} - - - {{ booking.purpose }} - - - {{ utilization }} - - - {{ pod.slave.status }} - - - - Book - - - - - Info - - - - {% endfor %} - -{% endblock table %} - -{% block tablejs %} - -{% endblock tablejs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html b/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html deleted file mode 100644 index aa74507c..00000000 --- a/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "dashboard/table.html" %} -{% load staticfiles %} - -{% load jenkins_filters %} - -{% block table %} - - - Slave name - Status - Job - - - - {% for slave in slaves %} - - {{ slave.name }} - - - {{ slave.status }} - - - {{ slave.last_job_name }} - - - {% endfor %} - -{% endblock table %} - - -{% block tablejs %} - -{% endblock tablejs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/resource.html b/tools/pharos-dashboard/templates/dashboard/resource.html deleted file mode 100644 index c9e57354..00000000 --- a/tools/pharos-dashboard/templates/dashboard/resource.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} - -{% block extrahead %} - - - - - - - - -{% endblock extrahead %} - - -{% block content %} - {% include "dashboard/resource_detail.html" %} -{% endblock content %} - - -{% block extrajs %} - - - - - - - - - - - - - - - - - - - -{% endblock extrajs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/resource_all.html b/tools/pharos-dashboard/templates/dashboard/resource_all.html deleted file mode 100644 index a770d4e8..00000000 --- a/tools/pharos-dashboard/templates/dashboard/resource_all.html +++ /dev/null @@ -1,73 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} - -{% block extrahead %} - - - - - - - - -{% endblock extrahead %} - - -{% block content %} - {% for resource, utilization, bookings in pods %} -
-
-
-
- {{ resource.name }} -
-
- {% include "dashboard/resource_detail.html" %} -
-
-
-
- {% endfor %} -{% endblock content %} - - -{% block extrajs %} - - - - - - - - - - - - - - - - < - - -{% endblock extrajs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/resource_detail.html b/tools/pharos-dashboard/templates/dashboard/resource_detail.html deleted file mode 100644 index 657d5656..00000000 --- a/tools/pharos-dashboard/templates/dashboard/resource_detail.html +++ /dev/null @@ -1,184 +0,0 @@ -{% load jenkins_filters %} - -
-
-
-
- Jenkins Utilization -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- Servers -
-
-
- - {% include "dashboard/server_table.html" %} -
-
-
-
-
-
-
-
-
-
- Booking Utilization -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- Bookings -
-
-
- - {% include "booking/booking_table.html" %} -
-
-
-
-
-
-
-
-
-
- Contact -
-
-

- Lab Owner: - {{ resource.owner.username }} -

-

- Email: -

-

- - Booking - - - OPNFV Wiki - -

-
-
-
-
-
-
- Jenkins Status -
-
-

- Slave Name: - {{ resource.slave.name }} -

-

- Status: - {{ resource.slave.status }} -

-

- Last Job: - - {{ resource.slave.last_job_name }} - -

-
-
-
-
-
-
- VPN Users -
-
-
- - - - - - - - - - {% for user in resource.vpn_users.all %} - - - - - - {% endfor %} -
UserEmailCompany
- {{ user.username }} - - {{ user.email }} - - {{ user.userprofile.company }} -
- -
-
-
-
-
\ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/server_table.html b/tools/pharos-dashboard/templates/dashboard/server_table.html deleted file mode 100644 index f01bd603..00000000 --- a/tools/pharos-dashboard/templates/dashboard/server_table.html +++ /dev/null @@ -1,30 +0,0 @@ - - - Server - Model - CPU - RAM - Storage - - - -{% for server in resource.server_set.all %} - - - {{ server.name }} - - - {{ server.model }} - - - {{ server.cpu }} - - - {{ server.ram }} - - - {{ server.storage }} - - -{% endfor %} - \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/dashboard/table.html b/tools/pharos-dashboard/templates/dashboard/table.html deleted file mode 100644 index addd5c12..00000000 --- a/tools/pharos-dashboard/templates/dashboard/table.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} - -{% block extrahead %} - - - - - -{% endblock extrahead %} - -{% block content %} -
-
-
-
-
- - - {% block table %} - {% endblock table %} - -
-
- -
- -
- -
- -
-{% endblock content %} - -{% block extrajs %} - - - - - - - - - - {% block tablejs %} - {% endblock tablejs %} -{% endblock extrajs %} \ No newline at end of file diff --git a/tools/pharos-dashboard/templates/layout.html b/tools/pharos-dashboard/templates/layout.html deleted file mode 100644 index 64fed4ae..00000000 --- a/tools/pharos-dashboard/templates/layout.html +++ /dev/null @@ -1,73 +0,0 @@ -{% load staticfiles %} - - - - - - - - - - - - OPNFV Pharos {{ title }} - - - - - - - - - - - - - - - - - - {% block extrahead %} - {% endblock extrahead %} - - - - - - - -{% block extrastyle %} -{% endblock extrastyle %} - - -{% block basecontent %} -{% endblock basecontent %} - - - -{##} -{##} -{##} - -{##} - - - - - - - - - -{% block extrajs %} -{% endblock extrajs %} - - diff --git a/tools/pharos-dashboard/templates/rest_framework/api.html b/tools/pharos-dashboard/templates/rest_framework/api.html deleted file mode 100644 index 9c6c4f7d..00000000 --- a/tools/pharos-dashboard/templates/rest_framework/api.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "rest_framework/base.html" %} - -{% block title %}Pharos Dashboard API{% endblock %} - -{% block branding %} - - Pharos Dashboard API - -{% endblock %} \ No newline at end of file -- cgit 1.2.3-korg