This commit is contained in:
Laurent Destailleur 2017-11-18 13:09:12 +01:00
parent bcaccb1829
commit 90684750c1
3 changed files with 9 additions and 7 deletions

View File

@ -1124,8 +1124,8 @@ div.fiche {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'22':'6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'20':'12')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'25':'6')); ?>px;
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?> <?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?> <?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
} }

View File

@ -1147,8 +1147,8 @@ div.fiche {
<?php } ?> <?php } ?>
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'12')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> <?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
margin-bottom: 15px; margin-bottom: 15px;
} }
@ -3222,8 +3222,8 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
} }
.photointoolitp { .photointoolitp {
margin-top: 8px; margin-top: 8px;
float: left; margin-bottom: 6px;
/*text-align: center; */ text-align: center;
} }
.photodelete { .photodelete {
margin-top: 6px !important; margin-top: 6px !important;

View File

@ -1825,12 +1825,14 @@ if ($action == 'editmeta' || $action == 'create')
if ($action == 'file_manager') if ($action == 'file_manager')
{ {
print '<!-- Edit Media -->'."\n"; print '<!-- Edit Media -->'."\n";
print '<br><br>'; print '<div class="fiche"><br><br>';
//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>'; //print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
$module = 'medias'; $module = 'medias';
if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php'; if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php';
include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php'; include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php';
print '</div>';
} }
if ($action == 'editmenu') if ($action == 'editmenu')