graphdb-workbench 10.0.0-M2-1 → 10.5.1

package/dist/js/angular/repositories/templates/fedx-repo.html

@@ -1,57 +1,63 @@
 <div id="fedx-content" class="pt-1">
     <div id="fedx-members">
-        <form ng-show="5" class="form-repo-members mb-1 form-group3">
+        <div class="form-repo-members col-md-6 col-lg-5 col-xl-4 mb-1">
             <h4>{{'fedx.repo.federation.members' | translate}}</h4>
             <div class="alert alert-warning" ng-if="fedxMembers.length === 0">{{'fedx.repo.no.members.warning' | translate}}</div>
-            <table id="fedx-members-table" class="table table-hover table-striped" aria-describedby="Repositories table">
-                <tbody class="tbody-fedx">
-                    <tr class="repository" style="display: flex"
-                        ng-repeat="member in fedxMembers | orderBy: ['type === \'system\'', 'endpoint', 'repositoryServer', 'repositoryName'] : true ">
-                        <td style="display: inline-block; flex: 1">
-                            <span class="multiline-text multilined">
-                                <em ng-class="getMemberIcon(member)" class="fedx-repo-member-icon"></em>
-                                {{resolveName(member)}}
-                            </span>
-                            <span class="icon-warning" ng-if="!checkIfRepoExist(member)" tooltip="{{'repoTooltips.fedx.repositoryNotExistWarning' | translate}}"> </span>
-                        </td>
-                        <td style="display: inline-block">
-                            <button class="btn btn-link p-0 edit-repository-btn" type="button">
+            <ul id="fedx-members-table" class="list-group" aria-describedby="Repositories table">
+                <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center repository"
+                    ng-repeat="member in fedxMembers | orderBy: ['type === \'system\'', 'endpoint', 'repositoryServer', 'repositoryName'] : true ">
+                    <div class="name">
+                        <span class="multiline-text multilined">
+                            <em ng-class="getMemberIcon(member)" class="fedx-repo-member-icon"></em>
+                            {{resolveName(member)}}
+                        </span>
+                        <span class="icon-warning" ng-if="!checkIfRepoExist(member)" gdb-tooltip="{{'repoTooltips.fedx.repositoryNotExistWarning' | translate}}"> </span>
+                    </div>
+                    <div class="actions">
+                        <button class="btn btn-link p-0 edit-repository-btn" type="button">
                                 <span id="{{member.repositoryName}}-icon-edit" class="icon-edit"
                                       ng-click="editFedXRepository(member)"
                                       ng-if="member.store !== 'NativeStore'"
-                                      tooltip="{{'repoTooltips.editRepository' | translate}}"></span>
-                            </button>
-                            <button class="btn btn-link p-0 secondary" type="button">
+                                      gdb-tooltip="{{'repoTooltips.editRepository' | translate}}"></span>
+                        </button>
+                        <button class="btn btn-link p-0 secondary" type="button">
                                 <span id="{{member.repositoryName}}-icon-close" ng-click="removeMember(member)"
                                       class="icon-close"
-                                      tooltip="{{'repoTooltips.fedx.removeMember' | translate}}"></span>
-                            </button>
-                            <button class="btn btn-link p-0 secondary">
-                                <span id = "{{member.repositoryName}}-icon-writable"
+                                      gdb-tooltip="{{'repoTooltips.fedx.removeMember' | translate}}"></span>
+                        </button>
+                        <button class="btn btn-link p-0 secondary">
+                                <span id="{{member.repositoryName}}-icon-writable"
                                       ng-click="setWritableRepo(member)"
                                       class="icon-import{{getActiveClass(member)}}"
-                                      tooltip="{{'repoTooltips.fedx.setAsWritable' | translate}}"></span>
-                            </button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </form>
-        <h8 class = "indented-div">{{'fedx.repo.local.attached.header' | translate}}</h8>
-        <div class = "form-group2">
-            <form class="form-local-repos pre-scrollable">
-                <div ng-repeat="repository in knownRepos | orderBy: ['type === \'system\'', 'location', 'id']" ng-if="repository.type !== 'fedx'" style="display:block" id="{{repository.id}}-local-repo" class = "fedXMember">
-                    <a ng-click="addMember(repository)" id="{{repository.id}}-a" tooltip="{{'repoTooltips.fedx.localReposInstructions' | translate}}">
+                                      gdb-tooltip="{{'repoTooltips.fedx.setAsWritable' | translate}}"></span>
+                        </button>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="col-md-4 col-lg-3 col-xl-3 mb-1">
+            <div class="attached-header">{{'fedx.repo.local.attached.header' | translate}}</div>
+            <div class="form-local-repos pre-scrollable locations-list">
+                <div class="location-item hoverable"
+                     ng-repeat="repository in knownRepos | orderBy: ['type === \'system\'', 'location', 'id']"
+                     ng-if="repository.type !== 'fedx'"
+                     id="{{repository.id}}-local-repo">
+
+                    <a id="{{repository.id}}-a"
+                       ng-click="addMember(repository)"
+                       gdb-tooltip="{{'repoTooltips.fedx.localReposInstructions' | translate}}">
                         <span class="multiline-text">
                             <em ng-class="'icon-repo-' + repository.type" class="fedx-repo-member-icon"></em>
                             {{repository.id}}
                         </span>
-<!--                        <small> " . " <span> </span> </small>-->
                         <span class="small"><small> &middot; {{getRepositoryServer(repository)}}</small></span>
                     </a>
                 </div>
-            </form>
-            <button id="addFedXRepository" ng-click="addRemoteMember()" class="btn btn-primary" style="margin-top:1%">{{'fedx.repo.add.remote' | translate}}</button>
+            </div>
+            <button type="button" id="addFedXRepository" ng-click="addRemoteMember()" class="btn btn-primary">
+                <span class="icon-plus"></span>
+                {{'fedx.repo.add.remote' | translate}}
+            </button>
         </div>
     </div>
     <div id="fedx-options">
@@ -59,8 +65,7 @@
         <div class="pb-1">
             <div class="form-group row">
                 <div class="checkbox offset-xs-1 offset-md-4 indented-div checkbox-param-include-inferred">
-                    <label
-                           tooltip="{{'repoTooltips.fedx.withIncludeInferredDefault' | translate}}">
+                    <label gdb-tooltip="{{'repoTooltips.fedx.withIncludeInferredDefault' | translate}}">
                         <input id="includeInferredDefault" name="includeInferredDefault" type="checkbox"
                                ng-true-value="'true'" ng-false-value="'false'"
                                ng-model="repositoryInfo.params.includeInferredDefault.value"/>
@@ -68,7 +73,7 @@
                     </label>
                 </div>
                 <div class="checkbox offset-xs-1 offset-md-4 offset-lg-2">
-                    <label class="padding-label" tooltip="{{'repoTooltips.fedx.withEnableServiceAsBoundJoin' | translate}}">
+                    <label class="padding-label" gdb-tooltip="{{'repoTooltips.fedx.withEnableServiceAsBoundJoin' | translate}}">
                         <input id="enableServiceAsBoundJoin"
                                name="enableServiceAsBoundJoin" type="checkbox"
                                ng-true-value="'true'" ng-false-value="'false'"
@@ -79,8 +84,7 @@
             </div>
             <div class="form-group row">
                 <div class="checkbox offset-xs-1 offset-md-4 indented-div checkbox-param-padded">
-                    <label
-                           tooltip="{{'repoTooltips.fedx.withLogQueries' | translate}}">
+                    <label gdb-tooltip="{{'repoTooltips.fedx.withLogQueries' | translate}}">
                         <input id="isLogQueries" name="isLogQueries" type="checkbox"
                                ng-true-value="'true'" ng-false-value="'false'"
                                ng-model="repositoryInfo.params.isLogQueries.value"/>
@@ -88,7 +92,7 @@
                     </label>
                 </div>
                 <div class="checkbox offset-xs-1 offset-md-4 offset-lg-2">
-                    <label class="padding-label" tooltip="{{'repoTooltips.fedx.withDebugQueryPlan' | translate}}">
+                    <label class="padding-label" gdb-tooltip="{{'repoTooltips.fedx.withDebugQueryPlan' | translate}}">
                         <input id="debugQueryPlan"
                                name="debugQueryPlan" type="checkbox"
                                ng-true-value="'true'" ng-false-value="'false'"
@@ -111,7 +115,7 @@
                                ng-model="repositoryInfo.params.queryTimeout.value"
                                class="form-control"
                                required
-                               tooltip="{{'repoTooltips.fedx.enforceMaxQueryTime' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.enforceMaxQueryTime' | translate}}"/>
                     </div>
                 </div>
                 <div class="offset-xs-1 offset-md-4 indented-div">
@@ -125,7 +129,7 @@
                                ng-model="repositoryInfo.params.boundJoinBlockSize.value"
                                class="form-control"
                                required
-                               tooltip="{{'repoTooltips.fedx.withBoundJoinBlockSize' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.withBoundJoinBlockSize' | translate}}"/>
                     </div>
                 </div>
             </div>
@@ -141,7 +145,7 @@
                                ng-model="repositoryInfo.params.joinWorkerThreads.value"
                                class="form-control"
                                required
-                               tooltip="{{'repoTooltips.fedx.withJoinWorkerThreads' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.withJoinWorkerThreads' | translate}}"/>
                     </div>
                 </div>
                 <div class="offset-xs-1 offset-md-4 indented-div">
@@ -155,7 +159,7 @@
                                ng-model="repositoryInfo.params.leftJoinWorkerThreads.value"
                                class="form-control"
                                required
-                               tooltip="{{'repoTooltips.fedx.withLeftJoinWorkerThreads' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.withLeftJoinWorkerThreads' | translate}}"/>
                     </div>
                 </div>
             </div>
@@ -177,19 +181,19 @@
                                ng-model="repositoryInfo.params.unionWorkerThreads.value"
                                class="form-control"
                                required
-                               tooltip="{{'repoTooltips.fedx.unionWorkerThreads' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.unionWorkerThreads' | translate}}"/>
                     </div>
                 </div>
             </div>
         </div>
         <div class="pb-1">
             <div class="form-group row">
-                <div class = "indented-div">
+                <div class="indented-div">
                     <label for="cache-spec" class="col-md-3 col-lg-3 col-form-label">{{'fedx.repo.source.selection.cache.spec' | translate}}</label>
                     <div class="col-lg-7 col-xl-7">
                         <input id="cache-spec" class="form-control"
                                ng-model="repositoryInfo.params['sourceCacheSpec'].value"
-                               tooltip="{{'repoTooltips.fedx.withSourceSelectionCacheSpec' | translate}}"/>
+                               gdb-tooltip="{{'repoTooltips.fedx.withSourceSelectionCacheSpec' | translate}}"/>
                     </div>
                 </div>
             </div>

package/dist/js/angular/repositories/templates/ontop-repo.html

@@ -1,86 +1,213 @@
 <div id="ontop-content" class="pt-1">
-    <h4>{{'ontop.repo.configuration' | translate}}</h4>
+
+    <!-- Connection information -->
+    <h4>{{'ontop.repo.connection.information' | translate}}</h4>
+
+    <!-- select driver type -->
     <div class="form-group row indented-div">
         <label class="col-xs-12 col-md-3 col-lg-2 col-form-label">{{'ontop.repo.database.driver' | translate}}</label>
-        <div class="col-xs-8 col-md-5 col-lg-4" tooltip="{{'repoTooltips.ontop.driverType' | translate}}">
-            <select class="form-control" id="driverType" ng-model="selectedDriver.driverType"
-                    ng-change="selectDriverByType(selectedDriver.driverType)"
+        <div class="col-xs-8 col-md-5 col-lg-4" gdb-tooltip="{{'repoTooltips.ontop.driverType' | translate}}">
+            <select class="form-control" id="driverType" ng-model="formData.connectionInformation.driverType"
+                    ng-change="selectDriver(formData.connectionInformation.driverType)"
                     ng-options="driver.driverType as driver.driverName for driver in supportedDriversData">
             </select>
         </div>
-        <div class="form-group col-xs-4 col-md-2 wrapper-div"
-             ng-if="selectedDriver.driverType === genericDriverType"
-             tooltip="{{'repoTooltips.ontop.testConn' | translate}}">
-            <button id="testConnection" ng-click="validateOntopPropertiesConnection()"
-                    ng-disabled="!isOntopRepoFileUploaded() && !editRepoPage"
-                    type="submit"
-                    class="btn btn-primary">{{'ontop.repo.test.connection' | translate}}
-            </button>
+    </div>
+
+    <!-- Host Name -->
+    <div class="form-group row indented-div" ng-if="!isGenericDriver">
+        <label for="hostName" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{getHostNameLabel()}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.hostName' | translate}}">
+            <input id="hostName" class="form-control"
+                   type="text" min="1" max="65535"
+                   ng-required="true"
+                   placeholder="{{'ontop.repo.database.host_name.placeholder' | translate}}"
+                   ng-model="formData.connectionInformation.hostName"
+                   ng-change="updateUrl()">
         </div>
     </div>
-    <div ng-repeat="labelName in propertiesFileParams" class="form-group row indented-div"
-         ng-if="selectedDriver.driverType !== genericDriverType">
-        <label for="{{labelName}}" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
-            {{supportedDriverLabels[labelName] + (isRequiredField(labelName) ? '*' : '')}}</label>
-        <div ng-class="{'col-xs-8 col-md-5 col-lg-4': labelName === 'url', 'col-xs-12 col-md-5 col-lg-4': labelName !== 'url'}"
-             tooltip="{{getFieldTooltip(labelName)}}">
-            <input id="{{labelName}}" class="form-control" ng-readonly="isReadOnly(labelName)"
-                   type="{{getInputType(labelName)}}" min="1" max="65535"
-                   ng-required="isRequiredField(labelName)"
-                   placeholder="{{isRequiredField(labelName) ? 'required.field' : '' | translate}}"
-                   ng-model="selectedDriver.jdbc[labelName]" ng-change="concatURL(labelName)">
-        </div>
-        <div class="col-xs-12 col-md-4" ng-if="labelName === 'driverClass'">
-            <em class="icon-warning icon-2x"
-                ng-if="!classAvailable"
-                tooltip="{{'repoTooltips.ontop.driverClassWarning' | translate}}"
-                tooltip-placement="top"></em>
-            <a class="uri" ng-if="selectedDriver.downloadDriverUrl && !classAvailable"
-               href="{{selectedDriver.downloadDriverUrl}}"
-               style="text-decoration: underline;">
-                {{'ontop.repo.download.jdbc.driver' | translate}}
-            </a>
+
+    <!-- Port -->
+    <div class="form-group row indented-div" ng-if="!isGenericDriver">
+        <label for="port" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{'ontop.repo.database.port' | translate}} {{selectedDriver.portRequired ? '*' : ''}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.port' | translate}}">
+            <input id="port" class="form-control"
+                   type="number" min="1" max="65535"
+                   ng-required="selectedDriver.portRequired"
+                   name="port"
+                   placeholder="{{'ontop.repo.database.port.placeholder' | translate}}"
+                   ng-model="formData.connectionInformation.port"
+                   ng-change="updateUrl()">
+        </div>
+    </div>
+
+    <!-- Data Base Name -->
+    <div class="form-group row indented-div" ng-if="!isGenericDriver">
+        <label for="databaseName" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{getDatabaseNameLabel()}} *</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.databaseName' | translate}}">
+            <input id="databaseName" class="form-control"
+                   type="text" min="1" max="65535"
+                   ng-required="true"
+                   placeholder="{{'ontop.repo.database.database_name.placeholder' | translate}}"
+                   ng-model="formData.connectionInformation.databaseName"
+                   ng-change="updateUrl()">
+        </div>
+    </div>
+
+    <!-- Username -->
+    <div class="form-group row indented-div">
+        <label for="username" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{'ontop.repo.database.username' | translate}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.userName' | translate}}">
+            <input id="username" class="form-control"
+                   type="text" min="1" max="65535"
+                   placeholder="{{'ontop.repo.database.username.placeholder' | translate}}"
+                   ng-model="formData.connectionInformation.username">
+        </div>
+    </div>
+
+    <!-- Password -->
+    <div class="form-group row indented-div">
+        <label for="password" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{'ontop.repo.database.password' | translate}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.password' | translate}}">
+            <input id="password" class="form-control"
+                   autocomplete="new-password"
+                   type="password" min="1" max="65535"
+                   placeholder="{{'ontop.repo.database.password.placeholder' | translate}}"
+                   ng-model="formData.connectionInformation.password">
         </div>
-        <div class="col-xs-4 col-md-2" ng-if="labelName === 'url'">
-            <div class="wrapper-div" tooltip="{{'repoTooltips.ontop.testConn' | translate}}">
-                <button id="testConnection1" ng-click="validateOntopPropertiesConnection()"
-                        ng-disabled="!selectedDriver.jdbc.hostName || !selectedDriver.jdbc.userName || !selectedDriver.jdbc.databaseName || isRequiredField('port') && !selectedDriver.jdbc.port"
+    </div>
+
+    <!-- Driver class -->
+    <div class="form-group row indented-div">
+        <label for="driverClass" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{('ontop.repo.database.driver_class' | translate) + ' *'}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.driverClass' | translate}}">
+            <input id="driverClass" class="form-control"
+                   type="text" min="1" max="65535"
+                   ng-required="true"
+                   placeholder="{{'ontop.repo.database.driver_class.placeholder' | translate}}"
+                   ng-readonly="!isGenericDriver"
+                   ng-model="formData.connectionInformation.driverClass">
+        </div>
+        <div class="col-xs-12 col-md-4" ng-if="!selectedDriver.classAvailable">
+            <div ng-if="!isGenericDriver">
+                <em class="icon-warning icon-2x" gdb-tooltip="{{'repoTooltips.ontop.driverClassWarning' | translate}}"
+                    tooltip-placement="top"></em>
+                <a class="uri" ng-if="selectedDriver.downloadDriverUrl"
+                   href="{{selectedDriver.downloadDriverUrl}}"
+                   style="text-decoration: underline;">
+                    {{'ontop.repo.download.jdbc.driver' | translate}}
+                </a>
+            </div>
+
+            <div ng-if="isGenericDriver && !formData.connectionInformation.driverClass">
+                <em class="icon-warning icon-2x" gdb-tooltip="{{'repoTooltips.ontop.driverClassWarning' | translate}}"
+                    tooltip-placement="top"></em>
+                <span>{{'ontop.repo.missing.jdbc.driver' | translate}}</span>
+            </div>
+        </div>
+    </div>
+
+    <!-- JDBC URL -->
+    <div class="form-group row indented-div">
+        <label for="url" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{('ontop.repo.database.url' | translate) + ' *'}}</label>
+        <div class="col-xs-12 col-md-5 col-lg-4"
+             gdb-tooltip="{{'repoTooltips.ontop.url' | translate}}">
+            <input id="url" class="form-control"
+                   type="text" min="1" max="65535"
+                   ng-required="true"
+                   placeholder="{{isGenericDriver ? defaultUrlTemplate : selectedDriver.urlTemplate}}"
+                   ng-model="formData.connectionInformation.url"
+                   ng-keydown="onKeyDownInUrlInput($event)"
+                   ng-keyup="onKeyUpInUrlInput()">
+        </div>
+
+        <div class="col-xs-4 col-md-2">
+            <div class="wrapper-div" gdb-tooltip="{{'repoTooltips.ontop.testConn' | translate}}">
+                <button id="testConnection"
+                        ng-click="testConnection()"
+                        ng-disabled="isTestConnectionDisabled()"
                         type="submit"
                         class="btn btn-primary">{{'ontop.repo.test.connection' | translate}}
                 </button>
             </div>
         </div>
     </div>
-    <div ng-repeat="file in ontopRepoFiles" class="form-group row indented-div"
-         ng-if="selectedDriver.driverType === genericDriverType || propertiesFile !== file">
-        <label for="{{file}}" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
-            {{repositoryInfo.params[file].label + (isRequiredOntopRepoFile(file) ? '*' : '')}}</label>
-        <div class="col-xs-8 col-md-5 col-lg-4" tooltip="{{'repoTooltips.ontop.' + file | translate}}">
-            <a class="btn btn-link ot-edit-input" ng-if="ontopRepoFileNames[file]" ng-click="editFile(file)"
-               tooltip="{{'edit.file.content' | translate}}"
-               tooltip-placement="right"
-               tooltip-trigger="mouseenter">
+
+    <!-- Ontop settings -->
+    <h4>{{'ontop.repo.settings' | translate}}</h4>
+
+    <!-- Additional properties -->
+    <div class="form-group row indented-div">
+        <label class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{'ontop.repo.properties.label' | translate}}
+        </label>
+        <div class="col-xs-8 col-md-5 col-lg-4">
+            <div class="mb-1" gdb-tooltip="{{'ontop.repo.properties.tooltip' | translate}}">
+                <textarea class="form-control" rows="3" maxlength="1000"
+                          id="additionalProperties"
+                          ng-model="formData.settings.additionalProperties"
+                          placeholder="{{'ontop.repo.properties.placeholder' | translate}}">
+                </textarea>
+            </div>
+        </div>
+        <div class="col-xs-12 col-md-4">
+            <a class="uri"
+               href="{{ontopProperiesLink}}"
+               style="text-decoration: underline;">
+                {{'ontop.repo.properties.configuration.link' | translate}}
+            </a>
+        </div>
+    </div>
+
+    <!-- ontop files -->
+    <div ng-repeat="ontopFileInfo in formData.settings.ontopFiles" class="form-group row indented-div">
+        <label for="{{ontopFileInfo.type}}" class="col-xs-12 col-md-3 col-lg-2 col-form-label">
+            {{(('ontop.repo.file.' + ontopFileInfo.type + '.name') | translate)}} {{ontopFileInfo.required ? ' *' : ''}}
+        </label>
+
+        <div class="col-xs-8 col-md-5 col-lg-4" gdb-tooltip="{{'repoTooltips.ontop.' + ontopFileInfo.type | translate}}">
+            <a ng-if="!!ontopFileInfo.fileName"
+               class="btn btn-link ot-edit-input"
+               ng-click="editFile(ontopFileInfo)"
+               gdb-tooltip="{{'edit.file.content' | translate}}"
+               tooltip-placement="right">
                 <span class="icon-edit"></span>
             </a>
-            <input class="form-control" id="{{file}}" ng-readonly="true"
-                   placeholder="{{isRequiredOntopRepoFile(file) ? 'required.field' : '' | translate}}"
-                   ng-model="ontopRepoFileNames[file]">
+            <input class="form-control" id="{{ontopFileInfo.type}}" ng-readonly="true"
+                   placeholder="{{ontopFileInfo.required ? ('required.field' | translate) : ''}}"
+                   ng-model="ontopFileInfo.fileName">
         </div>
+
         <div class="col-xs-4 col-md-2">
             <div class="btn btn-outline-primary btn-sm">
-                <div ngf-select ngf-change="uploadOntopRepoFile($files, file)" ngf-multiple="false "
+                <div ngf-select ngf-change="uploadOntopFile($files, ontopFileInfo)" ngf-multiple="false "
                      class="selectFiles pointer clearfix">
-                    <em ng-hide="uploadFileLoader" class="fa fa-upload fa-2x"></em>&nbsp;
-                    <div ng-show="uploadFileLoader" onto-loader size="24" class="spinner-container ot-loader"></div>
-                    <span for="{{file}}" class="pageInfo" style="vertical-align: super; color: #8a8a8a;">{{'upload.file' | translate}}</span>
+                    <em ng-hide="ontopFileInfo.loading" class="fa fa-upload fa-2x"></em>&nbsp;
+                    <div ng-show="ontopFileInfo.loading" onto-loader size="24" class="spinner-container ot-loader"></div>
+                    <span for="{{ontopFileInfo.type}}" class="pageInfo"
+                          style="vertical-align: super; color: #8a8a8a;">{{'upload.file' | translate}}</span>
                 </div>
             </div>
         </div>
     </div>
+
     <div class="pt-1"></div>
     <div class="form-group row" ng-if="editRepoPage">
         <div class="checkbox col-xs-12">
-            <label tooltip="{{'restart.repo.check.tooltip' | translate}}">
+            <label gdb-tooltip="{{'restart.repo.check.tooltip' | translate}}">
                 <input id="restartRepo" name="restartRepo"
                        type="checkbox"
                        ng-model="repositoryInfo.restartRequested"
@@ -90,11 +217,15 @@
             </label>
         </div>
     </div>
-    <div class="form-group row pb-3">
-        <div class="col-xs-12">
-            <button id="addSaveOntopRepository" ng-click="createOntopRepo()" ng-if="!editRepoPage" type="submit" class="btn btn-primary">{{'common.create.btn' | translate}}</button>
-            <button id="addEditOntopRepository" ng-click="editOntopRepo()" ng-if="editRepoPage" type="submit" class="btn btn-primary">{{'common.save.btn' | translate}}</button>
-            <a ng-click="goBackToPrevious()" class="btn btn-secondary">{{'common.cancel.btn' | translate}}</a>
+    <div class="form-group row col-xs-12 pb-3">
+        <div class="text-right">
+            <a ng-click="goBackToPreviousLocation()" class="btn btn-secondary">{{'common.cancel.btn' | translate}}</a>
+            <button id="addSaveOntopRepository" ng-click="updateOntopRepo()" ng-if="!editRepoPage" type="submit" class="btn btn-primary">
+                {{'common.create.btn' | translate}}
+            </button>
+            <button id="addEditOntopRepository" ng-click="updateOntopRepo()" ng-if="editRepoPage" type="submit" class="btn btn-primary">
+                {{'common.save.btn' | translate}}
+            </button>
         </div>
     </div>
 </div>

package/dist/js/angular/security/templates/modal/default-authorities.html

@@ -24,26 +24,26 @@
             </div>
             <div class="row" style="margin-top: 0">
                 <h5 class="boldless col-xs-10">{{'security.repository.title' | translate}}</h5>
-                <span class="fa fa-eye fa-1andAhalfx col-xs-1" tooltip="{{'security.tooltip.read' | translate}}" tooltip-trigger="mouseenter"
-                      tooltip-placement="top" tooltip-append-to-body="true" style="margin-top: 10px"></span>
-                <span class="fa fa-pencil fa-1andAhalfx col-xs-1" tooltip="{{'security.tooltip.write' | translate}}" tooltip-trigger="mouseenter"
-                      tooltip-placement="top" tooltip-append-to-body="true" style="margin-top: 10px"></span>
+                <span class="fa fa-eye fa-1andAhalfx col-xs-1" gdb-tooltip="{{'security.tooltip.read' | translate}}"
+                      tooltip-placement="top" style="margin-top: 10px"></span>
+                <span class="fa fa-pencil fa-1andAhalfx col-xs-1" gdb-tooltip="{{'security.tooltip.write' | translate}}"
+                      tooltip-placement="top" style="margin-top: 10px"></span>
             </div>
             <div id="access-user-repos access-user-rights" class="row"
-                 ng-repeat="repository in getRepositories() | orderBy: 'id'">
-                <p class="col-xs-10">{{repository.id}}</p>
+                 ng-repeat="repository in getRepositories() | orderBy: ['id', 'location']">
+                <p class="col-xs-10">{{repository.id}}<small> &middot; {{repository.location ? repository.location : 'Local'}}</small></p>
                 <label class="col-xs-1">
                     <input class="animated read" type="checkbox"
-                           ng-model="grantedAuthorities.READ_REPO[repository.id]"
-                           ng-checked="grantedAuthorities.READ_REPO[repository.id] || grantedAuthorities.WRITE_REPO[repository.id]"
-                           ng-disabled="grantedAuthorities.WRITE_REPO[repository.id]"
-                           ng-class="grantedAuthorities.WRITE_REPO[repository.id] ? 'bounceIn' : ''"
+                           ng-model="grantedAuthorities.READ_REPO[createUniqueKey(repository)]"
+                           ng-checked="grantedAuthorities.READ_REPO[createUniqueKey(repository)] || grantedAuthorities.WRITE_REPO[createUniqueKey(repository)]"
+                           ng-disabled="grantedAuthorities.WRITE_REPO[createUniqueKey(repository)]"
+                           ng-class="grantedAuthorities.WRITE_REPO[createUniqueKey(repository)] ? 'bounceIn' : ''"
                            ng-click="setGrantedAuthorities()">
                 </label>
                 <label class="col-xs-1">
                     <input class="animated write" type="checkbox"
-                           ng-model="grantedAuthorities.WRITE_REPO[repository.id]"
-                           ng-checked="grantedAuthorities.WRITE_REPO[repository.id]"
+                           ng-model="grantedAuthorities.WRITE_REPO[createUniqueKey(repository)]"
+                           ng-checked="grantedAuthorities.WRITE_REPO[createUniqueKey(repository)]"
                            ng-click="setGrantedAuthorities()">
                 </label>
             </div>