lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix import of web site

Browse Source 
Fix sort on constant setup page lost
This commit is contained in:
Laurent Destailleur 2019-10-09 15:01:19 +02:00
parent 5fce7e5fd0
commit 346e9f3e1b
6 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/const.php
View File

@ -195,6 +195,8 @@ $param = '';
print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" id="action" name="action" value="">'; print '<input type="hidden" id="action" name="action" value="">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

7
htdocs/theme/eldy/dropdown.inc.php
View File

@ -111,6 +111,13 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
max-width: 100%; max-width: 100%;
} }
div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
line-height: 46px;
}
a.top-menu-dropdown-link {
padding: 8px;
}
.dropdown-user-image { .dropdown-user-image {
border-radius: 50%; border-radius: 50%;
vertical-align: middle; vertical-align: middle;

14
htdocs/theme/eldy/global.inc.php
View File

@ -1039,15 +1039,21 @@ td.showDragHandle {
} }
#id-right, #id-left { #id-right, #id-left {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px;
display: table-cell; /* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */ display: table-cell; /* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */
float: none; float: none;
vertical-align: top; vertical-align: top;
} }
#id-left {
padding-bottom: 5px;
<?php if (! empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && ! empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { ?>
padding-top: 8px;
<?php } ?>
}
#id-right { /* This must stay id-right and not be replaced with echo $right */ #id-right { /* This must stay id-right and not be replaced with echo $right */
width: 100%; width: 100%;
background: rgb(<?php print $colorbackbody; ?>); background: rgb(<?php print $colorbackbody; ?>);
padding-bottom: 20px;
} }
#id-left { #id-left {
/* background-color: #fff; /* background-color: #fff;
@ -1130,7 +1136,7 @@ div.vmenu, td.vmenu {
} }
.blockvmenu .menu_titre { .blockvmenu .menu_titre {
margin-top: 4px; margin-top: 4px;
margin-bottom: 3px; margin-bottom: 1px;
} }
/* Try responsive even not on smartphone /* Try responsive even not on smartphone
@ -2183,8 +2189,8 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;
padding-right: 1px; padding-right: 1px;
padding-top: 3px; padding-top: 4px;
padding-bottom: 3px; padding-bottom: 7px;
margin: 0 0 0 2px; margin: 0 0 0 2px;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);

3
htdocs/theme/md/style.css.php
View File

@ -2104,7 +2104,7 @@ table.login_table_securitycode tr td {
div.login_block { div.login_block {
border-right: 1px solid rgba(0,0,0,0.3); border-right: 1px solid rgba(0,0,0,0.3);
padding-top: 5px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
<?php print $left; ?>: 0; <?php print $left; ?>: 0;
top: 0px; top: 0px;
@ -2316,6 +2316,7 @@ a.vsmenu.addbookmarkpicto {
} }
div.blockvmenufirst { div.blockvmenufirst {
padding-top: 10px; padding-top: 10px;
/* border-top: 1px solid #e0e0e0; */
} }
div.blockvmenusearch, div.blockvmenubookmarks div.blockvmenusearch, div.blockvmenubookmarks
{ {

5
htdocs/website/class/website.class.php
View File

@ -1012,8 +1012,8 @@ class Website extends CommonObject
return -1; return -1;
} }
dol_delete_dir_recursive(dirname($pathtofile).'/'.$object->ref); dol_delete_dir_recursive($conf->website->dir_temp.'/'.$object->ref);
dol_mkdir(dirname($pathtofile).'/'.$object->ref); dol_mkdir($conf->website->dir_temp.'/'.$object->ref);
$filename = basename($pathtofile); $filename = basename($pathtofile);
if (! preg_match('/^website_(.*)-(.*)$/', $filename, $reg)) if (! preg_match('/^website_(.*)-(.*)$/', $filename, $reg))
@ -1023,6 +1023,7 @@ class Website extends CommonObject
} }
$result = dol_uncompress($pathtofile, $conf->website->dir_temp.'/'.$object->ref); $result = dol_uncompress($pathtofile, $conf->website->dir_temp.'/'.$object->ref);
if (! empty($result['error'])) if (! empty($result['error']))
{ {
$this->errors[]='Failed to unzip file '.$pathtofile.'.'; $this->errors[]='Failed to unzip file '.$pathtofile.'.';

7
htdocs/website/index.php
View File

@ -1836,6 +1836,9 @@ if ($action == 'importsiteconfirm')
} }
else else
{ {
// Force mode dynamic on
dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$object->ref); header("Location: ".$_SERVER["PHP_SELF"].'?website='.$object->ref);
exit(); exit();
} }
@ -3489,12 +3492,12 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
{ {
if (empty($websitekey) || $websitekey == '-1') if (empty($websitekey) || $websitekey == '-1')
{ {
print '<br><br><div class="center">'.$langs->trans("NoWebSiteCreateOneFirst").'</center><br><br><br>'; print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
print '<div class="center"><div class="logo_setup"></div></div>'; print '<div class="center"><div class="logo_setup"></div></div>';
} }
else else
{ {
print '<br><br><div class="center">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</center><br><br><br>'; print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
print '<div class="center"><div class="logo_setup"></div></div>'; print '<div class="center"><div class="logo_setup"></div></div>';
} }
} }