From 8c55ccfae5028237dbd8eec29154d6a10ac96ff2 Mon Sep 17 00:00:00 2001 From: Michael Douchin Date: Fri, 4 Aug 2023 14:25:31 +0200 Subject: [PATCH] f --- .../locales/en_US/admin.UTF-8.properties | 5 +- .../admin/templates/project_list_help.tpl | 43 +++------------- .../admin/templates/project_list_zone.tpl | 35 +++++++------ .../modules/admin/zones/project_list.zone.php | 12 ++++- lizmap/www/assets/css/admin.css | 51 ++++++++++++++++--- .../www/assets/js/admin/activate_datatable.js | 27 +++++++++- 6 files changed, 109 insertions(+), 64 deletions(-) diff --git a/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties b/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties index 2f68cd1529..2e0fe29d12 100644 --- a/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties +++ b/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties @@ -283,7 +283,8 @@ server.information.qgis.unknown=QGIS server minimum %s and Lizmap QGIS server pl server.information.error=Before checking your projects, you must check your QGIS server settings in the "Server information" menu. The configuration of QGIS Server is currently not correct. -project.not.displayed=Some projects, listed below, can not be displayed in the main web interface because they need an update from the GIS administrator. Please read the guidelines about colours under this table. +project.error.some.projects.not.displayed=Some projects, listed below, can not be displayed in the main web interface because they need an update from the GIS administrator. \ +Please read the guidelines about colours by clicking on the button "%s". project.rules.list.introduction=Explanation about colours used in the table above project.rules.list.description.html=Given your current Lizmap Web Client version %s and QGIS Server version %s, there are some rules about the table above : project.rules.list.warnings.html=Warnings, projects are still visible, but you should have a look to these projects : @@ -341,4 +342,4 @@ project.list.column.layout.count.label=Layouts project.list.column.show.line.hidden.columns=Show/Hide the hidden columns project.modal.title=Table legend project.modal.button.close=Close -project.list.no.hidden.column.content=No extra content for this project in the hidden table columns +project.list.no.hidden.column.content=No extra content for this project in the following hidden table columns diff --git a/lizmap/modules/admin/templates/project_list_help.tpl b/lizmap/modules/admin/templates/project_list_help.tpl index bc5f5cde6c..f9aacfa20c 100644 --- a/lizmap/modules/admin/templates/project_list_help.tpl +++ b/lizmap/modules/admin/templates/project_list_help.tpl @@ -3,43 +3,19 @@

{@admin.project.modal.title@}

-
- +

{jlocale "admin.project.rules.list.description.html", array($lizmapVersion, ($serverVersions['qgis_server_version_human_readable']))}

    +
  • {@admin.project.rules.list.blocking.html@}
    • +
      +
    • {jlocale "admin.project.rules.list.blocking.target.html", + array($minimumLizmapTargetVersionRequired - 0.1)}
      • +
    +
  • {@admin.project.rules.list.warnings.html@}
    • {@admin.project.list.column.qgis.desktop.version.label@}
      • @@ -87,11 +63,6 @@ {/if}
    -
  • {@admin.project.rules.list.blocking.html@}
    • -
      -
    • {jlocale "admin.project.rules.list.blocking.target.html", - array($minimumLizmapTargetVersionRequired - 0.1)}
      • -
diff --git a/lizmap/modules/admin/templates/project_list_zone.tpl b/lizmap/modules/admin/templates/project_list_zone.tpl index f1f667f81a..0f503e3fd2 100644 --- a/lizmap/modules/admin/templates/project_list_zone.tpl +++ b/lizmap/modules/admin/templates/project_list_zone.tpl @@ -4,6 +4,7 @@ {meta_html js $basePath.'assets/js/jquery.dataTables.min.js'} {meta_html js $basePath.'assets/js/dataTables.responsive.min.js'} {meta_html js $basePath.'assets/js/admin/activate_datatable.js'} + {assign $tableClass=''} {if $hasInspectionData} {assign $tableClass='has_inspection_data'} @@ -17,12 +18,16 @@
{/if} - {@admin.project.modal.title@} + + + + @@ -38,7 +43,7 @@ {/if} - + @@ -73,13 +78,13 @@ - - @@ -182,9 +187,9 @@ - @@ -226,17 +231,17 @@ {/if} {if $hasInspectionData} - + {if $p['invalid_layers_count'] > 0} {/if} - + {/if} diff --git a/lizmap/modules/admin/zones/project_list.zone.php b/lizmap/modules/admin/zones/project_list.zone.php index 1a2a1b8feb..85268b0bf4 100644 --- a/lizmap/modules/admin/zones/project_list.zone.php +++ b/lizmap/modules/admin/zones/project_list.zone.php @@ -72,7 +72,17 @@ protected function _prepareTpl() $this->_tpl->assign('mapItems', $maps); $this->_tpl->assign('hasInspectionData', $hasInspectionData); $this->_tpl->assign('minimumLizmapTargetVersionRequired', $humanLizmapTargetVersion); - $this->_tpl->assign('hasSomeProjectsNotDisplayed', $hasSomeProjectsNotDisplayed); + + // Add an warning message when some projects cannot be displayed in LWC + if ($hasSomeProjectsNotDisplayed) { + \jMessage::add( + jLocale::get( + 'admin~admin.project.error.some.projects.not.displayed', + array(jLocale::get('admin~admin.project.modal.title')) + ), + 'warning' + ); + } // Get the server metadata $server = new \Lizmap\Server\Server(); diff --git a/lizmap/www/assets/css/admin.css b/lizmap/www/assets/css/admin.css index 825dcde15d..6ee4c7b7b2 100644 --- a/lizmap/www/assets/css/admin.css +++ b/lizmap/www/assets/css/admin.css @@ -96,8 +96,6 @@ Admin QGIS project lists ====== */ div#lizmap_project_list_container { - /* display: flex; - flex-wrap: wrap; */ height: 80%; width: 100%; margin: auto; @@ -119,9 +117,14 @@ div.lizmap_project_list_details { padding: 5px; } +/* Cursor pointer only if the table has hidden columns (responsive datatable extension) */ table.lizmap_project_list tr { + cursor: default; +} +table.lizmap_project_list tr.has_hidden_columns { cursor: pointer; } + /* hovered line */ /* Blue left border when hovering a line */ table.lizmap_project_list tr td:first-child { @@ -154,18 +157,50 @@ div.lizmap_project_list_details dd { overflow: auto; background-color: #efefef; } -table.lizmap_project_list tr dd.lizmap-project-qgis-log { - font-size: 0.8em; - line-height: 15px; +table.lizmap_project_list tr dd.lizmap-project-qgis-log pre { + font-size: 0.9em; + line-height: 10px; } -table.lizmap_project_list tr td.lizmap-project-qgis-log div { +table.lizmap_project_list tr td.lizmap-project-qgis-log pre { font-size: 0.8em; - line-height: 15px; - max-height: 50px; + line-height: 10px; + max-height: 80px; + max-width: 300px; overflow: auto; } /* End of project list page */ +/* Project list help with colours and legend */ +#lizmap_project_list_help div.modal-body { + background-color: rgb(239, 239, 239); +} +#lizmap_project_list_help ul ul li { + font-weight: bold; +} +#lizmap_project_list_help ul ul ul.rules li { + font-weight: normal; +} +#lizmap_project_list_help ul > .rules { + list-style: none; +} +#lizmap_project_list_help ul > .rules li::before { + content: '■'; + font-weight: bold; + display: inline-block; + width: 1em; + margin-left: -1em; + font-size: 2.5em; +} +#lizmap_project_list_help .warning::before { + color: var(--warning-bg-color); +} +#lizmap_project_list_help .error::before { + color: var(--error-bg-color); +} +#lizmap_project_list_help .blocker::before { + color: var(--blocker-bg-color); +} + /* List of users and groups */ .jacl2-list.jacl2-list-sticky-heads thead, diff --git a/lizmap/www/assets/js/admin/activate_datatable.js b/lizmap/www/assets/js/admin/activate_datatable.js index e14fd3bc0d..3a112c3a85 100644 --- a/lizmap/www/assets/js/admin/activate_datatable.js +++ b/lizmap/www/assets/js/admin/activate_datatable.js @@ -86,7 +86,7 @@ $(document).ready(function () { `; } else { noDataSentence = document.getElementById('lizmap_project_list_no_data_label').innerText; - noDataSentence += ` : ${hiddenColumns.join(', ')}`; + noDataSentence += ` : "${hiddenColumns.join('", "')}"`; html = noDataSentence; } @@ -110,7 +110,30 @@ $(document).ready(function () { }); }); - // Adjust header + // Adjust the table header at startupt project_table.tables().columns.adjust(); + + // Adjust it when the size has changed + project_table.on('responsive-resize', function (e, datatable, row, showHide, update) { + // Adjust header + project_table.tables().columns.adjust(); + + // Toggle the cursor pointer on the lines + document.querySelectorAll('table.lizmap_project_list tr').forEach((element) => { + element.classList.toggle( + 'has_hidden_columns', + project_table.responsive.hasHidden() + ); + }); + }); + + // Change Tr cursor depending of the state hidden columns + document.querySelectorAll('table.lizmap_project_list tr').forEach((element) => { + element.classList.toggle( + 'has_hidden_columns', + project_table.responsive.hasHidden() + ); + }); + } });
{@admin.project.list.column.qgis.desktop.version.label@} {@admin.project.list.column.target.lizmap.version.label@}{@admin.project.list.column.lizmap.plugin.version.label@} {@admin.project.list.column.hidden.project.label@} {@admin.project.list.column.authorized.groups.label@} {@admin.project.list.column.project.file.time.label@} + {$mi->id} + {$p['id']} + @@ -199,7 +204,7 @@ {if !empty($p['acl_groups'])} - {$p['acl_groups']|strip_tags|eschtml:ENT_QUOTES} + {$p['acl_groups']|strip_tags|eschtml} {/if} {if !empty($p['projection'])} - {$p['projection']|strip_tags|eschtml:ENT_QUOTES} + {$p['projection']|strip_tags|eschtml} {/if}
    {foreach $p['invalid_layers'] as $id=>$properties} -
  • +
  • {$properties['name']}
    • {/foreach} @@ -246,12 +251,12 @@
{if !empty($p['qgis_log'])} -
- {$p['qgis_log']|strip_tags|eschtml:ENT_QUOTES|nl2br} -
+ 
+                {$p['qgis_log']|strip_tags|eschtml|nl2br}
+
{/if}