From fe471c43d1dd8415c96161cbcf1dd0e55f1490bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Oct 2016 18:28:09 +0200
Subject: [PATCH] Minor css enhancement
---
htdocs/core/class/html.formfile.class.php | 2 +-
htdocs/core/lib/functions.lib.php | 2 +-
htdocs/projet/class/project.class.php | 2 +-
htdocs/theme/eldy/style.css.php | 15 ++++-----------
htdocs/theme/md/style.css.php | 15 ++++-----------
5 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e4cb365adfc..61f4f459091 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -157,7 +157,7 @@ class FormFile
$out .= '<tr>';
if (! empty($options)) $out .= '<td>'.$options.'</td>';
$out .= '<td valign="middle" class="nowrap">';
- $out .= '<input type="checkbox" checked name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+ $out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
$out .= '</td>';
$out .= '</tr>';
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index db257c4b47c..8a39600fec2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4245,7 +4245,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
$path = '';
- $arrayforoldpath=array('cheque','user','category','holiday','shipment', 'member','supplier_invoice','invoice_supplier','mailing');
+ $arrayforoldpath=array('cheque','user','category','holiday','shipment','supplier_invoice','invoice_supplier','mailing');
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
if (! empty($level) && in_array($modulepart, $arrayforoldpath))
{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a348fc3200a..5b572a7d455 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1327,9 +1327,9 @@ class Project extends CommonObject
$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
- //manage new parent clone task id
$tab_conv_child_parent=array();
+ // Loop on each task, to clone it
foreach ($tasksarray as $tasktoclone)
{
$result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,$move_date,true,false,$clone_task_file,true,false);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4c0cebc9633..a4ce55658c2 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -529,17 +529,6 @@ div.confirmmessage {
div.myavailability {
padding-top: 6px;
}
-/* Style to move picto into left of button */
-/*
-.buttonactionview {
- padding-left: 15px;
-}
-.pictoactionview {
- padding-left: 10px;
- margin-right: -24px;
- z-index: 999999;
-}
-*/
.googlerefreshcal {
padding-top: 4px;
padding-bottom: 4px;
@@ -588,6 +577,10 @@ div.myavailability {
color: #880000;
font-weight: bold;
}
+.savingdocmask {
+ margin-top: 6px;
+ margin-bottom: 12px;
+}
/* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
.table-responsive {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 921592b5e27..8b13e39428b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -528,17 +528,6 @@ div.confirmmessage {
div.myavailability {
padding-top: 6px;
}
-/* Style to move picto into left of button */
-/*
-.buttonactionview {
- padding-left: 15px;
-}
-.pictoactionview {
- padding-left: 10px;
- margin-right: -24px;
- z-index: 999999;
-}
-*/
.googlerefreshcal {
padding-top: 4px;
padding-bottom: 4px;
@@ -579,6 +568,10 @@ div.myavailability {
.tablelistofcalendars {
margin-top: 25px !important;
}
+.savingdocmask {
+ margin-top: 6px;
+ margin-bottom: 12px;
+}
/* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
.table-responsive {
--
GitLab