'."\n";
$boxcontent.= '';
// set cookie by js
$boxcontent.='';
$this->info_box_contents[0][] = array(
- 'tr'=>'class="nohover"',
+ 'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
'td' => 'class="nohover"',
'textnoformat' => $boxcontent,
);
@@ -188,7 +188,7 @@ class box_task extends ModeleBoxes
$label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
- $boxcontent = getTaskProgressView($taskstatic, $label, true, false, true);
+ $boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
$this->info_box_contents[$i][] = array(
'td' => '',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7f1c2cbee50..72c1e589233 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4070,13 +4070,13 @@ class Form
* @param array $formquestion An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
* type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
* @param string $selectedchoice '' or 'no', or 'yes' or '1' or '0'
- * @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
- * @param int $height Force height of box
+ * @param int|string $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
+ * @param int $height Force height of box (0 = auto)
* @param int $width Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
* @param int $disableformtag 1=Disable form tag. Can be used if we are already inside a
'."\n";
}
// JQUI method dialog is broken with jmobile, we use standard HTML.
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 6fc00605d77..12ec3e7f5ad 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -47,7 +47,7 @@ class FormWebsite
/**
- * Return HTML select list of export models
+ * Return HTML select list of websites
*
* @param string $selected Id modele pre-selectionne
* @param string $htmlname Name of HTML select
@@ -99,7 +99,7 @@ class FormWebsite
/**
- * Return a HTML select list of a dictionary
+ * Return a HTML select list of type of containers from the dictionary
*
* @param string $htmlname Name of select zone
* @param string $selected Selected value
@@ -162,7 +162,7 @@ class FormWebsite
/**
- * Return a HTML select list of type of containers
+ * Return a HTML select list of samples of containers content
*
* @param string $htmlname Name of select zone
* @param string $selected Selected value
@@ -217,4 +217,72 @@ class FormWebsite
return $out;
}
+
+
+ /**
+ * Return a HTML select list of containers of a website.
+ * Note: $website->lines must have been loaded.
+ *
+ * @param Website $website Object Website
+ * @param string $htmlname Name of select zone
+ * @param int $pageid Preselected container ID
+ * @param int $showempty Show empty record
+ * @param string $action Action on page that use this select list
+ * @return string HTML select component with list of type of containers
+ */
+ public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '')
+ {
+ global $langs;
+
+ $atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+
+ $out='';
+ if ($atleastonepage && $action != 'editsource')
+ {
+ $out.='