';
- $moreforfilter.= $langs->trans('Status') . ': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1);
- $moreforfilter.= '
';
- $moreforfilter.='';
$moreforfilter.= $langs->trans('Origin') . ': '.$form->selectarray('search_nature', $arrayofnatures, $search_nature, 1);
$moreforfilter.= '
';
if (! empty($conf->global->MAIN_FEATURES_LEVEL))
@@ -337,6 +335,9 @@ if ($mode != 'marketplace')
$moreforfilter.= $langs->trans('Version') . ': '.$form->selectarray('search_version', $array_version, $search_version, 1);
$moreforfilter.= '';
}
+ $moreforfilter.='';
+ $moreforfilter.= $langs->trans('Status') . ': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1);
+ $moreforfilter.= '
';
$moreforfilter.=' ';
$moreforfilter.='';
$moreforfilter.='
';
@@ -370,7 +371,8 @@ if ($mode != 'marketplace')
$modName = $filename[$key];
$objMod = $modules[$key];
-
+ $dirofmodule = $dirmod[$key];
+
$special = $objMod->special;
//print $objMod->name." - ".$key." - ".$objMod->special.' - '.$objMod->version."
";
@@ -497,11 +499,13 @@ if ($mode != 'marketplace')
if ($objMod->getDescLong()) $text.=$objMod->getDesc().'
'.$objMod->getDescLong().'
';
else $text.=$objMod->getDesc().'
';
+ $textexternal='';
if ($objMod->isCoreOrExternalModule() == 'external')
{
- $text.='
'.$langs->trans("Origin").': '.$langs->trans("ExternalModule",$dirofmodule);
- if (! empty($objMod->editor_name) && $objMod->editor_name != 'dolibarr') $text.='
'.$langs->trans("Author").': '.$objMod->editor_name;
- if (! empty($objMod->editor_url) && $objMod->editor_url != 'www.dolibarr.org') $text.='
'.$langs->trans("Url").': '.$objMod->editor_url;
+ $textexternal.='
'.$langs->trans("Origin").': '.$langs->trans("ExternalModule",$dirofmodule);
+ if ($objMod->editor_name != 'dolibarr') $textexternal.='
'.$langs->trans("Publisher").': '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
+ if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='
'.$langs->trans("Url").': '.$objMod->editor_url;
+ $text.=$textexternal;
$text.='
';
}
else
@@ -636,13 +640,22 @@ if ($mode != 'marketplace')
$text.='
'.$langs->trans("AddOtherPagesOrServices").': ';
$text.=$langs->trans("DetectionNotPossible");
- print $form->textwithpicto('', $text, 1, 'help');
+ print $form->textwithpicto('', $text, 1, 'help', 'minheight20');
+
+ // Picto warning
+ $version=$objMod->getVersion();
+ if (preg_match('/development/i', $version)) print img_warning($langs->trans("Development"), 'style="float: right"');
+ if (preg_match('/experimental/i', $version)) print img_warning($langs->trans("Experimental"), 'style="float: right"');
+ if (preg_match('/deprecated/i', $version)) print img_warning($langs->trans("Deprecated"), 'style="float: right"');
+
+ // Picto external
+ if ($textexternal) print img_picto($langs->trans("ExternalModule",$dirofmodule), 'external', 'style="float: right"');
+
+
print '';
// Version
print '
';
- $version=$objMod->getVersion();
- $dirofmodule=$dirmod[$key];
print $version;
print " | \n";
@@ -688,11 +701,11 @@ if ($mode != 'marketplace')
{
if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
{
- print '
'.img_picto($langs->trans("Setup"),"setup").'';
+ print '
'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
}
else
{
- print '
'.img_picto($langs->trans("Setup"),"setup").'';
+ print '
'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
}
}
}
@@ -700,16 +713,16 @@ if ($mode != 'marketplace')
}
else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
{
- print '
'.img_picto($langs->trans("Setup"),"setup").' | ';
+ print '
'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
}
else
{
- print '
'.img_picto($langs->trans("Setup"),"setup").' | ';
+ print '
'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
}
}
else
{
- print '
'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp"').' | ';
+ print '
'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').' | ';
}
}
@@ -732,7 +745,7 @@ if ($mode != 'marketplace')
print "\n";
}
print "\n";
- print '
'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp"').' | ';
+ print '
'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').' | ';
}
print "\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8671638ce0c..63d7f749be7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2416,16 +2416,16 @@ function img_info($titlealt = 'default')
* Show warning logo
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- * @param int $float If we must add style "float: right"
+ * @param string $options Add more attribute on img tag (For example 'style="float: right"'). If 1
* @return string Return img tag
*/
-function img_warning($titlealt = 'default', $float = 0)
+function img_warning($titlealt = 'default', $options = '')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
- return img_picto($titlealt, 'warning.png', 'class="pictowarning"'.($float ? ' style="float: right"' : ''));
+ return img_picto($titlealt, 'warning.png', 'class="pictowarning"'.($options ? ($options == '1' ? ' style="float: right"' : ' '.$options): ''));
}
/**
diff --git a/htdocs/theme/eldy/img/credit_card.png b/htdocs/theme/eldy/img/credit_card.png
new file mode 100644
index 00000000000..33b1cb32c9d
Binary files /dev/null and b/htdocs/theme/eldy/img/credit_card.png differ
diff --git a/htdocs/theme/eldy/img/external.png b/htdocs/theme/eldy/img/external.png
new file mode 100644
index 00000000000..507d8c24858
Binary files /dev/null and b/htdocs/theme/eldy/img/external.png differ
diff --git a/htdocs/theme/eldy/img/object_energie.png b/htdocs/theme/eldy/img/object_energie.png
deleted file mode 100644
index bc3966d2fa2..00000000000
Binary files a/htdocs/theme/eldy/img/object_energie.png and /dev/null differ
diff --git a/htdocs/theme/md/img/object_energie.png b/htdocs/theme/eldy/img/object_energy.png
similarity index 100%
rename from htdocs/theme/md/img/object_energie.png
rename to htdocs/theme/eldy/img/object_energy.png
diff --git a/htdocs/theme/eldy/img/setup.png b/htdocs/theme/eldy/img/setup.png
index f997e53799b..b045658a6eb 100644
Binary files a/htdocs/theme/eldy/img/setup.png and b/htdocs/theme/eldy/img/setup.png differ
diff --git a/htdocs/theme/eldy/img/upload.png b/htdocs/theme/eldy/img/upload.png
new file mode 100644
index 00000000000..862fb593232
Binary files /dev/null and b/htdocs/theme/eldy/img/upload.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5dd81e0d0e1..050c685aed8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -576,6 +576,7 @@ div.myavailability {
.maxwidth300 { max-width: 300px; }
.maxwidth400 { max-width: 400px; }
.maxwidth500 { max-width: 500px; }
+.minheight20 { min-height: 20px; }
.titlefield { width: 25%; }
.titlefieldcreate { width: 20%; }
diff --git a/htdocs/theme/md/img/credit_card.png b/htdocs/theme/md/img/credit_card.png
new file mode 100644
index 00000000000..33b1cb32c9d
Binary files /dev/null and b/htdocs/theme/md/img/credit_card.png differ
diff --git a/htdocs/theme/md/img/external.png b/htdocs/theme/md/img/external.png
new file mode 100644
index 00000000000..e767123a351
Binary files /dev/null and b/htdocs/theme/md/img/external.png differ
diff --git a/htdocs/theme/md/img/object_energy.png b/htdocs/theme/md/img/object_energy.png
new file mode 100644
index 00000000000..668d1bc68a1
Binary files /dev/null and b/htdocs/theme/md/img/object_energy.png differ
diff --git a/htdocs/theme/md/img/upload.png b/htdocs/theme/md/img/upload.png
new file mode 100644
index 00000000000..862fb593232
Binary files /dev/null and b/htdocs/theme/md/img/upload.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9f6f2f3cf91..c497e8f876c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -566,6 +566,7 @@ div.myavailability {
.maxwidth300 { max-width: 300px; }
.maxwidth400 { max-width: 400px; }
.maxwidth500 { max-width: 500px; }
+.minheight20 { min-height: 20px; }
.titlefield { width: 30%; }
.titlefieldcreate { width: 20%; }