climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [32/50] git commit: Add angular-ui-date
Date Mon, 21 Jul 2014 13:25:08 GMT
Add angular-ui-date


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

Branch: refs/heads/master
Commit: d91b1038fea55fcfa8aa4f52f328a20c05e7fc58
Parents: 49e64a3
Author: Michael Joyce <joyce@apache.org>
Authored: Fri Jul 18 10:31:10 2014 -0700
Committer: Michael Joyce <joyce@apache.org>
Committed: Fri Jul 18 10:31:10 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/climate/blob/d91b1038/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 b9fc6f8..a71dfe0 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -16,6 +16,7 @@
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
     <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css"
/>
     <!-- endbuild -->
   </head>
   <body ng-app="ocwUiApp">
@@ -87,6 +88,8 @@
     <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>
+    <script src="bower_components/jquery-ui/jquery-ui.js"></script>
+    <script src="bower_components/angular-ui-date/ui-date.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
@@ -116,5 +119,8 @@
     <script src="scripts/services/regionselectparams.js"></script>
     <script src="scripts/services/selecteddatasetinformation.js"></script>
     <!-- endbuild -->
+
+    <!-- grunt wiredep wasn't properly linking this. Had to add manually -->
+    <script src="bower_components/angular-ui-date/src/date.js"></script>
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/climate/blob/d91b1038/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 72eb3a9..7b84ab3 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -15,7 +15,8 @@ angular
     'ngResource',
     'ngRoute',
     'ui.router',
-    'ui.bootstrap'
+    'ui.bootstrap',
+    'ui.date',
   ])
   .config(['$stateProvider', '$routeProvider', '$urlRouterProvider',
     function ($stateProvider,   $routeProvider,   $urlRouterProvider) {

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


Mime
View raw message