Skip to content

Commit

Permalink
Admin panel - QGIS projects view: overall UI improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
mdouchin authored and github-actions[bot] committed Aug 4, 2023
1 parent 2cf0cd0 commit 7187a4c
Show file tree
Hide file tree
Showing 10 changed files with 395 additions and 284 deletions.
4 changes: 2 additions & 2 deletions lizmap/app/themes/default/master_admin/main.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@

<div id="content" class="container-fluid">
<div class="row-fluid">
<div id="menu" class="span3">
<div id="menu" class="span2">
<div class="well sidebar-nav">
<ul class="nav nav-list">
{$MENU}
</ul>
</div>
</div>
<div class="span9">
<div class="span10">
<div class="row-fluid">
<div id="admin-message">{jmessage_bootstrap}</div>
{$MAIN}
Expand Down
11 changes: 7 additions & 4 deletions lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,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 <strong>%s</strong> and QGIS Server version <strong>%s</strong>, there are some rules about the table above :
project.rules.list.warnings.html=<strong>Warnings</strong>, projects are still visible, but you should have a look to these projects :
Expand All @@ -306,6 +307,7 @@ project.rules.list.blocking.description=Some projects are not visible anymore wi
project.rules.list.blocking.target.html=The project is designed for Lizmap Web Client version equal or less than <strong>%s</strong>.
project.list.column.repository.label=Repository
project.list.column.project.label=Project
project.list.column.inspection.file.time.label=Inspection time
project.list.column.project.abstract.label=Abstract
project.list.column.project.has.log.label=QGIS Server logs
project.list.column.project.qgis.log.label=QGIS Server logs
Expand Down Expand Up @@ -340,6 +342,7 @@ project.list.column.invalid.layers.count.label=Invalid layers
project.list.column.invalid.layers.list.label=List of invalid layers
project.list.column.invalid.layers.count.error.label=Some layers cannot be read by QGIS. Please check that the server can access the layer data. \n* For file based layers, the path must be accessible.\n* For PostgreSQL layers, the Lizmap server must be able to connect to the database server.
project.list.column.layout.count.label=Layouts

menu.lizmap.project.sidebar.title.label=Project details
menu.lizmap.project.image.label=Image
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 following hidden table columns
17 changes: 0 additions & 17 deletions lizmap/modules/admin/templates/project_list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,6 @@
<div id="lizmap_project_list">
{$projectList}
</div>
<div id="lizmap_project_list_sidebar">
<h4>{@admin.menu.lizmap.project.sidebar.title.label@}</h4>
<div id="lizmap_project_list_sidebar_content">
<dl>
<dt id="dd_image_label">{@admin.menu.lizmap.project.image.label@}</dt>
<dd id="dd_image_value"></dd>
<dt id="dd_title_label">{@admin.project.list.column.project.label@}</dt>
<dd id="dd_title_value"></dd>
<dt id="dd_abstract_label">{@admin.project.list.column.project.abstract.label@}</dt>
<dd id="dd_abstract_value"></dd>
<dt id="dd_invalid_layers_label">{@admin.project.list.column.invalid.layers.list.label@}</dt>
<dd id="dd_invalid_layers_value"></dd>
<dt id="dd_qgis_logs_label">{@admin.project.list.column.project.qgis.log.label@}</dt>
<dd id="dd_qgis_logs_value"></dd>
</dl>
</div>
</div>
</div>

{/ifacl2}
71 changes: 71 additions & 0 deletions lizmap/modules/admin/templates/project_list_help.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<div id="lizmap_project_list_help" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{@admin.project.modal.title@}</h3>
</div>
<div class="modal-body">
<p>
{jlocale "admin.project.rules.list.description.html", array($lizmapVersion,
($serverVersions['qgis_server_version_human_readable']))}
</p>

<ul>
<li>{@admin.project.rules.list.blocking.html@}</li>
<ul class="rules">
<li class="blocker">{jlocale "admin.project.rules.list.blocking.target.html",
array($minimumLizmapTargetVersionRequired - 0.1)}</li>
</ul>

<li>{@admin.project.rules.list.warnings.html@}</li>
<ul>
<li>{@admin.project.list.column.qgis.desktop.version.label@}</li>
<ul class="rules">
<li class="warning">{jlocale "admin.project.rules.list.qgis.version.warning.html",
array($serverVersions['qgis_server_version_old'])}</li>
<li class="error">{jlocale "admin.project.rules.list.qgis.version.error.html", array(
$serverVersions['qgis_server_version_next'])}</li>
</ul>
<li>{@admin.project.list.column.target.lizmap.version.label.longer@}</li>
<ul class="rules">
<li class="warning">{jlocale "admin.project.rules.list.target.version.html",
array($minimumLizmapTargetVersionRequired)}</li>
</ul>
<li>{@admin.project.list.column.layers.count.label.longer@}</li>
<ul class="rules">
<li class="warning">{jlocale "admin.project.rules.list.important.count.layers.html",
array($warningLayerCount)}</li>
<li class="error">{jlocale "admin.project.rules.list.very.important.count.layers.html",
array(($errorLayerCount))}</li>
</ul>
<li>{@admin.project.list.column.crs.label@}</li>
<ul class="rules">
<li class="warning">{@admin.project.rules.list.custom.projection@}</li>
</ul>

{if $hasInspectionData}
<li>{@admin.project.list.column.invalid.layers.count.label@}</li>
<ul class="rules">
<li class="warning">{@admin.project.rules.list.invalid.datasource.html@}</li>
</ul>
<li>{@admin.project.list.column.loading.time.label.alt@}</li>
<ul class="rules">
<li class="warning">{jlocale "admin.project.rules.list.warning.loading.html",
array($warningLoadingTime)}</li>
<li class="error">{jlocale "admin.project.rules.list.error.loading.html", array($errorLoadingTime)}
</li>
</ul>
<li>{@admin.project.list.column.memory.usage.label.alt@}</li>
<ul class="rules">
<li class="warning">{jlocale "admin.project.rules.list.warning.memory.html", array($warningMemory)}
</li>
<li class="error">{jlocale "admin.project.rules.list.error.memory.html", array($errorMemory)}</li>
</ul>
{/if}

</ul>
</ul>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">{@admin.project.modal.button.close@}</button>
</div>
</div>
Loading

0 comments on commit 7187a4c

Please sign in to comment.