Skip to content

Commit

Permalink
added some icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@marzim
marzim committed Feb 16, 2017
1 parent 554e484 commit c4e83f9
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 24 deletions.
2 changes: 1 addition & 1 deletion accounts/templates/editemail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div>
<ul class="nav nav-tabs actions-nav">
<li>
<a href="/editpassword" title="Change Password">Change Password</a>
<a href="/settings/password/" title="Change Password">Change Password</a>
</li>

<li class="active">
Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/editpassword.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<a href="#" title="Change Password">Change Password</a>
</li>
<li>
<a href="/editemail">Change Email</a>
<a href="/settings/email/">Change Email</a>
</li>
</ul>
<form class="form-signin form-horizontal col-md-6" role="form" method="post" action="">
Expand Down
6 changes: 3 additions & 3 deletions accounts/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
30 changes: 15 additions & 15 deletions home/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,54 +5,54 @@
{% endblock %}
{% block content %}
{% if not current_user.is_authenticated %}
<li><a href="/login">Log in</a></li>
<li><a href="/register">Sign up</a></li>
<li><a href="#">Gallery</a></li>
<li><a href="/login"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;&nbsp;Log in</a></li>
<li><a href="/register"><span class="glyphicon glyphicon-sunglasses"></span>&nbsp;&nbsp;&nbsp;Sign up</a></li>
<li><a href="#"><span class="glyphicon glyphicon-picture"></span>&nbsp;&nbsp;&nbsp;Gallery</a></li>
{% endif %}
{% if current_user.is_authenticated %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Savings
<span class="glyphicon glyphicon-gift"></span>&nbsp;&nbsp;Savings
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
<a href="/summary">Summary</a>
<a href="/summary"><span class="glyphicon glyphicon-list-alt"></span>&nbsp;&nbsp;&nbsp;Summary</a>
</li>
<li>
<a href="/contributions">Contributions</a>
<a href="/contributions"><span class="glyphicon glyphicon-piggy-bank"></span>&nbsp;&nbsp;&nbsp;Contributions</a>
</li>
<!--<li>
<a href="/savings/contchecklist">Contribution Checklist</a>
</li>-->
<li>
<a href="/loans">Loans</a>
<a href="/loans"><span class="glyphicon glyphicon-usd"></span>&nbsp;&nbsp;&nbsp;Loans</a>
</li>
<li>
<a href="/guidelines">Guidelines</a>
<a href="/guidelines"><span class="glyphicon glyphicon-tasks"></span>&nbsp;&nbsp;&nbsp;Guidelines</a>
</li>
<li class="divider"></li>
<li>
<a href="/interestearned">Interest Earned</a>
<a href="/interestearned"><span class="glyphicon glyphicon-stats"></span>&nbsp;&nbsp;&nbsp;Interest Earned</a>
</li>
<li>
<a href="/customers">Customers</a>
<a href="/customers"><span class="glyphicon glyphicon-briefcase"></span>&nbsp;&nbsp;&nbsp;Customers</a>
</li>
</ul>
</li>
<li><a href="/users">Users</a></li>
<li><a href="/users"><span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;&nbsp;Users</a></li>
<li><a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{ current_user.name }}
<span class="glyphicon glyphicon-king"></span>&nbsp;&nbsp;&nbsp;{{ current_user.name }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
<a href="/editpassword">Settings
<a href="/settings/password/"><span class="glyphicon glyphicon-cog"></span>&nbsp;&nbsp;&nbsp;Settings
</a>
</li>
<li class="divider"></li>
<li>
<a href="/logout">Log out</a>
<a href="/logout"><span class="glyphicon glyphicon-log-out"></span>&nbsp;&nbsp;&nbsp;Log out</a>
</li>
</ul>
</li>
Expand All @@ -70,7 +70,7 @@
<li><a href="/contributions"><span class="glyphicon glyphicon-piggy-bank"></span>&nbsp;&nbsp;&nbsp;Contributions</a></li>
<!--<li><a href="/contributionschecklist"><span class="glyphicon glyphicon-ok-circle"></span>&nbsp;&nbsp;&nbsp;Contribution Checklist</a></li>-->
<li><a href="/loans"><span class="glyphicon glyphicon-usd"></span>&nbsp;&nbsp;&nbsp;Loans</a></li>
<li><a href="/interestearned"><span class="glyphicon glyphicon-circle-arrow-up"></span>&nbsp;&nbsp;&nbsp;Interest Earned</a></li>
<li><a href="/interestearned"><span class="glyphicon glyphicon-stats"></span>&nbsp;&nbsp;&nbsp;Interest Earned</a></li>
<li><a href="/customers"><span class="glyphicon glyphicon-briefcase"></span>&nbsp;&nbsp;&nbsp;Customers</a></li>
<li><a href="/users"><span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;&nbsp;Users</a></li>
<li><a href="/notes"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;&nbsp;Notes</a></li>
Expand Down
32 changes: 32 additions & 0 deletions static/css/dashboard.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion static/js/formvalidator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ $(document).ready(function(){
order_by = 'asc'
}else{
order_by = 'desc'

}
window.location.assign('/' + url + '/?' + parameter + '=' + order_by);
}
Expand Down
6 changes: 3 additions & 3 deletions templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<link href="{{ url_for('static', filename='css/mystyle.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/dashboard.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/datepicker.css') }}" rel="stylesheet" media="screen">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<title>{% block title %}{% endblock %}</title>
{% endblock %}
</head>
Expand All @@ -29,7 +28,7 @@
</div>
<div class="navbar-collapse collapse" style="height: 1px;">
<ul class="nav navbar-nav navbar-right navbar-inverse">
<li><a href="/">Home</a></li>
<li><a href="/"><span class="glyphicon glyphicon-home"></span>&nbsp;&nbsp;Home</a></li>
{% block content %}{% endblock %}
</ul>
</div>
Expand All @@ -53,12 +52,13 @@
{% endblock %}
<!--<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/formvalidator.js') }}" ></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/formmanipulator.js') }}" ></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.js"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.min.js') }}" ></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-datepicker.js') }}" ></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/datepicker.js') }}" ></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/additional-method.js') }}" ></script>
<!--<script type="text/javascript" src="{{ url_for('static', filename='js/additional-method.js') }}" ></script>-->
</body>
</html>

0 comments on commit c4e83f9

Please sign in to comment.