Resolve CLIMATE-377 and CLIMATE-378. Merge PR #92.

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

Branch: refs/heads/master
Commit: ee6b1b970ad1e7faf1afb907214776513035ebfc
Parents: 99acc8c dd3d262
Author: Michael Joyce <[email protected]>
Authored: Mon Jul 21 06:23:40 2014 -0700
Committer: Michael Joyce <[email protected]>
Committed: Mon Jul 21 06:23:40 2014 -0700

----------------------------------------------------------------------
 ocw-ui/backend/processing.py                    |  24 +-
 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                | 157 ++++++
 ocw-ui/frontend-new/app/favicon.ico             | Bin 0 -> 4286 bytes
 ocw-ui/frontend-new/app/index.html              | 129 +++++
 ocw-ui/frontend-new/app/robots.txt              |   3 +
 ocw-ui/frontend-new/app/scripts/app.js          |  77 +++
 .../app/scripts/controllers/about.js            |  17 +
 .../app/scripts/controllers/datasetdisplay.js   |  24 +
 .../app/scripts/controllers/datasetselect.js    |  45 ++
 .../app/scripts/controllers/main.js             |  17 +
 .../scripts/controllers/observationselect.js    | 184 +++++++
 .../app/scripts/controllers/parameterselect.js  | 256 +++++++++
 .../app/scripts/controllers/rcmedselection.js   | 125 +++++
 .../app/scripts/controllers/result.js           |  28 +
 .../app/scripts/controllers/resultdetail.js     |  27 +
 .../app/scripts/controllers/settings.js         |  15 +
 .../app/scripts/controllers/timeline.js         |  84 +++
 .../app/scripts/controllers/worldmap.js         |  85 +++
 .../app/scripts/directives/bootstrapmodal.js    |  60 ++
 .../scripts/directives/bootstrapmodalopen.js    |  24 +
 .../app/scripts/directives/leafletmap.js        |  27 +
 .../app/scripts/directives/onblur.js            |  19 +
 .../directives/predictivefilebrowserinput.js    | 297 ++++++++++
 .../app/scripts/directives/previewmap.js        |  57 ++
 .../app/scripts/directives/timeline.js          |  35 ++
 .../scripts/filters/isodatetomiddleendian.js    |  36 ++
 .../app/scripts/services/evaluationsettings.js  |  37 ++
 .../app/scripts/services/regionselectparams.js  |  27 +
 .../services/selecteddatasetinformation.js      |  38 ++
 ocw-ui/frontend-new/app/styles/main.css         | 119 ++++
 ocw-ui/frontend-new/app/views/main.html         | 255 +++++++++
 ocw-ui/frontend-new/app/views/modelselect.html  |  87 +++
 ocw-ui/frontend-new/app/views/results.html      |  15 +
 .../frontend-new/app/views/resultsdetail.html   |  11 +
 ocw-ui/frontend-new/app/views/resultslist.html  |   2 +
 .../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          |  73 +++
 .../frontend-new/test/spec/controllers/about.js |  22 +
 .../test/spec/controllers/datasetdisplay.js     |  22 +
 .../test/spec/controllers/datasetselect.js      |  22 +
 .../frontend-new/test/spec/controllers/main.js  |  22 +
 .../test/spec/controllers/observationselect.js  |  22 +
 .../test/spec/controllers/parameterselect.js    |  22 +
 .../test/spec/controllers/rcmedselection.js     |  22 +
 .../test/spec/controllers/result.js             |  22 +
 .../test/spec/controllers/resultdetail.js       |  22 +
 .../test/spec/controllers/settings.js           |  22 +
 .../test/spec/controllers/timeline.js           |  22 +
 .../test/spec/controllers/worldmap.js           |  22 +
 .../test/spec/directives/bootstrapmodal.js      |  20 +
 .../test/spec/directives/bootstrapmodalopen.js  |  20 +
 .../test/spec/directives/leafletmap.js          |  20 +
 .../frontend-new/test/spec/directives/onblur.js |  20 +
 .../directives/predictivefilebrowserinput.js    |  20 +
 .../test/spec/directives/previewmap.js          |  20 +
 .../test/spec/directives/timeline.js            |  20 +
 .../test/spec/filters/isodatetomiddleendian.js  |  19 +
 .../test/spec/services/evaluationsettings.js    |  18 +
 .../test/spec/services/regionselectparams.js    |  18 +
 .../spec/services/selecteddatasetinformation.js |  18 +
 73 files changed, 4225 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


Reply via email to