';
print '';
foreach ($fieldlist as $field => $value)
{
- // Determine le nom du champ par rapport aux noms possibles
- // dans les dictionnaires de donnees
- $valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
- $valuetoshow=$langs->trans($valuetoshow); // try to translate
- $align="left";
- if ($fieldlist[$field]=='fk_user') { $valuetoshow=$langs->trans("Owner");}
- if ($fieldlist[$field]=='lang') { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? ' ' : $langs->trans("Language")); }
- if ($fieldlist[$field]=='type') { $valuetoshow=$langs->trans("Type"); }
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); }
- if ($fieldlist[$field]=='private') { $align='center'; }
- if ($fieldlist[$field]=='position') { $align='center'; }
+ // Determine le nom du champ par rapport aux noms possibles
+ // dans les dictionnaires de donnees
+ $valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
+ $valuetoshow=$langs->trans($valuetoshow); // try to translate
+ $align="left";
+ if ($fieldlist[$field]=='fk_user') { $valuetoshow=$langs->trans("Owner");}
+ if ($fieldlist[$field]=='lang') { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? ' ' : $langs->trans("Language")); }
+ if ($fieldlist[$field]=='type') { $valuetoshow=$langs->trans("Type"); }
+ if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Code"); }
+ if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+ if ($fieldlist[$field]=='private') { $align='center'; }
+ if ($fieldlist[$field]=='position') { $align='center'; }
- if ($fieldlist[$field]=='topic') { $valuetoshow=''; }
- if ($fieldlist[$field]=='joinfiles') { $valuetoshow=''; }
- if ($fieldlist[$field]=='content') { $valuetoshow=''; }
- if ($fieldlist[$field]=='content_lines') { $valuetoshow=''; }
+ if ($fieldlist[$field]=='topic') { $valuetoshow=''; }
+ if ($fieldlist[$field]=='joinfiles') { $valuetoshow=''; }
+ if ($fieldlist[$field]=='content') { $valuetoshow=''; }
+ if ($fieldlist[$field]=='content_lines') { $valuetoshow=''; }
- if ($valuetoshow != '')
- {
- print '';
- if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print ''.$valuetoshow.' '.img_help(1,$valuetoshow).' ';
- else if (! empty($tabhelp[$id][$value]))
- {
- if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
- else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
- }
- else print $valuetoshow;
- print ' ';
- }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+ if ($valuetoshow != '')
+ {
+ print '';
+ if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print ''.$valuetoshow.' '.img_help(1,$valuetoshow).' ';
+ else if (! empty($tabhelp[$id][$value]))
+ {
+ if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
+ else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
+ }
+ else print $valuetoshow;
+ print ' ';
+ }
}
print '';
print ' ';
print ' ';
print " ";
+// Show fields for topic, join files and body
$fieldsforcontent = array('topic', 'joinfiles', 'content');
if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('content','content_lines'); }
foreach ($fieldsforcontent as $tmpfieldlist)
@@ -630,11 +629,11 @@ if ($resql)
$filterfound=0;
foreach ($fieldlist as $field => $value)
{
- if ($value == 'label') print '';
- print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
+ print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
print ' ';
}
elseif ($value == 'fk_user')
@@ -643,13 +642,13 @@ if ($resql)
$restrictid=array();
if (! $user->admin) $restrictid=array($user->id);
//var_dump($restrictid);
- print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth200');
+ print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
print '';
}
elseif ($value == 'topic') print ''.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200 maxwidth100onsmartphone').' ';
+ print ''.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').' ';
}
elseif (! in_array($value, array('content', 'content_lines'))) print '';
if (! empty($conf->global->MAIN_MULTILANGS))
{
- $selectedlang = GETPOSTISSET('langcode','aZ09')?GETPOST('langcode','aZ09'):$langs->defaultlang;
+ $selectedlang = GETPOSTISSET('langcode')?GETPOST('langcode', 'aZ09'):$langs->defaultlang;
if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
}
@@ -1023,17 +1023,18 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
}
else
{
- print $form->selectarray('type_template', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200');
+ print $form->selectarray('type_template', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
}
print ' ';
}
- elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
+ elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
else
{
$size=''; $class=''; $classtd='';
if ($fieldlist[$field]=='code') $class='maxwidth100';
+ if ($fieldlist[$field]=='label') $class='maxwidth100';
if ($fieldlist[$field]=='private') { $class='maxwidth50'; $classtd='center'; }
if ($fieldlist[$field]=='position') { $class='maxwidth50'; $classtd='center'; }
if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 4d5cc2be274..b16e9047b26 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -96,6 +96,7 @@ if ($action == 'update')
$menu->perms=GETPOST('perms','alpha');
$menu->target=GETPOST('target','alpha');
$menu->user=GETPOST('user','alpha');
+ $menu->mainmenu=GETPOST('propertymainmenu','alpha');
if (is_numeric(GETPOST('menuIdParent','alpha')))
{
$menu->fk_menu=GETPOST('menuIdParent','alpha');
@@ -123,14 +124,11 @@ if ($action == 'update')
setEventMessages($menu->error, $menu->errors, 'errors');
}
$action = "edit";
- }
- else
- {
+
header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
exit;
}
-
- if ($_GET['return'])
+ else
{
header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
exit;
@@ -215,6 +213,7 @@ if ($action == 'add')
$menu->perms=GETPOST('perms','alpha');
$menu->target=GETPOST('target','alpha');
$menu->user=GETPOST('user','alpha');
+ $menu->mainmenu=GETPOST('propertymainmenu','alpha');
if (is_numeric(GETPOST('menuId','int')))
{
$menu->fk_menu=GETPOST('menuId','int');
@@ -289,10 +288,13 @@ if ($action == 'create')
{
jQuery("#menuId").prop("disabled", true);
jQuery("#menuId").val(\'\');
+ jQuery("#propertymainmenu").removeAttr("disabled");
+ jQuery("#propertymainmenu").val(\'\');
}
- else
+ if (jQuery("#topleft").val() == \'left\')
{
jQuery("#menuId").removeAttr("disabled");
+ jQuery("#propertymainmenu").prop("disabled", true);
}
}
init_topleft();
@@ -338,7 +340,7 @@ if ($action == 'create')
print '';
print ''.$langs->trans('DetailMenuHandler').' ';
- //User
+ // User
print ''.$langs->trans('MenuForUsers').' ';
print '';
print ''.$langs->trans("AllMenus").' ';
@@ -362,9 +364,15 @@ if ($action == 'create')
print ''.$langs->trans('Left').' ';
print ' ';
}
- // print ''.$langs->trans('DetailType').' '.$langs->trans('MainMenuCode').' ';
+ print '';
+ print $langs->trans("Example").': mytopmenukey';
+ print ' '.$langs->trans('MenuIdParent').' ';
if ($parent_rowid)
@@ -373,23 +381,23 @@ if ($action == 'create')
}
else
{
- print ''.$langs->trans('DetailMenuIdParent');
print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
print ' '.$langs->trans('Title').' '.$langs->trans('DetailTitre').' '.$langs->trans('Title').' '.$langs->trans('DetailTitre').' '.$langs->trans('URL').' '.$langs->trans('DetailUrl').' '.$langs->trans('URL').' '.$langs->trans('DetailUrl').' '.$langs->trans('LangFile').' '.$langs->trans('DetailLangs').' '.$langs->trans('LangFile').' '.$langs->trans('DetailLangs').' '.$langs->trans('Position').' '.$langs->trans('DetailPosition').' '.$langs->trans('Position').' '.$langs->trans('DetailPosition').' '.$langs->trans('Target').' ';
@@ -398,10 +406,10 @@ if ($action == 'create')
print ' '.$langs->trans('DetailTarget').' '.$langs->trans('Enabled').' '.$langs->trans('DetailEnabled').' '.$langs->trans('Enabled').' '.$langs->trans('DetailEnabled').' '.$langs->trans('Rights').' '.$langs->trans('DetailRight').' '.$langs->trans('Rights').' '.$langs->trans('DetailRight').'
';
@@ -455,13 +463,30 @@ elseif ($action == 'edit')
// Type
print '