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

Look and feel v8

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-01 11:51:25 +01:00
parent 158ef79e70
commit 2368cb615f
9 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -599,8 +599,10 @@ if ($resql)
if (! empty($arrayfields['f.date_when']['checked'])) if (! empty($arrayfields['f.date_when']['checked']))
{ {
print '<td align="center">'; print '<td align="center">';
print '<div class="nowraponall">';
print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>'); print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late")); if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
print '</div>';
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -636,7 +638,7 @@ if ($resql)
} }
else else
{ {
print $langs->trans("DateIsNotEnough"); print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
} }
} }
else else

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

@ -744,7 +744,7 @@ class FormFile
if ($delallowed || $printer || $morepicto) if ($delallowed || $printer || $morepicto)
{ {
$out.= '<td align="right">'; $out.= '<td class="right nowraponall">';
if ($delallowed) if ($delallowed)
{ {
$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath); $out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);

2
htdocs/core/modules/modPaypal.class.php
View File

@ -114,7 +114,7 @@ class modPaypal extends DolibarrModules
'url'=>'/paypal/importpayments.php', 'url'=>'/paypal/importpayments.php',
'langs'=>'paypal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'langs'=>'paypal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>501, 'position'=>501,
'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. 'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'perms'=>'$user->rights->banque->consolidate', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'perms'=>'$user->rights->banque->consolidate', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
'target'=>'', 'target'=>'',
'user'=>2 'user'=>2

2
htdocs/core/modules/modStripe.class.php
View File

@ -100,7 +100,7 @@ class modStripe extends DolibarrModules
'url'=>'/stripe/importpayments.php', 'url'=>'/stripe/importpayments.php',
'langs'=>'stripe', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'langs'=>'stripe', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>500, 'position'=>500,
'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. 'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'perms'=>'$user->rights->banque->consolidate', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'perms'=>'$user->rights->banque->consolidate', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
'target'=>'', 'target'=>'',
'user'=>2 'user'=>2

4
htdocs/core/tpl/notes.tpl.php
View File

@ -78,7 +78,7 @@ print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
print '<div class="tagtable border table-border centpercent">'."\n"; print '<div class="tagtable border table-border centpercent">'."\n";
if ($module != 'product') { if ($module != 'product') {
// No public note yet on products // No public note yet on products
print '<div class="tagtr table-border-row">'."\n"; print '<div class="tagtr pair table-border-row">'."\n";
print '<div class="tagtd tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n"; print '<div class="tagtd tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0); print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
print '</div>'."\n"; print '</div>'."\n";
@ -88,7 +88,7 @@ if ($module != 'product') {
print '</div>'."\n"; print '</div>'."\n";
} }
if (empty($user->societe_id)) { if (empty($user->societe_id)) {
print '<div class="tagtr table-border-row">'."\n"; print '<div class="tagtr '.($module != 'product'?'impair':'pair').' table-border-row">'."\n";
print '<div class="tagtd tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n"; print '<div class="tagtd tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0); print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
print '</div>'."\n"; print '</div>'."\n";

3
htdocs/langs/en_US/paypal.lang
View File

@ -29,4 +29,5 @@ ShortErrorMessage=Short Error Message
ErrorCode=Error Code ErrorCode=Error Code
ErrorSeverityCode=Error Severity Code ErrorSeverityCode=Error Severity Code
OnlinePaymentSystem=Online payment system OnlinePaymentSystem=Online payment system
PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode) PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
PaypalImportPayment=Import Paypal payments

3
htdocs/langs/en_US/stripe.lang
View File

@ -37,4 +37,5 @@ STRIPE_TEST_SECRET_KEY=Secret test key
STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
STRIPE_LIVE_SECRET_KEY=Secret live key STRIPE_LIVE_SECRET_KEY=Secret live key
STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode) StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
StripeImportPayment=Import Stripe payments

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

@ -2256,8 +2256,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
background: rgb(<?php echo $colorbacktabcard1; ?>) !important; background: rgb(<?php echo $colorbacktabcard1; ?>) !important;
margin: 0 0.2em 0 0.2em !important; margin: 0 0.2em 0 0.2em !important;
border-right: 1px solid #AAA !important; border-right: 1px solid #CCC !important;
border-left: 1px solid #AAA !important; border-left: 1px solid #CCC !important;
/* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */ /* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */
border-top: <?php echo 2; ?>px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; border-top: <?php echo 2; ?>px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
} }
@ -2476,7 +2476,7 @@ td.border, div.tagtable div div.border {
/* Main boxes */ /* Main boxes */
.noborderbottom { .noborderbottom, .noborderbottom tr:last-of-type td {
border-bottom: none !important; border-bottom: none !important;
} }
/*.ficheaddleft table.noborder { /*.ficheaddleft table.noborder {
@ -2491,6 +2491,9 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-top-width: <?php echo $borderwidth ?>px; border-top-width: <?php echo $borderwidth ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>); border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid; border-top-style: solid;
/* border-top-width: 2px;
border-top-color: rgb(<?php echo $colorbackhmenu1 ?>);
border-top-style: solid; */
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>); border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
@ -2499,7 +2502,12 @@ table.liste, table.noborder, table.formdoc, div.noborder {
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;
} }
div.tabBar div.ficheaddleft table.noborder:last-of-type { div.tabBar div.ficheaddleft table.noborder:last-of-type {
border-bottom: 1px solid #aaa; border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
div.tabBar table.border>tbody>tr:last-of-type>td {
border-bottom-width: 1px;
border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-bottom-style: solid;
} }
div.tabBar div.ficheaddleft table.noborder { div.tabBar div.ficheaddleft table.noborder {
border-bottom: none; border-bottom: none;
@ -2529,7 +2537,7 @@ tr#trlinefordates td {
} }
.liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
{ {
border-top-width: 2px; border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>); border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid; border-top-style: solid;
} }
@ -2543,6 +2551,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td { table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
padding: 7px 8px 7px 8px; /* t r b l */ padding: 7px 8px 7px 8px; /* t r b l */
line-height: 1.2em; line-height: 1.2em;
height: 22px;
} }
div.liste_titre_bydiv .divsearchfield { div.liste_titre_bydiv .divsearchfield {
padding: 2px 1px 2px 7px; /* t r b l */ padding: 2px 1px 2px 7px; /* t r b l */
@ -2939,6 +2948,9 @@ table.tableforservicepart1 tr td {
{ {
padding-left: 2px; padding-left: 2px;
} }
.paymenttable, .margintable tr td {
height: 22px;
}
/* Disable shadows */ /* Disable shadows */
.noshadow { .noshadow {
@ -3106,6 +3118,12 @@ span.dashboardlineko {
.boxtable { .boxtable {
margin-bottom: 8px !important; margin-bottom: 8px !important;
border-bottom-width: 1px; border-bottom-width: 1px;
border-top: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
/* border-top: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
}
table.noborder.boxtable tr td {
height: unset;
} }
.boxtablenobottom { .boxtablenobottom {
border-bottom-width: 0 !important; border-bottom-width: 0 !important;

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

@ -2996,6 +2996,9 @@ tr.liste_sub_total, tr.liste_sub_total td {
{ {
padding-left: 2px; padding-left: 2px;
} }
.paymenttable, .margintable tr td {
height: 22px;
}
/* Disable shadows */ /* Disable shadows */
.noshadow { .noshadow {