Resolve CLIMATE-512. Merge PR #105.

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

Branch: refs/heads/master
Commit: fc2e0ffc02941d3de3a81478b8be84ea912b5142
Parents: fb37845 652ea65
Author: Michael Joyce <[email protected]>
Authored: Wed Aug 27 20:07:01 2014 -0700
Committer: Michael Joyce <[email protected]>
Committed: Wed Aug 27 20:07:01 2014 -0700

----------------------------------------------------------------------
 ocw-ui/frontend-new/.bowerrc                    |     3 -
 ocw-ui/frontend-new/.editorconfig               |    21 -
 ocw-ui/frontend-new/.gitattributes              |     1 -
 ocw-ui/frontend-new/.gitignore                  |     5 -
 ocw-ui/frontend-new/.jshintrc                   |    24 -
 ocw-ui/frontend-new/.travis.yml                 |     6 -
 ocw-ui/frontend-new/Gruntfile.js                |   412 -
 ocw-ui/frontend-new/app/.buildignore            |     1 -
 ocw-ui/frontend-new/app/.htaccess               |   543 -
 ocw-ui/frontend-new/app/404.html                |   175 -
 ocw-ui/frontend-new/app/favicon.ico             |   Bin 4286 -> 0 bytes
 ocw-ui/frontend-new/app/index.html              |   148 -
 ocw-ui/frontend-new/app/robots.txt              |     3 -
 ocw-ui/frontend-new/app/scripts/app.js          |    96 -
 .../app/scripts/controllers/datasetdisplay.js   |    43 -
 .../app/scripts/controllers/datasetselect.js    |    64 -
 .../app/scripts/controllers/main.js             |    36 -
 .../scripts/controllers/observationselect.js    |   203 -
 .../app/scripts/controllers/parameterselect.js  |   275 -
 .../app/scripts/controllers/rcmedselection.js   |   144 -
 .../app/scripts/controllers/result.js           |    47 -
 .../app/scripts/controllers/resultdetail.js     |    46 -
 .../app/scripts/controllers/settings.js         |    34 -
 .../app/scripts/controllers/timeline.js         |   103 -
 .../app/scripts/controllers/worldmap.js         |   104 -
 .../app/scripts/directives/bootstrapmodal.js    |    79 -
 .../scripts/directives/bootstrapmodalopen.js    |    43 -
 .../app/scripts/directives/leafletmap.js        |    46 -
 .../app/scripts/directives/onblur.js            |    38 -
 .../directives/predictivefilebrowserinput.js    |   316 -
 .../app/scripts/directives/previewmap.js        |    76 -
 .../app/scripts/directives/timeline.js          |    54 -
 .../scripts/filters/isodatetomiddleendian.js    |    55 -
 .../app/scripts/services/evaluationsettings.js  |    56 -
 .../app/scripts/services/regionselectparams.js  |    46 -
 .../services/selecteddatasetinformation.js      |    57 -
 ocw-ui/frontend-new/app/styles/main.css         |   120 -
 ocw-ui/frontend-new/app/views/main.html         |   274 -
 ocw-ui/frontend-new/app/views/modelselect.html  |    87 -
 ocw-ui/frontend-new/app/views/results.html      |    34 -
 .../frontend-new/app/views/resultsdetail.html   |    30 -
 ocw-ui/frontend-new/app/views/resultslist.html  |    21 -
 .../app/views/selectobservation.html            |    80 -
 ocw-ui/frontend-new/app/views/selectrcmed.html  |    40 -
 ocw-ui/frontend-new/bower.json                  |    25 -
 ocw-ui/frontend-new/package.json                |    40 -
 ocw-ui/frontend-new/test/.jshintrc              |    36 -
 ocw-ui/frontend-new/test/karma.conf.js          |    86 -
 .../test/spec/controllers/datasetdisplay.js     |    59 -
 .../test/spec/controllers/datasetselect.js      |    54 -
 .../frontend-new/test/spec/controllers/main.js  |    41 -
 .../test/spec/controllers/observationselect.js  |   122 -
 .../test/spec/controllers/parameterselect.js    |   136 -
 .../test/spec/controllers/rcmedselection.js     |   145 -
 .../test/spec/controllers/result.js             |    37 -
 .../test/spec/controllers/resultdetail.js       |    37 -
 .../test/spec/controllers/settings.js           |    37 -
 .../test/spec/controllers/timeline.js           |    37 -
 .../test/spec/controllers/worldmap.js           |    57 -
 .../test/spec/directives/bootstrapmodal.js      |    33 -
 .../test/spec/directives/bootstrapmodalopen.js  |    33 -
 .../test/spec/directives/leafletmap.js          |    33 -
 .../frontend-new/test/spec/directives/onblur.js |    50 -
 .../directives/predictivefilebrowserinput.js    |    33 -
 .../test/spec/directives/previewmap.js          |    53 -
 .../test/spec/directives/timeline.js            |    33 -
 .../test/spec/filters/isodatetomiddleendian.js  |    76 -
 .../test/spec/services/evaluationsettings.js    |    44 -
 .../test/spec/services/regionselectparams.js    |    44 -
 .../spec/services/selecteddatasetinformation.js |    92 -
 ocw-ui/frontend/.bowerrc                        |     3 +
 ocw-ui/frontend/.editorconfig                   |    21 +
 ocw-ui/frontend/.gitattributes                  |     1 +
 ocw-ui/frontend/.gitignore                      |     5 +
 ocw-ui/frontend/.jshintrc                       |    24 +
 ocw-ui/frontend/.travis.yml                     |     6 +
 ocw-ui/frontend/Gruntfile.js                    |   412 +
 ocw-ui/frontend/app/.buildignore                |     1 +
 ocw-ui/frontend/app/.htaccess                   |   543 +
 ocw-ui/frontend/app/404.html                    |   175 +
 ocw-ui/frontend/app/css/app.css                 |   108 -
 .../app/css/lib/bootstrap-responsive.min.css    |     9 -
 ocw-ui/frontend/app/css/lib/bootstrap.min.css   |     9 -
 .../frontend/app/css/lib/font-awesome.min.css   |   403 -
 ocw-ui/frontend/app/css/lib/timeline.css        |   193 -
 ocw-ui/frontend/app/favicon.ico                 |   Bin 0 -> 4286 bytes
 ocw-ui/frontend/app/font/FontAwesome.otf        |   Bin 61896 -> 0 bytes
 .../frontend/app/font/fontawesome-webfont.eot   |   Bin 37405 -> 0 bytes
 .../frontend/app/font/fontawesome-webfont.svg   |   399 -
 .../frontend/app/font/fontawesome-webfont.ttf   |   Bin 79076 -> 0 bytes
 .../frontend/app/font/fontawesome-webfont.woff  |   Bin 43572 -> 0 bytes
 ocw-ui/frontend/app/img/globe.png               |   Bin 25857 -> 0 bytes
 .../app/img/glyphicons-halflings-white.png      |   Bin 8777 -> 0 bytes
 .../frontend/app/img/glyphicons-halflings.png   |   Bin 12799 -> 0 bytes
 ocw-ui/frontend/app/index.html                  |   213 +-
 ocw-ui/frontend/app/js/app.js                   |    91 -
 .../app/js/controllers/DatasetDisplayCtrl.js    |    34 -
 .../app/js/controllers/DatasetSelectCtrl.js     |    55 -
 .../app/js/controllers/ObservationSelectCtrl.js |   194 -
 .../app/js/controllers/ParameterSelectCtrl.js   |   296 -
 .../app/js/controllers/RcmedSelectionCtrl.js    |   133 -
 .../frontend/app/js/controllers/ResultCtrl.js   |    38 -
 .../app/js/controllers/ResultDetailCtrl.js      |    38 -
 .../frontend/app/js/controllers/SettingsCtrl.js |    24 -
 .../frontend/app/js/controllers/TimelineCtrl.js |    92 -
 .../frontend/app/js/controllers/WorldMapCtrl.js |    95 -
 .../app/js/directives/BootstrapModal.js         |    71 -
 .../app/js/directives/BootstrapModalOpen.js     |    39 -
 ocw-ui/frontend/app/js/directives/LeafletMap.js |    38 -
 ocw-ui/frontend/app/js/directives/OnBlur.js     |    36 -
 .../js/directives/PredictiveFileBrowserInput.js |   308 -
 ocw-ui/frontend/app/js/directives/PreviewMap.js |    68 -
 ocw-ui/frontend/app/js/directives/Timeline.js   |    44 -
 .../app/js/filters/ISODateToMiddleEndian.js     |    48 -
 .../js/lib/angular-ui/angular-ui-0.4-tpls.js    |     2 -
 .../js/lib/angular-ui/angular-ui-router.min.js  |     7 -
 .../angular-ui/ui-bootstrap-tpls-0.5.0.min.js   |     2 -
 .../app/js/lib/angular/angular-cookies.js       |   183 -
 .../app/js/lib/angular/angular-cookies.min.js   |     7 -
 .../app/js/lib/angular/angular-loader.js        |   276 -
 .../app/js/lib/angular/angular-loader.min.js    |     7 -
 .../app/js/lib/angular/angular-resource.js      |   445 -
 .../app/js/lib/angular/angular-resource.min.js  |    10 -
 .../app/js/lib/angular/angular-sanitize.js      |   535 -
 .../app/js/lib/angular/angular-sanitize.min.js  |    13 -
 ocw-ui/frontend/app/js/lib/angular/angular.js   | 14733 ---------
 .../frontend/app/js/lib/angular/angular.min.js  |   161 -
 ocw-ui/frontend/app/js/lib/angular/version.txt  |     1 -
 .../frontend/app/js/lib/bootstrap/bootstrap.js  |  2276 --
 .../app/js/lib/bootstrap/bootstrap.min.js       |     6 -
 .../frontend/app/js/lib/jquery/jquery-1.10.1.js |  9807 ------
 .../jquery/jquery-ui/datepicker-wrapper/date.js |   125 -
 .../jquery/jquery-ui/jquery-ui-1.10.3.min.js    |    12 -
 .../frontend/app/js/lib/leaflet/leaflet-0.5.js  |     8 -
 .../app/js/lib/timeline/timeline-locales.js     |   101 -
 .../app/js/lib/timeline/timeline-min.js         |   199 -
 ocw-ui/frontend/app/js/lib/timeline/timeline.js |  6381 ----
 .../app/js/services/EvaluationSettings.js       |    47 -
 .../app/js/services/RegionSelectParams.js       |    37 -
 .../js/services/SelectedDatasetInformation.js   |    49 -
 ocw-ui/frontend/app/partials/main.html          |   261 -
 ocw-ui/frontend/app/partials/modelSelect.html   |    86 -
 .../frontend/app/partials/results.detail.html   |    30 -
 ocw-ui/frontend/app/partials/results.html       |    34 -
 ocw-ui/frontend/app/partials/results.list.html  |    22 -
 .../app/partials/selectObservation.html         |    58 -
 ocw-ui/frontend/app/partials/selectRcmed.html   |    44 -
 ocw-ui/frontend/app/robots.txt                  |     3 +
 ocw-ui/frontend/app/scripts/app.js              |    96 +
 .../app/scripts/controllers/datasetdisplay.js   |    43 +
 .../app/scripts/controllers/datasetselect.js    |    64 +
 ocw-ui/frontend/app/scripts/controllers/main.js |    36 +
 .../scripts/controllers/observationselect.js    |   203 +
 .../app/scripts/controllers/parameterselect.js  |   275 +
 .../app/scripts/controllers/rcmedselection.js   |   144 +
 .../frontend/app/scripts/controllers/result.js  |    47 +
 .../app/scripts/controllers/resultdetail.js     |    46 +
 .../app/scripts/controllers/settings.js         |    34 +
 .../app/scripts/controllers/timeline.js         |   103 +
 .../app/scripts/controllers/worldmap.js         |   104 +
 .../app/scripts/directives/bootstrapmodal.js    |    79 +
 .../scripts/directives/bootstrapmodalopen.js    |    43 +
 .../app/scripts/directives/leafletmap.js        |    46 +
 .../frontend/app/scripts/directives/onblur.js   |    38 +
 .../directives/predictivefilebrowserinput.js    |   316 +
 .../app/scripts/directives/previewmap.js        |    76 +
 .../frontend/app/scripts/directives/timeline.js |    54 +
 .../scripts/filters/isodatetomiddleendian.js    |    55 +
 .../app/scripts/services/evaluationsettings.js  |    56 +
 .../app/scripts/services/regionselectparams.js  |    46 +
 .../services/selecteddatasetinformation.js      |    57 +
 ocw-ui/frontend/app/styles/main.css             |   120 +
 ocw-ui/frontend/app/views/main.html             |   274 +
 ocw-ui/frontend/app/views/modelselect.html      |    87 +
 ocw-ui/frontend/app/views/results.html          |    34 +
 ocw-ui/frontend/app/views/resultsdetail.html    |    30 +
 ocw-ui/frontend/app/views/resultslist.html      |    21 +
 .../frontend/app/views/selectobservation.html   |    80 +
 ocw-ui/frontend/app/views/selectrcmed.html      |    40 +
 ocw-ui/frontend/bower.json                      |    25 +
 ocw-ui/frontend/config/karma-e2e.conf.js        |    40 -
 ocw-ui/frontend/config/karma.conf.js            |    48 -
 ocw-ui/frontend/package.json                    |    40 +
 ocw-ui/frontend/scripts/e2e-test.sh             |    27 -
 ocw-ui/frontend/scripts/test.sh                 |    27 -
 ocw-ui/frontend/scripts/web-server.js           |   313 -
 ocw-ui/frontend/test/.jshintrc                  |    36 +
 ocw-ui/frontend/test/e2e/runner.html            |    28 -
 ocw-ui/frontend/test/e2e/scenarios.js           |    63 -
 ocw-ui/frontend/test/karma.conf.js              |    86 +
 .../frontend/test/lib/angular/angular-mocks.js  |  1764 --
 .../test/lib/angular/angular-scenario.js        | 26195 -----------------
 ocw-ui/frontend/test/lib/angular/version.txt    |     1 -
 .../test/spec/controllers/datasetdisplay.js     |    59 +
 .../test/spec/controllers/datasetselect.js      |    54 +
 ocw-ui/frontend/test/spec/controllers/main.js   |    41 +
 .../test/spec/controllers/observationselect.js  |   122 +
 .../test/spec/controllers/parameterselect.js    |   136 +
 .../test/spec/controllers/rcmedselection.js     |   145 +
 ocw-ui/frontend/test/spec/controllers/result.js |    37 +
 .../test/spec/controllers/resultdetail.js       |    37 +
 .../frontend/test/spec/controllers/settings.js  |    37 +
 .../frontend/test/spec/controllers/timeline.js  |    37 +
 .../frontend/test/spec/controllers/worldmap.js  |    57 +
 .../test/spec/directives/bootstrapmodal.js      |    33 +
 .../test/spec/directives/bootstrapmodalopen.js  |    33 +
 .../frontend/test/spec/directives/leafletmap.js |    33 +
 ocw-ui/frontend/test/spec/directives/onblur.js  |    50 +
 .../directives/predictivefilebrowserinput.js    |    33 +
 .../frontend/test/spec/directives/previewmap.js |    53 +
 .../frontend/test/spec/directives/timeline.js   |    33 +
 .../test/spec/filters/isodatetomiddleendian.js  |    76 +
 .../test/spec/services/evaluationsettings.js    |    44 +
 .../test/spec/services/regionselectparams.js    |    44 +
 .../spec/services/selecteddatasetinformation.js |    92 +
 .../unit/controllers/DatasetDisplayCtrlTest.js  |    65 -
 .../unit/controllers/DatasetSelectCtrlTest.js   |    51 -
 .../controllers/ObservationSelectCtrlTest.js    |   151 -
 .../unit/controllers/ParameterSelectCtrlTest.js |   269 -
 .../unit/controllers/RcmedSelectionCtrlTest.js  |   161 -
 .../test/unit/controllers/SettingsCtrlTest.js   |    47 -
 .../test/unit/controllers/WorldMapCtrlTest.js   |    48 -
 .../test/unit/directives/BootstrapModalTest.js  |    41 -
 .../frontend/test/unit/directives/OnBlurTest.js |    42 -
 .../test/unit/directives/PreviewMapTest.js      |    46 -
 .../unit/filters/ISODateToMiddleEndianTest.js   |    67 -
 .../unit/services/EvaluationSettingsTest.js     |    40 -
 .../unit/services/RegionSelectParamsTest.js     |    41 -
 .../services/SelectedDatasetInfomationTest.js   |    90 -
 229 files changed, 5532 insertions(+), 74150 deletions(-)
----------------------------------------------------------------------


Reply via email to