graphdb-workbench 2.7.6 → 2.8.0-RC2

package/dist/js/angular/clustermanagement/templates/modal/cluster-edit-dialog.html

@@ -1,118 +1,79 @@
 <div onto-loader-new ng-if="loader" class="create-cluster-loader" message="getLoaderMessage" size="75"></div>
+<div ng-click="onClick($event)">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()"></button>
+        <h3 class="modal-title">{{pageTitle}}</h3>
+    </div>
 
-<div class="modal-header">
-    <button type="button" class="close" ng-click="cancel()"></button>
-    <h3 class="modal-title">{{pageTitle}}</h3>
-</div>
-
-<div class="modal-body">
-    <form novalidate id="clusterConfigurationForm" name="clusterConfigurationForm">
-        <div class="form-horizontal">
-            <div class="form-group">
-                <div>
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.electionMinTimeout.$invalid}">
-                            <label for="election-minimum-timeout" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.election_min_timeout' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_min_timeout_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.electionMinTimeout"
-                                       required id="election-minimum-timeout" min="0" pattern="[0-9]+" name="electionMinTimeout">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.electionMinTimeout.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.electionMinTimeout.$error.pattern">{{'cluster_management.cluster_page.errors.only_positive_integers' | translate}}</div>
+    <div class="modal-body">
+        <form novalidate id="clusterConfigurationForm" name="clusterConfigurationForm">
+            <div class="form-horizontal">
+                <div class="form-group" ng-repeat="fieldConfig in configFields">
+                    <div class="input-group"
+                         ng-class="{'has-danger': clusterConfigurationForm[fieldConfig.name].$invalid}">
+                        <label for="{{fieldConfig.id}}" class="col-xs-4 col-form-label">{{fieldConfig.label |
+                            translate}}*</label>
+                        <div class="col-xs-8" gdb-tooltip="{{fieldConfig.tooltip | translate}}">
+                            <input
+                                class="form-control"
+                                placeholder="{{'required.field' | translate}}"
+                                type="number"
+                                ng-model="clusterConfiguration[fieldConfig.name]"
+                                required
+                                id="{{fieldConfig.id}}"
+                                min="0"
+                                name="{{fieldConfig.name}}"
+                                ng-pattern="fieldConfig.pattern">
+                            <div class="form-control-feedback"
+                                 ng-show="clusterConfigurationForm[fieldConfig.name].$error.required">
+                                {{'required.field' | translate}}
                             </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.electionRangeTimeout.$invalid}">
-                            <label for="election-range-timeout" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.election_range_timeout' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_range_timeout_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.electionRangeTimeout"
-                                       required id="election-range-timeout" min="0" pattern="[0-9]+" name="electionRangeTimeout">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.electionRangeTimeout.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.electionRangeTimeout.$error.pattern">{{'cluster_management.cluster_page.errors.only_positive_integers' | translate}}</div>
+                            <div class="form-control-feedback"
+                                 ng-show="clusterConfigurationForm[fieldConfig.name].$error.pattern">
+                                {{fieldConfig.errorMsg | translate}}
                             </div>
                         </div>
                     </div>
+                </div>
 
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.heartbeatInterval.$invalid}">
-                            <label for="heartbeat-interval" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.heartbeat_interval' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.heartbeat_interval_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.heartbeatInterval"
-                                       required id="heartbeat-interval" min="0" pattern="[0-9]+" name="heartbeatInterval">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.heartbeatInterval.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.heartbeatInterval.$error.pattern">{{'cluster_management.cluster_page.errors.only_positive_integers' | translate}}</div>
-                            </div>
-                        </div>
+                <div class="form-group">
+                    <div ng-repeat="error in errors" class="cluster-properties-error alert alert-danger mt-1">
+                        {{error}}
                     </div>
-
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.messageSizeKB.$invalid}">
-                            <label for="message-size" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.message_size_kb' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.message_size_kb_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.messageSizeKB"
-                                       required id="message-size" min="0" pattern="[0-9]+" name="messageSizeKB">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.messageSizeKB.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.messageSizeKB.$error.pattern">{{'cluster_management.cluster_page.errors.only_positive_integers' | translate}}</div>
+                    <div ng-if="preconditionErrors" class="precondition-errors alert alert-danger">
+                        <div class="row">
+                            <div class="col-xs-6">
+                                {{'cluster_management.cluster_page.errors.preconditions_failed.label' | translate}}
+                                <ul>
+                                    <li>{{'cluster_management.cluster_page.errors.preconditions_failed.valid_license' |
+                                        translate}}
+                                    </li>
+                                    <li>
+                                        {{'cluster_management.cluster_page.errors.preconditions_failed.authentication_secret' | translate}}
+                                    </li>
+                                    <li>{{'cluster_management.cluster_page.errors.preconditions_failed.nodes_reachable' | translate}}
+                                    </li>
+                                </ul>
                             </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.verificationTimeout.$invalid}">
-                            <label for="verification-timeout" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.verification_timeout' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.verification_timeout_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.verificationTimeout"
-                                       required id="verification-timeout" min="0" pattern="[0-9]+" name="verificationTimeout">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.verificationTimeout.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.verificationTimeout.$error.pattern">{{'cluster_management.cluster_page.errors.only_positive_integers' | translate}}</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="input-group" ng-class="{'has-danger': clusterConfigurationForm.transactionLogMaximumSizeGB.$invalid}">
-                            <label for="verification-timeout" class="col-xs-4 col-form-label">{{'cluster_management.cluster_configuration_properties.transaction_log_maximum_size_gb' | translate}}*</label>
-                            <div class="col-xs-8" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.transaction_log_maximum_size_gb_tooltip' | translate}}">
-                                <input class="form-control" placeholder="{{'required.field' | translate}}" type="number" ng-model="clusterConfiguration.transactionLogMaximumSizeGB"
-                                       required id="transaction-log-max-size" pattern="-?[1-9][0-9]*(\.[0-9]+)?" name="transactionLogMaximumSizeGB">
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.transactionLogMaximumSizeGB.$error.required">{{'required.field' | translate}}</div>
-                                <div class="form-control-feedback" ng-show="clusterConfigurationForm.transactionLogMaximumSizeGB.$error.pattern">{{'cluster_management.cluster_page.errors.small_transaction_log_max_size' | translate}}</div>
+                            <div class="col-xs-6">
+                                {{'cluster_management.cluster_page.errors.nodes_status_label' | translate}}
+                                <ul>
+                                    <li ng-repeat="error in preconditionErrors">
+                                        {{error}}
+                                    </li>
+                                </ul>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-
-            <div class="form-group">
-                <div ng-repeat="error in errors" class="cluster-properties-error alert alert-danger mt-1">
-                    {{error}}
-                </div>
-                <div ng-if="preconditionErrors" class="precondition-errors alert alert-danger">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            {{'cluster_management.cluster_page.errors.preconditions_failed.label' | translate}}
-                            <ul>
-                                <li>{{'cluster_management.cluster_page.errors.preconditions_failed.valid_license' | translate}}</li>
-                                <li>{{'cluster_management.cluster_page.errors.preconditions_failed.authentication_secret' | translate}}</li>
-                                <li>{{'cluster_management.cluster_page.errors.preconditions_failed.nodes_reachable' | translate}}</li>
-                            </ul>
-                        </div>
-                        <div class="col-xs-6">
-                            {{'cluster_management.cluster_page.errors.nodes_status_label' | translate}}
-                            <ul>
-                                <li ng-repeat="error in preconditionErrors">
-                                    {{error}}
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-</div>
-<div class="modal-footer">
-    <button type="button" class="btn btn-secondary" ng-click="cancel()">{{'common.cancel.btn' | translate}}</button>
-    <button type="submit" ng-click="ok()" ng-disabled="!isClusterConfigurationValid()" form="clusterConfigurationForm"
-            class="btn btn-primary create-connector-btn">{{'cluster_management.cluster_page.save_btn' | translate}}</button>
+        </form>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" ng-click="cancel()">{{'common.cancel.btn' | translate}}</button>
+        <button type="submit" ng-click="ok()" ng-disabled="!isClusterConfigurationValid()"
+                form="clusterConfigurationForm"
+                class="btn btn-primary create-connector-btn">{{'cluster_management.cluster_page.save_btn' | translate}}
+        </button>
+    </div>
 </div>

package/dist/js/angular/clustermanagement/templates/modal/edit-cluster-nodes-modal.html

@@ -0,0 +1,17 @@
+<div class="modal-header">
+    <h3 class="modal-title" ng-if="hasCluster">{{'cluster_management.update_cluster_group_dialog.title' | translate}}</h3>
+    <h3 class="modal-title" ng-if="!hasCluster">{{'cluster_management.update_cluster_group_dialog.title_create' | translate}}</h3>
+</div>
+<div class="modal-body cluster-nodes-configuration-modal">
+        <cluster-nodes-configuration ng-if="!loading"></cluster-nodes-configuration>
+    <div class="alert alert-warning alert-save" ng-if="isChanged">
+        {{'cluster_management.update_cluster_group_dialog.messages.save_to_apply' | translate}}
+    </div>
+</div>
+<div class="modal-footer mt-0">
+    <button type="button" class="btn btn-secondary" ng-click="cancel()">{{'common.cancel.btn' | translate}}</button>
+    <button id="wb-edit-cluster-nodes-modal-submit" class="btn btn-primary"
+            ng-disabled="!isValid || !isChanged"
+            ng-click="ok()" type="submit">{{'save.changes.label' | translate}}
+    </button>
+</div>

package/dist/js/angular/clustermanagement/templates/modal/secondary-mode-modal.html

@@ -0,0 +1,40 @@
+<div ng-click="onClick($event)">
+    <div class="modal-header">
+        <h3 class="modal-title">{{title}}</h3>
+    </div>
+
+    <div class="modal-body">
+        <form name="modalForm" novalidate>
+            <div class="form-group row">
+                <label for="rpcAddress" class="col-sm-4 col-form-label">
+                    {{'cluster_management.cluster_configuration_multi_region.secondary_mode_modal.rpc_address' |
+                    translate}}
+                </label>
+                <div class="col-sm-8">
+                    <input required type="text" id="rpcAddress" ng-model="rpcAddress" class="form-control"
+                           placeholder="{{'cluster_management.cluster_configuration_multi_region.secondary_mode_modal.rpc_address_placeholder' | translate}}">
+                </div>
+            </div>
+
+            <div class="form-group row">
+                <label for="tag" class="col-sm-4 col-form-label">
+                    {{'cluster_management.cluster_configuration_multi_region.secondary_mode_modal.tag' | translate}}
+                </label>
+                <div class="col-sm-8">
+                    <input required type="text" id="tag" ng-model="tag" class="form-control"
+                           placeholder="{{'cluster_management.cluster_configuration_multi_region.secondary_mode_modal.tag_placeholder' | translate}}">
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="modal-footer">
+        <button type="button" class="btn btn-secondary cancel-btn" ng-click="cancel($event)">
+            {{'common.cancel.btn' | translate}}
+        </button>
+        <button class="btn btn-primary confirm-btn" ng-click="ok($event)" ng-disabled="modalForm.$invalid">
+            {{ (confirmButtonKey || 'cluster_management.cluster_configuration_multi_region.confirm.enable_secondary') |
+            translate}}
+        </button>
+    </div>
+</div>

package/dist/js/angular/core/directives/autocomplete/templates/autocomplete.html

@@ -1,4 +1,4 @@
-<link href="css/autocomplete-select.css?v=2.7.6" rel="stylesheet"/>
+<link href="css/autocomplete-select.css?v=2.8.0-RC2" rel="stylesheet"/>
 
 <div class="autocomplete-select-wrapper">
     <div class="autocomplete-select">

package/dist/js/angular/core/directives/inline-editable-text/templates/inline-editable-text.template.html

@@ -0,0 +1,14 @@
+<div class="inline-editable-text">
+    <div ng-if="!isEditing"
+          ng-click="onSelect()">
+        {{ source[fieldName] || '&nbsp;'}}
+    </div>
+
+    <input ng-if="isEditing"
+           type="text"
+           ng-model="editableModel.text"
+           class="form-control"
+           ng-blur="onCancelEditing()"
+           ng-keydown="onKeydown($event)"
+           auto-focus/>
+</div>

package/dist/js/angular/core/directives/operations-statuses-monitor/templates/operations-statuses-monitor.html

@@ -1,4 +1,4 @@
-<link href="css/operations-statuses-monitor.css?v=2.7.6" rel="stylesheet"/>
+<link href="css/operations-statuses-monitor.css?v=2.8.0-RC2" rel="stylesheet"/>
 
 <div ng-if="activeOperations && activeOperations.operations && activeOperations.operations.length > 0"
      class="operations-statuses btn-group">

package/dist/js/angular/core/directives/rdfresourcesearch/templates/rdfResourceSearchTemplate.html

@@ -1,7 +1,10 @@
-<link href="css/rdf-resource-search.css?v=2.7.6" rel="stylesheet"/>
+<link href="css/rdf-resource-search.css?v=2.8.0-RC2" rel="stylesheet"/>
 
-<div ng-if="getActiveRepository() && hasActiveLocation() && isNotLoading()" ng-cloak>
-    <div id="search-box" class="card search-rdf-input" ng-keydown="onKeyDown($event)" ng-if="!isHomePage()">
+<div ng-cloak>
+    <div id="search-box"
+         class="card search-rdf-input"
+         ng-class="{'show-rdf-search-box-visible': showRdfSearchInput, 'show-rdf-search-box-invisible': !showRdfSearchInput}"
+         ng-keydown="onKeyDown($event)">
         <div class="card-block">
             <search-resource-input namespacespromise="getNamespacesPromise"
                                    autocompletepromisestatus="getAutocompletePromise"
@@ -19,6 +22,7 @@
         </div>
     </div>
     <button class="btn btn-link search-rdf-btn"
+            ng-if="!showRdfSearchInput"
             gdb-tooltip="{{'search.resources.msg' | translate}}"
             tooltip-placement="bottom"
             ng-click="showInput()">

package/dist/js/angular/core/directives/yasgui-component/templates/yasgui-component.html

@@ -1,4 +1,4 @@
-<link href="css/lib/ontotext-yasgui-web-component.css?v=2.7.6" rel="stylesheet">
+<link href="css/lib/ontotext-yasgui-web-component.css?v=2.8.0-RC2" rel="stylesheet">
 
 <ontotext-yasgui
     class="{{classToApply}}"

package/dist/js/angular/core/templates/cookie-policy/cookie-consent.html

@@ -0,0 +1,8 @@
+<link href="css/cookie-policy.css?v=2.8.0-RC2" rel="stylesheet"/>
+
+<div class="cookie-consent-modal" ng-show="showCookieConsent">
+    <div class="cookie-consent-content">
+        <span>{{'cookie.cookie_consent' | translate}} <a href="#" ng-click="showCookiePolicy()">{{'cookie.cookie_policy_url_label' | translate}}</a>.</span>
+        <button class="btn btn-primary" ng-click="acceptConsent()">{{'common.agree.btn' | translate}}</button>
+    </div>
+</div>

package/dist/js/angular/core/templates/cookie-policy/cookie-policy.html

@@ -0,0 +1,50 @@
+<link href="css/cookie-policy.css?v=2.8.0-RC2" rel="stylesheet"/>
+
+<div class="cookie-policy-modal">
+    <div class="title">{{'cookie.policy.title' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.purpose_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.purpose_text' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.who_are_we_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.who_are_we_text' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.cookies_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.cookies_text' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.privacy_commitment_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.privacy_commitment_text' | translate}}</div>
+    <ul>
+        <li>{{'cookie.policy.privacy_commitment_1' | translate}}</li>
+        <li>{{'cookie.policy.privacy_commitment_2' | translate}}</li>
+    </ul>
+
+    <div class="heading">{{'cookie.policy.how_collect_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.how_collect_text' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.what_collect_heading' | translate}}</div>
+    <ul>
+        <li>{{'cookie.policy.what_collect_text_1' | translate}}</li>
+        <li>{{'cookie.policy.what_collect_text_2' | translate}}</li>
+    </ul>
+
+    <div class="heading">{{'cookie.policy.third_party_cookies_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.third_party_cookies_text' | translate}}</div>
+
+    <div class="subheading">{{'cookie.policy.google_analytics_heading' | translate}}</div>
+    <div class="text">
+        {{'cookie.policy.google_analytics_opt_out_text' | translate}}
+        <a href="https://tools.google.com/dlpage/gaoptout/" target="_blank">{{'cookie.policy.google_analytics_opt_out_link_text' | translate}}</a>
+        {{'cookie.policy.google_analytics_text' | translate}}
+    </div>
+
+    <div class="heading">{{'cookie.policy.changes_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.changes_text' | translate}}</div>
+
+    <div class="heading">{{'cookie.policy.contact_heading' | translate}}</div>
+    <div class="text">{{'cookie.policy.contact_text' | translate}}</div>
+
+    <div class="text-right">
+        <button class="btn btn-primary" ng-click="close()">{{'common.agree.btn' | translate}}</button>
+    </div>
+</div>

package/dist/js/angular/core/templates/modal/modal-simple.html

@@ -1,11 +1,13 @@
-<div class="modal-header">
-    <button ng-click="cancel();" class="close" aria-hidden="true"></button>
-    <h3 class="modal-title">{{title}}</h3>
-</div>
-<div class="modal-body">
-    <div class="lead" ng-bind-html="message">
+<div ng-click="onClick($event)">
+    <div class="modal-header">
+        <button ng-click="cancel();" class="close" aria-hidden="true"></button>
+        <h3 class="modal-title">{{title}}</h3>
+    </div>
+    <div class="modal-body">
+        <div class="lead" ng-bind-html="message">
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary confirm-btn" ng-click="ok()">{{'common.ok.btn' | translate}}</button>
     </div>
-</div>
-<div class="modal-footer">
-    <button class="btn btn-primary btn-sm confirm-btn" ng-click="cancel()">{{'common.yes.btn' | translate}}</button>
 </div>

package/dist/js/angular/core/templates/modal/modal-warning.html

@@ -1,16 +1,17 @@
-<!-- Start confirmDelete -->
-
-<div class="modal-header">
-	<button ng-click="cancel();" class="close" aria-hidden="true"></button>
-    <h3 class="modal-title">{{title}}</h3>
-</div>
-<div class="modal-body">
-    <div class="lead" ng-bind-html="message">
+<div ng-click="onClick($event)">
+    <div class="modal-header">
+        <button ng-click="cancel();" class="close" aria-hidden="true"></button>
+        <h3 class="modal-title">{{title}}</h3>
+    </div>
+    <div class="modal-body">
+        <div class="lead" ng-bind-html="message">
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-secondary cancel-btn" ng-click="cancel()">{{'common.cancel.btn' |
+            translate}}
+        </button>
+        <button class="btn btn-primary confirm-btn" ng-click="ok()">{{ (confirmButtonKey || 'common.yes.btn') | translate}}
+        </button>
     </div>
 </div>
-<div class="modal-footer">
-    <button type="button" class="btn btn-secondary cancel-btn" ng-click="cancel()">{{'common.cancel.btn' | translate}}</button>
-    <button class="btn btn-primary confirm-btn" ng-click="ok()">{{'common.yes.btn' | translate}}</button>
-</div>
-
-<!-- End confirmDelete -->

package/dist/js/angular/import/templates/import-resource-status-info.html

@@ -96,7 +96,7 @@
                 </td>
                 <td class="break-word">
                     <div class="value">
-                        {{importedOn | date:'yyyy-MM-dd, HH:mm' }}
+                        {{importedOn ? (importedOn | date:'yyyy-MM-dd, HH:mm') : '' }}
                     </div>
                 </td>
             </tr>

package/dist/js/angular/repositories/templates/manage-remote-location-dialog.template.html

@@ -0,0 +1,139 @@
+<div class="modal-header">
+    <button ng-click="cancel();" class="close" aria-hidden="true"></button>
+
+    <h3 class="modal-title">{{(isEdit ? 'manage.remote.location.dialog.update.instance' : 'manage.remote.location.dialog.attach.instance') | translate}}</h3>
+</div>
+<div class="modal-body">
+    <form id="remoteLocationForm" novalidate name="remoteLocationForm">
+        <label class="remote-location-radio-list">
+            <input type="radio"
+                   class="graph-db-instance"
+                   ng-model="remoteLocation.locationType"
+                   ng-disabled="isEdit"
+                   ng-change="onLocationTypeChanged()"
+                   value="{{RemoteLocationType.GRAPH_DB}}">
+            {{'manage.remote.location.dialog.graph_db.location.instance' | translate}}
+
+        </label>
+        <label class="padding-label remote-location-radio-list">
+            <input type="radio"
+                   class="grap ontopic-instance"
+                   ng-model="remoteLocation.locationType"
+                   ng-disabled="isEdit"
+                   ng-change="onLocationTypeChanged()"
+                   value="{{RemoteLocationType.ONTOPIC}}">
+            {{'manage.remote.location.dialog.ontopic.location.instance' | translate}}
+        </label>
+        <label class="padding-label remote-location-radio-list">
+            <input type="radio"
+                   class="graph-sparql-instance"
+                   ng-model="remoteLocation.locationType"
+                   ng-disabled="isEdit"
+                   ng-change="onLocationTypeChanged()"
+                   value="{{RemoteLocationType.SPARQL}}">
+            {{'manage.remote.location.dialog.sparql.endpoint.instance' | translate}}
+        </label>
+
+        <div class="form-group row">
+            <label for="location" class="col-md-4 col-form-label">{{'manage.remote.location.dialog.required.url' | translate}}</label>
+            <div class="col-md-8">
+                <input id="location" ng-model="remoteLocation.uri" required name="location" class="form-control"
+                       placeholder="http://my-hostname:7200" ng-disabled="isEdit" validate-url/>
+                <span ng-if="!isEdit" class="form-text text-muted">
+                    {{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.url.message' :
+                        remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.url.message' :
+                        'manage.remote.location.dialog.ontopic.url.message') | translate }}
+                </span>
+            </div>
+        </div>
+
+        <div ng-if="!remoteLocationForm.location.$pristine">
+            <div ng-if="remoteLocationForm.location.$error.required" class="alert alert-warning">
+                {{'manage.remote.location.dialog.url.requred.message' | translate}}
+            </div>
+            <div ng-if="remoteLocationForm.location.$error.validUrl" class="alert alert-warning">
+                {{(remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.error.not_valid.url' :
+                remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.error.not_valid.url' :
+                'manage.remote.location.dialog.ontopic.error.not_valid.url') | translate}} http://server.example.com:7200/.
+            </div>
+        </div>
+        <div class="form-group row" ng-if="remoteLocation.isGraphDBLocation()">
+            <label class="col-md-4 col-form-label">{{'manage.remote.location.dialog.auth_type.header' | translate}}</label>
+            <div class="col-md-8">
+                <label class="col-form-label" gdb-tooltip="{{'remote.location.no.auth.used.tooltip' | translate}}">
+                    <input type="radio" name="authType" ng-model="remoteLocation.authType" value="{{RemoteLocationAuthType.NONE}}" class="none-authentication"/>
+                    {{'manage.remote.location.dialog.auth_type.none' | translate}}
+                </label>
+                &nbsp;
+                <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="remoteLocation.authType" value="{{RemoteLocationAuthType.BASIC}}" class="basic-authentication"/>
+                    {{'manage.remote.location.dialog.auth_type.basic' | translate}}
+                </label>
+                &nbsp;
+                <label class="col-form-label" gdb-tooltip="{{'signature.auth.type.tooltip' | translate}}">
+                    <input type="radio" name="authType" ng-model="remoteLocation.authType" value="{{RemoteLocationAuthType.SIGNATURE}}" class="signature-authentication"/>
+                    {{'manage.remote.location.dialog.auth_type.signature' | translate}}
+                </label>
+            </div>
+        </div>
+        <div class="form-group row" ng-if="remoteLocation.isNoneAuthType()">
+            <div class="col-md-12">{{'manage.remote.location.dialog.auth_type.basic.description' | translate}}</div>
+        </div>
+        <div  ng-if="remoteLocation.isBasicAuthType()">
+            <div class="form-group row">
+                <div class="col-md-12">
+                    {{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.basic.auth.type.description' :
+                    remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.basic.auth.type.description' :
+                    'manage.remote.location.dialog.ontopic.basic.auth.type.description') | translate }}
+                </div>
+            </div>
+            <div class="form-group row">
+                <label for="username" class="col-md-4 col-form-label">
+                    {{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.username.required.message' :
+                    remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.username.required.message' :
+                    'manage.remote.location.dialog.ontopic.username.required.message') | translate }}
+                </label>
+                <div class="col-md-8">
+                    <input id="username" ng-model="remoteLocation.username" name="locationUsername"
+                           placeholder="{{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.username.placeholder' :
+                                            remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.username.placeholder' :
+                                            'manage.remote.location.dialog.ontopic.username.placeholder') | translate }}"
+                           class="form-control" ng-required="remoteLocation.isBasicAuthType()"/>
+                </div>
+            </div>
+            <div class="form-group row">
+                <label for="password" class="col-md-4 col-form-label">
+                    {{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.password.required.message' :
+                    remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.password.required.message' :
+                    'manage.remote.location.dialog.ontopic.password.required.message') | translate }}
+                </label>
+                <div class="col-md-8">
+                    <input id="password" ng-model="remoteLocation.password" name="locationPassword"
+                           placeholder="{{ (remoteLocation.isGraphDBLocation() ? 'manage.remote.location.dialog.graph_db.password.placeholder' :
+                                            remoteLocation.isSparqlLocation() ? 'manage.remote.location.dialog.sparql.password.placeholder' :
+                                            'manage.remote.location.dialog.ontopic.password.placeholder') | translate }}"
+                           type="password" class="form-control" ng-required="remoteLocation.isBasicAuthType()"/>
+                </div>
+            </div>
+        </div>
+        <div class="form-group row" ng-if="remoteLocation.isSignatureAuthType()">
+            <div class="col-md-12">
+                {{'manage.remote.location.dialog.auth_type.signature.description.prefix' | translate}}
+                <a href="{{docBase}}/access-control.html#gdb-authentication" rel="noopener" target="_blank">
+                    Access Control / GDB authentication
+                </a>
+                {{'manage.remote.location.dialog.auth_type.signature.description.suffix' | translate}}
+        </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" ng-click="cancel();" class="btn btn-secondary cancel-attaching-location" data-dismiss="modal">
+        {{'common.cancel.btn' | translate}}
+    </button>
+    <button type="submit" ng-click="ok();" class="btn btn-primary attach-location" form="remoteLocationForm"
+            ng-disabled="remoteLocationForm.$pristine || remoteLocationForm.$invalid">
+        <span ng-if="!isEdit" class="icon-plus"></span>
+        {{(isEdit ? 'common.save.btn' : 'common.attach') | translate}}
+    </button>
+</div>

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

@@ -31,9 +31,12 @@
 	</ul>
 </script>
 
-<link href="css/lib/ng-tags-input/ng-tags-input.min.css?v=2.7.6" rel="stylesheet"/>
+<link href="css/lib/ng-tags-input/ng-tags-input.min.css?v=2.8.0-RC2" rel="stylesheet"/>
 
-<h1>{{pageTitle}}</h1>
+<h1>
+    {{pageTitle}}
+    <page-info-tooltip></page-info-tooltip>
+</h1>
 
 <div id="wb-user" ng-hide="loader">
 	<form name="form" class="form newUserForm userForm editUserContainer" ng-submit="submit()" novalidate>
@@ -138,7 +141,11 @@
 							{{'security.ignore.shared.queries' | translate}}
 						</label>
 
-					</div>
+                        <label class="d-block cookie-policy-link" ng-if="showCookiePolicyLink">
+                            <a href="#" ng-click="showCookiePolicy()">{{'cookie.cookie_policy_url_label' | translate}}</a>
+                        </label>
+
+                    </div>
 				</div>
 
 				<div class="card" id="workbench-settings" ng-if="showWorkbenchSettings">