changes

asm-products · Nov 15, 2015 · 2934b22 · 2934b22
1 parent 86dbca4
commit 2934b22
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -29,3 +29,4 @@ accounts-google
 accounts-twitter
 ian:accounts-ui-bootstrap-3
 twbs:bootstrap
+fortawesome:fontawesome
diff --git a/.meteor/versions b/.meteor/versions
@@ -55,6 +55,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+fortawesome:[email protected]
 [email protected]
 [email protected]
 [email protected]

diff --git a/client/lib/angular-init.ls b/client/lib/angular-init.ls
@@ -1 +1 @@
-angular.module 'angularMeteor', ['angular-meteor', 'ui.router']
+angular.module 'angularMeteor', ['angular-meteor', 'ui.router', 'ui.bootstrap']
diff --git a/client/ls-compiled/lib/angular-init.js b/client/ls-compiled/lib/angular-init.js
diff --git a/client/ls-compiled/views/dashboard/dashboard.js b/client/ls-compiled/views/dashboard/dashboard.js
diff --git a/client/views/dashboard/dashboard.css b/client/views/dashboard/dashboard.css
diff --git a/client/views/dashboard/dashboard.ls b/client/views/dashboard/dashboard.ls
@@ -1,4 +1,11 @@
 angular.module('angularMeteor').controller 'DashboardController', <[ $scope $meteor ]> ++ ($scope, $meteor) ->
-
-
-
+	$scope.state = {
+		currentDate: new Date()
+	}
+
+	$scope.open = ($event) ->
+		$scope.state.opened = true;
+
+
+
+
diff --git a/client/views/dashboard/dashboard.ng.html b/client/views/dashboard/dashboard.ng.html
@@ -1 +1 @@
-<h1>My Dashboard</h1>
+<h1>My Dashboard</h1>
diff --git a/index.html b/index.html
@@ -8,6 +8,10 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>MeteorAngularProject</title>
 
+    <link href="/bower_components/angular-bootstrap/ui-bootstrap-csp.css" rel="stylesheet" type="text/css">
+
+	<script src="/bower_components/angular-bootstrap/ui-bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
+	<script src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" type="text/javascript" charset="utf-8"></script>
 </head>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		angular.module 'angularMeteor', ['angular-meteor', 'ui.router']
		angular.module 'angularMeteor', ['angular-meteor', 'ui.router', 'ui.bootstrap']