Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix css

Browse Source
This commit is contained in:
Laurent Destailleur
2018-03-02 11:18:29 +01:00
parent a3350d12d8
commit 191a1e9350
5 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/comm/mailing/card.php
View File

@@ -967,7 +967,7 @@ else
* Boutons d'action
*/
if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft', 'valid','delete','sendall','clone')))
if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft','valid','delete','sendall','clone','test')))
{
print "\n\n<div class=\"tabsAction\">\n";
@@ -1071,7 +1071,9 @@ else
print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
print load_fiche_titre($langs->trans("TestMailing"));
// Create l'objet formulaire mail
dol_fiche_head(null, '', '', -1);
// Create l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->fromname = $object->email_from;
@@ -1099,6 +1101,10 @@ else
print $formmail->get_form();
print '<br>';
dol_fiche_end();
print dol_set_focus('#sendto');
}
@@ -1114,7 +1120,7 @@ else
dol_fiche_head('', '', '', -1);
print '<table class="border" width="100%">';
print '<table class="bordernooddeven" width="100%">';
// Subject
print '<tr><td class="titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
@@ -1260,7 +1266,7 @@ else
dol_fiche_head(null, '', '', -1);
print '<table class="border" width="100%">';
print '<table class="bordernooddeven" width="100%">';
// Subject
print '<tr><td class="fieldrequired titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat quatrevingtpercent" type="text" name="sujet" value="'.$object->sujet.'"></td></tr>';

2
htdocs/comm/mailing/cibles.php
View File

@@ -260,7 +260,7 @@ if ($object->fetch($id) >= 0)
print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''), 'title_generic');
//print '<table class="noborder" width="100%">';
print '<div class="tagtable centpercent liste_titre_bydiv" id="tablelines">';
print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
//print '<tr class="liste_titre">';
print '<div class="tagtr liste_titre">';

2
htdocs/core/class/html.formmail.class.php
View File

@@ -406,7 +406,7 @@ class FormMail extends Form
$out.= '<table class="border" width="100%" style="border-top: 1px solid #BBB;">'."\n";
$out.= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
// Substitution array
if (! empty($this->withsubstit)) // Unset or set ->withsubstit=0 to disable this.

29
htdocs/theme/eldy/style.css.php
View File

@@ -2213,10 +2213,18 @@ div.tabBar div.titre {
padding-top: 20px;
}
/* tabBar used for creation/update/send forms */
div.tabBarWithBottom {
padding-bottom: 18px;
border-bottom: 1px solid #aaa;
}
div.tabBarWithBottom tr {
background: unset !important;
}
div.tabBarWithBottom table.border>tbody>tr:last-of-type>td {
border-bottom: none !important;
}
div.tabBar table.tableforservicepart2:last-child {
border-bottom: 1px solid #aaa;
}
@@ -2454,17 +2462,17 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
}
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
table.border, table.bordernooddeven, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
}
table.borderplus {
border: 1px solid #BBB;
}
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
height: 22px;
}
tr.liste_titre.box_titre td table td {
tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
height: 22px;
}
@@ -2478,7 +2486,7 @@ div .tdtop {
padding-bottom: 0px;
}
table.border td, div.border div div.tagtd {
table.border td, table.bordernooddeven td, div.border div div.tagtd {
padding: 5px 2px 5px 2px;
border-collapse: collapse;
}
@@ -2510,6 +2518,14 @@ td.border, div.tagtable div div.border {
.noborderbottom, .noborderbottom tr:last-of-type td {
border-bottom: none !important;
}
.bordertop {
border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.borderbottom {
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
/*.ficheaddleft table.noborder {
margin: 0px 0px 0px 0px;
}*/
@@ -3529,7 +3545,10 @@ div.ui-tooltip {
/* Calendar */
/* ============================================================================== */
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active {
.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
.ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
{
border: unset;
}

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

@@ -2473,7 +2473,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
}
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
table.border, table.bordernooddeven, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
border: 1px solid #f4f4f4;
border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
@@ -2481,10 +2481,12 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
table.borderplus {
border: 1px solid #BBB;
}
.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
height: 22px;
}
tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
height: 22px;
}
table.border td, div.border div div.tagtd {
padding: 2px 2px 2px 2px;
@@ -2515,6 +2517,13 @@ td.border, div.tagtable div div.border {
.noborderbottom, .noborderbottom tr:last-of-type td {
border-bottom: none !important;
}
.bordertop {
border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.borderbottom {
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.ficheaddleft table.noborder {
margin: 0px 0px 0px 0px;
}
@@ -3509,6 +3518,13 @@ div.ui-tooltip {
/* Calendar */
/* ============================================================================== */
.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
.ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
{
border: unset;
}
img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {