Look and feel v14
This commit is contained in:
parent
83d30be106
commit
2f6a91f506
@ -236,6 +236,9 @@ class box_funnel_of_prospection extends ModeleBoxes
|
|||||||
$dolgraph->SetDataColor(array_values($colorseriesstat));
|
$dolgraph->SetDataColor(array_values($colorseriesstat));
|
||||||
$dolgraph->setBorderColor(array_values($bordercolorseries));
|
$dolgraph->setBorderColor(array_values($bordercolorseries));
|
||||||
$dolgraph->setShowLegend(2);
|
$dolgraph->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$dolgraph->setShowPercent(1);
|
$dolgraph->setShowPercent(1);
|
||||||
$dolgraph->setMirrorGraphValues(true);
|
$dolgraph->setMirrorGraphValues(true);
|
||||||
$dolgraph->setBorderWidth(2);
|
$dolgraph->setBorderWidth(2);
|
||||||
|
|||||||
@ -165,6 +165,9 @@ class box_graph_nb_tickets_type extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
$px1->SetData($data);
|
$px1->SetData($data);
|
||||||
$px1->setShowLegend(2);
|
$px1->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$px1->SetType(array('pie'));
|
$px1->SetType(array('pie'));
|
||||||
$px1->SetLegend($legend);
|
$px1->SetLegend($legend);
|
||||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||||
|
|||||||
@ -137,6 +137,9 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
|
|||||||
$px1->SetDataColor(array_values($colorseries));
|
$px1->SetDataColor(array_values($colorseries));
|
||||||
$px1->SetData($data);
|
$px1->SetData($data);
|
||||||
$px1->setShowLegend(2);
|
$px1->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$px1->SetType(array('pie'));
|
$px1->SetType(array('pie'));
|
||||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||||
$px1->SetShading(3);
|
$px1->SetShading(3);
|
||||||
|
|||||||
@ -192,6 +192,9 @@ class box_graph_product_distribution extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
$px2->SetLegend($legend);
|
$px2->SetLegend($legend);
|
||||||
$px2->setShowLegend(2);
|
$px2->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$px2->setShowPointValue($showpointvalue);
|
$px2->setShowPointValue($showpointvalue);
|
||||||
$px2->setShowPercent(0);
|
$px2->setShowPercent(0);
|
||||||
$px2->SetMaxValue($px2->GetCeilMaxValue());
|
$px2->SetMaxValue($px2->GetCeilMaxValue());
|
||||||
@ -252,6 +255,9 @@ class box_graph_product_distribution extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
$px3->SetLegend($legend);
|
$px3->SetLegend($legend);
|
||||||
$px3->setShowLegend(2);
|
$px3->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$px3->setShowPointValue($showpointvalue);
|
$px3->setShowPointValue($showpointvalue);
|
||||||
$px3->setShowPercent(0);
|
$px3->setShowPercent(0);
|
||||||
$px3->SetMaxValue($px3->GetCeilMaxValue());
|
$px3->SetMaxValue($px3->GetCeilMaxValue());
|
||||||
@ -313,6 +319,9 @@ class box_graph_product_distribution extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
$px1->SetLegend($legend);
|
$px1->SetLegend($legend);
|
||||||
$px1->setShowLegend(2);
|
$px1->setShowLegend(2);
|
||||||
|
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$px1->SetWidth(320);
|
||||||
|
}
|
||||||
$px1->setShowPointValue($showpointvalue);
|
$px1->setShowPointValue($showpointvalue);
|
||||||
$px1->setShowPercent(0);
|
$px1->setShowPercent(0);
|
||||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||||
|
|||||||
@ -176,7 +176,6 @@ class box_graph_ticket_by_severity extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
|
|
||||||
$px1->SetData($data);
|
$px1->SetData($data);
|
||||||
//$px1->setShowLegend(2);
|
|
||||||
$px1->setShowLegend(0);
|
$px1->setShowLegend(0);
|
||||||
$px1->SetType(array('bars'));
|
$px1->SetType(array('bars'));
|
||||||
$px1->SetLegend($legend);
|
$px1->SetLegend($legend);
|
||||||
|
|||||||
@ -145,7 +145,7 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Subject
|
// Subject
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'class="nowrap"',
|
'td' => 'class="nowrap tdoverflowmax150"',
|
||||||
'text' => $objp->subject, // Some event have no ref
|
'text' => $objp->subject, // Some event have no ref
|
||||||
'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
|
'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
|
||||||
);
|
);
|
||||||
@ -153,7 +153,7 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Customer
|
// Customer
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
|
'td' => 'class="tdoverflowmax150"',
|
||||||
'text' => $link,
|
'text' => $link,
|
||||||
'asis' => 1,
|
'asis' => 1,
|
||||||
);
|
);
|
||||||
|
|||||||
@ -462,7 +462,7 @@ if ($step == 2 && $datatoimport) {
|
|||||||
print '<div class="underbanner clearboth"></div>';
|
print '<div class="underbanner clearboth"></div>';
|
||||||
print '<div class="fichecenter">';
|
print '<div class="fichecenter">';
|
||||||
|
|
||||||
print '<table width="100%" class="border tableforfield">';
|
print '<table class="border tableforfield centpercent">';
|
||||||
|
|
||||||
// Module
|
// Module
|
||||||
print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
|
print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
|
||||||
@ -475,7 +475,7 @@ if ($step == 2 && $datatoimport) {
|
|||||||
print $titleofmodule;
|
print $titleofmodule;
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Lot de donnees a importer
|
// Dataset to import
|
||||||
print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
|
print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
|
$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
|
||||||
@ -519,7 +519,9 @@ if ($step == 2 && $datatoimport) {
|
|||||||
$text = $objmodelimport->getDriverDescForKey($key);
|
$text = $objmodelimport->getDriverDescForKey($key);
|
||||||
print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
|
print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
|
||||||
print '<td style="text-align:center">';
|
print '<td style="text-align:center">';
|
||||||
print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
|
print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample");
|
||||||
|
print '</a>';
|
||||||
|
print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
// Action button
|
// Action button
|
||||||
print '<td style="text-align:right">';
|
print '<td style="text-align:right">';
|
||||||
|
|||||||
@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
|
|||||||
FileWithDataToImport=File with data to import
|
FileWithDataToImport=File with data to import
|
||||||
FileToImport=Source file to import
|
FileToImport=Source file to import
|
||||||
FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
|
FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
|
||||||
DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
|
DownloadEmptyExample=Download template file with field content information
|
||||||
|
StarAreMandatory=* are mandatory fields
|
||||||
ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
|
ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
|
||||||
ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
|
ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
|
||||||
SourceFileFormat=Source file format
|
SourceFileFormat=Source file format
|
||||||
|
|||||||
@ -112,8 +112,14 @@ if (empty($endyear)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$startyear = $endyear - 1;
|
$startyear = $endyear - 1;
|
||||||
|
|
||||||
|
// Change default WIDHT and HEIGHT (we need a smaller than default for both desktop and smartphone)
|
||||||
$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
|
$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
|
||||||
$HEIGHT = '200';
|
if (empty($conf->dol_optimize_smallscreen)) {
|
||||||
|
$HEIGHT = '200';
|
||||||
|
} else {
|
||||||
|
$HEIGHT = '160';
|
||||||
|
}
|
||||||
|
|
||||||
print '<div class="clearboth"></div>';
|
print '<div class="clearboth"></div>';
|
||||||
print '<div class="fichecenter fichecenterbis">';
|
print '<div class="fichecenter fichecenterbis">';
|
||||||
@ -298,7 +304,7 @@ print '</div>'."\n";
|
|||||||
print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
|
print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Latest tickets
|
* Latest unread tickets
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$max = 10;
|
$max = 10;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user