graphdb-workbench 2.4.0-TR1 → 2.4.0-TR10

package/dist/pages/graphs-visualizations.html

@@ -1,7 +1,7 @@
-<link href="css/graphs-vizualizations.css?v=2.4.0-TR1" rel="stylesheet"/>
-<link href="css/rdf-details-side-panel.css?v=2.4.0-TR1" rel="stylesheet"/>
-<link href="css/lib/ng-tags-input/ng-tags-input.min.css?v=2.4.0-TR1" rel="stylesheet"/>
-<link href="js/lib/d3-tip/d3-tip.css?v=2.4.0-TR1" rel="stylesheet"/>
+<link href="css/graphs-vizualizations.css?v=2.4.0-TR10" rel="stylesheet"/>
+<link href="css/rdf-details-side-panel.css?v=2.4.0-TR10" rel="stylesheet"/>
+<link href="css/lib/ng-tags-input/ng-tags-input.min.css?v=2.4.0-TR10" rel="stylesheet"/>
+<link href="js/lib/d3-tip/d3-tip.css?v=2.4.0-TR10" rel="stylesheet"/>
 
 <div class="container-fluid">
 
@@ -11,7 +11,7 @@
               uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
               popover-trigger="mouseenter"
               popover-placement="bottom-right"
-              popover-append-to-body="true"><span class="icon-info"></span></span>
+              popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
     </h1>
     <div core-errors license></div>
     <div system-repo-warning></div>
@@ -126,14 +126,14 @@
                             <p>{{'visual.advanced.graph.config.info' | translate}}</p>
                         </div>
                         <div ng-show="graphConfigs.length == 0">{{'visual.no.configs' | translate}}</div>
-                        <table class="table table-hover mb-0 graph-configurations-list" aria-describedby="Graph configurations table">
+                        <table class="table table-hover mb-0" aria-describedby="Graph configurations table">
                             <tbody>
                             <tr ng-repeat="config in graphConfigs">
                                 <td width="20">
                                     <a href ng-click="goToGraphConfig(config)">
-                                        <img ng-if="config.startMode == 'search'" src="css/images/search.png?v=2.4.0-TR1" alt="" width="64" uib-popover="{{'visual.config.search.box.starting.point' | translate}}" popover-trigger="mouseenter">
-                                        <img ng-if="config.startMode == 'node'" src="css/images/node.png?v=2.4.0-TR1" alt="" width="64" uib-popover="{{'visual.config.fixed.resource.starting.point' | translate}}" popover-trigger="mouseenter">
-                                        <img ng-if="config.startMode == 'query'" src="css/images/query.png?v=2.4.0-TR1" alt="" data-cy="graph-config-starting-point-query-results" width="64" uib-popover="{{'visual.config.query.results.starting.point' | translate}}" popover-trigger="mouseenter">
+                                        <img ng-if="config.startMode == 'search'" src="css/images/search.png?v=2.4.0-TR10" alt="" width="64" uib-popover="{{'visual.config.search.box.starting.point' | translate}}" popover-trigger="mouseenter">
+                                        <img ng-if="config.startMode == 'node'" src="css/images/node.png?v=2.4.0-TR10" alt="" width="64" uib-popover="{{'visual.config.fixed.resource.starting.point' | translate}}" popover-trigger="mouseenter">
+                                        <img ng-if="config.startMode == 'query'" src="css/images/query.png?v=2.4.0-TR10" alt="" data-cy="graph-config-starting-point-query-results" width="64" uib-popover="{{'visual.config.query.results.starting.point' | translate}}" popover-trigger="mouseenter">
                                     </a>
                                 </td>
                                 <td>
@@ -144,7 +144,7 @@
                                     <samp class="text-muted small text-overflow d-block" ng-if="config.startMode == 'node'">{{config.startIRI}}</samp>
                                 </td>
                                 <td class="text-xs-right" ng-if="isUser() && config.owner === principal.username">
-                                    <a ng-href="graphs-visualizations/config/save/{{config.id}}" class="btn btn-link btn-edit-config" gdb-tooltip="{{'visual.edit.config' | translate}}"><span class="icon-edit"></span></a>
+                                    <a ng-href="graphs-visualizations/config/save/{{config.id}}" class="btn btn-link" gdb-tooltip="{{'visual.edit.config' | translate}}"><span class="icon-edit"></span></a>
                                     <button type="button" ng-click="deleteConfig(config)" class="btn btn-link delete-config" gdb-tooltip="{{'visual.delete.config' | translate}}" data-cy="delete-graph-config"><span class="icon-trash"></span></button>
                                 </td>
                             </tr>
@@ -196,7 +196,8 @@
     </div>
 </div>
 
-<keyboard-shortcuts template-url="res/graphexplore/keyboard-shortcuts.html" ng-if="nodeSelected && !loading"></keyboard-shortcuts>
+
+<keyboard-shortcuts template-url="res/graphexplore/keyboard-shortcuts.html"></keyboard-shortcuts>
 
 <div class="graph-visualization" ng-hide="loading || !nodeSelected"></div>
 <div onto-loader-new

package/dist/pages/guides.html

@@ -1,11 +1,11 @@
-<link href="css/guides.css?v=2.4.0-TR1" rel="stylesheet">
+<link href="css/guides.css?v=2.4.0-TR10" rel="stylesheet">
 <h1>
     {{title}}
     <span class="btn btn-link"
           uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
           popover-trigger="mouseenter"
           popover-placement="bottom"
-          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 ng-show="displayedGuides.length > 0" class="clearfix">

package/dist/pages/home.html

@@ -17,8 +17,8 @@
                     </div>
                 </div>
                 <div class="card-block">
-                    <a href="guides" class="btn btn-lg btn-primary">{{'take.me.to.guides' | translate}}</a>
                     <a href="#" class="btn btn-lg btn-outline-secondary decline-tutorial" ng-click="declineTutorial()">{{'hide.panel' | translate}}</a>
+                    <a href="guides" class="btn btn-lg btn-primary">{{'take.me.to.guides' | translate}}</a>
                     <div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with button groups">
                         <div class="btn-group" role="group" aria-label="First group">
                             <button type="button" class="btn btn-secondary" ng-click="slideToPage($index)"

package/dist/pages/import.html

@@ -1,4 +1,4 @@
-<link rel="stylesheet" type="text/css" href="css/import.css?v=2.4.0-TR1">
+<link rel="stylesheet" type="text/css" href="css/import.css?v=2.4.0-TR10">
 
 <div id="wb-import">
     <h1>
@@ -7,7 +7,7 @@
               uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
               popover-trigger="mouseenter"
               popover-placement="bottom-right"
-              popover-append-to-body="true"><span class="icon-info"></span></span>
+              popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
     </h1>
     <div core-errors write ontop></div>
     <div ng-controller="TabCtrl" ng-show="!isRestricted && canWriteActiveRepo()">

package/dist/pages/info.html

@@ -5,7 +5,7 @@
 		   uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
 		   popover-trigger="mouseenter"
 		   popover-placement="bottom-right"
-		   popover-append-to-body="true"><span class="icon-info"></span></span>
+		   popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
 	</h1>
 
 	<uib-tabset>

package/dist/pages/jdbc-create.html

@@ -1,4 +1,14 @@
-<div class="container-fluid fit-content-on-mobile" ng-if="!isLoading">
+<link href="css/lib/angular-xeditable/xeditable.min.css?v=2.4.0-TR10" rel="stylesheet">
+
+<link href="css/lib/yasqe.min.css?v=2.4.0-TR10" rel="stylesheet"/>
+
+<link href="css/new-sparql.css?v=2.4.0-TR10" rel="stylesheet"/>
+
+<link href="css/graphs-config.css?v=2.4.0-TR10" rel="stylesheet"/>
+
+<link href="css/jdbc.css?v=2.4.0-TR10" rel="stylesheet"/>
+
+<div class="container-fluid fit-content-on-mobile">
     <h1>
         {{title}}
         <span class="btn btn-link"
@@ -15,196 +25,139 @@
         <p>{{repositoryError}}</p>
     </div>
 
-    <div class="card jdbc-configuration">
+    <div class="card mb-2 sql-table-config">
         <div class="card-block pt-1">
             <p class="lead">{{'table.name' | translate}}</p>
-            <div class="container-fluid">
-                <input required
-                       class="form-control jdbc-configuration-name"
-                       type="text"
-                       placeholder="{{'table.name.placeholder.required' | translate}}"
-                       ng-model="jdbcConfigurationInfo.jdbcConfigurationName"
-                       ng-change="setDirty()"
-                       ng-disabled="!jdbcConfigurationInfo.isNewJdbcConfiguration">
-
-                <div ng-if="saveOrUpdateExecuted">
-                    <div ng-if="!jdbcConfigurationInfo.jdbcConfigurationName"
-                         class="idError alert alert-danger jdbc-configuration-name-required"
-                         translate="jdbc.required.configuration.name">
-                    </div>
-                </div>
-
-                <ul class="nav nav-tabs pt-1">
-                    <li class="nav-item" ng-class="{ 'active': activeTab === 1 }">
-                        <a class="nav-link" href="#" ng-click="setActiveTab(1)">
-                            {{'data.query.label' | translate}}
-                        </a>
-                    </li>
-                    <li class="nav-item" ng-class="{ 'active': activeTab === 2 }">
-                        <a class="nav-link" href="#" ng-click="setActiveTab(2)">
-                            {{'jdbc.column.types' | translate}}
-                        </a>
-                    </li>
-                </ul>
-
-                <div>
-                    <!-- First tab -->
-                    <div class="tab-pane" ng-show="activeTab === 1">
+            <div class="table-group table-group-lg">
+                <input required class="form-control sql-table-name" type="text" placeholder="{{'table.name.placeholder.required' | translate}}"
+                       ng-model="currentQuery.name" ng-disabled="!currentQuery.isNewConfiguration" >
+            </div>
 
-                        <yasgui-component id="query-editor" class="pt-1" yasgui-config="yasguiConfig"
-                                          query-changed="setDirty()"></yasgui-component>
+            <ul class="nav nav-tabs pt-1">
+                <li class="nav-item">
+                    <a ng-class="page === 1 ? 'active' : ''" ng-click="goToPage(1)" class="nav-link" href>
+                        {{'data.query.label' | translate}}
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a ng-class="page === 2 ? 'active' : ''" ng-click="goToPage(2)" class="nav-link" href>
+                        {{'jdbc.column.types' | translate}}
+                    </a>
+                </li>
+            </ul>
 
-                        <div ng-if="!jdbcConfigurationInfo.isValidQuery"
-                             class="idError alert alert-danger invalid-query"
-                             translate="jdbc.invalid.query">
-                        </div>
-                        <div ng-if="!jdbcConfigurationInfo.isValidQueryType"
-                             class="idError alert alert-danger invalid-query-mode"
-                             translate="jdbc.warning.invalid.query">
-                        </div>
-                        <div onto-loader-new
-                             ng-if="isQueryRunning"
-                             size="75"
-                             message="queryRunningMessage"
-                             timeout="[1]">
-                        </div>
+            <div ng-show="page === 2 && !currentQuery.columns.length" class="mt-2">
+                {{'jdbc.no.columns.defined.warning' | translate}}
+            </div>
+            <div ng-show="page === 2 && currentQuery.columns.length">
+                <div class="form-group row pt-1">
+                    <label class="col-xs-2 col-sm-2 col-md-2 col-form-label"><strong>{{'jdbc.column.name' | translate}}</strong></label>
+                    <div class="col-xs-2 col-sm-2 col-md-2">
+                        <label class="col-form-label"><strong>{{'jdbc.sql.type.label' | translate}}</strong></label>
                     </div>
-
-                    <!-- Second tab -->
-                    <div class="tab-pane" ng-show="activeTab === 2">
-                        <div ng-if="jdbcConfigurationInfo.hasUndefinedColumns"
-                             class="idError alert alert-danger"
-                             translate="jdbc.warning.all.column.msg">
-                        </div>
-                        <div ng-show="!jdbcConfigurationInfo.columns.length" class="mt-2">
-                            {{'jdbc.no.columns.defined.warning' | translate}}
-                        </div>
-                        <div ng-show="activeTab === 2 && jdbcConfigurationInfo.columns.length">
-                            <div class="form-group row pt-1">
-                                <label
-                                    class="col-xs-2 col-sm-2 col-md-2 col-form-label"><strong>{{'jdbc.column.name' | translate}}</strong></label>
-                                <div class="col-xs-2 col-sm-2 col-md-2">
-                                    <label class="col-form-label"><strong>{{'jdbc.sql.type.label' | translate}}</strong></label>
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1"
-                                     ng-if="containsColumnsWithPrecision(currentQuery.columns)">
-                                    <label
-                                        class="col-form-label"><strong>{{'precision.label' | translate}}</strong></label>
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1"
-                                     ng-if="containsColumnsWithScale(currentQuery.columns)">
-                                    <label class="col-form-label"><strong>{{'scale.label' | translate}}</strong></label>
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1">
-                                    <label
-                                        class="col-form-label"><strong>{{'nullable.label' | translate}}</strong></label>
-                                </div>
-                                <div class="col-xs-4 col-sm-4 col-md-4"
-                                     ng-if="!containsNonLiteralColumnsOnly(currentQuery.columns)">
-                                    <label
-                                        class="col-form-label"><strong>{{'literal.type.language.tag.label' | translate}}</strong></label>
-                                </div>
-                            </div>
-                            <div ng-repeat="column in jdbcConfigurationInfo.columns track by $index"
-                                 class="form-group row pt-1 column-suggestion-row">
-                                <label class="col-xs-2 col-sm-2 col-md-2 col-form-label">
+                    <div class="col-xs-1 col-sm-1 col-md-1" ng-if="containsColumnsWithPrecision(currentQuery.columns)">
+                        <label class="col-form-label"><strong>{{'precision.label' | translate}}</strong></label>
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1" ng-if="containsColumnsWithScale(currentQuery.columns)">
+                        <label class="col-form-label"><strong>{{'scale.label' | translate}}</strong></label>
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1">
+                        <label class="col-form-label"><strong>{{'nullable.label' | translate}}</strong></label>
+                    </div>
+                    <div class="col-xs-4 col-sm-4 col-md-4" ng-if="!containsNonLiteralColumnsOnly(currentQuery.columns)">
+                        <label class="col-form-label"><strong>{{'literal.type.language.tag.label' | translate}}</strong></label>
+                    </div>
+                </div>
+                <div  ng-repeat="column in currentQuery.columns track by $index" class="form-group row pt-1">
+                    <label class="col-xs-2 col-sm-2 col-md-2 col-form-label">
                         <span gdb-tooltip="{{'jdbc.column.names.hint' | translate}}"
                               tooltip-placement="top">
                             {{column.column_name | uppercase}}
                         </span>
-                                </label>
-                                <div class="col-xs-2 col-sm-2 col-md-2">
-                                    <select gdb-tooltip="{{'jdbc.sql.type.hint' | translate}}"
-                                            tooltip-placement="top"
-                                            class="form-control" id="sql-type" ng-model="column.column_type"
-                                            ng-options="type as getTypeLabel(type) for type in sqlTypes track by type"
-                                            ng-change="selectColumnType(column.column_name, '{{column.column_type}}')"
-                                            ng-disabled="!canWriteActiveRepo">
-                                    </select>
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1"
-                                     ng-class="!hasPrecision(column.column_type) ? 'hidden' : ''"
-                                     ng-if="containsColumnsWithPrecision(currentQuery.columns)">
-                                    <input gdb-tooltip="{{'jdbc.sql.type.precision.hint' | translate}}"
-                                           tooltip-placement="top"
-                                           class="form-control" type="text" name="title" id="precision"
-                                           ng-model="column.sql_type_precision"
-                                           ng-change="setDirty()" ng-disabled="!canWriteActiveRepo">
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1"
-                                     ng-class="!hasScale(column.column_type) ? 'hidden' : ''"
-                                     ng-if="containsColumnsWithScale(currentQuery.columns)">
-                                    <input gdb-tooltip="{{'jdbc.sql.type.scale.hint' | translate}}"
-                                           tooltip-placement="top"
-                                           class="form-control" type="text" name="title" id="scale"
-                                           ng-model="column.sql_type_scale"
-                                           ng-change="setDirty()" ng-disabled="!canWriteActiveRepo">
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1">
-                                    <div class="form-control b-0">
-                                        <input gdb-tooltip="{{'jdbc.not.null.check.hint' | translate}}"
-                                               tooltip-placement="top"
-                                               type="checkbox" id="nullable" ng-model="column.nullable"
-                                               ng-change="setDirty()"
-                                               ng-disabled="!canWriteActiveRepo">
-                                    </div>
-                                </div>
-                                <div class="col-xs-4 col-sm-4 col-md-4"
-                                     ng-class="isLiteral(column.column_type) ? '' : 'hidden'"
-                                     ng-if="!containsNonLiteralColumnsOnly(currentQuery.columns)">
-                                    <input gdb-tooltip="{{'jdbc.literal.creation.and.filtering.hint' | translate}}"
-                                           tooltip-placement="top"
-                                           class="form-control" type="text" name="title" id="sparqlType"
-                                           ng-model="column.sparql_type"
-                                           ng-change="setDirty()" ng-disabled="!canWriteActiveRepo">
-                                </div>
-                                <div class="col-xs-1 col-sm-1 col-md-1">
-                                    <button type="button" ng-click="deleteColumn(column.column_name, $index)"
-                                            class="btn btn-link delete-column-btn"
-                                            gdb-tooltip="{{'jdbc.delete.column' | translate}}"
-                                            ng-if="canWriteActiveRepo"><span
-                                        class="icon-trash"></span>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="clearfix">
-                            <div class="pull-right">
-
-                            </div>
+                    </label>
+                    <div class="col-xs-2 col-sm-2 col-md-2">
+                        <select gdb-tooltip="{{'jdbc.sql.type.hint' | translate}}"
+                                tooltip-placement="top"
+                                class="form-control" id="sql-type" ng-model="column.column_type"
+                                ng-options="type as getTypeLabel(type) for type in sqlTypes track by type"
+                                ng-change="selectColumnType(column.column_name, '{{column.column_type}}')"
+                                ng-disabled="!canWriteActiveRepo()"></select>
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1" ng-class="!hasPrecision(column.column_type) ? 'hidden' : ''"  ng-if="containsColumnsWithPrecision(currentQuery.columns)">
+                        <input gdb-tooltip="{{'jdbc.sql.type.precision.hint' | translate}}"
+                               tooltip-placement="top"
+                               class="form-control" type="text" name="title" id="precision" ng-model="column.sql_type_precision"  ng-change="setDirty()" ng-disabled="!canWriteActiveRepo()">
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1" ng-class="!hasScale(column.column_type) ? 'hidden' : ''"  ng-if="containsColumnsWithScale(currentQuery.columns)">
+                        <input gdb-tooltip="{{'jdbc.sql.type.scale.hint' | translate}}"
+                               tooltip-placement="top"
+                               class="form-control" type="text" name="title" id="scale" ng-model="column.sql_type_scale" ng-change="setDirty()" ng-disabled="!canWriteActiveRepo()">
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1">
+                        <div class="form-control b-0">
+                            <input gdb-tooltip="{{'jdbc.not.null.check.hint' | translate}}"
+                                   tooltip-placement="top"
+                                   type="checkbox" id="nullable" ng-model="column.nullable" ng-change="setDirty()" ng-disabled="!canWriteActiveRepo()">
                         </div>
                     </div>
-
-                    <div class="pull-right pt-1">
-                        <button ng-if="2 === activeTab && canWriteActiveRepo" class="btn btn-lg suggest-btn"
-                                ng-click="getColumnsSuggestions()"
-                                uib-popover="{{'jdbc.column.suggestions' | translate}}"
-                                popover-placement="top"
-                                popover-trigger="mouseenter">
-                            {{'common.suggest' | translate}}
-                        </button>
-
-                        <button class="btn btn-lg preview-btn" ng-click="getPreview()"
-                                uib-popover="{{'jdbc.preview.configuration' | translate}}"
-                                popover-placement="top"
-                                popover-trigger="mouseenter">
-                            {{'common.preview' | translate}}
+                    <div class="col-xs-4 col-sm-4 col-md-4" ng-class="isLiteral(column.column_type) ? '' : 'hidden'"  ng-if="!containsNonLiteralColumnsOnly(currentQuery.columns)">
+                        <input gdb-tooltip="{{'jdbc.literal.creation.and.filtering.hint' | translate}}"
+                               tooltip-placement="top"
+                               class="form-control" type="text" name="title" id="sparqlType" ng-model="column.sparql_type" ng-change="setDirty()" ng-disabled="!canWriteActiveRepo()">
+                    </div>
+                    <div class="col-xs-1 col-sm-1 col-md-1">
+                        <button type="button" ng-click="deleteColumn(column.column_name, $index)"
+                                class="btn btn-link delete-column-btn" gdb-tooltip="{{'jdbc.delete.column' | translate}}" ng-if="canWriteActiveRepo()"><span
+                            class="icon-trash"></span>
                         </button>
                     </div>
                 </div>
             </div>
+
+            <div class="clearfix">
+                <div class="pull-right">
+                    <button ng-if="page === 2 && canWriteActiveRepo()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
+                            uib-popover="{{'jdbc.column.suggestions' | translate}}"
+                            popover-placement="top"
+                            popover-trigger="mouseenter">
+                        {{'common.suggest' | translate}}
+                    </button>
+                </div>
+            </div>
+
+            <div class="container-fluid">
+                <br/>
+                <query-editor nostorage notabs notoolbar-saved notoolbar-copy nostatus nocount norun
+                              notoolbar-inference
+                              notoolbar-same-as callback-on-change="updateDirty" enable-column-resizing-on-window-width>
+                </query-editor>
+            </div>
         </div>
     </div>
-
-    <div class="text-right">
-        <a ng-href="jdbc" class="btn btn-lg btn-secondary cancel-button"
+    <div class="pull-left">
+        <button class="btn btn-lg preview-btn" ng-click="getPreview()"
+                uib-popover="{{'jdbc.preview.configuration' | translate}}"
+                popover-placement="top"
+                popover-trigger="mouseenter">
+            {{'common.preview' | translate}}
+        </button>
+    </div>
+    <div class="pull-right">
+        <a ng-href="jdbc" class="btn btn-lg btn-secondary"
+           uib-popover="{{'jdbc.cancel.configuration' | translate}}"
+           popover-placement="top"
+           popover-trigger="mouseenter"
+           ng-if="!canWriteActiveRepo()">
+            {{'common.close' | translate}}
+        </a>
+        <a ng-href="jdbc" class="btn btn-lg btn-secondary cancel-query-btn"
            uib-popover="{{'jdbc.cancel.configuration' | translate}}"
            popover-placement="top"
-           popover-trigger="mouseenter">
-            {{ (canWriteActiveRepo ? 'common.cancel.btn' : common.close) | translate}}
+           popover-trigger="mouseenter"
+           ng-if="canWriteActiveRepo()">
+            {{'common.cancel.btn' | translate}}
         </a>
-        <button class="btn btn-lg btn-primary save-query-btn" ng-click="saveJdbcConfiguration()"
+        <button class="btn btn-lg btn-primary save-query-btn" ng-click="save()"
                 uib-popover="{{'jdbc.save.configuration' | translate}}"
                 popover-placement="top"
                 popover-trigger="mouseenter"
@@ -212,11 +165,5 @@
             {{'common.save.btn' | translate}}
         </button>
     </div>
-</div>
-
-<div onto-loader-new
-     ng-if="isLoading"
-     size="75"
-     message="loaderMessage"
-     timeout="[1]">
+    <br/><br/><br/>
 </div>

package/dist/pages/jdbc.html

@@ -5,7 +5,7 @@
               uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
               popover-trigger="mouseenter"
               popover-placement="bottom-right"
-              popover-append-to-body="true"><span class="icon-info"></span></span>
+              popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
     </h1>
     <div core-errors ontop fedx></div>
     <div class="jdbc-list-configurations card mb-2" ng-if="getActiveRepository() && !isActiveRepoOntopType() && !isActiveRepoFedXType()">

package/dist/pages/licenseInfo.html

@@ -6,7 +6,7 @@
           uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
           popover-trigger="mouseenter"
           popover-placement="bottom-right"
-          popover-append-to-body="true"><span class="icon-info"></span></span>
+          popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
 </h1>
 
 <div class="ot-loader ot-main-loader" onto-loader size="100" ng-show="loadingLicense()"></div>
@@ -58,14 +58,14 @@
                 </div>
             </div>
             <p class="text-muted">{{license.typeOfUse}}</p>
-            <div>
-                <a href="license/register" ng-if="!isLicenseHardcoded() && isAdmin()" class="btn btn-primary">
-                    {{'core.errors.set.new.license.warning.msg' | translate}}
-                </a>
+            <div class="text-right">
                 <button ng-click="revertToFree()" ng-if="!isLicenseHardcoded() && !isFreeEdition() && isAdmin()"
                         class="btn btn-secondary">
                     {{'revert.to.free' | translate}}
                 </button>
+                <a href="license/register" ng-if="!isLicenseHardcoded() && isAdmin()" class="btn btn-primary">
+                    {{'core.errors.set.new.license.warning.msg' | translate}}
+                </a>
             </div>
 
             <div class="mt-2" ng-if="isFreeEdition() || !getLicense().valid">

package/dist/pages/login.html

@@ -20,8 +20,7 @@
 							<input id="wb-login-password" type="password" placeholder="{{'your.password.placeholder' | translate}}" ng-model="$parent.password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
-					<div class="form-group">
-<!-- 					<a href="#" class="requestAccess">Request access</a> -->
+					<div class="form-group text-right">
 						<button id="wb-login-submitLogin" type="submit" class="btn btn-primary btn-lg">{{'sign.in' | translate}}</button>
 					</div>
 				</form>

package/dist/pages/monitor/backup-and-restore.html

@@ -0,0 +1,73 @@
+<div>
+    <title>${messages.app.title} : ${messages.jmx.QueryMonitoringPage.title}</title>
+
+    <link href="css/backup-and-restore.css?v=2.4.0-TR10" rel="stylesheet"/>
+
+    <h1>
+        {{title}}
+        <span class="btn btn-link"
+              uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
+              popover-trigger="mouseenter"
+              popover-placement="bottom-right"
+              popover-append-to-body="true">
+            <span class="icon-info text-tertiary"></span>
+        </span>
+        </span>
+    </h1>
+
+    <div core-errors ontop></div>
+
+    <div ng-if="initialized" class="backup-and-restore">
+        <table ng-if="backupAndRestoreInfos && backupAndRestoreInfos.length > 0" class="table table-striped table-bordered"
+               aria-describedby="Monitor backup and restore">
+            <thead>
+            <tr>
+                <th class="id-header">{{'view.monitoring.backup_and_restore.id.header' | translate}}</th>
+                <th class="username-header">{{'view.monitoring.backup_and_restore.username.header' | translate}}</th>
+                <th class="recovery-operation-header">{{'view.monitoring.backup_and_restore.recovery_operation_type.header' | translate}}
+                </th>
+                <th class="affected-repository-header">{{'view.monitoring.backup_and_restore.affected_repositories.header' | translate}}
+                </th>
+                <th class="lifetime-header">{{'view.monitoring.backup_and_restore.lifetime.header' | translate}}</th>
+                <th class="snapshot-options-header">{{'view.monitoring.backup_and_restore.snapshot_options.header' | translate}}</th>
+                <th ng-if="hasClusterOperation" class="node-performing-cluster-backup-header">
+                    {{'view.monitoring.backup_and_restore.node_performing_cluster_backup.header' | translate}}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-repeat="backupAndRestoreInfo in backupAndRestoreInfos">
+                <td>{{backupAndRestoreInfo.id}}</td>
+                <td>{{backupAndRestoreInfo.username}}</td>
+                <td>{{('view.monitoring.backup_and_restore.' + backupAndRestoreInfo.operation) | translate}}</td>
+                <td>
+                    <div ng-repeat="repository in backupAndRestoreInfo.affectedRepositories">
+                        {{repository}}
+                    </div>
+                </td>
+                <td>{{getHumanReadableSeconds(backupAndRestoreInfo.secondsSinceCreated)}}</td>
+                <td class="snapshot-options-data">
+                    <div ng-repeat="(key, value) in backupAndRestoreInfo.snapshotOptions">
+                        <div ng-if="hasToShowValue(value)">
+                            <b>{{key}}</b> : {{value}}
+                        </div>
+                    </div>
+                </td>
+                <td ng-if="hasClusterOperation">{{backupAndRestoreInfo.nodePerformingClusterBackup}}</td>
+            </tr>
+            </tbody>
+        </table>
+
+        <div class="alert alert-info no-icon no-running-backup-and-restore-alert"
+             ng-if="!backupAndRestoreInfos || !backupAndRestoreInfos.length || backupAndRestoreInfos.length === 0">
+            {{'view.monitoring.backup_and_restore.no_running_backup_and_restore' | translate}}
+        </div>
+    </div>
+
+    <div ng-if="!initialized && loading">
+        <div onto-loader-new
+             ng-if="loading"
+             size="75">
+        </div>
+    </div>
+</div>

package/dist/pages/monitor/queries.html

@@ -3,7 +3,7 @@
 
 	<title>${messages.app.title} : ${messages.jmx.QueryMonitoringPage.title}</title>
 
-	<link href="css/jmx.css?v=2.4.0-TR1" rel="stylesheet" />
+	<link href="css/jmx.css?v=2.4.0-TR10" rel="stylesheet" />
 
 	<h1>
 		{{title}}
@@ -11,7 +11,7 @@
 		   uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
 		   popover-trigger="mouseenter"
 		   popover-placement="bottom-right"
-		   popover-append-to-body="true"><span class="icon-info"></span></span>
+		   popover-append-to-body="true"><span class="icon-info text-tertiary"></span></span>
 	</h1>
 
     <div core-errors ontop></div>