diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 0569e90d903c537db4480b5e1277a610472e91fd..5eeb13ca937272ab143168a4efbd46d304f2afab 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -874,11 +874,11 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
* @param DoliDB $db Database handler
* @param Form $form Object form
* @param int $socid Id thirdparty
- * @param int $projectsListId Id of project i have permission on
- * @param int $mytasks Limited to task i am contact to
+ * @param int $projectsListId Id of project I have permission on
+ * @param int $mytasks Limited to task I am contact to
* @param int $statut -1=No filter on statut, 0 or 1 = Filter on status
* @param array $listofoppstatus List of opportunity status
- * @param array $hiddenfields List of fields to not show
+ * @param array $hiddenfields List of info to not show ('projectlabel', 'declaredprogress', '...', )
* @return void
*/
function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
@@ -993,7 +993,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PlannedWorkload"),"","","","",'align="right"',$sortfield,$sortorder);
+ if (! in_array('plannedworkload', $hiddenfields)) print_liste_field_titre($langs->trans("PlannedWorkload"),"","","","",'align="right"',$sortfield,$sortorder);
if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre($langs->trans("ProgressDeclared"),"","","","",'align="right"',$sortfield,$sortorder);
}
print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
@@ -1016,7 +1016,7 @@ 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);
+ if (! in_array('projectlabel', $hiddenfields)) print ' - '.dol_trunc($objp->title,24);
print '</td>';
print '<td>';
if ($objp->fk_soc > 0)
@@ -1044,8 +1044,10 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
$plannedworkload=$objp->planned_workload;
$total_plannedworkload+=$plannedworkload;
- print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
-
+ if (! in_array('plannedworkload', $hiddenfields))
+ {
+ print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+ }
if (! in_array('declaredprogress', $hiddenfields))
{
$declaredprogressworkload=$objp->declared_progess_workload;
@@ -1078,7 +1080,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
print '<td class="liste_total" align="right">'.$total_task.'</td>';
- print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+ if (! in_array('plannedworkload', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
}
print '<td class="liste_total"></td>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d173282fdb9e3071de5259d507e68744a68cc669..d27df85f4ac9cbfc73839c1de8d2935770e7aa61 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1749,9 +1749,9 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
$bugbaseurl.= urlencode("\n");
$bugbaseurl.= urlencode("# Report\n");
- print '<p id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
+ print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
print '<a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
- print '</p>';
+ print '</div>';
}
print "</div>\n";
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index b91b8763611959e0f3943540b752dff5e7bb1a38..8b3d2b76c25b100d5e4f5479601ab55008edd12f 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -132,7 +132,7 @@ include DOL_DOCUMENT_ROOT.'/projet/graph_opportunities.inc.php';
// List of draft projects
-print_projecttasks_array($db,$form,$socid,$projectsListId,0,0,$listofoppstatus,array('declaredprogress'));
+print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppstatus, array('projectlabel', 'plannedworkload', 'declaredprogress'));
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 360cd3631e85be0b9b1923e8e0c6a5ba5a9d66d0..f0f031114e5b7ad224a7e2d262884641f1d8127d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -190,6 +190,10 @@ $colortexttitle=join(',',colorStringToArray($colortexttitle));
$colortext=join(',',colorStringToArray($colortext));
$colortextlink=join(',',colorStringToArray($colortextlink));
+if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
+
+$nbtopmenuentries=$menumanager->showmenu('topnb');
+
print '/*'."\n";
print 'colorbackbody='.$colorbackbody."\n";
print 'colorbackvmenu1='.$colorbackvmenu1."\n";
@@ -211,14 +215,9 @@ print 'dol_use_jmobile='.$dol_use_jmobile."\n";
print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n";
print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n";
print 'fontsize='.$fontsize."\n";
+print 'nbtopmenuentries='.$nbtopmenuentries."\n";
print '*/'."\n";
-if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
-
-
-$nbtopmenuentries=$menumanager->showmenu('topnb');
-//print $nb;
-
?>
/* ============================================================================== */
@@ -2455,7 +2454,7 @@ input.liste_titre {
}
.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
- background: #F0F0F0;
+ /* background: #F0F0F0; */
}
.noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
color: #552266;
diff --git a/htdocs/theme/md/graph-color.php b/htdocs/theme/md/graph-color.php
index 0c091a1ede307f45c38014d7e64e135761d3f223..4346d00715807cd04805421f56ff9227caa97742 100644
--- a/htdocs/theme/md/graph-color.php
+++ b/htdocs/theme/md/graph-color.php
@@ -28,7 +28,7 @@
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170), array(190,170,190), array(170,190,190), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(140,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6dae9fd3e9c7d38ba004b68a9b76a4189efef6b1..cac83da19b9c835aa9d4b312f4c1d72d3009fed7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -185,6 +185,10 @@ $colortexttitle=join(',',colorStringToArray($colortexttitle));
$colortext=join(',',colorStringToArray($colortext));
$colortextlink=join(',',colorStringToArray($colortextlink));
+if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
+
+$nbtopmenuentries=$menumanager->showmenu('topnb');
+
print '/*'."\n";
print 'colorbackbody='.$colorbackbody."\n";
print 'colorbackvmenu1='.$colorbackvmenu1."\n";
@@ -205,12 +209,9 @@ print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
print 'dol_use_jmobile='.$dol_use_jmobile."\n";
print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n";
print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n";
+print 'nbtopmenuentries='.$nbtopmenuentries."\n";
print '*/'."\n";
-if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
-
-$nbtopmenuentries=$menumanager->showmenu('topnb');
-
?>
/* ============================================================================== */
@@ -1933,11 +1934,11 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-style: solid;
margin: 0px 0px 2px 0px;
-
+ /*
-moz-box-shadow: 2px 2px 4px #CCC;
-webkit-box-shadow: 2px 2px 4px #CCC;
box-shadow: 2px 2px 4px #CCC;
-
+ */
-moz-border-radius: 0.1em;
-webkit-border-radius: 0.1em;
border-radius: 0.1em;
@@ -1953,14 +1954,14 @@ table.noborder tr, div.noborder form {
border-left-width: 1px;
border-left-color: #BBBBBB;
border-left-style: solid;
- height: 26px;
+ min-height: 26px;
}
table.liste th, table.noborder th {
padding: 5px 2px 5px 3px; /* t r b l */
}
table.noborder th, table.noborder td, div.noborder form, div.noborder form div {
- padding: 1px 2px 1px 3px; /* t r b l */
+ padding: 4px 2px 4px 3px; /* t r b l */
}
table.nobordernopadding {
@@ -2211,7 +2212,7 @@ 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;
- border-bottom: 1px solid #f4f4f4;
+ border-bottom: 1px solid #eee;
}
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;
@@ -2309,14 +2310,15 @@ input.liste_titre {
}
.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
- background: #F0F0F0;
+ /* background: #F0F0F0; */
}
.noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
- border-top: 1px solid #f4f4f4;
+ /* border-top: 1px solid #f4f4f4; */
color: #332266;
font-weight: normal;
white-space: nowrap;
padding: 4px;
+ height: 20px;
}
@@ -3734,7 +3736,23 @@ border-top-right-radius: 6px;
-/* CSS style used for small screen */
+::-webkit-scrollbar {
+ width: 10px;
+}
+::-webkit-scrollbar-button {
+ background: #aaa
+}
+::-webkit-scrollbar-track-piece {
+ background: #fff
+}
+::-webkit-scrollbar-thumb {
+ background: #ddd
+}
+
+
+
+
+/***** CSS style used for small screen *****/
.imgopensurveywizard
{
@@ -3750,7 +3768,7 @@ border-top-right-radius: 6px;
}
}
-@media only screen and (max-width: <?php echo ($nbtopmenuentries * 85) + 200; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 200; ?>px)
{
.mainmenuaspan {
display: none;