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

Commit 2536a79

Browse files
aleksashinataleksashinat
committed
Merge remote-tracking branch 'origin/master'
2 parents 42bf38f + 84b03e1 commit 2536a79

File tree

12 files changed

+66
-59
lines changed

12 files changed

+66
-59
lines changed

‎src/main/resources/geoknow-initial-settings.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# #######################################################################################
2222

2323
:GeoKnowGeneratorService a sd:Service;
24-
sd:endpoint <http://localhost:8890/sparql>;
24+
sd:endpoint <http://10.0.0.85:8890/sparql>;
2525
sd:supportedLanguage sd:SPARQL11Query ;
2626
sd:defaultDataset :default-dataset;
2727
.
@@ -56,7 +56,7 @@
5656
rdfs:label "Virtuoso Generator Conductor"^^xsd:string ;
5757
lds:dbPassword "dba"^^xsd:string ;
5858
lds:dbUser "dba"^^xsd:string ;
59-
lds:serviceUrl <http://localhost:8890/conductor>
59+
lds:serviceUrl <http://10.0.0.85:8890/conductor>
6060
] ;
6161
lds:providesService :VirtuosoGeneratorEndpoint ;
6262
lds:version "7.0"^^xsd:string ;
@@ -65,14 +65,14 @@
6565
:VirtuosoGeneratorEndpoint
6666
a lds:SPARQLEndPointService ;
6767
rdfs:label "Virtuoso Generator Endpoint"^^xsd:string ;
68-
lds:serviceUrl <http://localhost:8890/sparql> .
68+
lds:serviceUrl <http://10.0.0.85:8890/sparql> .
6969

7070
:Sparqlify
7171
a lds:StackComponent ;
7272
rdfs:label "Sparqlify"^^xsd:string ;
7373
lds:providesService
7474
[ a lds:ExplorationService ;
75-
lds:serviceUrl <http://localhost:8080/sparqlify/>
75+
lds:serviceUrl <http://10.0.0.85:8080/sparqlify/>
7676
] ;
7777
lds:version "0.1-SNAPSHOT"^^xsd:string ;
7878
foaf:homepage <http://aksw.org/Projects/Sparqlify.html> .
@@ -122,7 +122,7 @@
122122
rdfs:label "OntoWiki"^^xsd:string ;
123123
lds:providesService
124124
[ a lds:AuthoringService ;
125-
lds:serviceUrl <http://localhost/ontowiki>
125+
lds:serviceUrl <http://10.0.0.85/ontowiki>
126126
] ;
127127
lds:version "0.9.10-1"^^xsd:string ;
128128
foaf:homepage <http://aksw.org/Projects/OntoWiki.html> .

‎src/main/resources/geoknow-settings.ttl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# #######################################################################################
2828

2929
:GeoKnowGeneratorService a sd:Service;
30-
sd:endpoint <http://localhost:8890/sparql>;
30+
sd:endpoint <http://10.0.0.85:8890/sparql>;
3131
sd:supportedLanguage sd:SPARQL11Query ;
3232
sd:defaultDataset :default-dataset;
3333
.
@@ -53,7 +53,7 @@
5353
foaf:homepage <http://generator.geoknow.eu/#/settings>;
5454
dcterms:modified "2013-09-12"^^xsd:date;
5555
dcterms:created "2013-09-12"^^xsd:date;
56-
void:sparqlEndpoint <http://localhost:8890/sparql>;
56+
void:sparqlEndpoint <http://10.0.0.85:8890/sparql>;
5757
];
5858
.
5959

@@ -76,7 +76,7 @@
7676
rdfs:label "Virtuoso Generator Conductor"^^xsd:string ;
7777
lds:dbPassword "dba"^^xsd:string ;
7878
lds:dbUser "dba"^^xsd:string ;
79-
lds:serviceUrl <http://localhost:8890/conductor>
79+
lds:serviceUrl <http://10.0.0.85:8890/conductor>
8080
] ;
8181
lds:providesService :VirtuosoGeneratorEndpoint ;
8282
lds:version "7.0"^^xsd:string ;
@@ -87,14 +87,14 @@
8787
rdfs:label "Virtuoso Generator Endpoint"^^xsd:string ;
8888
## This is to be the same URL as the configuration of the Generator
8989
## TODO: find a way to link both
90-
lds:serviceUrl <http://localhost:8890/sparql> .
90+
lds:serviceUrl <http://10.0.0.85:8890/sparql> .
9191

9292
:Sparqlify
9393
a lds:StackComponent ;
9494
rdfs:label "Sparqlify"^^xsd:string ;
9595
lds:providesService
9696
[ a lds:ExplorationService ;
97-
lds:serviceUrl <http://localhost:8080/sparqlify/>
97+
lds:serviceUrl <http://10.0.0.85:8080/sparqlify/>
9898
] ;
9999
lds:version "0.1-SNAPSHOT"^^xsd:string ;
100100
foaf:homepage <http://aksw.org/Projects/Sparqlify.html> .
@@ -144,7 +144,7 @@
144144
rdfs:label "OntoWiki"^^xsd:string ;
145145
lds:providesService
146146
[ a lds:AuthoringService ;
147-
lds:serviceUrl <http://localhost/ontowiki>
147+
lds:serviceUrl <http://10.0.0.85/ontowiki>
148148
] ;
149149
lds:version "0.9.10-1"^^xsd:string ;
150150
foaf:homepage <http://aksw.org/Projects/OntoWiki.html> .

‎src/main/webapp/css/app.css‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ html, body{
88
}
99

1010
body{
11-
overflow-y: hidden;
11+
overflow-y: auto;
1212
}
1313

1414
#contents{
@@ -331,6 +331,7 @@ form{
331331
}
332332

333333
/* Modal dialogs */
334+
/*
334335
.modal-body {
335336
overflow: auto;
336337
font: .87em Helvetica, arial, freesans, clean, sans-serif;
@@ -340,4 +341,5 @@ form{
340341
overflow: auto;
341342
margin-top: 0px !important;
342343
width: 1100px !important;
343-
}
344+
}
345+
*/

‎src/main/webapp/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<ul class="nav navbar-nav navbar-right">
4646
<li>
47-
<div class="navbar-form" ng-show="currentAccount.username">
47+
<div ng-show="currentAccount.username">
4848
<span class="strong">You are logged in as <strong>{{currentAccount.username}}</strong></span> <button class="btn-sm btn-primary" ng-click="logout()">Logout</button>
4949
</div>
5050
<div ng-hide="loggedIn">

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,14 @@ function LoginCtrl($scope, flash, AccountService, LoginService, ServerErrorRespo
115115
$scope.close('#modalLogin');
116116
$scope.login.username = null;
117117
$scope.login.password = null;
118-
$scope.loggedIn = true;
118+
if($scope.currentAccount.user != null){
119+
$scope.loggedIn = true;
120+
}
119121
}, function(response) {
120122
flash.error = ServerErrorResponse.getMessage(response.status);
121123
$scope.login.username = null;
122124
$scope.login.password = null;
125+
$scope.loggedIn = false;
123126
});
124127
};
125128

@@ -328,7 +331,7 @@ app.controller('VirtuosoCtrl', function($scope, ConfigurationService, AccountSer
328331
*
329332
***************************************************************************************************/
330333

331-
app.controller('FaceteFormCtrl', function($scope, ConfigurationService, GraphService) {
334+
app.controller('FaceteFormCtrl', function($scope, ConfigurationService, GraphService, AccountService) {
332335
//Settings for Facete
333336

334337
$scope.namedGraphs = [];
@@ -3384,4 +3387,4 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
33843387
$scope.notCurrent = function(mapping) {
33853388
return $scope.isNew || mapping.id != $scope.mapping.id;
33863389
};
3387-
};
3390+
};

‎src/main/webapp/partials/authoring/ontology.html‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,36 @@
11
<div ng-controller="OntologyCtrl">
22

3-
<div class="modal fade" id="modalOntology">
4-
<div class="modal-dialog">
3+
<div class="row below">
4+
<h3 class="green bold">
5+
<span class="btn-group">
6+
<button type="button" class="btn btn-link reset" ng-click="refreshOntologies()">
7+
<i class="glyphicon glyphicon-refresh" aria-hidden="true"></i>
8+
</button>
9+
</span>
10+
Ontologies
11+
</h3>
12+
13+
<table class="table table-striped">
14+
<thead>
15+
<tr>
16+
<th>Action</th>
17+
<th>URI</th>
18+
</tr>
19+
</thead>
20+
<tbody>
21+
<tr ng-repeat="onto in ontologies">
22+
<td>
23+
<button type="button" class="btn btn-default btn-xs" ng-click="delete('{{onto}}')"><span class="glyphicon glyphicon-trash"></span></button>
24+
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" ng-click="setUrl('{{onto}}'); openModal();"><span class="glyphicon glyphicon-edit"></span></button>
25+
</td>
26+
<td>{{onto}}</td>
27+
</tr>
28+
</tbody>
29+
</table>
30+
31+
<button type="button" class="btn btn-primary btn-large" data-toggle="modal" data-target="#modalOntology" ng-click="new();">Add new ontology</button>
32+
33+
<div class="modal fade" id="modalOntology">
534
<div class="modal-content">
635
<div class="modal-header">
736
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -53,43 +82,11 @@ <h5 class="modal-title green bold">Add ontology</h5>
5382
</div>
5483
</div>
5584
</div>
56-
</div>
57-
58-
<div class="row below">
59-
<h3 class="green bold">
60-
<span class="btn-group">
61-
<button type="button" class="btn btn-link reset" ng-click="refreshOntologies()">
62-
<i class="glyphicon glyphicon-refresh" aria-hidden="true"></i>
63-
</button>
64-
</span>
65-
Ontologies
66-
</h3>
67-
68-
<table class="table table-striped">
69-
<thead>
70-
<tr>
71-
<th>Action</th>
72-
<th>URI</th>
73-
</tr>
74-
</thead>
75-
<tbody>
76-
<tr ng-repeat="onto in ontologies">
77-
<td>
78-
<button type="button" class="btn btn-default btn-xs" ng-click="delete('{{onto}}')"><span class="glyphicon glyphicon-trash"></span></button>
79-
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" ng-click="setUrl('{{onto}}'); openModal();"><span class="glyphicon glyphicon-edit"></span></button>
80-
</td>
81-
<td>{{onto}}</td>
82-
</tr>
83-
</tbody>
84-
</table>
85-
86-
<button type="button" class="btn btn-primary btn-large" data-toggle="modal" data-target="#modalOntology" ng-click="new();">Add new ontology</button>
8785

8886
<div class="modal fade" id="fullModal">
89-
<div class="modal-dialog">
9087
<div class="modal-content">
9188
<div class="modal-header">
92-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
89+
<button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
9390
<h5 class="modal-title green bold">MiniDix</h5>
9491
</div>
9592
<div class="modal-body">
@@ -98,5 +95,4 @@ <h5 class="modal-title green bold">MiniDix</h5>
9895
</div>
9996
</div>
10097
</div>
101-
</div>
10298
</div>

‎src/main/webapp/partials/authoring/ontowiki.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ <h3 class="green bold">{{component.label}}</h3>
1414
</div>
1515
<!-- Modal -->
1616
<div class="modal fade" id="fullModal" >
17-
<div class="modal-dialog">
1817
<div class="modal-content">
1918
<div class="modal-header">
20-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
19+
<button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
2120
<h5 class="modal-title green bold">{{component.label}}</h5>
2221
</div>
2322
<div class="modal-body">
2423
<modal-iframe></modal-iframe>
2524
</div>
2625
</div><!-- /.modal -->
2726
</div>
28-
</div>
2927
</div>
3028

‎src/main/webapp/partials/extraction-and-loading/d2rq-mapping.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="modal-content">
99
<form name="mappingGroupForm" class="form-horizontal InputForm" role="form" novalidate>
1010
<div class="modal-header">
11-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
11+
<button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
1212
<h5 class="modal-title green bold">Add mapping group</h5>
1313
</div>
1414
<div class="modal-body">

‎src/main/webapp/partials/extraction-and-loading/sparqlify.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ <h3 class="green bold">{{component.label}}</h3>
2727

2828
<!-- Modal -->
2929
<div class="modal fade" id="fullModal" >
30+
<div class="modal-content">
3031
<div class="modal-header">
3132
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
3233
<h5 class="modal-title green bold">Sparqlify</h5>
3334
</div>
3435
<div class="modal-body">
3536
<modal-iframe></modal-iframe>
3637
</div>
38+
</div>
3739
</div><!-- /.modal -->
3840
</div>
3941

‎src/main/webapp/partials/querying-and-exploration/facete.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ <h3 class="green bold">{{component.label}}</h3>
3131
</form>
3232

3333
<!-- Modal -->
34-
<div class="modal fade" id="fullModal" >
34+
<div class="modal fade" id="fullModal">
35+
<div class="modal-content">
3536
<div class="modal-header">
3637
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
3738
<h5 class="modal-title green bold">Facete</h5>
3839
</div>
3940
<div class="modal-body">
4041
<modal-iframe></modal-iframe>
4142
</div>
43+
</div>
4244
</div><!-- /.modal -->
4345
</div>
4446

0 commit comments

Comments
 (0)