You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/07/21 15:25:00 UTC

[24/50] git commit: Add UI Bootstrap to Bower

Add UI Bootstrap to Bower


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5b974501
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5b974501
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5b974501

Branch: refs/heads/master
Commit: 5b9745011ed651a2f3e47596e02eb34c98a8d42b
Parents: 3885da0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 17:06:20 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 17:06:20 2014 -0700

----------------------------------------------------------------------
 ocw-ui/frontend-new/app/index.html     | 1 +
 ocw-ui/frontend-new/app/scripts/app.js | 3 ++-
 ocw-ui/frontend-new/bower.json         | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index b9f8a92..e366113 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -86,6 +86,7 @@
     <script src="bower_components/leaflet/dist/leaflet.js"></script>
     <script src="bower_components/leaflet/dist/leaflet-src.js"></script>
     <script src="bower_components/chap-links-timeline/timeline-min.js"></script>
+    <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 

http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index 6b90ff8..23e5a19 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -14,7 +14,8 @@ angular
     'ngCookies',
     'ngResource',
     'ngRoute',
-    'ui.router'
+    'ui.router',
+    'ui.bootstrap'
   ])
   .config(['$stateProvider', '$routeProvider', '$urlRouterProvider',
     function ($stateProvider,   $routeProvider,   $urlRouterProvider) {

http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index 054e532..160da2e 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -13,7 +13,8 @@
     "angular-ui-router": "angular-ui/ui-router#~0.2.10",
     "leaflet": "~0.7.3",
     "chap-links-timeline": "~2.6.1",
-    "components-font-awesome": "~4.1.0"
+    "components-font-awesome": "~4.1.0",
+    "angular-bootstrap": "~0.11.0"
   },
   "devDependencies": {
     "angular-mocks": "1.2.16",