graphdb-workbench 2.7.0-TR6 → 2.7.0-TR8

package/dist/css/import-resource-tree.css

@@ -18,6 +18,10 @@
     padding: 8px;
 }
 
+.import-resource-table .import-resource-header-cell:hover {
+    cursor: pointer;
+}
+
 .import-resource-table .import-resource-cell {
     padding-left: 8px;
     padding-right: 8px;
@@ -75,28 +79,34 @@
     padding-left: 0.5rem;
 }
 
+.import-resource-tree .import-resources-actions .import-resource-status-dropdown .dropdown-toggle:not(.selected) {
+    border: none;
+    background-color: #fff;
+}
+
 .import-resource-tree .import-resources-actions .import-resource-status-dropdown,
 .import-resource-tree .import-resources-actions .import-resource-selected-actions {
     display: flex;
 }
 
 .import-resource-tree .import-resource-table .import-resource-actions {
-    text-align: end;
+    display: flex;
+    justify-content: flex-end;
 }
 
-.import-resource-tree .import-resource-table .import-resource-actions .import-resource-action-import {
+.import-resource-tree .import-resource-table .import-resource-actions .import-resource-action-import-btn {
     border: none;
     padding: .25em .25em;
     margin: 0 .25em;
 }
 
-.import-resource-tree .import-resource-table .import-resource-actions .import-resource-action-import .icon-import {
+.import-resource-tree .import-resource-table .import-resource-actions .import-resource-action-import-btn .icon-import {
     line-height: 1;
 }
 
 .import-resource-tree .import-resource-table .import-resource-modified,
 .import-resource-tree .import-resource-table .import-resource-imported,
-.import-resource-tree .import-resource-table .import-resource-import-resource-size {
+.import-resource-tree .import-resource-table .import-resource-size {
     min-width: 120px;
 }
 
@@ -148,3 +158,21 @@
 .bold-text {
     font-weight: bolder;
 }
+
+.sorting {
+    padding-right: 20px;
+    background-size: 0.9em;
+    background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M41 288h238c21.4 0 32.1 25.9 17 41L177 448c-9.4 9.4-24.6 9.4-33.9 0L24 329c-15.1-15.1-4.4-41 17-41zm255-105L177 64c-9.4-9.4-24.6-9.4-33.9 0L24 183c-15.1 15.1-4.4 41 17 41h238c21.4 0 32.1-25.9 17-41z'/%3E%3C/svg%3E") no-repeat right center;
+}
+
+.sorting_asc {
+    padding-right: 20px;
+    background-size: 1em;
+    background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M176 352h-48V48a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16v304H16c-14.19 0-21.36 17.24-11.29 27.31l80 96a16 16 0 0 0 22.62 0l80-96C197.35 369.26 190.22 352 176 352zm240-64H288a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h56l-61.26 70.45A32 32 0 0 0 272 446.37V464a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-56l61.26-70.45A32 32 0 0 0 432 321.63V304a16 16 0 0 0-16-16zm31.06-85.38l-59.27-160A16 16 0 0 0 372.72 32h-41.44a16 16 0 0 0-15.07 10.62l-59.27 160A16 16 0 0 0 272 224h24.83a16 16 0 0 0 15.23-11.08l4.42-12.92h71l4.41 12.92A16 16 0 0 0 407.16 224H432a16 16 0 0 0 15.06-21.38zM335.61 144L352 96l16.39 48z'/%3E%3C/svg%3E") no-repeat right center;
+}
+
+.sorting_desc {
+    padding-right: 20px;
+    background-size: 1em;
+    background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M176 352h-48V48a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16v304H16c-14.19 0-21.36 17.24-11.29 27.31l80 96a16 16 0 0 0 22.62 0l80-96C197.35 369.26 190.22 352 176 352zm112-128h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-56l61.26-70.45A32 32 0 0 0 432 65.63V48a16 16 0 0 0-16-16H288a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h56l-61.26 70.45A32 32 0 0 0 272 190.37V208a16 16 0 0 0 16 16zm159.06 234.62l-59.27-160A16 16 0 0 0 372.72 288h-41.44a16 16 0 0 0-15.07 10.62l-59.27 160A16 16 0 0 0 272 480h24.83a16 16 0 0 0 15.23-11.08l4.42-12.92h71l4.41 12.92A16 16 0 0 0 407.16 480H432a16 16 0 0 0 15.06-21.38zM335.61 400L352 352l16.39 48z'/%3E%3C/svg%3E") no-repeat right center;
+}

package/dist/i18n/locale-en.json

@@ -900,14 +900,11 @@
         "restore.defaults.btn": "Restore defaults",
         "abort.btn": "Abort",
         "no.files.found": "No files found",
-        "rdf.from.snippet": "Import RDF data from a text snippet",
-        "rdf.data.here": "Put your RDF data here and select its format.",
         "enable.for.auto.start": "Enable this option to start the import when you click the Import button. If it is disabled the import will be added to the list but not started automatically.",
         "auto.start": "Start import automatically",
         "data.from.url": "Import RDF data from URL",
         "supported.url.with.rdf": "URL with RDF data. Supported formats are",
         "invalid.url": "Not valid url!",
-        "format": "Format",
         "gz.zip": ", as well as their .gz versions and .zip archives",
         "error.could.not.get.files": "Could not get files; {{data}}",
         "error.could.not.stop": "Could not stop import; {{data}}",
@@ -927,19 +924,35 @@
         "show.files.only": "Show files only",
         "show.files.directories": "Show both files and directories",
         "show.directories.only": "Show directories only",
-        "type.to.filter": "Type to filter",
+        "type.to.filter": "Type to filter by name",
         "selected.items": "Import the selected items",
         "without.changing.settings": "Import without changing settings",
         "reset.last.imported": "Reset the last imported status of the selected items",
         "reset.status": "Reset status",
         "remove.selected": "Remove the selected items from the list",
         "remove.btn": "Remove",
+        "import.btn": "Import",
         "remove.confirm.msg": "Are you sure you want to remove selected files: {{name}}",
         "mode.not.supported.constraint": "This mode is not supported when importing multiple items.",
         "enable.replace.option": "Enable this to replace the data in one or more graphs with the imported data.",
         "context.link": "JSON-LD context",
         "context.link.info": "Specifies external JSON-LD context as a URL. Only whitelisted URLs can be used.",
         "file.upload.progress": "{{progress}} % uploaded",
+        "text_snippet_dialog": {
+            "title": "Import RDF data from a text snippet",
+            "text_snippet": {
+                "label": "Insert your RDF data here and select its format below.",
+                "placeholder": "# Example: rdf:predicate a rdf:Property .",
+                "validation_message": "Maximum length of {{limit}} characters exceeded."
+            },
+            "auto_start": {
+                "tooltip": "Enable this option to start the import when you click the Import button. If it is disabled the import will be added to the list but not started automatically.",
+                "label": "Start import automatically"
+            },
+            "import_format_menu": {
+                "label": "Format"
+            }
+        },
         "user_data": {
             "duplicates_confirmation": {
                 "title": "Confirm files overwrite",
@@ -979,7 +992,7 @@
                 "the_property": "property"
             },
             "on_file_size_limit": {
-                "file_size_limit_info": "To import larger than {{fileSizeLimit}} MB, use the ",
+                "file_size_limit_info": "To import larger than {{fileSizeLimit}} MB files, use the ",
                 "server_files_link": "Server files",
                 "import_or_use": "import or use the",
                 "api_link": "API"
@@ -1014,7 +1027,6 @@
             "parser_settings": "Parser settings"
         }
     },
-    "text.snippet.text.aria.placeholder": "# Example: rdf:predicate a rdf:Property .",
     "url.import.input.placeholder": "Data URL",
     "filesTable.interrupt.import": "Interrupt import",
     "core.errors.no.connected.repository.warning.msg": "Some functionalities are not available because you are not connected to any repository.",

package/dist/i18n/locale-fr.json

@@ -899,14 +899,11 @@
         "restore.defaults.btn": "Restaurer les valeurs par défaut",
         "abort.btn": "Abandonner",
         "no.files.found": "Aucun fichier trouvé",
-        "rdf.from.snippet": "Importer des données RDF à partir d'un extrait de texte",
-        "rdf.data.here": "Mettez vos données RDF ici et sélectionnez leur format.",
         "enable.for.auto.start": "Activez cette option pour lancer l'importation lorsque vous cliquez sur le bouton Importer. Si elle est désactivée, l'importation sera ajoutée à la liste mais ne démarrera pas automatiquement.",
         "auto.start": "Démarrer l'importation automatiquement",
         "data.from.url": "Importer des données RDF depuis une URL",
         "supported.url.with.rdf": "URL avec des données RDF. Les formats supportés sont",
         "invalid.url": "URL non valide!",
-        "format": "Format",
         "gz.zip": "ainsi que leurs versions .gz et leurs archives .zip.",
         "error.could.not.get.files": "Impossible de récupérer des fichiers; {{data}}",
         "error.could.not.stop": "Impossible d'arrêter l'importation; {{data}}",
@@ -926,7 +923,7 @@
         "show.files.only": "Afficher uniquement les fichiers",
         "show.files.directories": "Afficher à la fois les fichiers et les dépôts",
         "show.directories.only": "Afficher uniquement les dépôts",
-        "type.to.filter": "Type de filtre",
+        "type.to.filter": "Tapez pour filtrer par nom",
         "select.all": "Tout sélectionner",
         "selected.items": "Importer les éléments sélectionnés",
         "without.changing.settings": "Importer sans modifier les paramètres",
@@ -934,12 +931,27 @@
         "reset.status": "Réinitialiser l'état",
         "remove.selected": "Supprimer les éléments sélectionnés de la liste",
         "remove.btn": "Supprimer",
+        "import.btn": "Importer",
         "remove.confirm.msg": "Êtes-vous sûr de vouloir supprimer les fichiers sélectionnés: {{name}}",
         "mode.not.supported.constraint": "Ce mode n'est pas pris en charge lors de l'importation de plusieurs éléments.",
         "enable.replace.option": "Activez cette option pour remplacer les données d'un ou plusieurs graphes par les données importées.",
         "context.link": "Contexte JSON-LD",
         "context.link.info": "Spécifie le contexte JSON-LD externe en tant qu'URL. Seules les URL figurant sur la liste blanche peuvent être utilisées",
         "file.upload.progress": "{{progress}} % téléchargé",
+        "text_snippet_dialog": {
+            "text_snippet": {
+                "label": "Insérez vos données RDF ici et sélectionnez son format ci-dessous.",
+                "placeholder": "# Exemple : rdf:predicate a rdf:Property .",
+                "validation_message": "Longueur maximale de {{limit}} caractères dépassée."
+            },
+            "auto_start": {
+                "tooltip": "Activez cette option pour lancer l'importation lorsque vous cliquez sur le bouton Importer. Si elle est désactivée, l'importation sera ajoutée à la liste mais ne démarrera pas automatiquement.",
+                "label": "Démarrer l'importation automatiquement"
+            },
+            "import_format_menu": {
+                "label": "Format"
+            }
+        },
         "user_data": {
             "duplicates_confirmation": {
                 "title": "Confirmer l'écrasement des fichiers",
@@ -979,7 +991,7 @@
                 "the_property": "propriété"
             },
             "on_file_size_limit": {
-                "file_size_limit_info": "Pour importer plus de {{fileSizeLimit}} Mo, utilisez l'importation de ",
+                "file_size_limit_info": "Pour importer des fichiers de plus de {{fileSizeLimit}} Mo, utilisez l'importation de ",
                 "server_files_link": "Fichiers du serveur",
                 "import_or_use": "ou utilisez l'",
                 "api_link": "API"
@@ -1014,7 +1026,6 @@
             "parser_settings": "Paramètres du parseur"
         }
     },
-    "text.snippet.text.aria.placeholder": "# Exemple : rdf:predicate a rdf:Property .",
     "url.import.input.placeholder": "URL des données",
     "filesTable.interrupt.import": "Interrompre l'importation",
     "core.errors.no.connected.repository.warning.msg": "Certaines fonctionnalités ne sont pas disponibles car vous n'êtes connecté à aucun dépôt.",

package/dist/index.html

@@ -13,8 +13,8 @@
 
     <link rel="apple-touch-icon-precomposed" href="icon.png">
 
-    <script src="plugin-registry.js?v=2.7.0-TR6"></script>
-    <script src="plugins.js?v=2.7.0-TR6"></script>
+    <script src="plugin-registry.js?v=2.7.0-TR8"></script>
+    <script src="plugins.js?v=2.7.0-TR8"></script>
 <link rel="shortcut icon" href="icon.png"><link href="vendor.c3e18291118da6a85719.css" rel="stylesheet"><link href="main.98c547eac0aca6db48bb.css" rel="stylesheet"></head>
 
 <body>
@@ -164,6 +164,6 @@
     <object data="img/graphdb-splash.1ef2940889acddc03c7defb3f9f41f8d.svg"></object>
     <div>GraphDB Workbench is loading...</div>
 </div>
-<script type="text/javascript" src="vendor.756b3dc4564a64c24aa9.bundle.js"></script><script type="text/javascript" src="main.76f659240970ae83eb6d.bundle.js"></script><script type="text/javascript" src="bundle.9f9f242ad327b8e01cd4.bundle.js"></script></body>
+<script type="text/javascript" src="vendor.28add64dc899b84882a0.bundle.js"></script><script type="text/javascript" src="main.51be3c62b284bf8cdde2.bundle.js"></script><script type="text/javascript" src="bundle.2cbe9ae1388c1b12ef05.bundle.js"></script></body>
 
 </html>

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

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

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.0-TR6" rel="stylesheet"/>
+<link href="css/operations-statuses-monitor.css?v=2.7.0-TR8" 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,4 +1,4 @@
-<link href="css/rdf-resource-search.css?v=2.7.0-TR6" rel="stylesheet"/>
+<link href="css/rdf-resource-search.css?v=2.7.0-TR8" 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()">

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.0-TR6" rel="stylesheet">
+<link href="css/lib/ontotext-yasgui-web-component.css?v=2.7.0-TR8" rel="stylesheet">
 
 <ontotext-yasgui
     class="{{classToApply}}"

package/dist/js/angular/import/templates/filesTable.html

@@ -3,7 +3,7 @@
 
     <div ng-show="showTable()" class="mb-1 clearfix">
         <div class="pull-right form-inline">
-            <div class="btn-group d-inline mr-1" ng-show="viewType === 'server'">
+            <div class="btn-group d-inline mr-1" ng-show="activeTabId === 'server'">
                 <button type="button" class="btn btn-secondary" ng-model="showItems" uib-btn-radio="'file'" gdb-tooltip="{{'import.show.files.only' | translate}}">
                     <em class="icon-file"></em>
                 </button>
@@ -48,7 +48,7 @@
                 {{'import.reset.status' | translate}}
             </button>
             <button id="wb-import-removeEntries"
-                    ng-show="batch && viewType === 'user'"
+                    ng-show="batch && activeTabId === 'user'"
                     class="btn btn-secondary" type="button" ng-click="removeEntrySelected()"
                     uib-popover="{{'import.remove.selected' | translate}}"
                     popover-trigger="mouseenter"
@@ -86,9 +86,9 @@
                 <div class="d-inline-block" style="overflow: hidden; text-overflow: ellipsis;">
                     <div class="import-file-header">
                         <!-- no icon for server files -->
-                        <em class="icon-file" ng-show="viewType === 'server' && file.type === 'file'"></em>
+                        <em class="icon-file" ng-show="activeTabId === 'server' && file.type === 'file'"></em>
                         <em class="icon-folder" ng-show="file.type === 'directory'"></em>
-                        <em class="icon-upload" ng-show="viewType === 'user' && file.type === 'file'"></em>
+                        <em class="icon-upload" ng-show="activeTabId === 'user' && file.type === 'file'"></em>
                         <em class="icon-link" ng-show="file.type === 'url'"></em>
                         <em class="icon-edit" ng-show="file.type === 'text'"></em>
                         <strong ng-show="file.type !== 'text'">{{file.name}}</strong>
@@ -131,7 +131,7 @@
                     </div>
                 </div>
             </td>
-            <td width="25" ng-show="viewType === 'user'">
+            <td width="25" ng-show="activeTabId === 'user'">
                 <button class="btn btn-link secondary remove-file-btn" ng-click="removeEntry([file.name])" ng-disabled="batch || file.status === 'IMPORTING' || file.status === 'UPLOADING' || file.status === 'PENDING' || file.status === 'INTERRUPTING'">
                     <em class="icon-trash"></em>
                 </button>
@@ -143,7 +143,7 @@
                         ng-cloak
                         ng-hide="!importable(file) || file.status === 'IMPORTING' || file.status === 'UPLOADING' || file.status === 'PENDING' || file.status === 'INTERRUPTING'"
                         guide-selector="import-file-{{file.name}}"
-                        data-target="#{{viewType}}Modal">
+                        data-target="#{{activeTabId}}Modal">
                     <span class="icon-import"></span>
                     {{'common.import' | translate}}
                 </button>
@@ -159,7 +159,7 @@
             </td>
         </tr>
         </tbody>
-        <tbody ng-show="files.length == 0 && viewType == 'server'">
+        <tbody ng-show="files.length == 0 && activeTabId == 'server'">
         <tr>
             <td>{{'import.no.files.found' | translate}}</td>
         </tr>

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

@@ -2,16 +2,16 @@
       uib-popover-template="popoverTemplate"
       popover-class="import-status-info-popover"
       popover-trigger="none"
+      ng-click="open()"
       popover-is-open="popoverIsOpen"
       popover-placement="left"
-      ng-mouseover="openPopover()"
-      ng-mouseleave="closePopover()"
       popover-append-to-body="true">
 </span>
 
 
 <script type="text/ng-template" id="resourceStatusInfoTemplate.html">
-    <div class="import-resource-status-info-popover" ng-mouseleave="closePopover()" ng-mouseover="openPopover()">
+    <sup class="pull-right btn btn-sm close" ng-click="close()"></sup>
+    <div class="import-resource-status-info-popover">
         <h4>{{'import.status-info.last_import_settings' | translate}}</h4>
 
         <table class="table table-sm m-0">

package/dist/js/angular/import/templates/import-resource-tree.html

@@ -1,11 +1,11 @@
-<link href="css/import-resource-tree.css?v=[AIV]{version}[/AIV]" rel="stylesheet">
-
 <div class="import-resource-tree mt-2" ng-if="resources && !resources.isEmpty()">
     <div class="import-resource-tree-header">
         <div class="import-resources-actions">
             <div class="import-resource-status-dropdown btn-group" uib-dropdown>
-                <button type="button" class="btn btn-secondary dropdown-toggle" uib-dropdown-toggle>
-                    <input type="checkbox">
+                <button type="button" uib-dropdown-toggle class="btn btn-secondary dropdown-toggle"
+                        ng-class="{'selected': selectedByStatus}">
+                    <input type="checkbox" prop-indeterminate="areAllDisplayedImportResourcesPartialSelected"
+                           ng-model="areAllDisplayedImportResourcesSelected">
                     {{selectedByStatus ? (('import.import_resource_tree.status.' + selectedByStatus) | translate) : '
                     '}}
                 </button>
@@ -46,21 +46,24 @@
                     </button>
                     <ul class="dropdown-menu" role="menu">
                         <li>
-                            <button type="button" class="dropdown-item import-without-change-btn batch-import-without-change-btn"
+                            <button type="button"
+                                    class="dropdown-item import-without-change-btn batch-import-without-change-btn"
                                     ng-click="importAll(true)">
                                 {{'import.without.changing.settings' | translate}}
                             </button>
                         </li>
                     </ul>
                 </div>
-                <button class="btn btn-secondary reset-status-btn batch-reset-btn" type="button" ng-click="onResetStatus()"
+                <button class="btn btn-secondary reset-status-btn batch-reset-btn" type="button"
+                        ng-click="onResetStatus()"
                         ng-if="canResetSelectedResources"
                         uib-popover="{{'import.reset.last.imported' | translate}}"
                         popover-trigger="mouseenter"
                         popover-placement="top">
                     {{'import.reset.status' | translate}}
                 </button>
-                <button ng-if="canRemoveResource" class="btn btn-secondary remove-resources-btn" type="button" ng-click="onRemoveResources()"
+                <button ng-if="canRemoveResource" class="btn btn-secondary remove-resources-btn" type="button"
+                        ng-click="onRemoveResources()"
                         uib-popover="{{'import.remove.selected' | translate}}"
                         popover-trigger="mouseenter"
                         popover-placement="top">
@@ -70,54 +73,72 @@
         </div>
         <div class="import-resource-tree-filter btn-group">
             <div ng-if="showTypeFilter" class="import-resource-type-filter mr-1">
-                <button class="btn btn-secondary"
-                        ng-click="filterByTypeChanged(TYPE_FILTER_OPTIONS.FILE)"
-                        ng-class="{'active': TYPE_FILTER_OPTIONS.FILE === filterByType}">
-                    <em class="icon-file"></em>
-                </button>
-                <button class="btn btn-secondary"
+                <button class="btn btn-secondary show-all-resources-btn"
                         ng-click="filterByTypeChanged(TYPE_FILTER_OPTIONS.ALL)"
                         ng-class="{'active': TYPE_FILTER_OPTIONS.ALL === filterByType}">
                     <em class="icon-file"></em>
                     <em class="icon-folder"></em>
                 </button>
-                <button class="btn btn-secondary"
+                <button class="btn btn-secondary show-only-folders-btn"
                         ng-click="filterByTypeChanged(TYPE_FILTER_OPTIONS.DIRECTORY)"
                         ng-class="{'active': TYPE_FILTER_OPTIONS.DIRECTORY === filterByType}">
                     <em class="icon-folder"></em>
                 </button>
+                <button class="btn btn-secondary show-only-files-btn"
+                        ng-click="filterByTypeChanged(TYPE_FILTER_OPTIONS.FILE)"
+                        ng-class="{'active': TYPE_FILTER_OPTIONS.FILE === filterByType}">
+                    <em class="icon-file"></em>
+                </button>
             </div>
 
             <div class="import-resource-filter btn-group">
                 <div class="input-group">
                     <input id="fileQuery" class="form-control" type="text" ng-model="filterByFileName"
+                           autocomplete="off"
                            ng-change="filterByFileNameChanged(filterByFileName)"
                            placeholder="{{'import.type.to.filter' | translate}}">
-                    <label class="input-group-addon" for="fileQuery">
-                        <span class="icon-search icon-lg text-muted"></span>
-                    </label>
                 </div>
             </div>
         </div>
     </div>
-    <table class="import-resource-table">
+    <table class="import-resource-table mt-2">
         <thead>
         <tr>
             <th class="import-resource-header-cell import-resource-cell-select"></th>
-            <th class="import-resource-header-cell import-resource-name">{{'import.import_resource_tree.header.name' |
-                translate}}
+            <th class="import-resource-header-cell import-resource-name" ng-click="sort(SORTING_TYPES.NAME)">
+                <span ng-class="{
+                'sorting_desc': SORTING_TYPES.NAME === sortedBy &&  !sortAsc,
+                'sorting_asc': SORTING_TYPES.NAME === sortedBy && sortAsc,
+                'sorting': SORTING_TYPES.NAME !== sortedBy
+                }">{{'import.import_resource_tree.header.name' | translate}}</span>
             </th>
-            <th class="import-resource-header-cell import-resource-size">{{'import.import_resource_tree.header.size' |
-                translate}}
+            <th class="import-resource-header-cell import-resource-size" ng-click="sort(SORTING_TYPES.SIZE)">
+                <span ng-class="{
+                'sorting_desc': SORTING_TYPES.SIZE === sortedBy &&  !sortAsc,
+                'sorting_asc': SORTING_TYPES.SIZE === sortedBy && sortAsc,
+                'sorting': SORTING_TYPES.SIZE !== sortedBy
+                }">{{'import.import_resource_tree.header.size' | translate}}</span>
             </th>
-            <th class="import-resource-header-cell import-resource-modified">
-                {{'import.import_resource_tree.header.modified' | translate}}
+            <th class="import-resource-header-cell import-resource-modified" ng-click="sort(SORTING_TYPES.MODIFIED)">
+                <span ng-class="{
+                'sorting_desc': SORTING_TYPES.MODIFIED === sortedBy &&  !sortAsc,
+                'sorting_asc': SORTING_TYPES.MODIFIED === sortedBy && sortAsc,
+                'sorting': SORTING_TYPES.MODIFIED !== sortedBy
+                }">{{'import.import_resource_tree.header.modified' | translate}}</span>
             </th>
-            <th class="import-resource-header-cell import-resource-imported">
-                {{'import.import_resource_tree.header.imported' | translate}}
+            <th class="import-resource-header-cell import-resource-imported" ng-click="sort(SORTING_TYPES.IMPORTED)">
+                <span ng-class="{
+                'sorting_desc': SORTING_TYPES.IMPORTED === sortedBy &&  !sortAsc,
+                'sorting_asc': SORTING_TYPES.IMPORTED === sortedBy && sortAsc,
+                'sorting': SORTING_TYPES.IMPORTED !== sortedBy
+                }">{{'import.import_resource_tree.header.imported' | translate}}</span>
             </th>
-            <th class="import-resource-header-cell import-resource-context">
-                {{'import.import_resource_tree.header.context' | translate}}
+            <th class="import-resource-header-cell import-resource-context" ng-click="sort(SORTING_TYPES.CONTEXT)">
+                <span ng-class="{
+                'sorting_desc': SORTING_TYPES.CONTEXT === sortedBy &&  !sortAsc,
+                'sorting_asc': SORTING_TYPES.CONTEXT === sortedBy && sortAsc,
+                'sorting': SORTING_TYPES.CONTEXT !== sortedBy
+                }">{{'import.import_resource_tree.header.context' | translate}}</span>
             </th>
             <th class="import-resource-header-cell import-resource-action"></th>
         </tr>
@@ -135,7 +156,12 @@
                 class="import-resource-cell">
                 <span class="import-resource-title">
                     <em ng-class="{'icon-folder': resource.isDirectory(), 'icon-file': resource.isFile()}"></em>
-                    <strong>{{resource.name}}</strong>
+                    <div ng-if="onEditResource && resource.isEditable">
+                        <a href="#" ng-click="editResource(resource)"><strong>{{resource.name}}</strong></a>
+                    </div>
+                    <div ng-if="!resource.isEditable">
+                        <strong>{{resource.name}}</strong>
+                    </div>
                 </span>
             </td>
             <td class="import-resource-cell">
@@ -143,20 +169,23 @@
                     <import-resource-status-info class="btn btn-sm import"
                                                  ng-if="resource.hasStatusInfo"
                                                  resource="resource"></import-resource-status-info>
-                    <button role="button" class="btn btn-link btn-sm secondary"
+                    <button role="button" class="btn btn-link btn-sm secondary import-resource-action-reset-btn"
                             ng-click="resetStatus(resource)"
                             ng-if="resource.canResetStatus"
                             ng-disabled="selectedResources.length > 1"
                             gdb-tooltip="{{'import.reset.status' | translate}}">
                         <span class="icon-close"></span>
                     </button>
-                    <button ng-if="canRemoveResource" class="btn btn-link btn-sm secondary import-resource-action-remove"
-                            ng-click="removeResource(resource)">
+                    <button ng-if="canRemoveResource"
+                            class="btn btn-link btn-sm secondary import-resource-action-remove-btn"
+                            ng-click="removeResource(resource)"
+                            gdb-tooltip="{{'import.remove.btn' | translate}}">
                         <em class="icon-trash"></em>
                     </button>
-                    <button class="btn btn-primary btn-sm import-resource-action-import"
+                    <button class="btn btn-primary btn-sm import-resource-action-import-btn"
                             ng-if="resource.isImportable"
-                            ng-click="onImport({resource: resource})">
+                            ng-click="onImport({resource: resource})"
+                            gdb-tooltip="{{'import.import.btn' | translate}}">
                         <span class="icon-import"></span>
                     </button>
                     <button class="btn btn-sm"
@@ -179,16 +208,22 @@
             <td class="import-resource-cell import-resource-size">
                 {{ resource.importResource.size || ''}}
             </td>
-            <td class="import-resource-cell import-resource-modified">
+            <td class="import-resource-cell import-resource-modified"
+                ng-class="{'font-weight-bold': resource.isImportedBiggerThanModified}">
                 {{ resource.importResource.modifiedOn | date:'yyyy-MM-dd, HH:mm' }}
             </td>
-            <td class="import-resource-cell import-resource-imported">
+            <td class="import-resource-cell import-resource-imported"
+                ng-class="{'font-weight-bold': resource.isModifiedBiggerThanImported}">
                 {{ resource.importResource.importedOn | date:'yyyy-MM-dd, HH:mm' }}
             </td>
-            <td class="import-resource-cell">
-                {{ resource.importResource.context || ''}}
+            <td colspan="2" class="import-resource-cell">
+                <a if="resource.importResource.context"
+                   title="{{resource.importResource.context}}"
+                   class="uri-link"
+                   href="{{'resource?uri=' + resource.importResource.context + '&role=context'}}">
+                    {{resource.shorthedContext ? resource.shorthedContext : resource.importResource.context}}
+                </a>
             </td>
-            <td class="import-resource-cell import-resource-cell-action"></td>
         </tr>
         </tbody>
     </table>

package/dist/js/angular/import/templates/settingsModal.html

@@ -66,26 +66,6 @@
                     </label>
                 </div>
             </div>
-            <div ng-show="settings.hasContextLink" class="form-group row contextLinkRow">
-                <label class="col-lg-3 col-form-label">
-                    {{'import.context.link' | translate}}
-                    <span class="btn btn-link p-0"
-                          uib-popover="{{'import.context.link.info' | translate}}"
-                          popover-trigger="mouseenter"
-                          popover-placement="right">
-                    <em class="icon icon-info"></em>
-                </span>
-                </label>
-                <div class="col-lg-9">
-                    <input validate-uri name="contextLink" type="text"
-                           ng-model="settings['contextLink']" class="form-control"
-                           placeholder="http://example.com/example.jsonld">
-                    <div class="alert alert-danger"
-                         ng-if="settingsForm.contextLink.$dirty && settingsForm.contextLink.$error.validateUri">
-                        {{'import.alert.not.valid.iri' | translate}}
-                    </div>
-                </div>
-            </div>
             <div class="form-group row" ng-show="enableReplace">
                 <label class="col-lg-3 col-form-label">
                     {{'import.replaced.graphs' | translate}}
@@ -165,6 +145,27 @@
                 </div>
             </div>
 
+            <div ng-show="settings.hasContextLink" class="form-group row contextLinkRow">
+                <label class="col-lg-3 col-form-label">
+                    {{'import.context.link' | translate}}
+                    <span class="btn btn-link p-0"
+                          uib-popover="{{'import.context.link.info' | translate}}"
+                          popover-trigger="mouseenter"
+                          popover-placement="right">
+                    <em class="icon icon-info"></em>
+                </span>
+                </label>
+                <div class="col-lg-9">
+                    <input validate-uri name="contextLink" type="text"
+                           ng-model="settings['contextLink']" class="form-control"
+                           placeholder="http://example.com/example.jsonld">
+                    <div class="alert alert-danger"
+                         ng-if="settingsForm.contextLink.$dirty && settingsForm.contextLink.$error.validateUri">
+                        {{'import.alert.not.valid.iri' | translate}}
+                    </div>
+                </div>
+            </div>
+
             <div class="text-xs-center">
                 <button type="button" ng-click="switchParserSettings()"
                         class="btn btn-link btn-sm toggle-advanced-settings">