[
https://issues.apache.org/jira/browse/SDAP-69?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16470942#comment-16470942
]
ASF GitHub Bot commented on SDAP-69:
fgreg closed pull request #13: SDAP-69 Rebrand MUDROD ui to Oceanworks
URL: https://github.com/apache/incubator-sdap-mudrod/pull/13
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/web/META-INF/resources/css/footer.css
b/web/META-INF/resources/css/footer.css
index 7e0732e..352785a 100644
--- a/web/META-INF/resources/css/footer.css
+++ b/web/META-INF/resources/css/footer.css
@@ -14,6 +14,6 @@ governing permissions and limitations under the License.
/*
-This file can be used to provide customized css for the customized footer
provided in partials/footer.html for the MUDROD website. It is currently left
empty.
+This file can be used to provide customized css for the customized footer
provided in partials/footer.html for the website. It is currently left empty.
*/
\ No newline at end of file
diff --git a/web/META-INF/resources/css/index.css
b/web/META-INF/resources/css/index.css
index 928839e..0d2c469 100644
--- a/web/META-INF/resources/css/index.css
+++ b/web/META-INF/resources/css/index.css
@@ -55,15 +55,15 @@ a:link, a:visited {
.view-area-fixed {
width: 100%;
padding-top: 1em;
-background-size: cover;
background: transparent url('../images/OceanWave.jpg') no-repeat fixed 0 0;
+background-size: cover;
}
.view-area-scroll {
width: 100%;
height: 800px;
-background-size: cover;
background: transparent url('../images/OceanWave.jpg') no-repeat scroll 0
0;
+background-size: cover;
}
.landing-dialog {
@@ -409,29 +409,24 @@ li {
border-radius: 4px;
}
-.mudrod-navbar {
+.search-navbar {
margin-bottom: 0;
padding-left: 1em;
padding-right: 1em;
}
-.mudrod-navbar #searchForm {
+.search-navbar #searchForm {
width: 50%;
}
-.mudrod-navbar #searchForm .form-group {
+.search-navbar #searchForm .form-group {
width: 100%;
}
-.mudrod-navbar #searchForm .form-group input {
+.search-navbar #searchForm .form-group input {
width: 45%;
}
-.mudrod-navbar .nav-item {
+.search-navbar .nav-item {
margin: 1em 0 0 1em;
-}
-
-.mudrod-footer {
-color: white;
-padding-left: 2em;
}
\ No newline at end of file
diff --git a/web/META-INF/resources/css/main-header.css
b/web/META-INF/resources/css/main-header.css
index 8494e09..d2712e7 100644
--- a/web/META-INF/resources/css/main-header.css
+++ b/web/META-INF/resources/css/main-header.css
@@ -14,6 +14,6 @@ governing permissions and limitations under the License.
/*
-This file can be used to provide customized css for the customized header
provided in partials/main-header.html for the MUDROD website. It is currently
left empty.
+This file can be used to provide customized css for the customized header
provided in partials/main-header.html for the website. It is currently left
empty.
*/
\ No newline at end of file
diff --git a/web/META-INF/resources/index.html
b/web/META-INF/resources/index.html
index cbcc30a..7070a96 100755
--- a/web/META-INF/resources/index.html
+++ b/web/META-INF/resources/index.html
@@ -12,9 +12,9 @@
express or implied. See the License for the specific language
governing permissions and limitations under the License.
-->
-
+
-JPL | MUDROD
+JPL | OCEANWORKS
https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css;>
@@ -44,16 +44,7 @@
-
-
-https://mudrod.github.io/;
- target="_blank">Mining and Utilizing Dataset Relevancy from
Oceanographic Datasets (MUDROD)
-is funded by NASA AIST Program(NNX15AM85G), developed by http://stcenter.net/stc/;>NSF Spatiotemporal
-Innovation Center in collaboration with http://www.jpl.nasa.gov/;>NASA JPL
-
-
+
diff --git a/web/META-INF/resources/js/app.js b/web/META-INF/resources/js/app.js
index 5901b80..e7440c6 100755
--- a/web/META-INF/resources/js/app.js
+++ b/web/META-INF/resources/js/app.js
@@ -16,13 +16,13 @@
/* App Module */
-var mudrod = angular.module('mudrodApp', [
+var sdapSearchApp = angular.module('sdapSearchApp', [
'ngRoute',
-'mudrodControllers',
-'mudrodServices'
+'searchControllers',
+'searchServices'
]);
-mudrod.filter('urlencode', function() {
+sdapSearchApp.filter('urlencode', function() {
return function(input) {
if(input) {
return window.encodeURIComponent(input);
@@ -32,7 +32,7 @@ mudrod.filter('urlencode', function() {
});
-mudrod.config(['$routeProvider',
+sdapSearchApp.config(['$routeProvider',
function ($routeProvider) {