Skip to content

Commit 298d9f7

Browse files
committed
hiding chart view as required in #37
1 parent 48b0ca0 commit 298d9f7

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

src/main/webapp/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var prideClusterApp = angular.module('prideClusterApp', [
3030
'prideClusterApp.similarityChartDirective',
3131
'prideClusterApp.boxPlotDirective',
3232
'prideClusterApp.modificationsChartDirective',
33-
'prideClusterApp.clusterListFiltersDirective',
33+
'prideClusterApp.viewControlsDirective',
3434
'prideClusterApp.clusterListPagingDirective',
3535
'prideClusterApp.spectralSearchDirective',
3636

src/main/webapp/components/directives/clusterListFilters-directive/clusterListFilters-directive.html src/main/webapp/components/directives/viewControls-directive/viewControls-directive.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<div id="cluster-filters">
2-
<!--Filter Controls-->
1+
<div id="view-controls">
32
<h6>
43
View as
54
<button ng-click="listSubmit()">List</button>

src/main/webapp/components/directives/clusterListFilters-directive/clusterListFilters-directive.js src/main/webapp/components/directives/viewControls-directive/viewControls-directive.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
/**
22
* @author Jose A. Dianes <[email protected]>
33
*
4-
* The prc-cluster-list-filters directive allows us to reuse a spectra visualisations using SpeckTackle.
4+
* The prc-view-controls directive allows us to change view type.
55
*
66
*/
77

8-
var clusterListFiltersDirective = angular.module('prideClusterApp.clusterListFiltersDirective', [])
8+
var viewControlsDirective = angular.module('prideClusterApp.viewControlsDirective', [])
99

10-
clusterListFiltersDirective.directive('prcClusterListFilters', function() {
10+
viewControlsDirective.directive('prcViewControls', function() {
1111
return {
12-
restrict: 'E',
12+
restrict: 'AE',
1313
scope: {
1414

1515
},
16-
controller: "ClusterListFiltersCtrl",
17-
templateUrl: 'components/directives/clusterListFilters-directive/clusterListFilters-directive.html'
16+
controller: "ViewControlsCtrl",
17+
templateUrl: 'components/directives/viewControls-directive/viewControls-directive.html'
1818
};
1919
});
2020

21-
clusterListFiltersDirective.controller('ClusterListFiltersCtrl', ['$scope', '$routeParams', '$location',
21+
viewControlsDirective.controller('ViewControlsCtrl', ['$scope', '$routeParams', '$location',
2222
function($scope, $routeParams, $location) {
2323

2424
function updateState(view) {

src/main/webapp/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ <h3 class="about"><a href="//www.ebi.ac.uk/about">About us</a></h3>
231231
<script src="components/directives/projectViewer-directive/projectViewer-directive.js"></script>
232232
<script src="components/directives/clusterList-directive/clusterList-directive.js"></script>
233233
<script src="components/directives/clusterChart-directive/clusterChart-directive.js"></script>
234-
<script src="components/directives/clusterListFilters-directive/clusterListFilters-directive.js"></script>
234+
<script src="components/directives/viewControls-directive/viewControls-directive.js"></script>
235235
<script src="components/directives/clusterListPaging-directive/clusterListPaging-directive.js"></script>
236236
<script src="components/directives/peptideSequenceViewer-directive/peptideSequenceViewer-directive.js"></script>
237237
<script src="components/directives/clusterKey-directive/clusterKey-directive.js"></script>

src/main/webapp/views/clusterChart-view/clusterChart.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</p>
1212
</nav>
1313
<div class="grid_4 omega">
14-
<prc-cluster-list-filters sequence="queryTerm"></prc-cluster-list-filters>
14+
<prc-view-controls sequence="queryTerm"></prc-view-controls>
1515
</div>
1616
</span>
1717
<section class="grid_24" id="search-results">

src/main/webapp/views/clusterList-view/clusterList.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
Peptide Search
1212
</p>
1313
</nav>
14-
<div class="grid_4 omega">
15-
<prc-cluster-list-filters sequence="queryTerm"></prc-cluster-list-filters>
16-
</div>
14+
<!--<div class="grid_4 omega">-->
15+
<!--<prc-view-controls sequence="queryTerm"></prc-view-controls>-->
16+
<!--</div>-->
1717
</span>
1818
<section class="grid_22 push_1" id="search-results">
1919
<!-- Body content uses components/clusterList-directive -->

0 commit comments

Comments
 (0)