From 841289742d6c89b8a2eb30cea721f46b2389b862 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 24 Oct 2018 16:55:02 +0530 Subject: Sbhs templates --- sbhs/templates/account/account_index.html | 4 +- sbhs/templates/account/home.html | 12 --- sbhs/templates/base.html | 111 +++++++++++++++++--- sbhs/templates/dashboard/all_bookings.html | 53 ++++++++++ sbhs/templates/dashboard/all_images.html | 9 ++ sbhs/templates/dashboard/dashboard_index.html | 87 ++++------------ sbhs/templates/dashboard/fetch_logs.html | 58 +++++++++++ sbhs/templates/dashboard/profile.html | 49 +++++++++ sbhs/templates/dashboard/show_all_boards.html | 40 +++++++ sbhs/templates/dashboard/test_boards.html | 145 ++++++++++++++++++++++++++ sbhs/templates/dashboard/update_mid.html | 9 ++ sbhs/templates/experiment/logs.html | 31 ++++++ sbhs/templates/footer.html | 68 +++++------- sbhs/templates/modals.html | 4 +- sbhs/templates/nav.html | 41 -------- sbhs/templates/pages/about.html | 93 ++++++++++++----- sbhs/templates/pages/experiments.html | 2 +- sbhs/templates/pages/feedback.html | 3 - sbhs/templates/pages/info.html | 28 ++++- sbhs/templates/pages/theory.html | 4 +- sbhs/templates/slot/new.html | 4 +- 21 files changed, 640 insertions(+), 215 deletions(-) create mode 100644 sbhs/templates/dashboard/all_bookings.html create mode 100644 sbhs/templates/dashboard/all_images.html create mode 100644 sbhs/templates/dashboard/fetch_logs.html create mode 100644 sbhs/templates/dashboard/profile.html create mode 100644 sbhs/templates/dashboard/show_all_boards.html create mode 100644 sbhs/templates/dashboard/test_boards.html create mode 100644 sbhs/templates/dashboard/update_mid.html create mode 100644 sbhs/templates/experiment/logs.html diff --git a/sbhs/templates/account/account_index.html b/sbhs/templates/account/account_index.html index 2d5789a..60fece6 100644 --- a/sbhs/templates/account/account_index.html +++ b/sbhs/templates/account/account_index.html @@ -19,7 +19,9 @@
{% csrf_token %} {{registration_form.as_p}} - + {% for field in registration_form %} + + {% endfor %}
diff --git a/sbhs/templates/account/home.html b/sbhs/templates/account/home.html index f2089b3..5f647bb 100644 --- a/sbhs/templates/account/home.html +++ b/sbhs/templates/account/home.html @@ -3,18 +3,6 @@ {% block content %}
-
- -
diff --git a/sbhs/templates/base.html b/sbhs/templates/base.html index c6294a6..a1e36f2 100644 --- a/sbhs/templates/base.html +++ b/sbhs/templates/base.html @@ -9,22 +9,66 @@ + {% block headerfiles %} {% endblock %} - - {% block style_block %} {% endblock %} - {% include 'nav.html' %} + {% block nav %} + +{% endblock %} + {% if messages %}
{% for message in messages %} @@ -35,10 +79,53 @@ {% endfor %}
{% endif %} - {% block content %} - {% endblock %} -


- {% include 'footer.html' %} - {% include 'modals.html' %} +
+ {% block content %} + {% endblock %} +
+ +
+ {% block footer %} +
+

Server time: {% now "jS M Y h:i:s A" %} + Copyright © {% now "Y" %}

+
+ +
+

Designed and hosted by Automation Lab, CDEEP, IIT Bombay +

+ +
+ About Us +
+ + + + {% endblock %} +
- \ No newline at end of file + diff --git a/sbhs/templates/dashboard/all_bookings.html b/sbhs/templates/dashboard/all_bookings.html new file mode 100644 index 0000000..810a506 --- /dev/null +++ b/sbhs/templates/dashboard/all_bookings.html @@ -0,0 +1,53 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% block title %} + All Bookings +{% endblock %} +{% block main %} +
+

All Bookings

+ + {% if slots %} + + + + + + + + + + + {% for slot in slots %} + + + + + + + {% endfor %} + +
DateSlotBoardUser
{{slot.start_time|date:"d M Y"}}{{slot.start_time|time:"H:i"}} to {{slot.end_time|time:"H:i"}}{{slot.user.userboard_set.get.board.mid}}{{slot.user}}
+ {% else %} +

No slots have been booked.

+ {% endif %} + + +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/all_images.html b/sbhs/templates/dashboard/all_images.html new file mode 100644 index 0000000..102a93b --- /dev/null +++ b/sbhs/templates/dashboard/all_images.html @@ -0,0 +1,9 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% block title %} + All Images +{% endblock %} +{% block main %} +
+

All Images

+
+{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/dashboard_index.html b/sbhs/templates/dashboard/dashboard_index.html index 8dacb7a..ccbba77 100644 --- a/sbhs/templates/dashboard/dashboard_index.html +++ b/sbhs/templates/dashboard/dashboard_index.html @@ -5,101 +5,52 @@ {% endblock %} {% block headerfiles %} - + - + + {% endblock %} {% block content %}
-
+
-
- {# Div for Show all boards #} -
-

All Active Boards

-
- - {% for board in all_active_boards %} - - - - - - - - - - - - - - - - - {% endfor %} -
Board MIDWebcamTemperature ProfileDownload Logs
{{board.mac_ids.0}}
-
-
-

All Bookings

-
-
-

All Images

-
-
-

Test Boards

-
-
-

Update MID

-
-
-

Fetch Logs

-
-
-

Download Experiment Directory

-
-
-

Turn On all Boards

-
-
-

Turn Off all Boards

-
-
-

Book all Slots

-
-
+ +
+{% block main %} +{% endblock %} +
- {% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/fetch_logs.html b/sbhs/templates/dashboard/fetch_logs.html new file mode 100644 index 0000000..8f870c5 --- /dev/null +++ b/sbhs/templates/dashboard/fetch_logs.html @@ -0,0 +1,58 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% load staticfiles %} +{% load custom_filter %} +{% block title %} + Fetch Logs +{% endblock %} +{% block headerfiles %} + + + + + + +{% endblock %} +{% block main %} +
+

Filter Log files

+
+
+
+ {% csrf_token %} + {{form.as_p}} +
+
+
+ +
+ + + + + + + + + + {% for experiment in experiments %} + + + + + + + {% endfor %} + +
Sl.NoUserFilename
{{forloop.counter}}{{experiment.slot.user.get_full_name}}{{experiment.log}}
+
+ +{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/profile.html b/sbhs/templates/dashboard/profile.html new file mode 100644 index 0000000..8a055df --- /dev/null +++ b/sbhs/templates/dashboard/profile.html @@ -0,0 +1,49 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% load staticfiles %} +{% block title %} + Dashboard - Profile +{% endblock %} +{% block headerfiles %} + + + + + + + +{% endblock %} +{% block main %} +
+
+

SBHS MID: {{ mid }} Profile for past {{ delta_T }} instances

+

Heat

+
+

Fan

+
+

Temperature

+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/show_all_boards.html b/sbhs/templates/dashboard/show_all_boards.html new file mode 100644 index 0000000..e247ffe --- /dev/null +++ b/sbhs/templates/dashboard/show_all_boards.html @@ -0,0 +1,40 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% block title %} + All boards +{% endblock %} + +{% block main %} +
+ {# Div for Show all boards #} +
+

All Active Boards

+
+ + + + + + + + + + + + + + {% for board in all_boards %} + + + + + + + + + {% endfor %} + +
Board MIDStatusPower StatusWebcamTemperature ProfileDownload Logs
{{board.mid}}{% if board.online %}Online{% else %}Offline{% endif %}{% if board.online %}On{% else %}Off{% endif %}View ImageView ProfileDownload
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/test_boards.html b/sbhs/templates/dashboard/test_boards.html new file mode 100644 index 0000000..11362df --- /dev/null +++ b/sbhs/templates/dashboard/test_boards.html @@ -0,0 +1,145 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% load staticfiles %} +{% load custom_filter %} +{% block title %} + Test Boards +{% endblock %} + +{% block style_block %} + +{% endblock %} +{% block main %} +
+
+
+ + + + + + + + + + {% for board in boards %} + + + + + + {% endfor %} + +
Board MIDStatusOccupied
{{board.mid}} + {% if board.online %}Online{% else %}Offline{% endif %} + + {% vacant_slot slot_history.start_time slot_history.end_time now as slot_status %} + {% if slot_status == "vacant" %} +

{% if board.online %}Vacant{% else %}Not available{% endif %}

+ {% elif slot_status == "occupied" %} +

Occupied

+ {% endif %} + +
+
+ + + + + + + + + + + + +
+
+ + +{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/dashboard/update_mid.html b/sbhs/templates/dashboard/update_mid.html new file mode 100644 index 0000000..ea2eb4d --- /dev/null +++ b/sbhs/templates/dashboard/update_mid.html @@ -0,0 +1,9 @@ +{% extends 'dashboard/dashboard_index.html' %} +{% block title %} + Update MID +{% endblock %} +{% block main %} +
+

Update MID

+
+{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/experiment/logs.html b/sbhs/templates/experiment/logs.html new file mode 100644 index 0000000..7e118ac --- /dev/null +++ b/sbhs/templates/experiment/logs.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} +{% block title %} + Download Previous log files +{% endblock %} +{% block content %} +
+
+

Download previous log files

+ + + + + + + + + + + {% for exp in experiment %} + + + + + + + {% endfor %} + +
DateSlot timingsFilenameDownload
{{exp.slot.start_time|date:"M d, Y"}}{{exp.slot.start_time|time}} -- {{exp.slot.end_time|time}} {{exp.logname}}Download
+
+
+{% endblock %} \ No newline at end of file diff --git a/sbhs/templates/footer.html b/sbhs/templates/footer.html index f5782d6..fe7ae4a 100644 --- a/sbhs/templates/footer.html +++ b/sbhs/templates/footer.html @@ -1,43 +1,29 @@ -
-
-
- -
- Server time: {% now "jS M Y h:i:s A" %}. Copyright © 2014 www.iitb.ac.in. Designed and hosted by Automation Lab, CDEEP, IIT Bombay + +
+ - \ No newline at end of file + + diff --git a/sbhs/templates/modals.html b/sbhs/templates/modals.html index d23f879..2381d74 100644 --- a/sbhs/templates/modals.html +++ b/sbhs/templates/modals.html @@ -5,11 +5,11 @@

Change Password

-

Please click following button to send password change link to your email address.

+

Please click following button to reset password.

- Send password change link + Reset Password
diff --git a/sbhs/templates/nav.html b/sbhs/templates/nav.html index 28f7738..e69de29 100644 --- a/sbhs/templates/nav.html +++ b/sbhs/templates/nav.html @@ -1,41 +0,0 @@ -
-
-
- {% if user.is_authenticated %} - Single Board Heater System Lab - {% else %} - Single Board Heater System Lab - {% endif %} - - - -
-
-
-
- -
-
-
\ No newline at end of file diff --git a/sbhs/templates/pages/about.html b/sbhs/templates/pages/about.html index 699fdd7..5768e43 100644 --- a/sbhs/templates/pages/about.html +++ b/sbhs/templates/pages/about.html @@ -4,24 +4,23 @@ {% block content %}
- {% if user.is_authenticated %} - {% include 'account/sub_nav.html' %} - {% endif %}
-
-
+
IITB
-

About us

-

SBHS Virtual Labs Team

-
+
+

About us

+

SBHS Virtual Labs Team

+
+ +
Prof. Kannan Moudgalya Principal Investigator
Prof. Kannan Moudgalya
-
+

Prof. Kannan M. Moudgalya received a B.Tech degree in chemical engineering from IIT Madras, a Master of Electrical Engineering from Rice University and a Ph.D (Chemical Engineering) degree, also from Rice University. He has been a professor at IIT Bombay for 22 years. He spent one year at the University of Alberta as a visiting professor.

@@ -36,25 +35,63 @@

-
-
-

SBHS Team

-
    -
  • Inderpreet Arora
    • -
  • Rupak Rokade
    • -
  • Kaushik Venkata Belusonti
    • -
  • Prashant Shah
    • -
  • Victor Chakroborty
    • -
  • Shalini Shrivastava
    • -
  • Rakhi R
    • -
  • Sushant Poojary
    • -
  • Tanuj Bhojwani
    • -
  • Sitesh Patel
    • -
  • Ankit Bahuguna
    • -
  • Amol Mandhane
    • -
  • Akash Chavan
    • -
-
+ + + + + + + + + + + + + +
SBHS TeamSBHS Web Team
+
    +
  • Inderpreet Arora
    • +
  • Rupak Rokade
    • +
  • Kaushik Venkata Belusonti
    • +
  • Prashant Shah
    • +
  • Victor Chakroborty
    • +
  • Shalini Shrivastava
    • +
  • Rakhi R
    • +
  • Sushant Poojary
    • +
  • Tanuj Bhojwani
    • +
  • Sitesh Patel
    • +
  • Ankit Bahuguna
    • +
+ 		+
    +
  • Amol Mandhane
    • +
  • Mahesh Gudi
    • +
  • Akash Chavan
    • +
+
+ + {% endblock %} \ No newline at end of file diff --git a/sbhs/templates/pages/experiments.html b/sbhs/templates/pages/experiments.html index f3d9fe1..ba2ba68 100644 --- a/sbhs/templates/pages/experiments.html +++ b/sbhs/templates/pages/experiments.html @@ -6,7 +6,7 @@
{% if user.is_authenticated %} - {% include 'account/sub_nav.html' %} + {% endif %}

Experiments

diff --git a/sbhs/templates/pages/feedback.html b/sbhs/templates/pages/feedback.html index 736f5a4..b58c727 100644 --- a/sbhs/templates/pages/feedback.html +++ b/sbhs/templates/pages/feedback.html @@ -4,9 +4,6 @@ {% block content %}
- {% if user.is_authenticated %} - {% include 'account/sub_nav.html' %} - {% endif %}

Feedback / Contact Us


diff --git a/sbhs/templates/pages/info.html b/sbhs/templates/pages/info.html index 0d68339..0dffbbd 100644 --- a/sbhs/templates/pages/info.html +++ b/sbhs/templates/pages/info.html @@ -14,7 +14,7 @@
-
+

Welcome to SBHS Virtual Labs. Here you can remotely access the Single Board Heater Systems (SBHS) hosted at IIT Bombay, and perform various experiments using it.

@@ -31,6 +31,32 @@

  • Launch Scilab, load the appropriate code and start experimenting remotely!
    • +
    +

    Theory

    +
    +
    + +
    +
    +
    +

    Procedure

    +

    + See the spoken tutorial on how to use SBHS virtual labs +

    +
    +
    + +
    +

    +

    + For more information please read the pdf +

    +
    +
    +
    +
    +
    +
    {% endblock %} diff --git a/sbhs/templates/pages/theory.html b/sbhs/templates/pages/theory.html index e94e10d..019b2c0 100644 --- a/sbhs/templates/pages/theory.html +++ b/sbhs/templates/pages/theory.html @@ -5,9 +5,7 @@
    - {% if user.is_authenticated %} - {#{% include 'account/sub_nav.html' %}#} - {% endif %} +

    Theory


    diff --git a/sbhs/templates/slot/new.html b/sbhs/templates/slot/new.html index f2464fa..2713396 100644 --- a/sbhs/templates/slot/new.html +++ b/sbhs/templates/slot/new.html @@ -11,7 +11,7 @@ - + {% endblock %}
    @@ -75,7 +75,7 @@ {% elif slot_status == "ongoing" %}

    Ongoing

    {% else %} -

    Finished

    +

    Finished

    {% endif %} {% endfor %} -- cgit