Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit b78fae4

Browse files
author
taleksashina
committed
show/hide menu button fixed; embedded minidix
1 parent 10ff030 commit b78fae4

File tree

9 files changed

+83
-11
lines changed

9 files changed

+83
-11
lines changed

‎src/main/webapp/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ <h5 class="modal-title green bold" data-i18n="_request-password_"></h5>
234234
<script src="js/workbench/manual-revision-and-authoring/ontowiki-controller.js"></script>
235235
<script src="js/workbench/manual-revision-and-authoring/ontology-controller.js"></script>
236236
<script src="js/workbench/manual-revision-and-authoring/edit-uploads-controller.js"></script>
237+
<script src="js/workbench/manual-revision-and-authoring/thesaurus-controller.js"></script>
237238
<script src="js/workbench/classification-and-enrichment/geolift-controller.js"></script>
238239
<script src="js/workbench/linking-and-fusing/limes-controller.js"></script>
239240
<script src="js/settings/settings-controller.js"></script>

‎src/main/webapp/js/app.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
6464
// .when('/home/search-querying-and-exploration/mappify', 'default.mappify')
6565
.when('/home/search-querying-and-exploration/search', 'default.search')
6666
// .when('/home/manual-revision-and-authoring/ontowiki', 'default.ontowiki')
67+
.when('/home/manual-revision-and-authoring/thesaurus', 'default.thesaurus')
6768
.when('/home/manual-revision-and-authoring/edit-uploads', 'default.edit-uploads')
6869
// .when('/home/linking-and-fusing/limes', 'default.limes')
6970
// .when('/home/classification-and-enrichment/geolift', 'default.geolift')
@@ -168,6 +169,8 @@ app.config(function($routeSegmentProvider, $routeProvider)
168169
templateUrl: 'js/workbench/search-querying-and-exploration/virtuoso.html'})
169170
.segment('ontowiki', {
170171
templateUrl: 'js/workbench/manual-revision-and-authoring/ontowiki.html' })
172+
.segment('thesaurus', {
173+
templateUrl: 'js/workbench/manual-revision-and-authoring/thesaurus.html' })
171174
.segment('edit-uploads', {
172175
templateUrl: 'js/workbench/manual-revision-and-authoring/edit-uploads.html',
173176
resolve: {

‎src/main/webapp/js/controllers.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@ function AccountMenuCtrl($scope) {
88
{ name: "_user-pref_", route:'#/account/preferences', url:'/account/preferences' }];
99
}
1010

11-
function WorkbenchCtrl($scope) {
12-
$scope.showStackMenu = true;
13-
$scope.toggleButtonName = "_hide-stack-menu_";
11+
function WorkbenchCtrl($scope, StackMenuService) {
12+
$scope.showStackMenu = StackMenuService.isShownStackMenu();
1413

15-
$scope.toggleStackMenu = function() {
16-
$scope.showStackMenu = !$scope.showStackMenu;
14+
$scope.$watch(function () {
15+
return StackMenuService.isShownStackMenu();
16+
}, function () {
17+
$scope.showStackMenu = StackMenuService.isShownStackMenu();
1718
if ($scope.showStackMenu) {
1819
$('#segment1').removeClass('col-xs-12');
1920
$('#segment1').addClass('col-xs-10');
20-
$scope.toggleButtonName = "_hide-stack-menu_";
2121
} else {
2222
$('#segment1').removeClass('col-xs-10');
2323
$('#segment1').addClass('col-xs-12');
24-
$scope.toggleButtonName = "_show-stack-menu_";
2524
}
26-
};
25+
});
2726
}
2827

2928
function StackMenuCtrl($scope, ConfigurationService, localize, AccountService, $window, flash, DocumentsService) {
@@ -64,7 +63,8 @@ function StackMenuCtrl($scope, ConfigurationService, localize, AccountService, $
6463
items: [
6564
// {name: 'OntoWiki', route:'#/home/manual-revision-and-authoring/ontowiki', url:'/home/manual-revision-and-authoring/ontowiki' },
6665
// {name: "_ontologies_", route:'#/home/manual-revision-and-authoring/ontology', url:'/home/manual-revision-and-authoring/ontology' },
67-
{name: "_thesaurus-management_", route:null, url:miniDixServiceUrl + "/?ontology=" + ontology + "&newConceptsOntology=" + ontology + "&writableOntologies=" + ontology, modaltitle:'MiniDix', requiredServices:[":MiniDixService"] },
66+
// {name: "_thesaurus-management_", route:null, url:miniDixServiceUrl + "/?ontology=" + ontology + "&newConceptsOntology=" + ontology + "&writableOntologies=" + ontology, modaltitle:'MiniDix', requiredServices:[":MiniDixService"] },
67+
{name: "_thesaurus-management_", route:'#/home/manual-revision-and-authoring/thesaurus', url:'/home/manual-revision-and-authoring/thesaurus', requiredServices:[":MiniDixService"] },
6868
{name: "_edit-uploads_", route:'#/home/manual-revision-and-authoring/edit-uploads', url:'/home/manual-revision-and-authoring/edit-uploads', requiredServices:[":DocumentService"] }]
6969
},
7070
/*

‎src/main/webapp/js/services/services.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,16 @@ module.factory('AuthenticationErrorResponse', function(localize) {
222222
return errorText;
223223
}
224224
};
225+
});
226+
227+
module.factory('StackMenuService', function() {
228+
var showStackMenu = true;
229+
return {
230+
toggleStackMenu: function() {
231+
showStackMenu = !showStackMenu;
232+
},
233+
isShownStackMenu: function() {
234+
return showStackMenu;
235+
}
236+
}
225237
});

‎src/main/webapp/js/workbench/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="contents" ng-controller="WorkbenchCtrl">
2-
<button class="btn btn-primary btn-large" ng-click="toggleStackMenu()" data-i18n="{{toggleButtonName}}"></button>
2+
33
<div class="col-xs-2 sidebar" ng-show="showStackMenu">
44

55
<div class="panel-group" id="accordion" ng-controller="StackMenuCtrl">

‎src/main/webapp/js/workbench/manual-revision-and-authoring/thesaurus-controller.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
'use strict';
2+
3+
var ThesaurusCtrl = function($scope, ConfigurationService, StackMenuService, localize) {
4+
var miniDixServices = ConfigurationService.getComponentServices(":MiniDix");
5+
var miniDixServiceUrl = miniDixServices[0].serviceUrl;
6+
var ontology = "http://acc.ontos.com/thesaurus/concept/v2/";
7+
8+
$scope.url = miniDixServiceUrl + "/?ontology=" + ontology + "&newConceptsOntology=" + ontology + "&writableOntologies=" + ontology;
9+
10+
$scope.toggleButtonName = "";
11+
12+
$scope.refreshToggleButton = function() {
13+
if (StackMenuService.isShownStackMenu()) {
14+
$scope.toggleButtonName = "_hide-stack-menu_";
15+
} else {
16+
$scope.toggleButtonName = "_show-stack-menu_";
17+
}
18+
};
19+
20+
$scope.refreshToggleButton();
21+
22+
$scope.toggleStackMenu = function() {
23+
StackMenuService.toggleStackMenu();
24+
$scope.refreshToggleButton();
25+
};
26+
27+
$scope.$watch(function () {
28+
return localize.language;
29+
}, function () {
30+
$scope.url = miniDixServiceUrl + "/?ontology=" + ontology + "&newConceptsOntology=" + ontology + "&writableOntologies=" + ontology + "?lang=" + localize.language;
31+
});
32+
};

‎src/main/webapp/js/workbench/manual-revision-and-authoring/thesaurus.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div ng-controller="ThesaurusCtrl">
2+
<h3 class="green bold" data-i18n="_thesaurus-management_"></h3>
3+
<button class="btn btn-link" ng-click="toggleStackMenu()" data-i18n="{{toggleButtonName}}"></button>
4+
5+
<iframe id="minidixFrame" frameborder="0" style="width:100%; height:1400px" src="{{url}}"></iframe>
6+
</div>

‎src/main/webapp/js/workbench/search-querying-and-exploration/search-controller.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
'use strict';
22

3-
var SearchCtrl = function($scope, ConfigurationService) {
3+
var SearchCtrl = function($scope, ConfigurationService, StackMenuService) {
44
var services = ConfigurationService.getComponentServices(":Solr");
55
var searchServiceUrl = services[0].serviceUrl;
66

77
$scope.url = searchServiceUrl;
88

9+
$scope.toggleButtonName = "";
10+
11+
$scope.refreshToggleButton = function() {
12+
if (StackMenuService.isShownStackMenu()) {
13+
$scope.toggleButtonName = "_hide-stack-menu_";
14+
} else {
15+
$scope.toggleButtonName = "_show-stack-menu_";
16+
}
17+
};
18+
19+
$scope.refreshToggleButton();
20+
21+
$scope.toggleStackMenu = function() {
22+
StackMenuService.toggleStackMenu();
23+
$scope.refreshToggleButton();
24+
};
25+
926
$scope.close = function(modalID) {
1027
$(modalID).modal('hide');
1128
$('body').removeClass('modal-open');

‎src/main/webapp/js/workbench/search-querying-and-exploration/search.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<div ng-controller="SearchCtrl">
22
<h3 class="green bold" data-i18n="_search_"></h3>
3+
<button class="btn btn-link" ng-click="toggleStackMenu()" data-i18n="{{toggleButtonName}}"></button>
34

45
<iframe id="searchFrame" frameborder="0" style="width:100%; height:1400px" src="{{url}}"></iframe>
56

0 commit comments

Comments
 (0)