Skip to content

Profile Images broken links fixed and embedded google map in Dashboard #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Profile Images broken links fixed and embedded google map in Dashboard #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions mobility-track-web/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<title>Tracker Dashboard</title>
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- Bootstrap 3.3.5 -->
<style >
#googleMap {
width:100%;
height:500px;
}
</style>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<!-- Font Awesome -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
Expand Down Expand Up @@ -58,9 +65,9 @@ <h1>

<!-- Main content -->
<section class="content">

<div id="googleMap" ></div>



</section><!-- /.content -->
</div><!-- /.content-wrapper -->
Expand All @@ -71,7 +78,7 @@ <h1>
<strong>Tracker by ScoreLab </strong>
</footer>


</div><!-- ./wrapper -->

<!-- jQuery 2.1.4 -->
Expand Down Expand Up @@ -106,7 +113,8 @@ <h1>
<script src="theme/js/app.min.js"></script>
<!-- AdminLTE for demo purposes -->
<script src="theme/js/demo.js"></script>



<!-- bower:js -->
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
Expand All @@ -117,10 +125,15 @@ <h1>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-touch/angular-touch.js"></script>



<!--Angular App -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/about.js"></script>
<script src="http://maps.googleapis.com/maps/api/js" type="text/javascript"></script>
<script src="scripts/map.js" type="text/javascript">

</script>
</body>
</html>
19 changes: 19 additions & 0 deletions mobility-track-web/app/scripts/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
function initialize() {
map = initializeMap();
//do something here
var marker = new google.maps.Marker({
position: new google.maps.LatLng(51.508742,-0.120850),
map: map,
title: "Marker"
});
}
function initializeMap() {
var mapProp = {
center:new google.maps.LatLng(51.508742,-0.120850),
zoom:5,
mapTypeId:google.maps.MapTypeId.ROADMAP
};
var map=new google.maps.Map(document.getElementById("googleMap"),mapProp);
return map;
}
google.maps.event.addDomListener(window, 'load', initialize);
6 changes: 3 additions & 3 deletions mobility-track-web/app/views/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ <h3>
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
<img src="theme/img/user2-160x160.jpg" class="user-image" alt="User Image">
<span class="hidden-xs">Alexander Pierce</span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
<img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
<img src="theme/img/user2-160x160.jpg" class="img-circle" alt="User Image">
<p>
Alexander Pierce - Web Developer
<small>Member since Nov. 2012</small>
Expand Down Expand Up @@ -244,4 +244,4 @@ <h3>
</ul>
</div>
</nav>
</header>
</header>
6 changes: 3 additions & 3 deletions mobility-track-web/app/views/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<a href="#"><i class="fa fa-circle text-success"></i> Online</a>
</div>
</div>

<!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="sidebar-menu">
<li class="header">MAIN NAVIGATION</li>

<li><a href="documentation/index.html"><i class="fa fa-book"></i> <span>Add a resource</span></a></li>
<li><a href="documentation/index.html"><i class="fa fa-book"></i> <span>Add a tracker</span></a></li>

</ul>
</section>
<!-- /.sidebar -->
</aside>
</aside>