Skip to content
Snippets Groups Projects
Commit 0061b650 authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

removed merge conflict

parents 155e8c46 371326c6
Branches feat-certify-account
No related tags found
1 merge request!3Feat certify account
Pipeline #5885 failed with stage
Stage: lint
    Hide whitespace changes
    Inline Side-by-side
    app/__init__.py
    + 0
    − 2
    View file @ 0061b650
    ...@@ -40,8 +40,6 @@ def create_app(config_name): ...@@ -40,8 +40,6 @@ def create_app(config_name):
    @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page
    def index(): def index():
    valid_eppa = ["faculty", "staff", "student", "affiliate"]
    if 'uid' not in session: if 'uid' not in session:
    session['uid']=str(uuid.uuid4()) session['uid']=str(uuid.uuid4())
    ......
    app/templates/errors/shibboleth.html deleted 100644 → 0
    + 0
    − 74
    View file @ 155e8c46
    <html class="gr__rc_uab_edu">
    <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>
    <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 Authorization 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>
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment