diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 004ad3a619f543b7c6aba27b1f56db334f57080b..0479fe007acba845579860c01edfb954d8ed7973 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -980,7 +980,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
print '<td>';
$projectstatic->ref=$objp->ref;
print $projectstatic->getNomUrl(1);
- print ' - '.dol_trunc($objp->title,24).'</td>';
+ print ' - '.dol_trunc($objp->title,24);
+ print '</td>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
print '<td align="right">';
@@ -1004,14 +1005,17 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
$i++;
}
- print '<tr><td>'.$langs->trans("Total")."</td>";
+ print '<tr class="liste_total">';
+ print '<td>'.$langs->trans("Total")."</td>";
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print '<td align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
- print '<td align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmount"), 1).'</td>';
+ print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
+ print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmount"), 1).'</td>';
}
- if (empty($conf->global->PROJECT_HIDE_TASKS)) print '<td align="right">'.$total_task.'</td>';
-
+ if (empty($conf->global->PROJECT_HIDE_TASKS)) print '<td class="liste_total" align="right">'.$total_task.'</td>';
+ print '<td class="liste_total"></td>';
+ print '</tr>';
+
$db->free($resql);
}
else
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index a47f4488ea47142c59998a8322b8b129bdc1052f..c2a702e796aa975f190395c03204daeeb1c16da2 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -369,6 +369,7 @@ $db->close();
function activitytrim($product_type)
{
global $conf,$langs,$db;
+ global $bc;
// We display the last 3 years
$yearofbegindate=date('Y',dol_time_plus_duree(time(), -3, "y"));
@@ -415,6 +416,8 @@ function activitytrim($product_type)
}
$i = 0;
+ $var=true;
+
while ($i < $num)
{
$objp = $db->fetch_object($result);
@@ -422,7 +425,8 @@ function activitytrim($product_type)
{
if ($trim1+$trim2+$trim3+$trim4 > 0)
{
- print '<tr ><td align=left>'.$tmpyear.'</td>';
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
print '<td align=right>'.price($trim1).'</td>';
print '<td align=right>'.price($trim2).'</td>';
print '<td align=right>'.price($trim3).'</td>';
@@ -455,7 +459,8 @@ function activitytrim($product_type)
}
if ($trim1+$trim2+$trim3+$trim4 > 0)
{
- print '<tr ><td align=left>'.$tmpyear.'</td>';
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
print '<td align=right>'.price($trim1).'</td>';
print '<td align=right>'.price($trim2).'</td>';
print '<td align=right>'.price($trim3).'</td>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 48fb4262925a0afac70db8e5e953685626ec2343..e2f6933d352edd16a47c6e5c76e9bed735f8744c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1695,9 +1695,14 @@ span.tabspan {
div.divButAction { margin-bottom: 1.4em; }
+span.butAction, span.butActionDelete {
+ cursor: pointer;
+}
+
.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
text-decoration: none;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+ padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
font-family: <?php print $fontlist ?>;
/* for bootstrap look
color: #fff;
@@ -1727,9 +1732,16 @@ div.divButAction { margin-bottom: 1.4em; }
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block;
- padding: 4px 14px;
text-align: center;
cursor: pointer;
+ color: #fff;
+ background: rgb(<?php echo $colorbackhmenu1 ?>);
+ background-image: linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
+ background-image: -o-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
+ background-image: -moz-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
+ background-image: -webkit-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
+ background-image: -ms-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
+
color: #333333;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: #f5f5f5;
@@ -1738,6 +1750,7 @@ div.divButAction { margin-bottom: 1.4em; }
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
@@ -1789,13 +1802,13 @@ div.divButAction { margin-bottom: 1.4em; }
white-space: nowrap !important;
cursor: not-allowed !important;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+ padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
font-family: <?php print $fontlist ?> !important;
/* for bootstrap look
color: #333;
background-color: #e6e6e6;
border-color: #adadad;
display: inline-block;
- padding: 6px 12px;
margin-bottom: 0;
font-weight: normal !important;
line-height: 1.42857143;
@@ -1817,7 +1830,8 @@ div.divButAction { margin-bottom: 1.4em; }
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block;
- padding: 4px 14px;
+ margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+ padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
text-align: center;
cursor: pointer;
color: #999 !important;
@@ -1841,16 +1855,7 @@ div.divButAction { margin-bottom: 1.4em; }
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
-.butActionRefused {
- display: none;
-}
-<?php } ?>
-
-span.butAction, span.butActionDelete {
- cursor: pointer;
}
/* Prepare for bootstrap look
@@ -1923,6 +1928,12 @@ a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
}
End bootstrap */
+<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
+.butActionRefused {
+ display: none;
+}
+<?php } ?>
+
/* ============================================================================== */
@@ -2341,8 +2352,13 @@ table.dataTable td {
}
tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
padding: 5px 2px 5px 3px;
+}
+tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
border-bottom: 1px solid #ddd;
}
+tr.even:last-child td, tr.pair:last-child td, tr.odd:last-child td, tr.impair:last-child td {
+ border-bottom: 0px !important;
+}
tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td {
border-bottom: 0px !important;
}
@@ -2440,13 +2456,14 @@ input.liste_titre {
background: #F0F0F0;
}
.noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
- border-top: 1px solid #DDDDDD;
color: #332266;
font-weight: normal;
white-space: nowrap;
padding: 4px;
}
-
+form.liste_total div {
+ border-top: 1px solid #DDDDDD;
+}
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
background: #FFF;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f7a0cd542028cc65b2937f19bcc25917cac86dd2..f912038a1df7b6ff26a84ef93e75ee49e02ba9a6 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1684,7 +1684,14 @@ span.tabspan {
div.divButAction { margin-bottom: 1.4em; }
-.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+span.butAction, span.butActionDelete {
+ cursor: pointer;
+}
+
+
+/*
+.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active
+{
text-decoration: none;
white-space: nowrap;
padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
@@ -1700,7 +1707,7 @@ div.divButAction { margin-bottom: 1.4em; }
border-radius:0px 2px 0px 2px;
-moz-box-shadow: 2px 2px 3px #f4f4f4;
-webkit-box-shadow: 2px 2px 3px #f4f4f4;
- box-shadow: 2px 2px 3px #f4f4f4;
+ box-shadow: 2px 2px 3px #f4f4f4;
}
.butAction:hover {
@@ -1734,24 +1741,15 @@ div.divButAction { margin-bottom: 1.4em; }
-webkit-box-shadow: 3px 3px 4px #f4f4f4;
box-shadow: 3px 3px 4px #f4f4f4;
}
+*/
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
-.butActionRefused {
- display: none;
-}
-<?php } ?>
-
-span.butAction, span.butActionDelete {
- cursor: pointer;
-}
-
-/* Prepare for bootstrap look
+/* Prepare for bootstrap look */
.butAction, .butActionDelete, .butActionRefused {
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block;
- padding: 4px 14px;
- margin-bottom: 0;
+ padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+ margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
line-height: 20px;
text-align: center;
vertical-align: middle;
@@ -1780,7 +1778,7 @@ span.butAction, span.butActionDelete {
}
.butAction {
- color: #ffffff;
+ color: #ffffff !important;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc;
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
@@ -1796,7 +1794,7 @@ span.butAction, span.butActionDelete {
}
.butActionDelete {
- color: #ffffff;
+ color: #ffffff !important;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #cc6d00;
background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
@@ -1813,7 +1811,26 @@ span.butAction, span.butActionDelete {
a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
color: #FFFFFF;
}
-End bootstrap */
+
+.butActionRefused {
+ color: #AAAAAA !important;
+ cursor: not-allowed !important;
+}
+
+a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover {
+ text-decoration: none;
+}
+a.butAction:hover, a.butActionDelete:hover {
+ opacity: 0.9;
+}
+
+/* End bootstrap */
+
+<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
+.butActionRefused {
+ display: none;
+}
+<?php } ?>