graphdb-workbench 10.0.0-M2-1 → 10.5.1

package/dist/js/angular/security/templates/user.html

@@ -31,25 +31,27 @@
 	</ul>
 </script>
 
+<link href="css/lib/ng-tags-input/ng-tags-input.min.css?v=10.5.1" rel="stylesheet"/>
+
 <h1>{{pageTitle}}</h1>
 
 <div id="wb-user" ng-hide="loader">
 	<form name="form" class="form newUserForm userForm editUserContainer" ng-submit="submit()" novalidate>
 		<div class="row">
-			<div class="col-md-6">
+			<div class="col-md-6 us-left-col">
 				<div class="card login-credentials" ng-hide="isOverrideAuth() || !isLocalAuthentication()">
 					<div class="card-block">
 						<h3>{{'view.login.title' | translate}}</h3>
 						<div class="form-group" ng-class="{'has-danger': usernameError}">
 							<div class="input-group">
-								<span class="input-group-addon" tooltip="{{'security.table.username' | translate}}" tooltip-trigger="mouseenter"><em class="icon-user icon-2x text-muted"></em></span>
+								<span class="input-group-addon" gdb-tooltip="{{'security.table.username' | translate}}"><em class="icon-user icon-2x text-muted"></em></span>
 								<input id="wb-user-username" placeholder="{{'security.table.username' | translate}}" name="username" class="form-control form-control-lg" type="text" ng-model="user.username" ng-readonly="mode !== 'add'">
 							</div>
 							<div ng-show="usernameError" class="form-control-feedback">{{usernameError}}</div>
 						</div>
 						<div class="form-group" ng-class="{'has-danger': passwordError}">
 							<div class="input-group">
-								<span class="input-group-addon" tooltip="{{'security.password.placeholder' | translate}}" tooltip-trigger="mouseenter"><em class="icon-lock icon-2x text-muted"></em></span>
+								<span class="input-group-addon" gdb-tooltip="{{'security.password.placeholder' | translate}}"><em class="icon-lock icon-2x text-muted"></em></span>
 								<input id="wb-user-password" placeholder="{{passwordPlaceholder | translate}}" name="password" class="form-control form-control-lg" type="password"	ng-model="user.password" ng-hide="user.external || hasExternalAuthUser()" ng-readonly="noPassword">
 								<span ng-show="user.external || hasExternalAuthUser()">{{'security.auth.from.external.module' | translate}}</span>
 							</div>
@@ -57,7 +59,7 @@
 						</div>
 						<div class="form-group" ng-class="{'has-danger': confirmPasswordError}" ng-hide="user.external || hasExternalAuthUser()">
 							<div class="input-group">
-								<span class="input-group-addon" tooltip="{{'security.password.confirm' | translate}}" tooltip-trigger="mouseenter"><em class="icon-lock icon-2x text-muted"></em></span>
+								<span class="input-group-addon" gdb-tooltip="{{'security.password.confirm' | translate}}"><em class="icon-lock icon-2x text-muted"></em></span>
 								<input id="wb-user-confirmpassword" placeholder="{{'security.password.confirm' | translate}}" name="password_confirm" class="form-control form-control-lg" type="password" ng-model="user.confirmpassword" ng-readonly="noPassword">
 							</div>
 							<div ng-show="confirmPasswordError" class="form-control-feedback">{{confirmPasswordError}}</div>
@@ -83,10 +85,12 @@
 									{{user.appSettings.DEFAULT_SAMEAS ? 'common.on.btn' : 'common.off.btn' | translate}}
 								</span>
 							</span>
-							<span tooltip="{{'security.tooltip.click.me' | translate}}" tooltip-placement="top" tooltip-trigger="mouseenter"
+							<span gdb-tooltip="{{shouldDisableSameAs() ? 'core.require.inferred' : 'security.tooltip.click.me' | translate}}" tooltip-placement="top"
 								  ng-click="user.appSettings.DEFAULT_SAMEAS = !user.appSettings.DEFAULT_SAMEAS"
 								  class="switch mr-0">
-								<input type="checkbox" class="switch" ng-checked="user.appSettings.DEFAULT_SAMEAS"/>
+								<input  id="sameAsCheck" type="checkbox" class="switch"
+                                        ng-checked="user.appSettings.DEFAULT_SAMEAS"
+                                        ng-disabled="shouldDisableSameAs()"/>
 								<label for="sameas-on"></label>
 							</span>
 							{{'security.default.editor.graph' | translate}}
@@ -99,7 +103,7 @@
 									{{user.appSettings.DEFAULT_INFERENCE ? 'common.on.btn' : 'common.off.btn' | translate}}
 								</span>
 							</span>
-							<span tooltip="{{'security.tooltip.click.me' | translate}}" tooltip-placement="top" tooltip-trigger="mouseenter"
+							<span gdb-tooltip="{{'security.tooltip.click.me' | translate}}" tooltip-placement="top"
 								  ng-click="user.appSettings.DEFAULT_INFERENCE = !user.appSettings.DEFAULT_INFERENCE"
 								  class="switch mr-0">
 								<input type="checkbox" class="switch" ng-checked="user.appSettings.DEFAULT_INFERENCE"/>
@@ -114,7 +118,7 @@
 								<span class="tag {{user.appSettings.DEFAULT_VIS_GRAPH_SCHEMA ? 'tag-primary' : 'tag-default'}}">
 									{{user.appSettings.DEFAULT_VIS_GRAPH_SCHEMA ? 'common.on.btn' : 'common.off.btn' | translate}}
 								</span>
-                                <span tooltip="{{'security.tooltip.click.me' | translate}}" tooltip-placement="top" tooltip-trigger="mouseenter"
+                                <span gdb-tooltip="{{'security.tooltip.click.me' | translate}}" tooltip-placement="top"
                                       ng-click="user.appSettings.DEFAULT_VIS_GRAPH_SCHEMA = !user.appSettings.DEFAULT_VIS_GRAPH_SCHEMA"
                                       class="switch mr-0">
 								<input type="checkbox" class="switch" ng-checked="user.appSettings.DEFAULT_VIS_GRAPH_SCHEMA"/>
@@ -137,27 +141,62 @@
 					</div>
 				</div>
 
+				<div class="card" id="workbench-settings" ng-if="showWorkbenchSettings">
+					<div class="card-block">
+						<h3>{{'security.workbench.settings.title' | translate}}
+							<em class="icon-info text-tertiary small" gdb-tooltip="{{'security.workbench.settings.theme.tooltip' | translate}}"></em></h3>
+						<div>
+                            <div class="form-group">
+                                <label class="col-lg-2">{{'security.workbench.settings.theme.label' | translate}}</label>
+                                <div class="btn-group theme-selector-dropdown" uib-dropdown>
+                                    <button type="button" class="btn btn-sm btn-secondary dropdown-toggle theme-selector-dropdown-btn" uib-dropdown-toggle>
+                                        {{selectedTheme.label}}
+                                    </button>
+                                    <ul class="dropdown-menu" role="menu">
+                                        <li ng-repeat="theme in themes">
+                                            <a ng-click="setTheme(theme)" class="dropdown-item">{{theme.label}}</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="col-lg-2">{{'security.workbench.settings.theme.mode.label' | translate}}</label>
+                                <div class="radio">
+                                    <label class="px-1">
+                                        <input type="radio" value="light" ng-model="workbenchSettings.mode" ng-change="setThemeMode()"/>
+                                        {{'security.workbench.settings.theme.mode.light' | translate}}
+                                    </label>
+                                    <label class="px-1">
+                                        <input type="radio" value="dark" ng-model="workbenchSettings.mode" ng-change="setThemeMode()"/>
+                                        {{'security.workbench.settings.theme.mode.dark' | translate}}
+                                    </label>
+                                </div>
+                            </div>
+						</div>
+					</div>
+				</div>
 			</div>
 
-			<div class="col-md-6" ng-hide="!isLocalAuthentication()">
+			<div class="col-md-6 us-right-col" ng-hide="!isLocalAuthentication()">
 				<div class="card user-role" id="user-roles">
 					<div class="card-block">
 						<h3>{{'security.user.role' | translate}}</h3>
 						<label class="mr-1"
-							   popover-template="'popover-content-user.html'"
+							   uib-popover-template="'popover-content-user.html'"
 							   popover-trigger="mouseenter"
 							   popover-placement="bottom">
 							<input type="radio" ng-model="userType" id="roleUser" value="user" ng-disabled="hasEditRestrictions()" >
 							{{'security.user.label' | translate}}
 						</label>
 						<label class="mr-1"
-							   popover-template="'popover-content-repo-manager.html'"
+							   uib-popover-template="'popover-content-repo-manager.html'"
 							   popover-trigger="mouseenter"
 							   popover-placement="bottom">
 							<input type="radio" ng-model="userType" id="roleRepoAdmin" value="repoManager" ng-disabled="hasEditRestrictions()">
 							{{'security.repo.manager.label' | translate}}
 						</label>
-						<label popover-template="'popover-content-admin.html'"
+						<label uib-popover-template="'popover-content-admin.html'"
 							   popover-trigger="mouseenter"
 							   popover-placement="bottom">
 							<input type="radio" ng-model="userType" id="roleAdmin" value="admin" ng-disabled="hasEditRestrictions()">
@@ -166,6 +205,24 @@
 					</div>
 				</div>
 
+                <div class="card user-custom-roles" id="user-custom-roles">
+                    <div class="card-block">
+                        <h3>{{'security.user.custom_role' | translate}}</h3>
+                        <div class="input-group">
+                            <tags-input class="wb-tags-input" ng-model="customRoles" min-length="2"
+                                        ng-disabled="!isUser() || mode === 'settings'"
+                                        use-strings="true"
+                                        add-on-space="true"
+                                        add-on-comma="true"
+                                        add-on-paste="true"
+                                        replace-spaces-with-dashes="false"
+                                        paste-split-pattern="[\s+]"
+                                        on-tag-added="addCustomRole($tag)"
+                                        placeholder="{{'security.user.add.custom_role.msg' | translate}}"></tags-input>
+                        </div>
+                    </div>
+                </div>
+
 				<div id="user-repos"  class="card user-repositories">
 					<div class="card-block">
 						<h3>{{'security.repo.rights' | translate}}</h3>
@@ -174,41 +231,45 @@
 								{{'security.user.rights' | translate}}
 							</p>
 						</div>
-						<table class="table table-hover table-sm" aria-describedby="User rights table">
-							<thead>
-								<tr>
-									<th id="repositoryIdColumn">{{'security.repository.title' | translate}}</th>
-									<th id="readRightsColumn" class="text-xs-center"><em class="icon-eye icon-lg" tooltip="{{'security.tooltip.read' | translate}}" tooltip-trigger="mouseenter"></em></th>
-									<th id="writeRightColumn" class="text-xs-center"><em class="icon-edit icon-lg" tooltip="{{'security.tooltip.write' | translate}}" tooltip-trigger="mouseenter"></em></th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td>{{'security.any.data.repo' | translate}}
-										<em class="icon-info text-primary" tooltip="{{'security.data.repos' | translate}}"></em>
-									</td>
-									<td class="text-xs-center">
+                        <div class="scrollable-table">
+                            <table class="table table-hover table-sm" aria-describedby="User rights table">
+                                <thead>
+                                <tr>
+                                    <th id="repositoryIdColumn">{{'security.repository.title' | translate}}</th>
+                                    <th id="readRightsColumn" class="text-xs-center"><em class="icon-eye icon-lg" gdb-tooltip="{{'security.tooltip.read' | translate}}"></em></th>
+                                    <th id="writeRightColumn" class="text-xs-center"><em class="icon-edit icon-lg" gdb-tooltip="{{'security.tooltip.write' | translate}}"></em></th>
+                                </tr>
+                                <tr>
+                                    <th>{{'security.any.data.repo' | translate}}
+                                        <em class="icon-info text-tertiary" gdb-tooltip="{{'security.data.repos' | translate}}"></em>
+                                    </th>
+                                    <th class="text-xs-center">
                                         <input class="read" type="checkbox" ng-model="grantedAuthorities.READ_REPO['*']"  ng-checked="hasReadPermission('*')" ng-disabled="readCheckDisabled('*')" ng-click="setGrantedAuthorities()">
-                                    </td>
-									<td class="text-xs-center">
+                                    </th>
+                                    <th class="text-xs-center">
                                         <input class="write" type="checkbox" ng-model="grantedAuthorities.WRITE_REPO['*']" ng-checked="hasWritePermission('*')" ng-disabled="writeCheckDisabled('*')" ng-click="setGrantedAuthorities()">
-                                    </td>
-								</tr>
-								<tr ng-repeat="repository in getReadableRepositories() | orderBy: 'id'">
-									<td class="repository-name">{{repository.id}}</td>
-									<td class="text-xs-center read-rights"><input class="read" type="checkbox" ng-model="grantedAuthorities.READ_REPO[repository.id]"  ng-checked="hasReadPermission(repository.id)" ng-disabled="readCheckDisabled(repository.id)" ng-click="setGrantedAuthorities()"></td>
-									<td class="text-xs-center write-rights"><input class="write" type="checkbox" ng-model="grantedAuthorities.WRITE_REPO[repository.id]" ng-checked="hasWritePermission(repository.id)" ng-disabled="writeCheckDisabled(repository.id)" ng-click="setGrantedAuthorities()"></td>
-								</tr>
-							</tbody>
-						</table>
+                                    </th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <div>
+                                    <tr ng-repeat="repository in getReadableRepositories() | orderBy: ['location', 'id']">
+                                        <td class="repository-name">{{repository.id}}<small> &middot; {{repository.location ? repository.location : 'Local'}}</small></td>
+                                        <td class="text-xs-center read-rights"><input class="read" type="checkbox" ng-model="grantedAuthorities.READ_REPO[createUniqueKey(repository)]"  ng-checked="hasReadPermission(repository)" ng-disabled="readCheckDisabled(repository)" ng-click="setGrantedAuthorities()"></td>
+                                        <td class="text-xs-center write-rights"><input class="write" type="checkbox" ng-model="grantedAuthorities.WRITE_REPO[createUniqueKey(repository)]" ng-checked="hasWritePermission(repository)" ng-disabled="writeCheckDisabled(repository)" ng-click="setGrantedAuthorities()"></td>
+                                    </tr>
+                                </div>
+                                </tbody>
+                            </table>
+                        </div>
 					</div>
 				</div>
-			</div>
+            </div>
 		</div>
 
-		<div class="mb-3">
-			<button id="wb-user-submit" class="btn btn-primary" type="submit">{{saveButtonText}}</button>
-			<button id="wb-user-goBack" class="btn btn-secondary" type="button" ng-click="goBack()">{{'common.cancel.btn' | translate}}</button>
+		<div class="text-right">
+            <button id="wb-user-goBack" class="btn btn-secondary" type="button" ng-click="goBack()">{{'common.cancel.btn' | translate}}</button>
+            <button id="wb-user-submit" class="btn btn-primary" type="submit">{{saveButtonText}}</button>
 		</div>
 	</form>
 </div>

package/dist/js/angular/security/templates/users.html

@@ -1,35 +1,35 @@
 <h1>
 	{{title}}
 	<span class="btn btn-link"
-	   popover-template="'js/angular/templates/titlePopoverTemplate.html'"
+	   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 id="wb-users" ng-hide="loader">
 	<div class="mb-1">
 		<div class="pull-right">
 			<span id="toggle-security" class="mr-1">
-				<span class="security-switch-label">{{'security.is' | translate}} <span class="tag {{securityEnabled() ? 'tag-primary' : 'tag-default'}}">{{securityEnabled() ? 'ON' : 'OFF'}}</span></span>
-				<span tooltip="Click to {{securityEnabled() ? 'disable' : 'enable'}} security" tooltip-placement="top" tooltip-trigger="mouseenter" ng-click="toggleSecurity()" class="switch">
+				<span class="security-switch-label">{{'security.is' | translate}} <span class="tag {{securityEnabled() ? 'tag-primary' : 'tag-default'}}">{{securityEnabled() ? 'common.on.btn' : 'common.off.btn' | translate}}</span></span>
+				<span gdb-tooltip="{{'click.to' | translate}} {{securityEnabled() ? 'disable' : 'enable' | translate}} {{'security.label' | translate}}" tooltip-placement="top" ng-click="toggleSecurity()" class="switch">
 					<input type="checkbox" class="switch" ng-checked="securityEnabled()"/>
 					<label for="toggle-security"></label>
 				</span>
 			</span>
 			<span ng-show="securityEnabled()" id="toggle-freeaccess">
-				<span>Free Access is <span class="tag {{freeAccessEnabled() ? 'tag-primary' : 'tag-default'}}">{{freeAccessEnabled() ? 'ON' : 'OFF'}}</span></span>
-				<span tooltip="Click to {{freeAccessEnabled() ? 'disable' : 'enable'}} free access to non-admin functionality" tooltip-placement="top" tooltip-trigger="mouseenter" ng-click="toggleFreeAccess()" class="switch">
+				<span>{{'security.free.access.is' | translate}} <span class="tag {{freeAccessEnabled() ? 'tag-primary' : 'tag-default'}}">{{freeAccessEnabled() ? 'common.on.btn' : 'common.off.btn' | translate}}</span></span>
+				<span gdb-tooltip="{{'click.to' | translate}} {{freeAccessEnabled() ? 'disable' : 'enable' | translate}} {{'security.free.access.non.admin' | translate}}" tooltip-placement="top" ng-click="toggleFreeAccess()" class="switch">
 					<input type="checkbox" class="switch" ng-checked="freeAccessEnabled()"/>
 					<label for="toggle-freeaccess"></label>
 				</span>
 				<span ng-show="freeAccessEnabled()">
 					{{'security.free.access.settings' | translate}}
-					<a style="padding-left: 0px;"  class="btn btn-link" href="#"><em class="icon-settings" tooltip="{{'security.free.access.config.title' | translate}}" ng-click="editFreeAccess()"></em></a>
+					<a style="padding-left: 0px;"  class="btn btn-link" href="#"><em class="icon-settings" gdb-tooltip="{{'security.free.access.config.title' | translate}}" ng-click="editFreeAccess()"></em></a>
 				</span>
 			</span>
 		</div>
 
-		<a id="wb-users-userCreateLink" class="btn btn-primary" href="user/create"><span class="icon-plus"></span> {{'view.create.user.title' | translate}}</a>
+		<a id="wb-users-userCreateLink" ng-show="!hasExternalAuth()" class="btn btn-primary" href="user/create"><span class="icon-plus"></span> {{'view.create.user.title' | translate}}</a>
 	</div>
 
 	<div ng-show="hasExternalAuth()">
@@ -37,6 +37,7 @@
 		<div class="alert alert-info no-icon mt-1">
 			<p>{{'security.using.external.auth.db' | translate}} {{getAuthImplementation()}}.</p>
 			<p>{{'security.user.settings.modification' | translate}}</p>
+			<p>{{'security.user.settings.user_role' | translate}}</p>
 		</div>
 	</div>
 
@@ -44,8 +45,8 @@
 		<thead>
 			<tr>
 				<th id="usernameColumn">{{'security.table.username' | translate}}</th>
-				<th id="roleColumn">{{'security.table.role' | translate}}</th>
-				<th id="repoRightsColumn">{{'security.repo.rights' | translate}}</th>
+				<th ng-if="!hasExternalAuth()" id="roleColumn">{{'security.table.role' | translate}}</th>
+				<th ng-if="!hasExternalAuth()" id="repoRightsColumn">{{'security.repo.rights' | translate}}</th>
 				<th id="creationDateColumn">{{'security.table.date.created' | translate}}</th>
 				<th id="actionsColumn">{{'security.table.actions' | translate}}</th>
 			</tr>
@@ -53,23 +54,29 @@
 		<tbody>
 			<tr ng-repeat="user in users | orderBy: 'username'">
 				<td class="username"><span>{{user.username}}</span></td>
-				<td class="user-type">{{user.userTypeDescription}}</td>
-				<td class="repository-rights">
+				<td ng-if="!hasExternalAuth()" class="user-type">{{user.userTypeDescription}}</td>
+				<td ng-if="!hasExternalAuth()" class="repository-rights">
 					<div ng-show="user.userType === 'user'" ng-repeat="(repo, rights) in user.repositories track by $index">
-						<em class="icon-eye" ng-class="rights.read ? 'text-tertiary' : 'text-muted'" tooltip="{{rights.read ? 'security.has.read.access' : 'security.no.read.access' | translate}}"></em>
-						<em class="icon-edit" ng-class="rights.write ? 'text-tertiary' : 'text-muted'" tooltip="{{rights.read ? 'security.has.write.access' : 'security.no.write.access' | translate}}"></em>
+						<em class="icon-eye" ng-class="rights.read ? 'text-tertiary' : 'text-muted'" gdb-tooltip="{{rights.read ? 'security.has.read.access' : 'security.no.read.access' | translate}}"></em>
+						<em class="icon-edit" ng-class="rights.write ? 'text-tertiary' : 'text-muted'" gdb-tooltip="{{rights.read ? 'security.has.write.access' : 'security.no.write.access' | translate}}"></em>
 						{{repo}}
 					</div>
 					<div ng-show="user.userType !== 'user'">{{'security.unrestricted' | translate}}</div>
+                    <div>
+                        <span ng-repeat="role in user.customRoles">
+                            <span class="tag tag-primary" >{{ role }}</span>
+                            &nbsp;
+                        </span>
+                    </div>
 				</td>
 				<td class="date-created"><span>{{user.dateCreated | date: 'yyyy-MM-dd HH:mm:ss'}}</span></td>
 				<td class="actions-bar">
 					<span>
 						<a class="btn btn-link edit-user-btn" href="user/{{encodeURIComponent(user.username)}}">
-                            <em class="icon-edit" tooltip="{{'security.edit.user.tooltip' | translate}}"></em>
+                            <em class="icon-edit" gdb-tooltip="{{'security.edit.user.tooltip' | translate}}"></em>
                         </a>
-						<a class="btn btn-link secondary delete-user-btn" ng-if="user.username != 'admin'" href ng-click="removeUser(user.username)">
-                            <em class="icon-trash" tooltip="{{'security.delete.user.tooltip' | translate}}"></em>
+						<a class="btn btn-link secondary delete-user-btn" ng-if="user.username != 'admin'" ng-show="!hasExternalAuth()" href ng-click="removeUser(user.username)">
+                            <em class="icon-trash" gdb-tooltip="{{'security.delete.user.tooltip' | translate}}"></em>
                         </a>
 					</span>
 				</td>

package/dist/js/angular/settings/modal/location-settings.html

@@ -3,26 +3,25 @@
     <h3 class="modal-title">{{'view.settings.title' | translate}}</h3>
 </div>
 
-
-<form id="settingsForm" class="form-horizontal" novalidate name="settingsForm">
-    <div class="modal-body">
-        <div ng-hide="supportsStatistics" class="alert alert-info">
-            {{'active.location.version.not.support.settings.warning' | translate}}
-        </div>
-        <div ng-show="supportsStatistics" class="container" ng-init="moreInfo = false">
+<div class="modal-body">
+	<form id="settingsForm" class="form-horizontal" novalidate name="settingsForm">
+		<div ng-hide="supportsStatistics" class="alert alert-info">
+			{{'active.location.version.not.support.settings.warning' | translate}}
+		</div>
+		<div ng-show="supportsStatistics" class="container" ng-init="moreInfo = false">
 
 			<div class="form-check">
-				<label tooltip="{{'click.to' | translate}} {{settings.statistics ? 'disable' : 'enable' | translate}} {{'this.setting' | translate}}"
-					   tooltip-placement="top" tooltip-trigger="mouseenter" class="form-check-label">
+				<label gdb-tooltip="{{'click.to' | translate}} {{settings.statistics ? 'disable' : 'enable' | translate}} {{'this.setting' | translate}}"
+					   tooltip-placement="top" class="form-check-label">
 					<input type="checkbox" ng-model="settings.statistics" class="form-check-input">
 					{{'send.anonymous.statistics' | translate}}
 				</label>
 			</div>
 
-            <div class="clearfix">
+			<div class="clearfix">
 				<button ng-click="moreInfo = !moreInfo" class="btn btn-link btn-sm pull-right" ng-show="!moreInfo">{{'more.info' | translate}} <span class="icon-caret-down"></span></button>
 				<button ng-click="moreInfo = !moreInfo" class="btn btn-link btn-sm pull-right" ng-show="moreInfo">{{'less.info' | translate}} <span class="icon-caret-up"></span></button>
-            </div>
+			</div>
 
 			<div id="statisticsInfo" ng-if="moreInfo">
 				<h4>{{'why.send.statistics' | translate}}</h4>
@@ -57,10 +56,10 @@
 					http://statistics.graphdb.ontotext.com.</p>
 				<p>{{'data.encryption.msg' | translate}}</p>
 			</div>
-        </div>
-    </div>
-    <div class="modal-footer">
-        <button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
-        <button ng-click="submitForm();" class="btn btn-primary">{{'save.settings.btn' | translate}}</button>
-    </div>
-</form>
+		</div>
+	</form>
+</div>
+<div class="modal-footer">
+	<button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
+	<button ng-click="submitForm();" form="settingsForm" class="btn btn-primary">{{'save.settings.btn' | translate}}</button>
+</div>

package/dist/js/angular/settings/modal/validate-license.html

@@ -1,26 +1,39 @@
 <div class="modal-header">
-	<button type="button" class="close" ng-click="cancel()"></button>
-	<h3 class="modal-title">{{'are.license.details.correct' | translate}}</h3>
+    <button type="button" class="close" ng-click="cancel()"></button>
+    <h3 class="modal-title">{{'are.license.details.correct' | translate}}</h3>
 </div>
 <div class="modal-body">
     <h4>GraphDB {{license.productType | titlecase}} {{'edition' | translate}}</h4>
     <div>
-		<div class="d-inline-block mr-2 mb-1">
+		<div class="float-xs-left d-inline-block mr-2 mb-1">
 			{{'licensed.to' | translate}}
 			<span class="data-value big">{{license.licensee}}</span>
 		</div>
-		<div class="d-inline-block mr-2 mb-1">
+		<div class="float-xs-left d-inline-block mr-2 mb-1">
 			{{'valid.until' | translate}}
 			<span class="data-value big">{{license.expiryDate ? (license.expiryDate | date : 'yyyy-MM-dd') : 'perpetual' | translate}}</span>
 		</div>
-		<div class="d-inline-block mr-2 mb-1">
+		<div class="float-xs-left d-inline-block mr-2 mb-1">
 			{{'cores.number' | translate}}
 			<span class="data-value big">{{license.maxCpuCores ? license.maxCpuCores : 'unlimited' | translate}}</span>
 		</div>
-		<div class="d-inline-block mb-1">
+		<div class="float-xs-left d-inline-block mr-2 mb-1">
 			{{'maintenance.date' | translate}}
 			<span class="data-value big">{{license.latestPublicationDate ? (license.latestPublicationDate | date : 'yyyy-MM-dd') : 'perpetual' | translate}}</span>
 		</div>
+        <div class="d-inline-block mb-1">
+            {{'capabilities' | translate}}
+            <div class="data-value big">
+                <div ng-if="license.licenseCapabilities.length !== 0">
+                    <div ng-repeat="capability in license.licenseCapabilities">
+                        <div>{{capability}}</div>
+                    </div>
+                </div>
+                <div ng-if="license.licenseCapabilities.length === 0">
+                    <div>{{'none' | translate}}</div>
+                </div>
+            </div>
+        </div>
 	</div>
 	<div class="text-muted">{{license.typeOfUse}}</div>
 </div>

package/dist/js/angular/templates/graphdb-small.svg

@@ -5,15 +5,15 @@
 	 width="100px" height="100px" viewBox="184 224 100 100" enable-background="new 199.13 227.965 524 104"
 	 xml:space="preserve">
 
-	<path fill="#F04E23" d="M257.183,270.272c5.665,1.141,9.35,6.691,8.209,12.356c-1.143,5.66-6.689,9.341-12.351,8.199
+	<path fill="#E84E0F" d="M257.183,270.272c5.665,1.141,9.35,6.691,8.209,12.356c-1.143,5.66-6.689,9.341-12.351,8.199
 		c-5.664-1.142-9.353-6.683-8.21-12.346C245.976,272.816,251.523,269.127,257.183,270.272"/>
-	<path fill="#F04E23" d="M233.855,288.523c3.347,0.677,5.53,3.953,4.853,7.309c-0.672,3.34-3.957,5.52-7.301,4.848
+	<path fill="#E84E0F" d="M233.855,288.523c3.347,0.677,5.53,3.953,4.853,7.309c-0.672,3.34-3.957,5.52-7.301,4.848
 		c-3.353-0.676-5.529-3.954-4.857-7.302C227.226,290.022,230.504,287.85,233.855,288.523"/>
-	<path fill="#F04E23" d="M242.877,255.706c2.288,0.462,3.774,2.692,3.313,4.978c-0.46,2.29-2.695,3.779-4.982,3.313
+	<path fill="#E84E0F" d="M242.877,255.706c2.288,0.462,3.774,2.692,3.313,4.978c-0.46,2.29-2.695,3.779-4.982,3.313
 		c-2.286-0.457-3.773-2.697-3.313-4.989C238.356,256.727,240.593,255.245,242.877,255.706"/>
-	<path fill="#F04E23" d="M234.699,231.969c4.287,3.282,5.107,9.447,1.816,13.735c-3.276,4.28-9.44,5.091-13.729,1.806
+	<path fill="#E84E0F" d="M234.699,231.969c4.287,3.282,5.107,9.447,1.816,13.735c-3.276,4.28-9.44,5.091-13.729,1.806
 		c-4.275-3.274-5.095-9.445-1.813-13.719C224.254,229.502,230.423,228.69,234.699,231.969"/>
-	<path fill="#F04E23" d="M217.591,301.536c3.548,3.693,3.436,9.595-0.269,13.146c-3.685,3.544-9.588,3.425-13.14-0.269
+	<path fill="#E84E0F" d="M217.591,301.536c3.548,3.693,3.436,9.595-0.269,13.146c-3.685,3.544-9.588,3.425-13.14-0.269
 		c-3.555-3.698-3.428-9.595,0.264-13.145C208.144,297.724,214.044,297.831,217.591,301.536"/>
 
-</svg>
+</svg>

package/dist/js/angular/templates/modal/add-fedx-remote-repo.html

@@ -10,8 +10,8 @@
     </button>
     <h3 class="modal-title">{{'edit.local.repo' | translate}}</h3>
 </div>
-<form id="addFedXRepositoryForm" novalidate name="form">
-    <div class="modal-body" ng-if="mode === 'remote'">
+<div class="modal-body" ng-if="mode === 'remote'">
+    <form id="addFedXRepositoryForm" novalidate name="form">
         <label> <input type="radio" name="model.store" ng-model="model.store" ng-disabled="model.editMode" id="graphdb-server" value="RemoteRepository">
             {{'gdb.rdf4j.server' | translate}}</label>
         <label class="padding-label"> <input type="radio" name="model.store" ng-model="model.store" ng-disabled="model.editMode" id="sparql-endpoint" value="SPARQLEndpoint">
@@ -58,8 +58,10 @@
                 </div>
             </div>
         </div>
-    </div>
-    <div class="modal-body" ng-if="mode === 'local'">
+    </form>
+</div>
+<div class="modal-body" ng-if="mode === 'local'">
+    <form id="addFedXRepositoryForm" novalidate name="form">
         <div id="respect">
             <input type="radio" name="model.respectRights" ng-model="model.respectRights" id="respect_access" value="true">
             <label for="respect_access" style="font-size: 1.3em; display:inline">{{'respect.repo.access.rights' | translate}}</label>
@@ -70,14 +72,14 @@
             <label for="ignore_access" style="font-size: 1.3em; display:inline">{{'ignore.repo.access.rights' | translate}}</label>
             <p class="indented-div">{{'regardless.repo.rights.federated.view.warning' | translate}}</p>
         </div>
-    </div>
-    <div class="modal-footer">
-        <button type="submit" ng-click="ok();" class="btn btn-primary"
-                ng-disabled="form.$invalid" ng-if="!model.editMode"> {{'common.add' | translate}}
-        </button>
-        <button type="submit" ng-click="ok();" class="btn btn-primary"
-                ng-disabled="form.$invalid" ng-if="model.editMode"> {{'edit' | translate}}
-        </button>
-        <button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
-    </div>
-</form>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="submit" form="addFedXRepositoryForm" ng-click="ok();" class="btn btn-primary"
+            ng-disabled="form.$invalid" ng-if="!model.editMode"> {{'common.add' | translate}}
+    </button>
+    <button type="submit" form="addFedXRepositoryForm" ng-click="ok();" class="btn btn-primary"
+            ng-disabled="form.$invalid" ng-if="model.editMode"> {{'edit' | translate}}
+    </button>
+    <button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
+</div>

package/dist/js/angular/templates/modal/add-location.html

@@ -1,11 +1,9 @@
-<!-- Start addLocation.html -->
-
 <div class="modal-header">
     <button ng-click="cancel();" class="close" aria-hidden="true"></button>
     <h3 class="modal-title">{{'attach.remote.gdb.instance' | translate}}</h3>
 </div>
-<form id="addLocationForm" novalidate name="form">
-    <div class="modal-body">
+<div class="modal-body">
+    <form id="addLocationForm" novalidate name="form">
         <div class="form-group row">
             <label for="sesameLocation" class="col-md-4 col-form-label">{{'remote.location.url' | translate}}</label>
             <div class="col-md-8">
@@ -16,23 +14,23 @@
             </div>
         </div>
         <div ng-show="!isValidLocation()" class="alert alert-warning">
-			{{'valid.remote.location.warning' | translate}} http://server.example.com:7200/.
-		</div>
+            {{'valid.remote.location.warning' | translate}} http://server.example.com:7200/.
+        </div>
 
         <div class="form-group row">
             <label class="col-md-4 col-form-label">{{'auth.type.header' | translate}}</label>
             <div class="col-md-8">
-                <label class="col-form-label" tooltip="{{'remote.location.no.auth.used.tooltip' | translate}}">
+                <label class="col-form-label" gdb-tooltip="{{'remote.location.no.auth.used.tooltip' | translate}}">
                     <input type="radio" name="authType" ng-model="newLocation.authType" value="none"/>
                     {{'auth.type.none' | translate}}
                 </label>
                 &nbsp;
-                <label class="col-form-label" tooltip="{{'basic.auth.type.tooltip' | translate}}. {{'basic.auth.type.admin.constraint.tooltip' | translate}}">
+                <label class="col-form-label" gdb-tooltip="{{'basic.auth.type.tooltip' | translate}}. {{'basic.auth.type.admin.constraint.tooltip' | translate}}">
                     <input type="radio" name="authType" ng-model="newLocation.authType" value="basic"/>
                     {{'auth.type.basic' | translate}}
                 </label>
                 &nbsp;
-                <label class="col-form-label" tooltip="{{'signature.auth.type.tooltip' | translate}}">
+                <label class="col-form-label" gdb-tooltip="{{'signature.auth.type.tooltip' | translate}}">
                     <input type="radio" name="authType" ng-model="newLocation.authType" value="signature"/>
                     {{'auth.type.signature' | translate}}
                 </label>
@@ -62,17 +60,15 @@
         </div>
         <div class="form-group row" ng-if="newLocation.authType === 'signature'">
             <div class="col-md-12">
-                {{'signature.auth.info' | translate}}<a href="{{docBase}}/access-control.html#gdb-authentication"
-                                                        rel="noopener" target="_blank">Access Control / GDB authentication</a>{{'signature.auth.info.last' | translate}}
-            </div>
+            {{'signature.auth.info' | translate}}<a href="{{docBase}}/access-control.html#gdb-authentication"
+                                                    rel="noopener" target="_blank">Access Control / GDB authentication</a>{{'signature.auth.info.last' | translate}}
         </div>
-    </div>
-    <div class="modal-footer">
-        <button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
-        <button type="submit" ng-click="ok();" class="btn btn-primary"
-                ng-disabled="form.$invalid"><span class="icon-plus"></span> {{'common.attach' | translate}}
-        </button>
-    </div>
-
-</form>
-<!-- End addLocation.html -->
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" ng-click="cancel();" class="btn btn-secondary" data-dismiss="modal">{{'common.cancel.btn' | translate}}</button>
+    <button type="submit" ng-click="ok();" class="btn btn-primary add-location-btn" form="addLocationForm"
+            ng-disabled="form.$invalid"><span class="icon-plus"></span> {{'common.attach' | translate}}
+    </button>
+</div>