Skip to content

Commit 2225ff3

Browse files
marc92wmarc92w
committed
Make last fixes before source code release.
- Add about page with license. - Change the interpretation of filters: Checked means elements are hidden - Make labels in settings more meaningful. - Restrict edge lengths. - Fix visual bug when deselecting namespace as 'internal'.
1 parent 8a87d8a commit 2225ff3

File tree

14 files changed

+111
-42
lines changed

14 files changed

+111
-42
lines changed

Diff for: ‎LICENSE.txt

-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22-

Diff for: ‎app/app.config.js

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import startTemplate from './components/start/start.html';
22
import settingsTemplate from './components/settings/settings.html';
33
import graphTemplate from './components/graph/graph.html';
4+
import aboutTemplate from './components/about/about.html';
45

56
function routing($httpProvider, $routeProvider, $logProvider) {
67

@@ -31,6 +32,12 @@ function routing($httpProvider, $routeProvider, $logProvider) {
3132
controller: 'GraphCtrl',
3233
controllerAs: 'vm'
3334
})
35+
.when('/about', {
36+
title: 'About',
37+
template: aboutTemplate,
38+
controller: 'AboutCtrl',
39+
controllerAs: 'about'
40+
})
3441
.otherwise({
3542
redirectTo: '/'
3643
});

Diff for: ‎app/components/about/about.ctrl.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function aboutCtrl() {
2+
3+
}
4+
5+
export default aboutCtrl;

Diff for: ‎app/components/about/about.html

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<div class="container">
2+
3+
<h2>LD-VOWL</h2>
4+
<p>
5+
More information about LD-VOWL and a public demo is available at
6+
<a href="http://ldvowl.visualdataweb.org/" target="_blank">VisualDataWeb.org</a>.
7+
</p>
8+
9+
<p>
10+
The source code of LD-VOWL is publicly available on
11+
<a href="https://github.com/VisualDataWeb/LD-VOWL" target="_blank">GitHub</a>.
12+
</p>
13+
14+
<h3>License</h3>
15+
16+
<b>The MIT License (MIT)</b>
17+
<p>
18+
Copyright (c) 2015-2016 Marc Weise, Steffen Lohmann, Florian Haag <br />
19+
</p>
20+
<p>
21+
Permission is hereby granted, free of charge, to any person obtaining a copy
22+
of this software and associated documentation files (the "Software"), to deal
23+
in the Software without restriction, including without limitation the rights
24+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
25+
copies of the Software, and to permit persons to whom the Software is
26+
furnished to do so, subject to the following conditions: <br/>
27+
</p>
28+
<p>
29+
The above copyright notice and this permission notice shall be included in all
30+
copies or substantial portions of the Software. <br/>
31+
</p>
32+
<p>
33+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
SOFTWARE.
40+
</p>
41+
42+
</div>

Diff for: ‎app/components/about/about.module.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import angular from 'angular';
2+
3+
import AboutCtrl from './about.ctrl';
4+
5+
export default angular.module('components.about', [])
6+
.controller('AboutCtrl', AboutCtrl)
7+
.name;

Diff for: ‎app/components/components.module.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import header from './header/header.module';
55
import settings from './settings/settings.module';
66
import sidebar from './sidebar/sidebar.module';
77
import start from './start/start.module';
8+
import about from './about/about.module';
89

9-
export default angular.module('components', [graph, header, settings, sidebar, start])
10+
export default angular.module('components', [graph, header, settings, sidebar, start, about])
1011
.name;

Diff for: ‎app/components/graph/graph.ctrl.js

+13-12
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ function graphCtrl($scope, $q, $log, Filters, ClassExtractor, RelationExtractor,
2525
vm.numberOfProps = 5;
2626
vm.numberOfPrefixes = 3;
2727

28-
vm.extractTypes = Filters.getIncludeLiterals();
29-
vm.includeLoops = Filters.getIncludeLoops();
30-
vm.includeDisjointNode = Filters.getIncludeDisjointNode();
31-
vm.includeSubclassRelations = Filters.getIncludeSubclassRelations();
28+
vm.filterTypes = !Filters.getIncludeLiterals();
29+
vm.filterLoops = !Filters.getIncludeLoops();
30+
vm.filterDisjointNodes = !Filters.getIncludeDisjointNode();
31+
vm.filterSubclassRelations = !Filters.getIncludeSubclassRelations();
32+
3233
vm.differentColors = Prefixes.getDifferentColors();
3334

3435
// jshint ignore:start
@@ -91,25 +92,25 @@ function graphCtrl($scope, $q, $log, Filters, ClassExtractor, RelationExtractor,
9192
};
9293

9394
vm.toggleTypes = function () {
94-
vm.extractTypes = Filters.toggleLiterals();
95-
if (vm.extractTypes) {
95+
vm.filterTypes = !Filters.toggleLiterals();
96+
if (vm.filterTypes) {
9697
vm.loadTypes();
9798
}
9899
};
99100

100101
vm.toggleLoops = function () {
101-
vm.includeLoops = Filters.toggleLoops();
102-
if (vm.includeLoops) {
102+
vm.filterLoops = !Filters.toggleLoops();
103+
if (vm.filterLoops) {
103104
vm.loadLoops();
104105
}
105106
};
106107

107108
vm.toggleDisjointNode = function () {
108-
vm.includeDisjointNode = Filters.toggleDisjointNode();
109+
vm.filterDisjointNodes = !Filters.toggleDisjointNode();
109110
};
110111

111112
vm.toggleSubclassRelations = function() {
112-
vm.includeSubclassRelations = Filters.toggleSubclassRelations();
113+
vm.includeSubclassRelations = !Filters.toggleSubclassRelations();
113114
};
114115

115116
vm.toggleDifferentColors = function () {
@@ -173,7 +174,7 @@ function graphCtrl($scope, $q, $log, Filters, ClassExtractor, RelationExtractor,
173174
}
174175

175176
// optionally extract types referring to instances of the classes
176-
if (vm.extractTypes) {
177+
if (vm.filterTypes) {
177178
vm.loadTypes();
178179
}
179180

@@ -202,7 +203,7 @@ function graphCtrl($scope, $q, $log, Filters, ClassExtractor, RelationExtractor,
202203
// for each pair of classes search relation and check equality
203204
for (let end = 0; end < vm.classes.length; end++) {
204205
for (let start = 0; start < vm.classes.length; start++) {
205-
if (vm.includeLoops || start !== end) {
206+
if (vm.filterLoops || start !== end) {
206207
var origin = vm.classes[start];
207208
var target = vm.classes[end];
208209

Diff for: ‎app/components/graph/graph.html

-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
</uib-accordion-heading>
1818
<selection-group></selection-group>
1919
</uib-accordion-group>
20-
</uib-accordion>
2120

22-
<uib-accordion>
2321
<uib-accordion-group is-open="false">
2422
<uib-accordion-heading>
2523
<span class="glyphicon glyphicon-filter" aria-hidden="true"></span> Filters
@@ -40,9 +38,7 @@
4038
</uib-accordion-heading>
4139
<namespace-group></namespace-group>
4240
</uib-accordion-group>
43-
</uib-accordion>
4441

45-
<uib-accordion>
4642
<uib-accordion-group is-open="true">
4743
<uib-accordion-heading>
4844
<span class="glyphicon glyphicon-transfer" aria-hidden="true"></span> Endpoint

Diff for: ‎app/components/header/header.html

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
Settings
3535
</a>
3636
</li>
37+
<li ng-class="{ active: header.isActive('/about') }">
38+
<a ng-href="#/about">
39+
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
40+
About
41+
</a>
42+
</li>
3743
</ul>
3844
</div><!-- /.navbar-collapse -->
3945
</div><!-- /.container-fluid -->

Diff for: ‎app/components/settings/settings.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<div class="container">
22

3-
<h2>SPARQL</h2>
3+
<h2>SPARQL Queries</h2>
44

55
<form name="extractionForm" class="form-horizontal well" role="form" novalidate>
66
<div class="form-group" ng-class="{ 'has-error' : extractionForm.limit.$invalid && !extractionForm.limit.$pristine }">
7-
<label class="control-label col-sm-2" for="lang">Labels</label>
7+
<label class="control-label col-sm-3" for="lang">Label Language</label>
88
<div class="col-sm-4">
99
<select class="form-control" name="lang" id="lang" ng-model="vm.currentLanguage"
1010
ng-options="language.id as language.name for language in vm.availableLanguages">
1111
</select>
1212
</div>
1313

14-
<label for="limit" class="col-sm-2 control-label">Limit</label>
15-
<div class="col-sm-4">
14+
<label for="limit" class="col-sm-2 control-label">Default Limit</label>
15+
<div class="col-sm-3">
1616
<input class="form-control" name="limit" id="limit" type="number" ng-model="vm.currentLimit" min="1" required/>
1717
<p ng-show="extractionForm.limit.$invalid && !extractionForm.limit.$pristine" class="help-block">
1818
must be greater 0!
@@ -21,11 +21,11 @@ <h2>SPARQL</h2>
2121
</div>
2222

2323
<div class="form-group">
24-
<div class="col-lg-offset-2 col-sm-10">
24+
<div class="col-lg-offset-3 col-sm-10">
2525
<div class="checkbox">
2626
<label>
2727
<input type="checkbox" name="ordered" ng-model="vm.propsOrdered">
28-
fetch properties ordered
28+
fetch properties in descending order of their usage
2929
</label>
3030
</div>
3131
</div>
@@ -49,8 +49,8 @@ <h2>SPARQL</h2>
4949
<h2>Blacklists</h2>
5050
<form name="lists" class="form-horizontal well" role="form" novalidate>
5151
<div class="form-group">
52-
<label class="control-label col-sm-2">
53-
Lists
52+
<label class="control-label col-sm-3">
53+
Predefined Lists
5454
</label>
5555
<div class="col-sm-2">
5656
<div class="checkbox">
@@ -94,7 +94,7 @@ <h2>Blacklists</h2>
9494
</div>
9595

9696
<div class="form-group" style="margin-bottom: 0;">
97-
<div class="col-sm-offset-2 col-sm-10">
97+
<div class="col-sm-offset-3 col-sm-9">
9898
<uib-alert type="warning" style="margin-bottom: 0;">
9999
<span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
100100
Any manual changes below will be overwritten!
@@ -105,16 +105,16 @@ <h2>Blacklists</h2>
105105

106106
<form class="form-horizontal well" name="bl" role="form" novalidate>
107107
<div class="form-group">
108-
<label for="classBlacklist" class="control-label col-sm-2">Classes</label>
109-
<div class="col-sm-10">
108+
<label for="classBlacklist" class="control-label col-sm-3">Classes</label>
109+
<div class="col-sm-9">
110110
<textarea class="form-control" id="classBlacklist" name="clazz" rows="6" ng-model="vm.classBlacklistInput">
111111
</textarea>
112112
</div>
113113
</div>
114114

115115
<div class="form-group">
116-
<label class="control-label col-sm-2" for="propBlacklist">Properties</label>
117-
<div class="col-sm-10">
116+
<label class="control-label col-sm-3" for="propBlacklist">Properties</label>
117+
<div class="col-sm-9">
118118
<textarea class="form-control" id="propBlacklist" name="prop" rows="6" ng-model="vm.propertyBlacklistInput">
119119
</textarea>
120120
</div>

Diff for: ‎app/components/sidebar/groups/filter-group/filter-group.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22

33
<div class="checkbox">
44
<label for="showLiterals">
5-
<input id="showLiterals" type="checkbox" ng-model="vm.extractTypes" ng-change="vm.toggleTypes()">
6-
Show datatypes
5+
<input id="showLiterals" type="checkbox" ng-model="vm.filterTypes" ng-change="vm.toggleTypes()">
6+
datatypes
77
</label>
88
</div>
99

1010
<div class="checkbox">
1111
<label for="includeLoops">
12-
<input id="includeLoops" type="checkbox" ng-model="vm.includeLoops" ng-change="vm.toggleLoops()">
13-
Show property loops
12+
<input id="includeLoops" type="checkbox" ng-model="vm.filterLoops" ng-change="vm.toggleLoops()">
13+
property loops
1414
</label>
1515
</div>
1616

1717
<div class="checkbox">
1818
<label for="includeSubclassRelations">
19-
<input id="includeSubclassRelations" type="checkbox" ng-model="vm.includeSubclassRelations"
19+
<input id="includeSubclassRelations" type="checkbox" ng-model="vm.filterSubclassRelations"
2020
ng-change="vm.toggleSubclassRelations()">
21-
Show subclass relations
21+
subclass relations
2222
</label>
2323
</div>
2424

2525
<div class="checkbox">
2626
<label for="includeDisjointNode">
27-
<input id="includeDisjointNode" type="checkbox" ng-model="vm.includeDisjointNode"
27+
<input id="includeDisjointNode" type="checkbox" ng-model="vm.filterDisjointNodes"
2828
ng-change="vm.toggleDisjointNode()">
29-
Show disjoint classes
29+
class disjointness
3030
</label>
3131
</div>
3232

Diff for: ‎app/components/sidebar/groups/graph-settings-group/graph-settings-group.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
<p>
1414
<label for="ctEdgeLength">Class - Class Distance: {{ ccEdgeLength }}</label>
15-
<div id="ccEdgeLength" slider class="cdbl-slider" model="ccEdgeLength" min="10" max="600"></div>
15+
<div id="ccEdgeLength" slider class="cdbl-slider" model="ccEdgeLength" min="1" max="300"></div>
1616
</p>
1717

1818
<p>
1919
<label for="ctEdgeLength">Class - Type Distance: {{ ctEdgeLength }}</label>
20-
<div id="ctEdgeLength" slider class="cdbl-slider" model="ctEdgeLength" min="10" max="600"></div>
20+
<div id="ctEdgeLength" slider class="cdbl-slider" model="ctEdgeLength" min="1" max="150"></div>
2121
</p>
2222

2323
</div>

Diff for: ‎app/services/model/extraction-filters.srv.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function filters($cookies, $log) {
3939
var cookieLoopFlag = $cookies.get(cookiePrefix + 'include_loops');
4040

4141
if (cookieLoopFlag !== undefined) {
42-
includeLoops= cookieLoopFlag;
42+
includeLoops = cookieLoopFlag;
4343
}
4444

4545
return (includeLoops === 'true');

Diff for: ‎app/styles/main.css

+5
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ div.main {
6060
margin-top: 15px;
6161
}
6262

63+
/* small fix so deactivated namespace really looks deactivated */
64+
.btn-default:focus {
65+
background-color: #fff;
66+
}
67+
6368
/* Everything but the jumbotron gets side spacing for mobile first views */
6469
.header,
6570
.marketing,

0 commit comments

Comments
 (0)