From ccb1363a3dd02338e0d8adaaad7f8e72581fa1df Mon Sep 17 00:00:00 2001 From: Krish M <krish94@uab.edu> Date: Mon, 18 Apr 2022 23:07:16 -0500 Subject: [PATCH 1/3] replaced valid_eppa as a variable from groupvars --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 653dddf..5fa7a64 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -40,7 +40,7 @@ def create_app(config_name): @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page def index(): - valid_eppa = ["faculty", "staff", "student", "affiliate"] + valid_eppa = vars.valid_eppa if 'uid' not in session: session['uid']=str(uuid.uuid4()) -- GitLab From 7ac8330fcca33899acd61385a96ca3b57ebb34b3 Mon Sep 17 00:00:00 2001 From: Krish M <krish94@uab.edu> Date: Tue, 19 Apr 2022 01:30:26 -0500 Subject: [PATCH 2/3] added shibboleth authorization error page --- app/templates/errors/shibboleth.html | 74 ++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 app/templates/errors/shibboleth.html diff --git a/app/templates/errors/shibboleth.html b/app/templates/errors/shibboleth.html new file mode 100644 index 0000000..df972e1 --- /dev/null +++ b/app/templates/errors/shibboleth.html @@ -0,0 +1,74 @@ +<html class="gr__rc_uab_edu"> +<title>User Blocked </title> +<head> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> +<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script> +<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script> +<script src="{{ url_for('static', filename='scripts/function.js') }}"></script> + + +<link rel="shortcut icon" type="image/x-icon" href="/public/favicon.ico"> +<link rel="stylesheet" media="all" href="{{ url_for('static', filename='style/application.css') }}"> +<link rel="stylesheet" media="all" href="{{ url_for('static', filename='style/app2.css') }}"> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<style> + .navbar-inverse { background-color: rgb(0,99,65); } + button{ margin: 13px; + .important { color: #336699; }} +</style> + +</head> + + +<body data-gr-c-s-loaded="true"> +<header> + <nav class="navbar navbar-inverse navbar-static-top"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9" aria-expanded="false"> <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="/"> UAB Research Computing</a> + </div> + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-9"> + <div class="navbar-right"> + <ul class="nav navbar-nav"> + <li> + <a target="_blank" href="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted"> + <i class="fas fa-info-circle fa-fw"></i> Online Documentation + </a> + </li> + </ul> + </div> + </div> + </div> + </nav> +</header> + +<div class="container content" role="main" style="width: 100%"> + <div class="col-md-2 col-sm-2 my-col"> + <img alt="logo" height="auto" width="80%" src="{{ url_for('static', filename='img/logo_svg.svg') }}"> + <a href="https://tinyurl.com/cheahaAL" target="_blank"></a> + </div> + + <div class="col-md-10 col-sm-10 my-col"> + <div id="form-wrapper"> + <h2> Account SHIB error </h2> + <p style="font-size:110%;"> {{ welcome_msg |safe }}</p> + </div> + </div> +</div> + +<footer> + <div class="container-fluid"> + <div class="row"> + <div class="col-md-6 col-sm-6"> + <a href="https://osc.github.io/Open-OnDemand/"> + <img class="footer-logo" alt="Powered by Open OnDemand" height="40" style="margin-bottom: 20px" src="{{ url_for('static', filename='img/OpenOnDemand_powered_by_RGB-cb3aad5ff5350c7994f250fb334ddcc72e343233ce99eb71fda93beddd76a847.svg') }}"> + </a> + </div> + </div> + </div> +</footer> + +</body> +</html> -- GitLab From 29e7252206e68bb4a1972f5ae519b2e7ac8cd069 Mon Sep 17 00:00:00 2001 From: Krish M <krish94@uab.edu> Date: Tue, 19 Apr 2022 01:33:01 -0500 Subject: [PATCH 3/3] edited authorization error message --- app/templates/errors/shibboleth.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/errors/shibboleth.html b/app/templates/errors/shibboleth.html index df972e1..f4a5cf5 100644 --- a/app/templates/errors/shibboleth.html +++ b/app/templates/errors/shibboleth.html @@ -1,5 +1,5 @@ <html class="gr__rc_uab_edu"> -<title>User Blocked </title> +<title>User Authorization error </title> <head> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script> @@ -52,7 +52,7 @@ <div class="col-md-10 col-sm-10 my-col"> <div id="form-wrapper"> - <h2> Account SHIB error </h2> + <h2> Account Authorization error </h2> <p style="font-size:110%;"> {{ welcome_msg |safe }}</p> </div> </div> -- GitLab