2
0
forked from Wavyzz/dolibarr

Minor css enhancement

This commit is contained in:
Laurent Destailleur
2016-10-16 18:28:09 +02:00
parent 9175ff80a0
commit fe471c43d1
5 changed files with 11 additions and 25 deletions

View File

@@ -157,7 +157,7 @@ class FormFile
$out .= '<tr>'; $out .= '<tr>';
if (! empty($options)) $out .= '<td>'.$options.'</td>'; if (! empty($options)) $out .= '<td>'.$options.'</td>';
$out .= '<td valign="middle" class="nowrap">'; $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 .= '</td>';
$out .= '</tr>'; $out .= '</tr>';
} }

View File

@@ -4245,7 +4245,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
$path = ''; $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($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
if (! empty($level) && in_array($modulepart, $arrayforoldpath)) if (! empty($level) && in_array($modulepart, $arrayforoldpath))
{ {

View File

@@ -1327,9 +1327,9 @@ class Project extends CommonObject
$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0); $tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
//manage new parent clone task id
$tab_conv_child_parent=array(); $tab_conv_child_parent=array();
// Loop on each task, to clone it
foreach ($tasksarray as $tasktoclone) 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); $result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,$move_date,true,false,$clone_task_file,true,false);

View File

@@ -529,17 +529,6 @@ div.confirmmessage {
div.myavailability { div.myavailability {
padding-top: 6px; 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 { .googlerefreshcal {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
@@ -588,6 +577,10 @@ div.myavailability {
color: #880000; color: #880000;
font-weight: bold; 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 */ /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
.table-responsive { .table-responsive {

View File

@@ -528,17 +528,6 @@ div.confirmmessage {
div.myavailability { div.myavailability {
padding-top: 6px; 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 { .googlerefreshcal {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
@@ -579,6 +568,10 @@ div.myavailability {
.tablelistofcalendars { .tablelistofcalendars {
margin-top: 25px !important; 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 */ /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
.table-responsive { .table-responsive {