graphdb-workbench 2.4.0-TR1 → 2.4.0-TR11

package/dist/pages/edit.html

@@ -1,4 +1,4 @@
-<link href="css/lib/angular-xeditable/xeditable.min.css?v=2.4.0-TR1" rel="stylesheet">
+<link href="css/lib/angular-xeditable/xeditable.min.css?v=2.4.0-TR11" rel="stylesheet">
 
 <div core-errors></div>
 <div class="page" ng-show="getActiveRepository()">
@@ -38,7 +38,7 @@
                         <form name="newRowPredicate" novalidate>
                             <input required uri name="value"
                                    placeholder="{{'example.label' | translate}}: &quot;http://exampleuri.com/examplepath&quot;, &quot;namespaceprefix:exampleproperty&quot;"
-                                   class="form-control predicate-input" type="text" ng-model="newRow.predicate">
+                                   class="form-control" type="text" ng-model="newRow.predicate">
 
                             <div ng-show="predicate_new.$submitted || predicate_new.value.$touched">
                                 <p ng-show="predicate_new.value.$error.required"
@@ -46,19 +46,16 @@
                                     {{'complete.short.iri.warning' | translate}}
                                 </p>
                             </div>
-                            <ul class="list-inline predicate-suggestions">
-                                <li ng-repeat="namespace in namespaces" class="list-inline-item">
-                                    <a href
-                                       ng-click="newRow.predicate = namespace.uri"
-                                       class="pointer predicate-suggestion">{{namespace.prefix}}
-                                    </a>
-                                </li>
+                            <ul class="list-inline">
+                                <li ng-repeat="namespace in namespaces" class="list-inline-item"><a href
+                                                                           ng-click="newRow.predicate = namespace.uri"
+                                                                           class="pointer">{{namespace.prefix}}</a></li>
                             </ul>
                         </form>
                     </td>
                     <td style="vertical-align: top;">
                         <form name="newRowObject" novalidate>
-                            <select class="form-control mb-1 object-type-selector" ng-model="newRow.object.type">
+                            <select class="form-control mb-1" ng-model="newRow.object.type">
                                 <option value="uri">{{'iri.label' | translate}}</option>
                                 <option value="literal">{{'literal.type.index' | translate}}</option>
                             </select>
@@ -72,13 +69,10 @@
                                     {{'complete.short.iri.warning' | translate}}
                                 </p>
                             </div>
-                            <ul class="list-inline object-iri-type-suggestions" ng-show="newRow.object.type == 'uri'">
-                                <li ng-repeat="namespace in namespaces" class="list-inline-item">
-                                    <a href
-                                       ng-click="newRow.object.value = namespace.uri"
-                                       class="pointer object-iri-type-suggestion">{{namespace.prefix}}
-                                    </a>
-                                </li>
+                            <ul class="list-inline" ng-show="newRow.object.type == 'uri'">
+                                <li ng-repeat="namespace in namespaces" class="list-inline-item"><a href
+                                                                           ng-click="newRow.object.value = namespace.uri"
+                                                                           class="pointer">{{namespace.prefix}}</a></li>
                             </ul>
                             <select ng-show="newRow.object.type == 'literal'" class="form-control literalType"
                                     ng-model="newRow.object.datatype">
@@ -96,19 +90,16 @@
                         <form name="newRowContext" novalidate>
                             <input name="" uri
                                    placeholder="{{'example.label' | translate}}: &quot;http://exampleuri.com/examplepath&quot;, &quot;namespaceprefix:exampleproperty&quot;"
-                                   class="form-control context-input" type="text" ng-model="newRow.context">
+                                   class="form-control" type="text" ng-model="newRow.context">
 
                             <p ng-show="newRow.context && !validateUri(newRow.context)"
                                class="alert alert-info completeUriAlert">
                                 {{'complete.short.iri.warning' | translate}}
                             </p>
                             <ul class="list-inline">
-                                <li ng-repeat="namespace in namespaces" class="list-inline-item context-suggestions">
-                                    <a href
-                                       ng-click="newRow.context = namespace.prefix+':'"
-                                       class="pointer context-suggestion">{{namespace.prefix}}
-                                    </a>
-                                </li>
+                                <li ng-repeat="namespace in namespaces" class="list-inline-item"><a href
+                                                                           ng-click="newRow.context = namespace.prefix+':'"
+                                                                           class="pointer">{{namespace.prefix}}</a></li>
                             </ul>
                         </form>
                     </td>
@@ -182,13 +173,13 @@
             </table>
     </div>
     <div class="text-xs-right">
-		<button class="btn btn-secondary view-trig-btn"
+		<button class="btn btn-secondary"
                 ng-disabled="statements.length == 0"
                 gdb-tooltip="{{'view.resource.trig.format.tooltip' | translate}}"
                 ng-click="viewTrig()">
             {{'view.trig.format.label' | translate}}
         </button>
-        <button class="btn btn-primary save-btn"
+        <button class="btn btn-primary"
                 gdb-tooltip="{{'save.changes.label' | translate}}"
                 ng-click="save()">
             {{'common.save.btn' | translate}}

package/dist/pages/explore.html

@@ -1,143 +1,114 @@
-<link href="css/explore.css?v=2.4.0-TR1" rel="stylesheet"/>
-
+<link href="css/explore.css?v=2.4.0-TR11" rel="stylesheet"/>
 <div core-errors></div>
-<div class="page fit-content-on-mobile">
-    <div class="resource-info" ng-if="resourceInfo && !isTripleResource()">
-        <div class="thumb" ng-if="resourceInfo.details.img">
-            <a href="resourceInfo.details.img">
-                <img ng-src="{{details.img}}" alt="details image"/>
-            </a>
+<div class="page fit-content-on-mobile" ng-show="getActiveRepository()">
+    <div class="resource-info" ng-if="!isTripleResource()">
+        <div class="thumb" ng-show="{{details.img}}">
+            <a href="{{details.img}}"><img ng-src="{{details.img}}" alt="details image"/></a>
         </div>
         <h1>
-            <a href="resourceInfo.details.uri" gdb-tooltip="resourceInfo.details.uri">
-                {{resourceInfo.details.label ? resourceInfo.details.label : getLocalName(resourceInfo.details.uri)}}
+            <a href="{{details.uri}}" gdb-tooltip="{{details.uri}}">
+                {{details.label ? details.label : getLocalName(details.uri)}}
             </a>
 
-            <a gdb-tooltip="{{'edit.resource.label' | translate}}" href="resource/edit?uri={{resourceInfo.details.encodeURI}}"
+            <a gdb-tooltip="{{'edit.resource.label' | translate}}" href="resource/edit?uri={{details.encodeURI}}"
                ng-if="canWriteActiveRepo(true)"
-               class="btn btn-link edit-resource-link">
+               class="btn btn-link">
                 <span class="icon-edit"></span>
             </a>
         </h1>
 
-        <p ng-if="resourceInfo.details.comment" data-escape="false">{{resourceInfo.details.comment}}</p>
+        <p ng-show="{{details.comment}}" data-escape="false">{{details.comment}}</p>
         <p>
-            <span>{{'source.label' | translate}}:</span>&nbsp;
-            <a class="source-link" href="{{resourceInfo.details.uri}}">{{resourceInfo.details.uri}}</a>
+            <span>{{'source.label' | translate}}:</span>&nbsp;<a href="{{details.uri}}">{{details.uri}}</a>
         </p>
         <p ng-show="isContextAvailable()">
-            <span>{{'context.label' | translate}}:</span>&nbsp;
-            <a class="context-link" href="{{resourceInfo.details.context}}">{{resourceInfo.details.context}}</a>
+            <span>{{'context.label' | translate}}:</span>&nbsp;<a href="{{details.context}}">{{details.context}}</a>
         </p>
     </div>
 
-    <div class="resource-info" ng-if="resourceInfo && isTripleResource()">
-        <div class="thumb" ng-if="resourceInfo.details.img">
-            <a href="{{resourceInfo.details.img}}">
-                <img ng-src="{{resourceInfo.details.img}}" alt="details image"/>
-            </a>
+    <div class="resource-info" ng-if="isTripleResource()">
+        <div class="thumb" ng-show="{{details.img}}">
+            <a href="{{details.img}}"><img ng-src="{{details.img}}" alt="details image"/></a>
         </div>
         <h1 fit-text fit-text-min="30">
-            <a href="sparql?query=describe%20{{encodeURIComponent(resourceInfo.triple)}}"
-               gdb-tooltip="{{resourceInfo.triple}}"
-            class="triple-resource-link">
-                {{getRdfStarLocalNames(resourceInfo.triple)}}
+            <a href="sparql?query=describe%20{{encodeURIComponent(tripleParam)}}" gdb-tooltip="{{tripleParam}}">
+                {{getRdfStarLocalNames(tripleParam)}}
             </a>
         </h1>
 
-        <p ng-show="resourceInfo.details.comment" data-escape="false">{{resourceInfo.details.comment}}</p>
+        <p ng-show="{{details.comment}}" data-escape="false">{{details.comment}}</p>
         <p>
-            <span>{{'target.label' | translate}}:</span>&nbsp;
-            <a href="sparql?query=describe%20{{encodeURIComponent(resourceInfo.triple)}}"
-               class="target-link">
-                {{resourceInfo.triple}}
-            </a>
+            <span>{{'target.label' | translate}}:</span>&nbsp;<a href="sparql?query=describe%20{{encodeURIComponent(tripleParam)}}">{{tripleParam}}</a>
         </p>
     </div>
 
-    <div class="pull-right" ng-if="resourceInfo">
+    <div class="pull-right">
 
         <label for="inference-select" class="mb-0">
             <select id="inference-select"
-                    class="form-control form-control-sm"
-                    ng-model="currentContextType"
-                    ng-change="changeInference(currentContextType)"
-                    ng-disabled="loading || role === 'context' || getActiveRepository() === 'SYSTEM'">
-                <option ng-repeat="contextType in contextTypes"
-                        value="{{contextType.id}}"
-                        ng-selected="resourceInfo.contextType.id === contextType.id">
-                    {{contextType.labelKey | translate}}
-                </option>
-            </select>
+                    ng-options="inf.id as inf.title | translate for inf in inferences" ng-model="inference"
+                    ng-change="changeInference(inference)" class="form-control form-control-sm" ng-disabled="loading || role === 'context' || getActiveRepository() === 'SYSTEM'"></select>
         </label>
 
-        <button type="button" class="btn btn-link same-as-btn btn-sm"
-                ng-model="sameAs"
+        <button type="button" class="btn btn-link" ng-model="sameAs"
                 ng-class="loading ? 'disabled' : ''"
-                ng-if="resourceInfo.contextType !== ContextTypes.EXPLICIT"
-                ng-click="toggleSameAs()"
-                uib-popover="{{'sidepanel.expand.results.sameas' | translate}}: {{resourceInfo.sameAs ? 'common.on.btn' : 'common.off.btn' | translate}}"
+                ng-show="inference != 'explicit'"
+                ng-click="sameAs = !sameAs; exploreResource()"
+                uib-popover="{{'sidepanel.expand.results.sameas' | translate}}: {{sameAs ? 'common.on.btn' : 'common.off.btn' | translate}}"
                 popover-trigger="mouseenter"
                 popover-placement="bottom">
-            <span ng-class="{'icon-sameas-on':resourceInfo.sameAs, 'icon-sameas-off':!resourceInfo.sameAs}"></span>
+            <span class="icon-2-5x"
+                  ng-class="{'icon-sameas-on':sameAs, 'icon-sameas-off':!sameAs}"></span>
         </button>
 
-        <button type="button"
-                class="btn btn-sm show-blank-nodes-btn" ng-model="resourceInfo.blanks"
-                ng-class="loading ? 'disabled' : (resourceInfo.blanks ? 'btn-primary' : 'btn-secondary')"
-                uib-btn-checkbox
-                btn-checkbox-true="true"
-                btn-checkbox-false="false"
-                ng-change="exploreResource()">
+        <button type="button" class="btn btn-sm" ng-model="blanks"
+                ng-class="loading ? 'disabled' : (blanks ? 'btn-primary' : 'btn-secondary')"
+                uib-btn-checkbox btn-checkbox-true="true"
+                btn-checkbox-false="false" ng-change="exploreResource()">
             {{'show.blank.nodes.label' | translate}}
         </button>
 
         <div class="btn-group" uib-dropdown is-open="isopen">
-            <button type="button"
-                    class="btn btn-sm btn-secondary dropdown-toggle"
-                    ng-class="loading ? 'disabled' : ''"
+            <button type="button" ng-class="loading ? 'disabled' : ''" class="btn btn-sm btn-secondary dropdown-toggle"
                     uib-dropdown-toggle>
                 {{'download.as.label' | translate}}
             </button>
             <ul class="dropdown-menu small" role="menu">
-                <li ng-repeat="fileType in fileTypes">
-                    <a href="javascript:" ng-click="downloadExport(fileType)" class="dropdown-item">{{fileType.name}}</a>
+                <li ng-repeat="format in formats">
+                    <a href="javascript:" ng-click="downloadExport(format)" class="dropdown-item">{{format.name}}</a>
                 </li>
             </ul>
         </div>
 
-        <button type="button" role="button" class="btn btn-primary btn-sm visual-graph-btn"
+        <button type="button" role="button" class="btn btn-primary btn-sm"
                 uib-popover="{{'explore.graph.visually.popover' | translate}}"
                 popover-trigger="mouseenter"
                 popover-placement="bottom"
-                ng-click="goToGraphsViz()"
-                guide-selector="explore-visual">
+                ng-click="goToGraphsViz()" guide-selector="explore-visual">
             {{'visual.graph.label' | translate}}
         </button>
 
     </div>
 
-    <div id="selection" class="selection mb-1" ng-if="resourceInfo">
+    <div id="selection" class="selection mb-1" ng-init="roles = ['subject', 'predicate', 'object', 'context', 'all']">
         <ul class="nav nav-tabs">
-            <li ng-repeat="role in roles" class="nav-item">
-                <a class="nav-link" href
-                   ng-click="changeRole(role)"
-                   ng-class="resourceInfo.role === role ? 'active' : (loading ? 'disabled': '')"
-                   ng-disabled="loading"
-                   guide-selector="role-{{role}}">
-                    {{role | translate}}
+            <li ng-repeat="roleVar in roles" class="nav-item">
+                <a class="nav-link" href ng-click="changeRole(roleVar)"
+                   ng-class="role === roleVar ? 'active' : (loading ? 'disabled': '')" ng-disabled="loading"
+                   guide-selector="role-{{roleVar}}">
+                    {{roleVar | translate}}
                 </a>
             </li>
         </ul>
     </div>
 
-    <yasgui-component id="query-editor" yasgui-config="yasguiConfig"></yasgui-component>
-
-    <div onto-loader-new
-         ng-if="isLoading"
-         size="100"
-         message="loaderMessage"
-         timeout="[1]">
+    <div id="yasr" class="explore">
+        <!--<uib-pagination class="nav navbar-right" ng-show="allResultsCount > pageSize" total-items="allResultsCount" items-per-page="pageSize" ng-model="page" ng-change="changePagination()" direction-links="false" boundary-links="true" max-size="5" rotate="true"></pagination>-->
+        <div class="yasr" id="yasr-inner">
+            <div class='yasr_results' guide-selector="yasrResults"></div>
+        </div>
     </div>
 
+    <div id="results-loader" class="ot-loader opacity-hide" onto-loader size="100"></div>
+
 </div>

package/dist/pages/export.html

@@ -1,4 +1,4 @@
-<link href="css/export.css?v=2.4.0-TR1" rel="stylesheet">
+<link href="css/export.css?v=2.4.0-TR11" rel="stylesheet">
 
 <div id="wb-export">
 
@@ -8,7 +8,7 @@
 			uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
 			popover-trigger="mouseenter"
 			popover-placement="bottom-right"
-			popover-append-to-body="true"><span class="icon-info"></span></span>
+			popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
 	</h1>
 
 
@@ -49,26 +49,24 @@
 					</label>
 				</div>
 
-
-
 				<div class="clearfix mb-2">
-					<div class="btn-group" uib-dropdown>
-						<button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle>
-							<span class="icon-export"></span> {{'export.repository.label' | translate}}
-						</button>
-						<ul class="dropdown-menu">
-							<li ng-repeat="format in exportFormats" class="export-repo-format-{{format.name}}"
-								ng-click="exportRepo(format, false);">
-								<span class="dropdown-item">{{format.name}}</span>
-							</li>
-						</ul>
-					</div>
 					<button type="button" class="btn btn-secondary clear-repository-btn"
 							ng-click="dropRepository()"
 							gdb-tooltip="{{'removes.data.from.repo.label' | translate}}" tooltip-placement="top"
 							ng-disabled="!canWriteActiveRepo(true)">
 						<span class="icon-trash"></span> {{'clear.repo.label' | translate}}
 					</button>
+                    <div class="btn-group" uib-dropdown>
+                        <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle>
+                            <span class="icon-export"></span> {{'export.repository.label' | translate}}
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li ng-repeat="format in exportFormats" class="export-repo-format-{{format.name}}"
+                                ng-click="exportRepo(format, false);">
+                                <span class="dropdown-item">{{format.name}}</span>
+                            </li>
+                        </ul>
+                    </div>
 					<div class="pull-right">
 						<div ng-show="pageSize >= filteredGraphs.length"></div>
                         <div paginations ng-hide="pageSize >= filteredGraphs.length"
@@ -89,9 +87,10 @@
 										<input class="form-check-input" type="checkbox" ng-model="selectedAll" ng-click="checkAll()">
 									</label>
 									<div class="btn-group btn-group-sm" uib-dropdown>
+										<!-- Keep the closing button tag right after the closing span tag, otherwise
+											 an extra space is rendered in HTML -->
 										<button type="button" class="btn btn-link dropdown-toggle" uib-dropdown-toggle gdb-tooltip="{{'export.selected.graphs.tooltip' | translate}}" ng-disabled="!hasMultipleSelected()">
-											<span class="icon-export"></span>
-										</button>
+											<span class="icon-export"></span></button>
 										<ul class="dropdown-menu" role="menu">
 											<li ng-repeat="format in exportFormats"
 												ng-click="exportSelectedGraphs(format)">
@@ -133,10 +132,11 @@
 							<td>
 
 								<div class="btn-group" uib-dropdown>
+									<!-- Keep the closing button tag right after the closing span tag, otherwise
+										 an extra space is rendered in HTML -->
 									<button type="button" class="btn btn-link dropdown-toggle" uib-dropdown-toggle gdb-tooltip="{{'export.graph.label' | translate}}"
-                                            ng-disabled="!graph.contextID.uri">
-										<span class="icon-export"></span>
-									</button>
+											ng-disabled="!graph.contextID.uri">
+										<span class="icon-export"></span></button>
 									<ul class="dropdown-menu" role="menu">
 										<li ng-repeat="format in exportFormats"
 											ng-click="exportRepo(format, graph.contextID);">

package/dist/pages/find.html

@@ -1,4 +1,4 @@
-<link href="css/find.css?v=2.4.0-TR1" rel="stylesheet"/>
+<link href="css/find.css?v=2.4.0-TR11" rel="stylesheet"/>
 
 <div class="page">
 	<h1>
@@ -7,7 +7,7 @@
 		   uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
 		   popover-trigger="mouseenter"
 		   popover-placement="bottom-right"
-		   popover-append-to-body="true"><span class="icon-info"></span></span>
+		   popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
 	</h1>
     <div core-errors></div>
     <form class="form-horizontal" name="form" novalidate ng-submit="submit()" ng-show="getActiveRepository()">