-
Notifications
You must be signed in to change notification settings - Fork 1
/
index.html
168 lines (163 loc) · 8.76 KB
/
index.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
<!DOCTYPE html>
<html>
<head>
<title>CMD</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- Angular -->
<script src="libs/bower/lib/angular/angular.js"></script>
<!-- Angular Material -->
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<!-- Bootstrap -->
<script src="libs/bower/lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="libs/bower/lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<link rel="stylesheet" type="text/css" href="libs/bower/lib/bootstrap/dist/css/bootstrap.css">
<!-- MapBox -->
<link href='https://api.mapbox.com/mapbox.js/v2.3.0/mapbox.css' rel='stylesheet' />
<script src='https://api.mapbox.com/mapbox.js/v2.3.0/mapbox.js'></script>
<!-- Leaflet -->
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css" />
<script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
<script src='https://api.mapbox.com/mapbox.js/plugins/leaflet-zoomslider/v0.7.0/L.Control.Zoomslider.js'></script>
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-zoomslider/v0.7.0/L.Control.Zoomslider.css' rel='stylesheet' />
<!-- FontAwesome -->
<link rel="stylesheet" href="libs/bower/lib/font-awesome/css/font-awesome.css">
<!-- location button/mapbox -->
<script src='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/L.Control.Locate.min.js'></script>
<<<<<<< HEAD
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/L.Control.Locate.mapbox.css' rel='stylesheet' />
<!--[if lt IE 9]>
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/L.Control.Locate.ie.css' rel='stylesheet' />
<![endif]-->
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/css/font-awesome.min.css' rel='stylesheet' />
<script src="js/app.js"></script>
</head>
<body>
<!-- Modal - Profilsida i popup-fönster -->
<div class="modal fade" id="profilsida" tabindex="-1" role="dialog" aria-labelledby="profilsidaLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<center>
<img src="images/profile.jpeg" name="profilsida" width="140" height="140" border="0" class="img-circle">
<h3 class="media-heading">Gustav Svensson <small>Malmö</small></h3>
<hr>
<center>
<p class="text-center">
<strong>Email: </strong><br>
</p>
<p class="text-center">
<strong>Mobilnummer: </strong><br>
0738097421
</p>
<br>
<button type="button" class="btn btn-default">Redigera</button>
</center>
<br>
</center>
</div>
<div class="modal-footer">
<center>
<button type="button" class="btn btn-default" data-dismiss="modal">Tillbaka till kartan</button>
</center>
</div>
</div>
</div>
</div>
<!-- MENU -->
<div id="menu">
<div class="row-menu">
<div id="left-menu" class="mini-submenu">
<button type="button" class="btn btn-primary btn-circle btn-xl">
<i class="glyphicon glyphicon-list"></i>
</button>
</div>
<!-- Gruoups in left menu -->
<div id="left-group-menu" class="list-group">
<!-- User Menu -->
<span href="#" class="list-group-item active">
<i class="fa fa-picture-o"></i> Användarnamn
<span class="pull-right" id="left-slide-menu">
<i class="fa fa-times"></i>
</span>
</span>
<!-- Link to profile -->
<a href="#aboutModal" data-toggle="modal" data-target="#profilsida" class="list-group-item">
<i class="fa fa-picture-o"></i> Min profil
</a>
<!-- Link to settings -->
<a href="#" class="list-group-item">
<i class="fa fa-cog"></i> Inställningar
</a>
<!-- Group Menu -->
<p class="menu-undertitle"> Grupper</p>
<a href="#" class="list-group-item"><i class="fa fa-user"></i> Grupp 1 </a>
<a href="#" class="list-group-item"><i class="fa fa-user"></i> Grupp 2 </a>
<a href="#" class="list-group-item"><i class="fa fa-user"></i> Grupp 3 </a>
<a href="#" class="list-group-item"><i class="fa fa-user"></i> Grupp 4 </a>
<!-- Others Menu -->
<p class="menu-undertitle"> Övrigt</p>
<a href="#" class="list-group-item"><i class="fa fa-sticky-note-o"></i> Skapa ny omröstning</a>
<a href="#" class="list-group-item"><i class="fa fa-users"></i> Skapa ny grupp</a>
<div class="btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-danger btn-block" data-toggle="tooltip" data-placement="top" title="Logga ut!">
<span class="glyphicon glyphicon-log-out"></span> Logga ut
</button>
</div>
</div>
</div>
</div>
=======
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/L.Control.Locate.mapbox.css' rel='stylesheet' />
<!--[if lt IE 9]>
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.43.0/L.Control.Locate.ie.css' rel='stylesheet' />
<![endif]-->
<!-- AngularJS App & Controllers & Views -->
<script src="js/app.js"></script>
<script src="js/controllers/getAnonJwt.js"></script>
<script src="js/views/loginUser.js"></script>
<script src="js/controllers/authJwt.js"></script>
<script src="js/controllers/slider.js"></script>
<script src="js/views/getRestaurants.js"></script>
<!--<script src="js/views/getUserInformation.js"></script>-->
<script src="js/views/addPoll.js"></script>
<script src="js/views/addUser.js"></script>
>>>>>>> origin/new_design
<script src="js/controllers/templatepopup.js"></script>
<!-- Angular Material requires Angular.js Libraries -->
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-animate.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-aria.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-messages.min.js"></script>
<!-- Angular Material Library -->
<script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
<!-- Custom Stylesheets -->
<link rel="stylesheet" type="text/css" href="css/layouts/style.css">
<link rel="stylesheet" type="text/css" href="css/layouts/ratingStyle.css">
</head>
<body ng-controller="getAnonJwt" ng-app="app">
<div ng-controller="slideMenu" class="menu" ng-include="'pages/sidemenu.html'"></div>
<div ng-include="'pages/profilepage.html'"></div>
<div ng-controller="templatepopup" ng-include="'pages/votepage.html'"></div>
<!--<div ng-controller="getUserInformation"></div>-->
<!-- Karta -->
<div ng-controller="getRestaurants">
<div ng-include="'pages/moreinfo.html'"></div>
<div id="map" class="container-fluid"></div>
</div>
<<<<<<< HEAD
</div>
<!-- Karta med temporär ng-app deklaration, ska flyttas upp till body när mer angular
implementeras i filen -->
<div id="map" class="container-fluid" ng-app="app" ng-controller="getRestaurants"></div>
<script src="js/views/map.js"></script>
<script src="js/api/getRestaurants.js"></script>
=======
<script src="js/views/map.js"></script>
<script src="js/views/addRestaurant.js"></script>
>>>>>>> origin/new_design
</body>
</html>