';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 92229a72d23..479e46258be 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -93,11 +93,17 @@ function project_prepare_head($object)
// Then tab for sub level of projet, i mean tasks
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
$head[$h][1] = $langs->trans("Tasks");
+
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+ $taskstatic=new Task($db);
+ $nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+ if ($nbTasks > 0) $head[$h][1].= '
'.($nbTasks).'';
$head[$h][2] = 'tasks';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id;
$head[$h][1] = $langs->trans("Gantt");
+ if ($nbTasks > 0) $head[$h][1].= '
'.($nbTasks).'';
$head[$h][2] = 'gantt';
$h++;
}
@@ -116,7 +122,7 @@ function project_prepare_head($object)
*/
function task_prepare_head($object)
{
- global $langs, $conf, $user;
+ global $db, $langs, $conf, $user;
$h = 0;
$head = array();
@@ -156,8 +162,10 @@ function task_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $listoffiles=dol_dir_list($filesdir,'files',1,'','thumbs');
- $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));
+ $nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview\.png)$'));
+ $nbLinks=Link::count($db, $object->element, $object->id);
+ $head[$h][1] = $langs->trans('Documents');
+ if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '
'.($nbFiles+$nbLinks).'';
$head[$h][2] = 'task_document';
$h++;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 976e0013431..29c3cd85bad 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -299,25 +299,28 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
/*
* Actions
*/
- print '
';
}
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 17187fba7fc..1601302c046 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -438,6 +438,9 @@ th .button {
.quatrevingtpercent, .inputsearch {
width: 80%;
}
+.soixantepercent {
+ width: 60%;
+}
textarea.centpercent {
width: 96%;
}
@@ -2292,6 +2295,16 @@ div.pagination li.pagination span {
}
div.pagination li.pagination span.inactive {
cursor: default;
+ color: #ccc;
+}
+div.pagination li a.inactive:hover,
+div.pagination li span.inactive:hover {
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
}
/*div.pagination li.litext {
padding-top: 8px;
@@ -3822,7 +3835,7 @@ dl.dropdown {
position:absolute;
top:2px;
list-style:none;
- max-height: 200px;
+ max-height: 300px;
overflow: auto;
}
.dropdown span.value {
diff --git a/htdocs/theme/md/img/object_category.png b/htdocs/theme/md/img/object_category.png
index b0292d92aae..389277f4004 100644
Binary files a/htdocs/theme/md/img/object_category.png and b/htdocs/theme/md/img/object_category.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 15f763ef901..55f4e72cb85 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -425,6 +425,9 @@ th .button {
.quatrevingtpercent, .inputsearch {
width: 80%;
}
+.soixantepercent {
+ width: 60%;
+}
textarea.centpercent {
width: 96%;
}
@@ -2134,7 +2137,9 @@ div.pagination li.pagination span {
}
div.pagination li.pagination span.inactive {
cursor: default;
+ color: #ccc;
}
+
div.pagination li.litext a {
border: none;
padding-right: 10px;
@@ -3611,7 +3616,7 @@ span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;
}
span.noborderoncategories {
- padding: 5px 5px 0px 5px;
+ padding: 3px 5px 0px 5px;
}
.categtextwhite, .treeview .categtextwhite.hover {
color: #fff !important;
@@ -3662,7 +3667,7 @@ dl.dropdown {
position:absolute;
top:2px;
list-style:none;
- max-height: 200px;
+ max-height: 300px;
overflow: auto;
}
.dropdown span.value {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 602d70d540d..dc1cb5ebf34 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -162,7 +162,7 @@ class User extends CommonObject
*/
function fetch($id='', $login='',$sid='',$loadpersonalconf=1, $entity=-1)
{
- global $langs, $conf, $user;
+ global $conf, $user;
// Clean parameters
$login=trim($login);
@@ -256,7 +256,7 @@ class User extends CommonObject
$this->country_id = $obj->country_id;
$this->country_code = $obj->country_id?$obj->country_code:'';
- $this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+ //$this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
$this->state_id = $obj->state_id;
$this->state_code = $obj->state_code;