Repository: climate Updated Branches: refs/heads/master 74699f4b5 -> e34318319
CLIMATE-500 Determine actions and address DRAT reporting output. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5ea18ff6 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5ea18ff6 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5ea18ff6 Branch: refs/heads/master Commit: 5ea18ff67d13433cf54dcfeb26774761a0a9ba72 Parents: 1c8631c Author: Lewis John McGibbney <[email protected]> Authored: Wed Jul 30 23:26:36 2014 -0400 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Jul 30 23:26:36 2014 -0400 ---------------------------------------------------------------------- ocw-ui/frontend/app/css/app.css | 4 +-- ocw-ui/frontend/app/css/lib/timeline.css | 24 ++++++++++++++ ocw-ui/frontend/app/index.html | 34 ++++++++++---------- ocw-ui/frontend/app/partials/main.html | 18 +++++++++++ ocw-ui/frontend/app/partials/modelSelect.html | 32 +++++++++--------- .../frontend/app/partials/results.detail.html | 19 +++++++++++ ocw-ui/frontend/app/partials/results.html | 19 +++++++++++ ocw-ui/frontend/app/partials/results.list.html | 19 +++++++++++ .../app/partials/selectObservation.html | 34 ++++++++++---------- ocw-ui/frontend/app/partials/selectRcmed.html | 34 ++++++++++---------- 10 files changed, 168 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/css/app.css ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/css/app.css b/ocw-ui/frontend/app/css/app.css index 61f461e..ad5fbe5 100755 --- a/ocw-ui/frontend/app/css/app.css +++ b/ocw-ui/frontend/app/css/app.css @@ -1,4 +1,4 @@ -/* +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -15,7 +15,7 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. -**/ + */ body { } http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/css/lib/timeline.css ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/css/lib/timeline.css b/ocw-ui/frontend/app/css/lib/timeline.css index 1b7c529..9618dbb 100644 --- a/ocw-ui/frontend/app/css/lib/timeline.css +++ b/ocw-ui/frontend/app/css/lib/timeline.css @@ -1,3 +1,27 @@ +/** + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the 'Software'), to deal in the Software without + * restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons + * to whom the Software is furnished to do so, subject to the + * following conditions: + * + * The above copyright notice and this permission + * notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT + * OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + div.timeline-frame { border: 1px solid #BEBEBE; overflow: hidden; http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/index.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html index 1c2b398..95ce8e4 100755 --- a/ocw-ui/frontend/app/index.html +++ b/ocw-ui/frontend/app/index.html @@ -1,21 +1,21 @@ <!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <!doctype html> <html lang="en" ng-app="ocw"> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/main.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/main.html b/ocw-ui/frontend/app/partials/main.html index 83152d3..f100fde 100644 --- a/ocw-ui/frontend/app/partials/main.html +++ b/ocw-ui/frontend/app/partials/main.html @@ -1,3 +1,21 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <!-- Modal for evaluation settings --> <bootstrap-modal modal-id="evaluationSettings"> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/modelSelect.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/modelSelect.html b/ocw-ui/frontend/app/partials/modelSelect.html index 6ac653b..6a28a3f 100644 --- a/ocw-ui/frontend/app/partials/modelSelect.html +++ b/ocw-ui/frontend/app/partials/modelSelect.html @@ -1,20 +1,20 @@ <!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <div class="container"> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/results.detail.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/results.detail.html b/ocw-ui/frontend/app/partials/results.detail.html index f2aab55..a5c4d7c 100644 --- a/ocw-ui/frontend/app/partials/results.detail.html +++ b/ocw-ui/frontend/app/partials/results.detail.html @@ -1,3 +1,22 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <div> <h2>{{result}}</h2> <div class="row-fluid text-center"> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/results.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/results.html b/ocw-ui/frontend/app/partials/results.html index a8f58af..a21dadc 100644 --- a/ocw-ui/frontend/app/partials/results.html +++ b/ocw-ui/frontend/app/partials/results.html @@ -1,3 +1,22 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <div class="row"> <div class="span3"> <div id="results-sidebar" class="pa-sidebar well well-small"> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/results.list.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/results.list.html b/ocw-ui/frontend/app/partials/results.list.html index ddc4ce2..ef1d9d7 100644 --- a/ocw-ui/frontend/app/partials/results.list.html +++ b/ocw-ui/frontend/app/partials/results.list.html @@ -1,3 +1,22 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <h4>Select one of your previous runs. If none are displayed, please return to the main page and start one!</h4> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/selectObservation.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/selectObservation.html b/ocw-ui/frontend/app/partials/selectObservation.html index 68c4a40..c364f75 100644 --- a/ocw-ui/frontend/app/partials/selectObservation.html +++ b/ocw-ui/frontend/app/partials/selectObservation.html @@ -1,20 +1,20 @@ <!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <div ng-controller="ObservationSelectCtrl"> @@ -55,4 +55,4 @@ <button class="btn btn-primary pull-left" ng-click="addDataSet()">Add Dataset</button> <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/climate/blob/5ea18ff6/ocw-ui/frontend/app/partials/selectRcmed.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/partials/selectRcmed.html b/ocw-ui/frontend/app/partials/selectRcmed.html index e9c5fcf..c454165 100644 --- a/ocw-ui/frontend/app/partials/selectRcmed.html +++ b/ocw-ui/frontend/app/partials/selectRcmed.html @@ -1,20 +1,20 @@ <!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <div ng-controller="RcmedSelectionCtrl"> @@ -41,4 +41,4 @@ <button class="btn btn-primary pull-left" ng-click="addObservation()">Add Observation</button> <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div> -</div> \ No newline at end of file +</div>
