Merge branch 'navbar'

app/templates/navbar.html

@@ -7,21 +7,31 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand topnav" href="{{ url_for('home.homepage') }}">Project Dream Team</a>
+			<a class="navbar-brand topnav" href="{{ url_for('home.homepage') }}">Research Computing</a>
 		</div>
 		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 			<ul class="nav navbar-nav navbar-right">
 				{% if current_user.is_authenticated %}
 					{% if current_user.is_admin %}
-						<li><a href="{{ url_for('home.admin_dashboard') }}">Dashboard</a></li>
-						<li><a href="{{ url_for('admin.list_departments') }}">Departments</a></li>
-						<li><a href="{{ url_for('admin.list_roles') }}">Roles</a></li>
-						<li><a href="{{ url_for('admin.list_employees') }}">Employees</a></li>
+						<li class="dropdown">
+							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+								Dashboard<span class="caret"></span></a>
+							<ul class="dropdown-menu">
+								<li><a href="{{ url_for('admin.list_departments') }}">Departments</a></li>
+								<li><a href="{{ url_for('admin.list_roles') }}">Roles</a></li>
+								<li><a href="{{ url_for('admin.list_employees') }}">Employees</a></li>
+							</ul>
+						</li>
 					{% else %}
 						<li><a href="{{ url_for('home.dashboard') }}">Dashboard</a></li>
 					{% endif %}
-					<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
-					<li><a><i class="fa fa-user"></i>  Hi, {{ current_user.username }}!</a></li>
+					<li class="dropdown">
+						<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+							<i class="fa fa-user"></i>  Hi, {{ current_user.username }}<span class="caret"></span></a>
+						<ul class="dropdown-menu">
+							<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
+						<ul>
+					</li>
 				{% else %}
 					<li><a href="{{ url_for('home.homepage') }}">Home</a></li>
 					<li><a href="{{ url_for('auth.register') }}">Register</a></li>