From 0f5d3f72b9b8fbf4c6608e3952d448dd9864cedd Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 24 Oct 2017 10:40:39 +0200
Subject: [PATCH] FEAT #6157 hide editing button when imported file is selected
---
modules/templates/js/functions.js | 2 +-
modules/templates/templates_management.php | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/modules/templates/js/functions.js b/modules/templates/js/functions.js
index 5b4aed2a16a..1ff1b1d2d13 100755
--- a/modules/templates/js/functions.js
+++ b/modules/templates/js/functions.js
@@ -103,7 +103,7 @@ function select_template(path_to_script, attachment_type)
function addTemplateBase(file)
{
- if (confirm('Voulez-vous l\'ajouter à la liste des modèles ?')) {
+ if (confirm('En cliquant sur ok, le modèle sera ajouté dans la liste des natures de modèle.')) {
saveTemplateBase = "yes";
}else{
saveTemplateBase = "no";
diff --git a/modules/templates/templates_management.php b/modules/templates/templates_management.php
index d7ce2fdaab4..e6fef2f1f19 100755
--- a/modules/templates/templates_management.php
+++ b/modules/templates/templates_management.php
@@ -229,7 +229,7 @@ if ($mode == 'list') {
<?php
echo '<label for="template_style">'._TEMPLATE_STYLE.' : ';
if ($mode == 'add') {
- echo '<i id="template_style_icon" class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" onclick="$j(\'#addTemplateFile\').click();$(\'template_style_icon\').setStyle({color: \'#009DC5\'});$(\'template_style_icon2\').setStyle({color: \'#666\'});"></i> <i id="template_style_icon2" class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" onclick="$j(\'#template_style\').show();$j(\'#addTemplate\').hide();$(\'template_style_icon\').setStyle({color: \'#666\'});$(\'template_style_icon2\').setStyle({color: \'#009DC5\'});" style="color:#009DC5"></i>';
+ echo '<i id="template_style_icon" class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" onclick="$j(\'#templateEditTr\').hide();$j(\'#addTemplateFile\').click();$(\'template_style_icon\').setStyle({color: \'#009DC5\'});$(\'template_style_icon2\').setStyle({color: \'#666\'});"></i> <i id="template_style_icon2" class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" onclick="$j(\'#templateEditTr\').show();$j(\'#template_style\').show();$j(\'#addTemplate\').hide();$(\'template_style_icon\').setStyle({color: \'#666\'});$(\'template_style_icon2\').setStyle({color: \'#009DC5\'});" style="color:#009DC5"></i>';
}
echo '</label>';
if ($mode == 'up') {
@@ -288,9 +288,9 @@ if ($mode == 'list') {
}
$objectTable = _TEMPLATES_TABLE_NAME;
?>
- <p>
+ <p id="templateEditTr">
<label><?php echo _EDIT_TEMPLATE;?> :</label>
- <div style="text-align:center;">
+
<?php
$strAction .= 'showAppletLauncher(\''
. $_SESSION['config']['businessappurl'] . 'index.php?display=true'
@@ -306,8 +306,7 @@ if ($mode == 'list') {
<i class="fa fa-pencil fa-2x"></i>
<?php echo _EDIT_TEMPLATE;?>
- </a>
- </div>
+ </a>
</p>
</div>
<div id="txt_div" name="txt_div">
--
GitLab