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.
-->
-<html lang="en" ng-app="mudrodApp">
+<html lang="en" ng-app="sdapSearchApp">
<head>
- <title>JPL | MUDROD</title>
+ <title>JPL | OCEANWORKS</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css";>
@@ -44,16 +44,7 @@
<div ng-include src="'partials/main-header.html'"></div>
<div ng-view></div>
-<footer class="mudrod-footer">
- <p>
- <a href="https://mudrod.github.io/";
- target="_blank">Mining and Utilizing Dataset Relevancy from
Oceanographic Datasets (MUDROD)</a>
- is funded by NASA AIST Program(NNX15AM85G), developed by <a
- href="http://stcenter.net/stc/";>NSF Spatiotemporal
- Innovation Center</a> in collaboration with <a
- href="http://www.jpl.nasa.gov/";>NASA JPL</a>
- </p>
-</footer>
+
<div ng-include src="'partials/footer.html'"></div>
</body>
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) {
$routeProvider.when('/', {
templateUrl: 'partials/search.html'
diff --git a/web/META-INF/resources/js/controllers.js
b/web/META-INF/resources/js/controllers.js
index 8ff196f..a278146 100755
--- a/web/META-INF/resources/js/controllers.js
+++ b/web/META-INF/resources/js/controllers.js
@@ -15,9 +15,9 @@
'use strict';
/* Controllers */
-var mudrodControllers = angular.module('mudrodControllers', []);
+var searchControllers = angular.module('searchControllers', []);
-mudrodControllers.controller('searchCtrl', ['$scope', '$rootScope',
'$location', '$route', 'Autocomplete', 'SearchOptions',
+searchControllers.controller('searchCtrl', ['$scope', '$rootScope',
'$location', '$route', 'Autocomplete', 'SearchOptions',
function ($scope, $rootScope, $location, $route, Autocomplete,
SearchOptions) {
$scope.hidethis = true;
@@ -60,7 +60,7 @@ mudrodControllers.controller('searchCtrl', ['$scope',
'$rootScope', '$location',
}, true);
}]);
-mudrodControllers.controller('vocabularyCtrl', ['$scope', '$rootScope',
'VocabList',
+searchControllers.controller('vocabularyCtrl', ['$scope', '$rootScope',
'VocabList',
function vocabularyCtrl($scope, $rootScope, VocabList) {
var word = $rootScope.searchOptions.query;
@@ -75,7 +75,7 @@ mudrodControllers.controller('vocabularyCtrl', ['$scope',
'$rootScope', 'VocabLi
);
}]);
-mudrodControllers.controller('metadataViewCtrl', ['$rootScope', '$scope',
'$location', '$routeParams', 'MetaData', 'PagerService', 'SearchOptions',
+searchControllers.controller('metadataViewCtrl', ['$rootScope', '$scope',
'$location', '$routeParams', 'MetaData', 'PagerService', 'SearchOptions',
function metadataViewCtrl($rootScope, $scope, $location, $routeParams,
MetaData, PagerService, SearchOptions) {
$scope.searchComplete = false;
@@ -165,7 +165,7 @@ mudrodControllers.controller('metadataViewCtrl',
['$rootScope', '$scope', '$loca
}
}]);
-mudrodControllers.controller('datasetViewCtrl', ['$rootScope', '$scope',
'$routeParams', 'DatasetDetail', 'SearchOptions',
+searchControllers.controller('datasetViewCtrl', ['$rootScope', '$scope',
'$routeParams', 'DatasetDetail', 'SearchOptions',
function datasetViewCtrl($rootScope, $scope, $routeParams, DatasetDetail,
SearchOptions) {
var shortname = $routeParams.shortname;
@@ -192,7 +192,7 @@ mudrodControllers.controller('datasetViewCtrl',
['$rootScope', '$scope', '$route
);
}]);
-mudrodControllers.controller('hRecommendationCtrl', ['$scope', '$routeParams',
'HRecommendation',
+searchControllers.controller('hRecommendationCtrl', ['$scope', '$routeParams',
'HRecommendation',
function hRecommendationCtrl($scope, $routeParams, HRecommendation) {
var shortname = $routeParams.shortname;
HRecommendation.get({shortname: shortname},
diff --git a/web/META-INF/resources/js/services.js
b/web/META-INF/resources/js/services.js
index 3d80be4..f00de70 100755
--- a/web/META-INF/resources/js/services.js
+++ b/web/META-INF/resources/js/services.js
@@ -16,44 +16,44 @@
/* Services */
-var mudrodServices = angular.module('mudrodServices', ['ngResource']);
+var searchServices = angular.module('searchServices', ['ngResource']);
-mudrodServices.factory('MetaData', ['$resource',
+searchServices.factory('MetaData', ['$resource',
function($resource) {
return $resource("services/metadata/search/", {}, {
get: {method: 'GET', cache: false, isArray: false}
});
}]);
-mudrodServices.factory('VocabList', ['$resource',
+searchServices.factory('VocabList', ['$resource',
function($resource) {
return $resource("services/vocabulary/search/", {}, {
get: {method: 'GET', cache: false, isArray: false}
});
}]);
-mudrodServices.factory('Autocomplete', ['$resource',
+searchServices.factory('Autocomplete', ['$resource',
function($resource) {
return $resource("services/autocomplete/query", {}, {
get: {method: 'GET', cache: false, isArray: true}
});
}]);
-mudrodServices.factory('DatasetDetail', ['$resource',
+searchServices.factory('DatasetDetail', ['$resource',
function($resource) {
return $resource("services/datasetdetail/search/", {}, {
get: {method: 'GET', cache: false, isArray: false}
});
}]);
-mudrodServices.factory('HRecommendation', ['$resource',
+searchServices.factory('HRecommendation', ['$resource',
function($resource) {
return $resource("services/hrecommendation/search/", {}, {
get: {method: 'GET', cache: false, isArray: false}
});
}]);
-mudrodServices.factory('SearchOptions', function(){
+searchServices.factory('SearchOptions', function(){
var searchOptions = {'opt':'Or'};
return {
getSearchOptions: function () {
@@ -65,7 +65,7 @@ mudrodServices.factory('SearchOptions', function(){
};
});
-mudrodServices.factory('PagerService',
+searchServices.factory('PagerService',
function() {
// service definition
var service = {};
diff --git a/web/META-INF/resources/partials/datasetResults.html
b/web/META-INF/resources/partials/datasetResults.html
index 4e21b87..097be62 100644
--- a/web/META-INF/resources/partials/datasetResults.html
+++ b/web/META-INF/resources/partials/datasetResults.html
@@ -124,7 +124,7 @@ <h4 class="panel-title">
<a title="{{recommendation['name']}}"
ng-href="#/datasetView?shortname={{recommendation['name'] |
urlencode}}">{{recommendation['name']}}</a>
</div>
<div class="learn-more">
- <a
href="https://mudrod.github.io/recommendation-algorithms/"; target="_blank">How
does MUDROD find related Datasets?</a>
+ <a
href="https://mudrod.github.io/recommendation-algorithms/"; target="_blank">How
do we find related Datasets?</a>
</div>
</div>
</div>
@@ -141,7 +141,7 @@ <h4 class="panel-title">
<a title="{{ontology['word']}}"
ng-href="#/metadataView?query={{ontology['word'] |
urlencode}}">{{ontology['word'] | uppercase}} ({{ontology['weight']}})</a>
</div>
<div class="learn-more">
- <a
href="https://mudrod.github.io/vocabulary-similarity-algorithm/";
target="_blank">How does MUDROD find related keyword searches?</a>
+ <a
href="https://mudrod.github.io/vocabulary-similarity-algorithm/";
target="_blank">How do we find related keyword searches?</a>
</div>
</div>
</div>
diff --git a/web/META-INF/resources/partials/footer.html
b/web/META-INF/resources/partials/footer.html
index 13d526b..976c8bc 100644
--- a/web/META-INF/resources/partials/footer.html
+++ b/web/META-INF/resources/partials/footer.html
@@ -14,6 +14,6 @@
<!--
- This file can be used to provide a customized footer for the MUDROD
website. It is currently left empty.
+ This file can be used to provide a customized footer for the website. It
is currently left empty.
-->
\ No newline at end of file
diff --git a/web/META-INF/resources/partials/main-header.html
b/web/META-INF/resources/partials/main-header.html
index 6db05dc..edc3c31 100644
--- a/web/META-INF/resources/partials/main-header.html
+++ b/web/META-INF/resources/partials/main-header.html
@@ -14,6 +14,6 @@
<!--
- This file can be used to provide a customized header for the MUDROD
website. It is currently left empty.
+ This file can be used to provide a customized header for the search
website. It is currently left empty.
-->
\ No newline at end of file
diff --git a/web/META-INF/resources/partials/navbar-plain.html
b/web/META-INF/resources/partials/navbar-plain.html
index ce4e811..3f3fb31 100755
--- a/web/META-INF/resources/partials/navbar-plain.html
+++ b/web/META-INF/resources/partials/navbar-plain.html
@@ -12,24 +12,15 @@
governing permissions and limitations under the License.
-->
<header>
- <nav class="navbar navbar-inverse mudrod-navbar">
+ <nav class="navbar navbar-inverse search-navbar">
<div class="container-fluid">
<div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#mudrod-collapse" aria-expanded="false">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand navbar-link"
href="https://mudrod.github.io/";>MUDROD</a>
- </div>
- <div class="collapse navbar-collapse" id="mudrod-collapse">
- <div class="nav navbar-nav">
- <div class="nav-item active">
- <a class="nav-link" href="#/">Home <span
class="sr-only">(current)</span></a>
- </div>
- </div>
+ <a class="navbar-brand"
href="https://oceanworks.jpl.nasa.gov";>Oceanworks</a>
</div>
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="#">Search <span
class="sr-only">(current)</span></a></li>
+ <li><a href="http://sdap.incubator.apache.org/";>SDAP</a></li>
+ </ul>
</div>
</nav>
</header>
\ No newline at end of file
diff --git a/web/META-INF/resources/partials/navbar-search.html
b/web/META-INF/resources/partials/navbar-search.html
index fdc99da..bee2bcb 100755
--- a/web/META-INF/resources/partials/navbar-search.html
+++ b/web/META-INF/resources/partials/navbar-search.html
@@ -13,50 +13,42 @@
-->
<header>
- <nav class="navbar navbar-inverse mudrod-navbar">
+
+ <nav class="navbar navbar-inverse search-navbar">
<div class="container-fluid">
<div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#mudrod-collapse" aria-expanded="false">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand navbar-link"
href="https://mudrod.github.io/";>MUDROD</a>
+ <a class="navbar-brand"
href="https://oceanworks.jpl.nasa.gov";>Oceanworks</a>
</div>
- <div class="collapse navbar-collapse" id="mudrod-collapse">
- <div class="nav navbar-nav">
- <div class="nav-item active">
- <a class="nav-link" href="#/">Home <span
class="sr-only">(current)</span></a>
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="#">Search <span
class="sr-only">(current)</span></a></li>
+ <li><a href="http://sdap.incubator.apache.org/";>SDAP</a></li>
+ </ul>
+ <form id="searchForm" class="navbar-form navbar-right"
autocomplete="off" ng-controller="searchCtrl">
+ <div class="form-group">
+ <input id="query" type="text" role="search"
class="form-control" ng-model="options.query" ng-keyup="complete(options.query)"
+ placeholder="Enter ocean concepts (e.g. ocean wind)
to search">
+ <ul class="list-group search-ul autocomplete"
ng-model="hidethis" ng-hide="hidethis">
+ <li class="list-group-item" ng-repeat="searchdata in
filterSearch" ng-click="fillTextbox(searchdata.value)">{{searchdata.value}}</li>
+ </ul>
+ <button class="btn btn-default" id="search-btn"
ng-click="search(options)"
+ type="submit">
+ <i class="glyphicon glyphicon-search"></i>
+ </button>
+ <div class="searchOption input-group" id="searchOption">
+ <label for="searchOption" style="padding-right:
.5em;">Search Operator: </label>
+ <label class="radio-inline">
+ <input type="radio" ng-model="options.opt"
value="Or">Or
+ </label>
+ <label class="radio-inline">
+ <input type="radio" ng-model="options.opt"
value="Phrase"> Phrase
+ </label>
+ <label class="radio-inline">
+ <input type="radio" ng-model="options.opt"
value="And"> And
+ </label>
</div>
</div>
+ </form>
- <form id="searchForm" class="navbar-form navbar-right"
autocomplete="off" ng-controller="searchCtrl">
- <div class="form-group">
- <input id="query" type="text" role="search"
class="form-control" ng-model="options.query" ng-keyup="complete(options.query)"
- placeholder="Enter ocean concepts (e.g. ocean
wind) to search">
- <ul class="list-group search-ul autocomplete"
ng-model="hidethis" ng-hide="hidethis">
- <li class="list-group-item" ng-repeat="searchdata
in filterSearch"
ng-click="fillTextbox(searchdata.value)">{{searchdata.value}}</li>
- </ul>
- <button class="btn btn-default" id="search-btn"
ng-click="search(options)"
- type="submit">
- <i class="glyphicon glyphicon-search"></i>
- </button>
- <div class="searchOption input-group"
id="searchOption">
- <label for="searchOption" style="padding-right:
.5em;">Search Operator: </label>
- <label class="radio-inline">
- <input type="radio" ng-model="options.opt"
value="Or">Or
- </label>
- <label class="radio-inline">
- <input type="radio" ng-model="options.opt"
value="Phrase"> Phrase
- </label>
- <label class="radio-inline">
- <input type="radio" ng-model="options.opt"
value="And"> And
- </label>
- </div>
- </div>
- </form>
- </div>
</div>
</nav>
</header>
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
