Skip to content

Commit 0477287

Browse files
author
tvmendoza
committed
Changed the UI per Bill's feedback
1 parent 40ec1ca commit 0477287

File tree

17,248 files changed

+2270674
-2369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

17,248 files changed

+2270674
-2369
lines changed

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module.exports = function (grunt) {
6969
port: 9010,
7070
// Change this to '0.0.0.0' to access the server from outside.
7171
hostname: 'localhost',
72-
livereload: 35729
72+
livereload: 35730
7373
},
7474
livereload: {
7575
options: {

‎app/scripts/controllers/main.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ angular.module('mdsApp')
1616
var configName = $location.search().configName;
1717
$http.get(APIURL + '/mdc_tree')
1818
.success(function (data) {
19-
$scope.retrievalTerms = data
19+
$scope.softwareTerms = {"Software" : data.software}
20+
$scope.datasetsTerms = {"Datasets" : data.dataset}
2021

2122
$scope.showChildren = function (term) {
2223
for (var i in term.children) {

‎app/scripts/controllers/modals/details.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ angular.module('mdsApp').controller('DetailModalInstanceController', function ($
77
if (Array.isArray(item[key])){
88
var fieldData = ""
99
for (var i in item[key]) {
10-
fieldData = item[key][i] + ", "
10+
fieldData = fieldData + item[key][i] + ", "
1111
}
1212
//we remove the last comma and space.
1313
parsedItem[key] = fieldData.slice(0, -2);

‎app/styles/main.css‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.divider-vertical {
22
height: 50px;
3-
margin: 0 15px;
3+
margin: 0 100px;
44
border-left: 1px solid gray;
55
opacity: 0.5;
66
}
@@ -9,10 +9,6 @@ body {
99
padding: 0;
1010
}
1111

12-
.tree {
13-
white-space: nowrap;
14-
max-height: 10px;
15-
}
1612

1713
.tree ul {
1814
list-style: none;
@@ -23,7 +19,7 @@ body {
2319
}
2420

2521
.chosenTerms {
26-
margin-top: 20px;
22+
margin-top: 10px;
2723
max-height: 200px;
2824
overflow: auto;
2925
}
@@ -47,3 +43,14 @@ body {
4743
overflow-x: auto
4844
}
4945

46+
table {
47+
width: 100%;
48+
}
49+
50+
th.from, th.date {
51+
width: 15%
52+
}
53+
th.subject {
54+
width: 70%;
55+
}
56+

‎app/views/main.html‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@
1515
</ul>
1616
</script>
1717
<!-- main container for page -->
18-
<div class="container">
19-
<div id="retrievalTermsContainer">
20-
<div class=" panel panel-primary">
21-
<div class="panel-body">
22-
<div class='row' ng-hide='searchHidden'>
23-
<div class='col-xs-8' >
24-
<h4>MDC Tree</h4>
25-
<div id="retrievalTree" class="well well-sm tree">
26-
<ul>
27-
<li ng-hide="areTermsEmpty(retrievalTerms)">Loading...</li>
28-
<li ng-repeat="term in retrievalTerms" ng-include="'tree-renderer.html'" ></li>
29-
</ul>
30-
</div>
18+
<br/>
19+
<div class="row">
20+
<div class="col-md-4">
21+
<div id="retrievalTree" class="well well-sm tree">
22+
<ul>
23+
<li ng-hide="areTermsEmpty(softwareTerms)">Loading...</li>
24+
<li ng-repeat="term in softwareTerms" ng-include="'tree-renderer.html'" ></li>
25+
</ul>
3126
</div>
32-
</div>
27+
</div>
28+
<div class="col-md-5">
29+
<div id="retrievalTree" class="well well-sm tree">
30+
<ul>
31+
<li ng-hide="areTermsEmpty(datasetsTerms)">Loading...</li>
32+
<li ng-repeat="term in datasetsTerms" ng-include="'tree-renderer.html'" ></li>
33+
</ul>
3334
</div>
3435
</div>
35-
</div>
36-
<div>
36+
</div>
37+
38+

0 commit comments

Comments
 (0)