You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by om...@apache.org on 2016/01/30 11:36:09 UTC
[1/3] climate git commit: CLIMATE-715 Adding a new demo tab along
with the evaluate and result so that user can see the demo of the ocw in this
tab
Repository: climate
Updated Branches:
refs/heads/master 947478539 -> c706df1c6
CLIMATE-715 Adding a new demo tab along with the evaluate and result so that user can see the demo of the ocw in this tab
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8e150de8
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8e150de8
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8e150de8
Branch: refs/heads/master
Commit: 8e150de857fb9c4ecb18ad569497a4f48643fd63
Parents: 4743021
Author: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Authored: Thu Jan 28 23:51:24 2016 +0530
Committer: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Committed: Thu Jan 28 23:51:24 2016 +0530
----------------------------------------------------------------------
ocw-ui/frontend/app/index.html | 16 ++++++++++++++++
ocw-ui/frontend/app/scripts/app.js | 4 ++++
ocw-ui/frontend/app/views/demo.html | 22 ++++++++++++++++++++++
3 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 4d5996a..421c52d 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -143,5 +143,21 @@ under the License.
<!-- grunt wiredep wasn't properly linking this. Had to add manually -->
<script src="bower_components/angular-ui-date/src/date.js"></script>
+
+ <!-- Footer for the Web-App -->
+ <footer class="footer" align="center">
+ <div class="container">
+ <hr>
+ <p>
+ Apache Open Climate Workbench Software .
+ <a href="https://climate.apache.org/" target="_blank">About Us</a> . <a href="https://issues.apache.org/jira/browse/CLIMATE/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel" target="_blank">Report an issue</a> .
+ <br>
+ Copyright © 2013 The Apache Software Foundation, Licensed under the
+
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+ </p>
+ </div>
+ <footer>
+
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/scripts/app.js b/ocw-ui/frontend/app/scripts/app.js
index 8dca2dc..606d2cb 100644
--- a/ocw-ui/frontend/app/scripts/app.js
+++ b/ocw-ui/frontend/app/scripts/app.js
@@ -62,6 +62,10 @@ angular
templateUrl: 'views/results.html',
controller: 'ResultCtrl'
})
+ .state('demo', {
+ url: '/demo',
+ templateUrl: 'views/demo.html'
+ })
.state('results.list', {
// parent: 'results',
url: '',
http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/views/demo.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/views/demo.html b/ocw-ui/frontend/app/views/demo.html
new file mode 100644
index 0000000..412a18c
--- /dev/null
+++ b/ocw-ui/frontend/app/views/demo.html
@@ -0,0 +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="col-md-12" >
+ <iframe width="960" height="540" align="center" src="https://www.youtube.com/embed/wjUbifVeqa8?autoplay=0">
+ </iframe>
+</div>
[2/3] climate git commit: CLIMATE-715 Changing link in the footer
Posted by om...@apache.org.
CLIMATE-715 Changing link in the footer
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/de531847
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/de531847
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/de531847
Branch: refs/heads/master
Commit: de531847664c4628b7fd9dcd3353ced51c1de4f2
Parents: 8e150de
Author: Omkar20895 <om...@Omkars-MBP.connectify>
Authored: Fri Jan 29 19:24:01 2016 +0530
Committer: Omkar20895 <om...@Omkars-MBP.connectify>
Committed: Fri Jan 29 19:24:01 2016 +0530
----------------------------------------------------------------------
ocw-ui/frontend/app/index.html | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/de531847/ocw-ui/frontend/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 421c52d..ac82f35 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -150,10 +150,9 @@ under the License.
<hr>
<p>
Apache Open Climate Workbench Software .
- <a href="https://climate.apache.org/" target="_blank">About Us</a> . <a href="https://issues.apache.org/jira/browse/CLIMATE/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel" target="_blank">Report an issue</a> .
+ <a href="https://climate.apache.org/" target="_blank">About Us</a> . <a href="dev@climate.apache.org" target="_blank">Report an issue</a> .
<br>
Copyright © 2013 The Apache Software Foundation, Licensed under the
-
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
</p>
</div>
[3/3] climate git commit: CLIMATE-715 - Adding a new demo tab this
closes #281
Posted by om...@apache.org.
CLIMATE-715 - Adding a new demo tab this closes #281
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c706df1c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c706df1c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c706df1c
Branch: refs/heads/master
Commit: c706df1c64af54d0d278347839066ab0ee1ad930
Parents: 9474785 de53184
Author: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Authored: Sat Jan 30 16:05:22 2016 +0530
Committer: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Committed: Sat Jan 30 16:05:22 2016 +0530
----------------------------------------------------------------------
ocw-ui/frontend/app/index.html | 15 +++++++++++++++
ocw-ui/frontend/app/scripts/app.js | 4 ++++
ocw-ui/frontend/app/views/demo.html | 22 ++++++++++++++++++++++
3 files changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/c706df1c/ocw-ui/frontend/app/index.html
----------------------------------------------------------------------