Skip to content
Snippets Groups Projects
Commit 47b97e0a authored by Ishan Patel's avatar Ishan Patel Committed by Mitchell Moore
Browse files

Removed unused functions from Signup. Edited reg failed error page. 

- Removed function from signup.html
- Script fix
- Basic function cleanup
- Script src path fix
parent 1371d75c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/__init__.py
+ 5
− 0
View file @ 47b97e0a
......@@ -43,12 +43,17 @@ class MyHandler(FileSystemEventHandler): # Watchdog handler class to take action
try:
<<<<<<< Updated upstream
if ("/home/reggie/flat_db/" + time_stamp + ".done") in snap_diff.files_moved[0]: # check for timestamped string with .done extention in flat_db
=======
if len(snap_diff.files_moved) > 0 and ("/home/reggie/flat_db/" + time_stamp + ".done") in snap_diff.files_moved[0]:
>>>>>>> Stashed changes
observing = False
# print("YES!")
except Exception as e:
print(e)
return render_template('errors/500.html', title='Server Error'), 500
# print("Created: ", snap_diff.files_created)
# print("Deleted: ", snap_diff.files_deleted)
# print("Modified: ", snap_diff.files_modified)
......
app/static/scripts/function.js 0 → 100644
+ 19
− 0
View file @ 47b97e0a
function displayloading() {
document.getElementById("notification_window").innerHTML = "" +
"<div class=\"joyride-tip-guide\" data-index=\"0\" style=\"visibility: visible; display: block; top: 77.5px; left: 570px;\"><span class=\"joyride-nub\" style=\"display: none;\"></span><div class=\"joyride-content-wrapper\" role=\"dialog\"><ol>\n" +
" <h4>\n" +
"\n" +
" Your account is pending creation...\n" +
"\n" +
" </h4>\n" +
" <br><p>\n" +
" This can take between 5-10 min.\n" +
" </p>\n" +
" </ol>\n" +
" <img src=\"/register/static/img/loading.gif\" style=\"width: 35px; height: auto\"> Pending...\n" +
" </div></div>\n" +
"\n" +
" <div class=\"joyride-modal-bg\" style=\"display: block;\"></div>"
}
\ No newline at end of file
app/templates/auth/SignUp.html
+ 2
− 23
View file @ 47b97e0a
......@@ -3,7 +3,8 @@
{% block title %} User Registration {% endblock %}
{% block head %}
{{ super() }}
<script src="/register/static/scripts/application.js"></script>
<script src="{{ url_for('static', filename='scripts/function.js') }}"></script>
<script src="{{ url_for('static', filename='scripts/application.js') }}"></script>
<style type="text/css">
.important { color: #336699; }
</style>
......@@ -59,28 +60,6 @@
<h2>Hello, {{ user }}!</h2>
<script>
function displayloading() {
document.getElementById("notification_window").innerHTML = "" +
"<div class=\"joyride-tip-guide\" data-index=\"0\" style=\"visibility: visible; display: block; top: 77.5px; left: 570px;\"><span class=\"joyride-nub\" style=\"display: none;\"></span><div class=\"joyride-content-wrapper\" role=\"dialog\"><ol>\n" +
" <h4>\n" +
"\n" +
" Your account is pending creation...\n" +
"\n" +
" </h4>\n" +
" <br><p>\n" +
" This can take between 5-10 min.\n" +
" </p>\n" +
" </ol>\n" +
" <img src=\"/register/static/img/loading.gif\" style=\"width: 35px; height: auto\"> Pending...\n" +
" </div></div>\n" +
"\n" +
" <div class=\"joyride-modal-bg\" style=\"display: block;\"></div>"
}
</script>
<form action="." method="post" onsubmit="displayloading()">
<div class="signUpContainer">
<label><b>{{ form.fullname.label }}<br></b></label>
......
app/templates/errors/registration_failed.html
+ 1
− 1
View file @ 47b97e0a
......@@ -6,7 +6,7 @@
</head>
<body>
<h2>Something went wrong...</h2>
<h2>Something went right...</h2>
<p>
Redirecting back to sign-in page in 5 seconds.
</p>
......
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