Merge pull request #248 from MasterChief-John-117/granular-lockdown

devinmatte · web-flow · commit e3dab17eb449 · 2020-04-08T15:50:55.000-04:00
Use protected and not protected templates for lockdown
diff --git a/conditional/templates/attendance_history.html b/conditional/templates/attendance_history.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Attendance History
 {% endblock %}
diff --git a/conditional/templates/attendance_hm.html b/conditional/templates/attendance_hm.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 House Meeting Attendance
 {% endblock %}
diff --git a/conditional/templates/base.html b/conditional/templates/base.html
@@ -20,20 +20,9 @@
     <body>
         {% block nav %}
         {% endblock %}
-        {% if not lockdown %}
-            {% block body %}
-            {% endblock %}
-        {% else %}
-        <div class="container main error-page align-center">
-            <div class="col-xs-12">
-                <img src="/static/images/material_lock.svg" alt="Attention!">
-                <h1>Congratulations or I'm Sorry...</h1>
-                <h2>We cannot reveal the results of your evaluation!</h2>
-                <h3>Evaluations underway:</h3>
-                <p>Conditional is in Lockdown</p>
-            </div>
-        </div>
-        {% endif %}
+
+        {% block body %}
+        {% endblock %}
 
         <footer>
             <a class="footer-version" href="https://github.com/ComputerScienceHouse/conditional/tree/v{{config["VERSION"]}}">Conditional (v{{config["VERSION"]}})</a>
diff --git a/conditional/templates/base_protected.html b/conditional/templates/base_protected.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" content="">
+        <meta name="author" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+
+        <link rel="shortcut icon" href="https://assets.csh.rit.edu/uploads/favicon.ico" type="image/x-icon">
+        <link href="/static/css/app.css" rel="stylesheet">
+        {% block extraHeader %}
+        {% endblock %}
+
+        <title>{% block title %}{% endblock %}</title>
+    </head>
+
+    <body>
+        {% block nav %}
+        {% endblock %}
+        {% if not lockdown %}
+            {% block body %}
+            {% endblock %}
+        {% else %}
+        <div class="container main error-page align-center">
+            <div class="col-xs-12">
+                <img src="/static/images/material_lock.svg" alt="Attention!">
+                <h1>Congratulations or I'm Sorry...</h1>
+                <h2>We cannot reveal the results of your evaluation!</h2>
+                <h3>Evaluations underway:</h3>
+                <p>Conditional is in Lockdown</p>
+            </div>
+        </div>
+        {% endif %}
+
+        <footer>
+            <a class="footer-version" href="https://github.com/ComputerScienceHouse/conditional/tree/v{{config["VERSION"]}}">Conditional (v{{config["VERSION"]}})</a>
+        </footer>
+        <script src="/static/js/app.js"></script>
+    </body>
+</html>
diff --git a/conditional/templates/co_op_management.html b/conditional/templates/co_op_management.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Co-Op Management
 {% endblock %}
diff --git a/conditional/templates/conditional.html b/conditional/templates/conditional.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
     Conditionals
 {% endblock %}
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Dashboard
 {% endblock %}
diff --git a/conditional/templates/errors.html b/conditional/templates/errors.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}Error {{ error_code }}{% endblock %}
 {% block body %}
 <div class="container main error-page align-center">
diff --git a/conditional/templates/financial.html b/conditional/templates/financial.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Financial
 {% endblock %}
diff --git a/conditional/templates/housing.html b/conditional/templates/housing.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Housing
 {% endblock %}
diff --git a/conditional/templates/intro_eval_slideshow.html b/conditional/templates/intro_eval_slideshow.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_protected.html" %}
 {% block title %}
 Introductory Evaluations Slideshow
 {% endblock %}
diff --git a/conditional/templates/intro_evals.html b/conditional/templates/intro_evals.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Introductory Evaluations
 {% endblock %}
diff --git a/conditional/templates/intro_evals_form.html b/conditional/templates/intro_evals_form.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Introductory Evaluations Form
 {% endblock %}
diff --git a/conditional/templates/logs.html b/conditional/templates/logs.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 User Logs
 {% endblock %}
diff --git a/conditional/templates/member_management.html b/conditional/templates/member_management.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Administration
 {% endblock %}
diff --git a/conditional/templates/nav_protected.html b/conditional/templates/nav_protected.html
@@ -0,0 +1,115 @@
+{% extends "base_protected.html" %}
+{% block nav %}
+<nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="/dashboard"></a>
+        </div>
+        <div id="navbar" class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-stats"></span> Evals <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/intro_evals"><span class="glyphicon glyphicon-star"></span> Introductory Evaluations</a></li>
+                        <li><a href="/spring_evals"><span class="glyphicon glyphicon-tree-deciduous"></span> Membership Evaluations</a></li>
+                        <li><a href="/conditionals"><span class="glyphicon glyphicon-exclamation-sign"></span> Current Conditionals</a></li>
+                    </ul>
+                </li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-list-alt"></span> Forms <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/major_project"><span class="glyphicon glyphicon-star"></span> Major Project</a></li>
+                        {% if check_current_student(username) %}
+                        <li><a href="/co_op"><span class="glyphicon glyphicon-briefcase"></span> Co-Op Submission</a></li>
+                        {% endif %}
+                        {% if is_intromember %}
+                        <li><a href="/intro_evals_form"><span class="glyphicon glyphicon-blackboard"></span> Introductory Evaluations</a></li>
+                        {% endif %}
+                    </ul>
+                </li>
+
+                <li><a href="/housing"><span class="glyphicon glyphicon-home"></span> Housing</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-ok"></span> Attendance
+                    {% if is_eboard and pending_review != 0 %}
+                    ({{pending_review}})
+                    {% endif %}
+                    <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/attendance_cm"><span class="glyphicon glyphicon-user"></span> Directorship Meeting </a></li>
+                        <li><a href="/attendance_ts"><span class="glyphicon glyphicon-blackboard"></span> Technical Seminar</a></li>
+                        {% if is_eboard %}
+                        <li><a href="/attendance/history"><span class="glyphicon glyphicon-calendar"></span> Attendance History</a></li>
+                        {% endif %}
+                        {% if is_eval_director %}
+                        <li><a href="/attendance_hm"><span class="glyphicon glyphicon-home"></span> House Meeting</a></li>
+                        {% endif %}
+                    </ul>
+                </li>
+
+                {% if is_eboard or is_rtp%}
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-wrench"></span> Admin<span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+
+                        {% if is_financial_director or is_eval_director %}
+                            <li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
+                        {% endif %}
+
+                        {% if is_eval_director %}
+                            <li><a href="/co_op/manage"><span class="glyphicon glyphicon-briefcase"></span> Co-Op Management</a></li>
+                            <li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Introductory Evaluations Presentation</a></li>
+                            <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
+                        {% endif %}
+
+                        <li><a href="/logs"><span class="glyphicon glyphicon-list"></span> User Logs</a></li>
+
+                        {% if is_eval_director or is_rtp %}
+                            <li><a href="/clearcache"><span class="glyphicon glyphicon-floppy-remove"></span> Clear Cache</a></li>
+                        {% endif %}
+
+                        {% if is_rtp %}
+                            <li><a href="/restart"><span class="glyphicon glyphicon-refresh"></span> Restart Conditional</a></li>
+                        {% endif %}
+                    </ul>
+                </li>
+
+                {% endif %}
+
+
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown navbar-user">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+                        <img src="https://profiles.csh.rit.edu/image/{{username}}">
+                        {{username}}
+                        <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/dashboard"><span class="glyphicon glyphicon-dashboard"></span> Dashboard</a></li>
+                        <li><a href="https://profiles.csh.rit.edu/user/{{username}}"><span class="glyphicon glyphicon-user"></span> Profiles</a></li>
+                        <li role="separator" class="divider"></li>
+                        <li><a href="https://members.csh.rit.edu/"><span class="glyphicon glyphicon-globe"></span> Members Portal</a></li>
+                        <li><a href="https://github.com/ComputerScienceHouse/conditional/issues"><span class="glyphicon glyphicon-exclamation-sign"></span> Report an Issue</a></li>
+                        <li><a href="/logout"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+{% if admin_warning %}
+<div class="container">
+    <div class="alert alert-warning alert-admin" role="alert">
+        <strong>Conditional is in lockdown!</strong> Data shown relating to any on-going evaluation is confidential, do not disclose any information to anyone. 
+    </div>
+</div>
+{% endif %}
+{% endblock %}
diff --git a/conditional/templates/new_year.html b/conditional/templates/new_year.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 New Year Guide
 {% endblock %}
diff --git a/conditional/templates/spring_eval_slideshow.html b/conditional/templates/spring_eval_slideshow.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_protected.html" %}
 {% block title %}
 Membership Evaluations Slideshow
 {% endblock %}
diff --git a/conditional/templates/spring_evals.html b/conditional/templates/spring_evals.html
@@ -1,4 +1,4 @@
-{% extends "nav.html" %}
+{% extends "nav_protected.html" %}
 {% block title %}
 Membership Evaluations
 {% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "nav.html" %}`
	`1`	`+{% extends "nav_protected.html" %}`
`2`	`2`	`{% block title %}`
`3`	`3`	`Attendance History`
`4`	`4`	`{% endblock %}`