2
0
forked from Wavyzz/dolibarr

Fix style fo ECM module

This commit is contained in:
Laurent Destailleur
2016-12-13 01:19:33 +01:00
parent 71d2ee3aa9
commit d2d0e66c5c
7 changed files with 11 additions and 11 deletions

View File

@@ -138,7 +138,7 @@ if (! dol_is_dir($upload_dir))
exit;*/ exit;*/
} }
print '<!-- TYPE='.$type.' -->'."\n"; print '<!-- ajaxdirpreview type='.$type.' -->'."\n";
print '<!-- Page called with mode='.(isset($mode)?$mode:'').' type='.$type.' module='.$module.' url='.$url.' '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n"; print '<!-- Page called with mode='.(isset($mode)?$mode:'').' type='.$type.' module='.$module.' url='.$url.' '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
$param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:''); $param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');

View File

@@ -932,7 +932,7 @@ class FormFile
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<input type="hidden" name="modulepart" value="'.$modulepart.'">'; print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
} }
print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">'."\n"; print '<table width="100%" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
@@ -1087,7 +1087,7 @@ class FormFile
} }
if ($nboffiles == 0) if ($nboffiles == 0)
{ {
print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'4').'" class="opacitymedium">'; print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'5').'" class="opacitymedium">';
if (empty($textifempty)) print $langs->trans("NoFileFound"); if (empty($textifempty)) print $langs->trans("NoFileFound");
else print $textifempty; else print $textifempty;
print '</td></tr>'; print '</td></tr>';
@@ -1130,7 +1130,7 @@ class FormFile
// Show list of documents // Show list of documents
if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles")); if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
if (empty($url)) $url=$_SERVER["PHP_SELF"]; if (empty($url)) $url=$_SERVER["PHP_SELF"];
print '<table width="100%" class="nobordernopadding">'."\n"; print '<table width="100%" class="noborder">'."\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
$sortref="fullname"; $sortref="fullname";
if ($modulepart == 'invoice_supplier') $sortref='level1name'; if ($modulepart == 'invoice_supplier') $sortref='level1name';

View File

@@ -117,8 +117,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessages($langs->trans($ecmdir->error), null, 'errors'); setEventMessages($langs->trans($ecmdir->error), $ecmdir->errors, 'errors');
setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
$action = 'create'; $action = 'create';
} }
} }
@@ -173,9 +172,7 @@ if ($action == 'create')
print '</textarea>'; print '</textarea>';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
print '</td></tr>'."\n"; print '</table>';
print '</table><br>';
dol_fiche_end(); dol_fiche_end();

View File

@@ -494,7 +494,7 @@ if ($action == 'delete_section')
if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete') if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
{ {
print '<table width="100%" class="nobordernopadding">'."\n"; print '<table width="100%" class="liste noborderbottom">'."\n";
print '<!-- Title for manual directories -->'."\n"; print '<!-- Title for manual directories -->'."\n";
print '<tr class="liste_titre">'."\n"; print '<tr class="liste_titre">'."\n";
@@ -721,6 +721,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$mode='noajax'; $mode='noajax';
$url=DOL_URL_ROOT.'/ecm/index.php';
include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';

View File

@@ -480,7 +480,7 @@ if ($action == 'delete_section')
if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete') if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
{ {
print '<table width="100%" class="nobordernopadding">'."\n"; print '<table width="100%" class="liste noborderbottom">'."\n";
print '<!-- Title for auto directories -->'."\n"; print '<!-- Title for auto directories -->'."\n";
print '<tr class="liste_titre">'."\n"; print '<tr class="liste_titre">'."\n";

View File

@@ -1934,6 +1934,7 @@ img.toolbarbutton {
} }
.ecm-in-layout-south { .ecm-in-layout-south {
border-top: 0px !important;
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;

View File

@@ -1946,6 +1946,7 @@ img.toolbarbutton {
} }
.ecm-in-layout-south { .ecm-in-layout-south {
border-top: 0px !important;
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;