Fix migration errors and responsive design
This commit is contained in:
parent
3e37185b74
commit
80ce8da7a3
@ -2083,6 +2083,7 @@ else
|
|||||||
|
|
||||||
print "</div>";
|
print "</div>";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Select mail models is same action as presend
|
// Select mail models is same action as presend
|
||||||
if (GETPOST('modelselected')) {
|
if (GETPOST('modelselected')) {
|
||||||
$action = 'presend';
|
$action = 'presend';
|
||||||
|
|||||||
@ -189,7 +189,9 @@ class FormActions
|
|||||||
|
|
||||||
$page=0; $param=''; $sortfield='a.datep';
|
$page=0; $param=''; $sortfield='a.datep';
|
||||||
|
|
||||||
$total = 0; $var=true;
|
$total = 0;
|
||||||
|
|
||||||
|
print '<div class="div-table-responsive">';
|
||||||
print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
|
print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], '', $page, $param, '');
|
print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], '', $page, $param, '');
|
||||||
@ -243,6 +245,7 @@ class FormActions
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
print '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $num;
|
return $num;
|
||||||
|
|||||||
@ -54,9 +54,9 @@ span.titre {
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
color: #444;
|
color: #444;
|
||||||
border: 1px solid #999;
|
border: 1px solid #bbb;
|
||||||
padding: 5px 5px 5px 5px;
|
padding: 10px 10px 10px 10px;
|
||||||
margin: 0 0 0 15px;
|
margin: 0 0 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.soustitre {
|
div.soustitre {
|
||||||
|
|||||||
@ -25,6 +25,23 @@
|
|||||||
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
||||||
|
|
||||||
|
|
||||||
|
-- Clean corrupted values for tms
|
||||||
|
-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
|
||||||
|
-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
|
||||||
|
-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
|
||||||
|
-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
|
||||||
|
-- Remove default not null on date_fin
|
||||||
|
-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
|
||||||
|
-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
|
||||||
|
|
||||||
|
ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
|
||||||
|
|
||||||
|
ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
|
||||||
|
ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
|
||||||
|
ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
|
||||||
|
ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
|
||||||
|
|
||||||
|
|
||||||
create table llx_notify_def_object
|
create table llx_notify_def_object
|
||||||
(
|
(
|
||||||
id integer AUTO_INCREMENT PRIMARY KEY,
|
id integer AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
|||||||
@ -23,7 +23,7 @@ CREATE TABLE llx_opensurvey_sondage (
|
|||||||
nom_admin VARCHAR(64),
|
nom_admin VARCHAR(64),
|
||||||
fk_user_creat integer NOT NULL,
|
fk_user_creat integer NOT NULL,
|
||||||
titre TEXT NOT NULL,
|
titre TEXT NOT NULL,
|
||||||
date_fin DATETIME NOT NULL,
|
date_fin DATETIME NULL,
|
||||||
status integer DEFAULT 1,
|
status integer DEFAULT 1,
|
||||||
format VARCHAR(2) NOT NULL, -- 'A' = Text choice (choices are saved into sujet field), 'D' = Date choice (choices are saved into sujet field), 'F' = Form survey
|
format VARCHAR(2) NOT NULL, -- 'A' = Text choice (choices are saved into sujet field), 'D' = Date choice (choices are saved into sujet field), 'F' = Form survey
|
||||||
mailsonde tinyint NOT NULL DEFAULT 0,
|
mailsonde tinyint NOT NULL DEFAULT 0,
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||||
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
|
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
|
||||||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
|
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
|
||||||
@ -395,11 +395,11 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
|
|||||||
print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
|
print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<br>";
|
print "<br><br>";
|
||||||
|
|
||||||
print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
|
print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
|
||||||
print $langs->trans("GoToDolibarr");
|
print $langs->trans("GoToDolibarr").'...';
|
||||||
print '</a></div>';
|
print '</a></div><br>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -698,7 +698,7 @@ div.fiche>form>div.div-table-responsive {
|
|||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
.thumbstat {
|
.thumbstat {
|
||||||
flex: 1 1 114px;
|
flex: 1 1 116px;
|
||||||
}
|
}
|
||||||
.thumbstat150 {
|
.thumbstat150 {
|
||||||
flex: 1 1 170px;
|
flex: 1 1 170px;
|
||||||
|
|||||||
@ -544,7 +544,7 @@ textarea.centpercent {
|
|||||||
.cursorpointer {
|
.cursorpointer {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.cusormove {
|
.cursormove {
|
||||||
cursor: move;
|
cursor: move;
|
||||||
}
|
}
|
||||||
.badge {
|
.badge {
|
||||||
@ -701,7 +701,7 @@ div.fiche>form>div.div-table-responsive {
|
|||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
.thumbstat {
|
.thumbstat {
|
||||||
flex: 1 1 114px;
|
flex: 1 1 116px;
|
||||||
}
|
}
|
||||||
.thumbstat150 {
|
.thumbstat150 {
|
||||||
flex: 1 1 150px;
|
flex: 1 1 150px;
|
||||||
@ -1979,9 +1979,10 @@ div.tabsElem { margin-top: 6px; } /* To avoid overlap of tabs when not browser
|
|||||||
|
|
||||||
div.tabBar {
|
div.tabBar {
|
||||||
color: #<?php echo $colortextbacktab; ?>;
|
color: #<?php echo $colortextbacktab; ?>;
|
||||||
padding-top: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
|
padding-top: 16px;
|
||||||
padding-left: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
|
padding-left: 16px;
|
||||||
padding-right: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
|
padding-right: 16px;
|
||||||
|
padding-bottom: 16px;
|
||||||
margin: 0px 0px 16px 0px;
|
margin: 0px 0px 16px 0px;
|
||||||
-moz-border-radius:3px;
|
-moz-border-radius:3px;
|
||||||
-webkit-border-radius: 3px;
|
-webkit-border-radius: 3px;
|
||||||
@ -1991,8 +1992,6 @@ div.tabBar {
|
|||||||
border-top: 1px solid #CCC;
|
border-top: 1px solid #CCC;
|
||||||
width: auto;
|
width: auto;
|
||||||
background: rgb(<?php echo $colorbacktabcard1; ?>);
|
background: rgb(<?php echo $colorbacktabcard1; ?>);
|
||||||
|
|
||||||
padding-bottom: 12px;
|
|
||||||
border-bottom: 1px solid #aaa;
|
border-bottom: 1px solid #aaa;
|
||||||
}
|
}
|
||||||
div.tabBar div.titre {
|
div.tabBar div.titre {
|
||||||
@ -4627,8 +4626,8 @@ border-top-right-radius: 6px;
|
|||||||
}
|
}
|
||||||
|
|
||||||
div.tabBar {
|
div.tabBar {
|
||||||
padding-left: 0px;
|
padding-left: 8px;
|
||||||
padding-right: 0px;
|
padding-right: 8px;
|
||||||
-moz-border-radius: 0;
|
-moz-border-radius: 0;
|
||||||
-webkit-border-radius: 0;
|
-webkit-border-radius: 0;
|
||||||
border-radius: 0px;
|
border-radius: 0px;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user