diff --git a/app/main.py b/app/main.py index 49ac2b8..d7bebdd 100644 --- a/app/main.py +++ b/app/main.py @@ -12,13 +12,6 @@ def index(): return render_template('main/index.jinja2') -@main_blueprint.route('/dashboard') -@login_required -def dashboard(): - """Dashboard Page""" - return render_template('main/dashboard.jinja2') - - @main_blueprint.route('/profile') @login_required def profile(): @@ -64,3 +57,10 @@ def serve_documents(filename): def signed_out(): """Sign out landing page""" return render_template('flask_user/signed_out.html') + + +@main_blueprint.route('/about') +@login_required +def about(): + """About Page""" + return render_template('main/about.jinja2') diff --git a/app/revisions.py b/app/revisions.py index af1c4aa..0c5cca1 100644 --- a/app/revisions.py +++ b/app/revisions.py @@ -39,17 +39,7 @@ def create(submission_id): else: # if a post process it if form.validate_on_submit(): - f = form.file.data - fname = secure_filename(f.filename) - fileext = fname.rsplit('.', 1)[1].lower() - filename = current_user.last_name + '_' + current_user.first_name + '_revision_' + \ - datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S") + '.' + fileext - f.save(os.path.join(current_app.config['SUBMISSION_FOLDER'], filename)) - - params = {'filename': filename, 'submission_id': submission_id} - revision_id = Revision.create_revision(params=params) - - return redirect(url_for('revisions.view', revision_id=revision_id)) + create_post(form, submission_id) # else present the create page else: return render_template('revisions/create.jinja2', @@ -59,17 +49,7 @@ def create(submission_id): else: # if a post process it if form.validate_on_submit(): - f = form.file.data - fname = secure_filename(f.filename) - fileext = fname.rsplit('.', 1)[1].lower() - filename = current_user.last_name + '_' + current_user.first_name + '_revision_' + \ - datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S") + '.' + fileext - f.save(os.path.join(current_app.config['SUBMISSION_FOLDER'], filename)) - - params = {'filename': filename, 'submission_id': submission_id} - revision_id = Revision.create_revision(params=params) - - return redirect(url_for('revisions.view', revision_id=revision_id)) + create_post(form, submission_id) # else present the create page else: return render_template('revisions/create.jinja2', @@ -77,6 +57,20 @@ def create(submission_id): submission_id=submission_id) +def create_post(form, submission_id): + f = form.file.data + fname = secure_filename(f.filename) + fileext = fname.rsplit('.', 1)[1].lower() + filename = current_user.last_name + '_' + current_user.first_name + '_revision_' + \ + datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S") + '.' + fileext + f.save(os.path.join(current_app.config['SUBMISSION_FOLDER'], filename)) + + params = {'filename': filename, 'submission_id': submission_id} + revision_id = Revision.create_revision(params=params) + + return redirect(url_for('revisions.view', revision_id=revision_id)) + + @revisions_blueprint.route('/view/') @login_required def view(revision_id): diff --git a/app/templates/flask_user/edit_user_profile.html b/app/templates/flask_user/edit_user_profile.html index 9c4f5ad..44b8f88 100644 --- a/app/templates/flask_user/edit_user_profile.html +++ b/app/templates/flask_user/edit_user_profile.html @@ -1,29 +1,86 @@ -{% extends 'flask_user/_authorized_base.html' %} +{% extends 'base.jinja2' %} {% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %} {% block title %}User Profile{% endblock %} {% block form_title %}User Profile{% endblock %} -{% block form %} -
- {{ form.hidden_tag() }} - {% for field in form %} - {% if not field.flags.hidden %} - {% if field.type=='SubmitField' %} - {{ render_submit_field(field, tabindex=loop.index*10) }} - {% else %} - {{ render_field(field, tabindex=loop.index*10) }} - {% endif %} - {% endif %} - {% endfor %} -
-
+{% block content %} +
+
+
+ {{ form.hidden_tag() }} +
+
+ {{ render_submit_field(form.submit, tabindex=220) }} +
+
+ {% if not user_manager.USER_ENABLE_AUTH0 %} + {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %} +

{% trans %}Change password{% endtrans %}

+ {% endif %} + {% endif %} +
+
+ +
+ +
Personal Info
+
+
+ {{ render_field(form.first_name, tabindex=10) }} + {{ render_field(form.middle_name, tabindex=20) }} + {{ render_field(form.last_name, tabindex=30) }} + {{ render_field(form.pref_name, tabindex=40) }} + {{ render_field(form.maiden_name, tabindex=50) }} + {{ render_field(form.birth_date, tabindex=60) }} +
+
+ {{ render_field(form.thoroughfare, tabindex=70) }} + {{ render_field(form.premise, tabindex=80) }} + {{ render_field(form.locality, tabindex=90) }} + {{ render_field(form.administrative_area, tabindex=100) }} + {{ render_field(form.postal_code, tabindex=110) }} + {{ render_field(form.country, tabindex=120) }} +
+
+ +
+ +
+
+
MSU Info
+ {{ render_field(form.net_id, tabindex=130) }} + {{ render_field(form.msu_id, tabindex=140) }} + {{ render_field(form.department, tabindex=150) }} +
+
+
+
Contact Info
+ {{ render_field(form.sec_email, tabindex=190) }} + {{ render_field(form.prim_phone, tabindex=200) }} + {{ render_field(form.sec_phone, tabindex=210) }} +
+
+ +
+ +
+
+ {{ render_submit_field(form.submit, tabindex=220) }} +
+
+ {% if not user_manager.USER_ENABLE_AUTH0 %} + {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %} +

{% trans %}Change password{% endtrans %}

+ {% endif %} + {% endif %} +
+
+
+
+
+ - {% if not user_manager.USER_ENABLE_AUTH0 %} - {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %} -

{% trans %}Change password{% endtrans %}

- {% endif %} - {% endif %} {% endblock %} {% block js %} @@ -31,8 +88,8 @@ {% endblock %} diff --git a/app/templates/flask_user/register.html b/app/templates/flask_user/register.html index 12426b1..36f51b4 100644 --- a/app/templates/flask_user/register.html +++ b/app/templates/flask_user/register.html @@ -68,8 +68,8 @@ {% endblock %} diff --git a/app/templates/header.jinja2 b/app/templates/header.jinja2 index 304001d..be61c5f 100644 --- a/app/templates/header.jinja2 +++ b/app/templates/header.jinja2 @@ -14,8 +14,8 @@ {# Visible only on large devices #}