diff --git a/accounts/templates/editemail.html b/accounts/templates/editemail.html index 34bff61..519be9c 100644 --- a/accounts/templates/editemail.html +++ b/accounts/templates/editemail.html @@ -14,7 +14,7 @@
diff --git a/accounts/views.py b/accounts/views.py index 5386edf..d808ffe 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -63,7 +63,7 @@ def register(): return render_template('register.html', form=form) @accounts_blueprint.route( - '/editpassword/', methods=['GET', 'POST']) # pragma: no cover + '/settings/password/', methods=['GET', 'POST']) # pragma: no cover @login_required def editpassword(): from coinage import bcrypt @@ -82,11 +82,11 @@ def editpassword(): flash(u'Successfully changed password.', 'success') flash(u'Please log out and log in using your new password.', 'info') else: - form.password.errors.append('Password does not match with the current password.') + form.password.errors.append('Password provided does not match with the current password.') return render_template('editpassword.html', form=form, error=error) @accounts_blueprint.route( - '/editemail/', methods=['GET', 'POST']) # pragma: no cover + '/settings/email/', methods=['GET', 'POST']) # pragma: no cover @login_required def editemail(): from coinage import db diff --git a/home/templates/index.html b/home/templates/index.html index 4648152..d8284dc 100644 --- a/home/templates/index.html +++ b/home/templates/index.html @@ -5,54 +5,54 @@ {% endblock %} {% block content %} {% if not current_user.is_authenticated %} -
  • Log in
    • -
  • Sign up
    • -
  • Gallery
    • +
  •    Log in
    • +
  •    Sign up
    • +
  •    Gallery
    • {% endif %} {% if current_user.is_authenticated %}
  • - Savings +   Savings
    • -
  • Users
    • +
  •    Users
  • - {{ current_user.name }} +    {{ current_user.name }}
    • @@ -70,7 +70,7 @@
  •    Contributions
  •    Loans
    • -
  •    Interest Earned
    • +
  •    Interest Earned
  •    Customers
  •    Users
  •    Notes
    • diff --git a/static/css/dashboard.css b/static/css/dashboard.css index a015f72..391fdd5 100644 --- a/static/css/dashboard.css +++ b/static/css/dashboard.css @@ -50,6 +50,38 @@ body { color: #fff; background-color: #428bca; } +.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { +color: #000; /*Sets the text hover color on navbar*/ +} + +.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > + a:hover, .navbar-default .navbar-nav > .active > a:focus { +color: white; /*BACKGROUND color for active*/ +background-color: #030033; +} + + .navbar-default { + background-color: #0f006f; + border-color: #030033; +} + + .dropdown-menu > li > a:hover, + .dropdown-menu > li > a:focus { + color: #262626; + text-decoration: none; + background-color: #66CCFF; /*change color of links in drop down here*/ + } + + .nav > li > a:hover, + .nav > li > a:focus { + text-decoration: none; + background-color: silver; /*Change rollover cell color here*/ + } + + + .navbar-default .navbar-nav > li > a { + color: white; /*Change active text color here*/ + } .error{ color: #BE716F diff --git a/static/js/formvalidator.js b/static/js/formvalidator.js index 688e25a..696fb8e 100644 --- a/static/js/formvalidator.js +++ b/static/js/formvalidator.js @@ -205,7 +205,6 @@ $(document).ready(function(){ order_by = 'asc' }else{ order_by = 'desc' - } window.location.assign('/' + url + '/?' + parameter + '=' + order_by); } diff --git a/templates/base.html b/templates/base.html index 4bc0890..9d07bfa 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,6 @@ - {% block title %}{% endblock %} {% endblock %} @@ -29,7 +28,7 @@
    @@ -53,12 +52,13 @@ {% endblock %} + - +