Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
equinton committed Feb 29, 2024
2 parents 421f5ba + a030ba7 commit 8bfc3fe
Show file tree
Hide file tree
Showing 27 changed files with 867 additions and 915 deletions.
4 changes: 2 additions & 2 deletions display/CSS/bootstrap-prototypephp.css
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ tr {
cursor: pointer;
}
/* bootstrap hack: fix content width inside hidden tabs */
.tab-content > .tab-pane:not(.active),
.pill-content > .pill-pane:not(.active) {
.tab-content > .tab-pane:not(.active)/*,
.pill-content > .pill-pane:not(.active)*/ {
display: block;
height: 0;
overflow-y: hidden;
Expand Down
2 changes: 1 addition & 1 deletion display/templates/about.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</p>


<h3>Copyright © 2014-2023 - Eric Quinton - EABX - INRAE</h3>
<h3>Copyright © 2014-2024 - Eric Quinton - EABX - INRAE</h3>
<p>

<br>
Expand Down
2 changes: 1 addition & 1 deletion display/templates/apropos_en.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p>
Version {$version} of {$versiondate}.
</p>
<h3>Copyright © 2015-2023 - INRAE</h3>
<h3>Copyright © 2015-2024 - INRAE</h3>
<p>
STURWILD is an application to record and consult the incidental catches of sturgeon.
</p>
Expand Down
7 changes: 4 additions & 3 deletions display/templates/declaration/declarationChange.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ Retour au détail</a>
</label>
<div class="col-sm-8" id="capture_date_zone">
<input class="datepicker form-control" id="capture_date" name="capture_date" value="{$data.capture_date}">
(<input id="estimated_capture_date" name="estimated_capture_date" value="{$data.estimated_capture_date}" placeholder="période ou heure de la capture" title="Période ou heur de la capture">)
(<input id="estimated_capture_date" name="estimated_capture_date" value="{$data.estimated_capture_date}"
placeholder="{t}période ou heure de la capture{/t}" title="{t}Période ou heure de la capture{/t}">)
</div>
</div>
<div class="form-group">
Expand All @@ -99,8 +100,8 @@ Retour au détail</a>
</label>
<div class="col-sm-8" id="depth_zone">
<input class="nombre form-control" id="depth" name="depth" value="{$data.depth}">
({t}de :{/t} <input name="depth_min" id="depth_min" value="{$data.depth_min}" placeholder="min" class="nombre num5"> m.
{t}à :{/t} <input name="depth_max" id="depth_max" value="{$data.depth_max}" placeholder="max" class="nombre num5"> m.)
({t}de :{/t} <input name="depth_min" id="depth_min" value="{$data.depth_min}" placeholder="{t}min{/t}" class="nombre num5"> m.
{t}à :{/t} <input name="depth_max" id="depth_max" value="{$data.depth_max}" placeholder="{t}max{/t}" class="nombre num5"> m.)
</div>
</div>
<div class="form-group">
Expand Down
5 changes: 3 additions & 2 deletions display/templates/declaration/declarationGeneral.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<div class="row">
{if $droits.gestion ==1}
<a href="index.php?module=declarationChange&declaration_id={$data.declaration_id}">
<img src="display/images/edit.gif" height="20">Modifier...
<img src="display/images/edit.gif" height="20">
{t}Modifier...{/t}
</a>
{/if}
</div>
Expand All @@ -23,7 +24,7 @@
<dd>{$data.year}</dd>
</dl>
<dl class="dl-horizontal">
<dt>{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}(période/heure){/if}</dt>
<dt>{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}({t}période/heure{/t}){/if}</dt>
<dd>{$data.capture_date}{if !empty($data.estimated_capture_date)}&nbsp;({$data.estimated_capture_date}){/if}</dd>
</dl>
<dl class="dl-horizontal">
Expand Down
5 changes: 4 additions & 1 deletion display/templates/declaration/declarationList.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
$('.tabResult').on('shown.bs.tab', function () {
myStorage.setItem("declarationResultTab", $(this).attr("id"));
});
$('.nav-tabs > li > a').hover(function() {
//$(this).tab('show');
});
});
</script>
{include file="declaration/declarationSearch.tpl"}
Expand Down Expand Up @@ -54,7 +57,7 @@
</div>
</div>
<div class="tab-pane fade" id="navmap" role="tabpanel" aria-labelledby="tabmap">
<div id="mapList" class="map"style="height:600px;"></div>
<div id="mapList" class="map" ></div>
{include file="declaration/declarationListMap.tpl"}
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions display/templates/declaration/declarationListMap.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@
markerGroup.addLayer(mark);
});
mapList.addLayer(markerGroup);
$("#mapList").width(window.innerWidth - 40);
$("#mapList").height(window.innerHeight * 0.5);
mapDisplay(mapList);
</script>
2 changes: 1 addition & 1 deletion display/templates/enpied.tpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<p class="text-muted">
{t}Copyright © 2015- 2023 - Tous droits réservés. Auteur : Éric Quinton, pour EABX - INRAE - Logiciel diffusé sous licence AGPL{/t}
{t}Copyright © 2015- 2024 - Tous droits réservés. Auteur : Éric Quinton, pour EABX - INRAE - Logiciel diffusé sous licence AGPL{/t}
<br>
{t}En cas de problème :{/t}&nbsp;
<a href="{$appliAssist}">{$appliAssist}</a>
Expand Down
42 changes: 42 additions & 0 deletions display/templates/param/translateDb.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<div class="row">
<h2>{t}Import ou mise à jour des tables de paramètres{/t}</h2>
</div>
<div class="row">
<div class="col-md-6">
<form class="form-horizontal" id="updateparamExec" method="post" action="index.php" enctype="multipart/form-data">
<input type="hidden" name="module" value="updateparamExec">
<div class="form-group">
<label for="upfile" class="control-label col-md-4"><span class="red">*</span>
{t}Nom du fichier à importer (ODS) :{/t}
</label>
<div class="col-md-8">
<input type="file" name="upfile" class="form-control" accept=".ods" required>
</div>
</div>
<div class="center">
<button type="submit" class="btn btn-danger">{t}Déclencher l'import{/t}</button>
</div>
</form>
</div>
</div>
<div class="row">
<div class="col-md-6 bg-info">
{t}Ce module permet d'importer ou de mettre à jour l'ensemble des tables de paramètres à partir d'un fichier ODS{/t}
<br>
{t}Le fichier doit contenir une feuille par table (le nom de la feuille doit être strictement équivalent au nom de la table){/t}
<br>
{t}Chaque feuille doit contenir impérativement les colonnes suivantes (conservez l'ordre des colonnes) :{/t}
<br>
<ul>
<li>id : {t}laissée à vide{/t}</li>
<li>name : {t}nom dans la langue courante{/t}</li>
<li>exchange : {t}nom en anglais, utilisé pour les échanges{/t}</li>
<li>order : {t}ordre d'affichage des enregistrements{/t}</li>
</ul>
<br>
<a href="index.php?module=updateparamGettemplate">
{t}Téléchargez le modèle de fichier{/t}
</a>
</div>
</div>

Loading

0 comments on commit 8bfc3fe

Please sign in to comment.