From b201aeb3d3334c6accac0685808cec6c3fd037ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Aug 2010 23:27:44 +0000 Subject: [PATCH] Image can be click on eldy menu --- htdocs/ecm/index.php | 59 ++++++++++---------- htdocs/ecm/search.php | 11 ++-- htdocs/includes/menus/barre_top/eldy.lib.php | 46 ++++++++------- htdocs/includes/menus/init_menu_auguria.sql | 1 - 4 files changed, 56 insertions(+), 61 deletions(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index ec52e558507..4cdd968aae6 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -211,7 +211,7 @@ if ($conf->fournisseur->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, //*********************** // List //*********************** -print_fiche_titre($langs->trans("ECMArea")); +print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("FileManager")); print $langs->trans("ECMAreaDesc")."
"; print $langs->trans("ECMAreaDesc2")."
"; @@ -228,10 +228,35 @@ if ($mesg) { print $mesg."
"; } // Tool bar $head = ecm_prepare_head_fm($fac); -dol_fiche_head($head, 'file_manager', '', 1); +//dol_fiche_head($head, 'file_manager', '', 1); print ''; + +// Toolbar +print ''; + //print ''; + + + print ''; print '
'; + + // Construit liste des repertoires + if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action)) + { + if ($user->rights->ecm->setup) + { + print ''.$langs->trans('ECMAddSection').''; + } + else + { + print ''.$langs->trans('ECMAddSection').''; + } + } + //print ''; + //print ''.img_picto($langs->trans("Refresh"),'refresh').''; + print ''.$langs->trans('Refresh').''; + +print '
'; @@ -251,31 +276,9 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti if ($ret == 'html') print '
'; } - // Construit liste des repertoires print ''; - print ''; - print ''; - //print ''; - - print ''; - - print ''; print ' '.$langs->trans("ECMSections"); print ''; @@ -605,12 +608,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti print '
'; - if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action)) - { - if ($user->rights->ecm->setup) - { - print ''.$langs->trans('ECMAddSection').''; - } - else - { - print ''.$langs->trans('ECMAddSection').''; - } - } - //print ''; - //print ''.img_picto($langs->trans("Refresh"),'refresh').''; - print ''.$langs->trans('Refresh').''; - print '
'; -print ''; -print ''; -print '
'; -//print $langs->trans("Filter").': '; -print '
'; - // Right area $relativepath=$ecmdir->getRelativePath(); $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index b07318e323f..4e0f299c2a6 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -117,17 +117,18 @@ if ($conf->fournisseur->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, //*********************** // List //*********************** -print_fiche_titre($langs->trans("ECMArea")); +print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search")); -print $langs->trans("ECMAreaDesc")."
"; -print $langs->trans("ECMAreaDesc2")."
"; -print "
\n"; +//print $langs->trans("ECMAreaDesc")."
"; +//print $langs->trans("ECMAreaDesc2")."
"; +//print "
\n"; +print $langs->trans("FeatureNotYetAvailable").'.

'; if ($mesg) { print $mesg."
"; } // Tool bar $head = ecm_prepare_head_fm($fac); -dol_fiche_head($head, 'search_form', '', 1); +//dol_fiche_head($head, 'search_form', '', 1); print '
'; diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index ad264d0f316..ea9311923e6 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -56,7 +56,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) } $idsel='home'; print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("Home")); print ''; @@ -84,7 +86,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("ThirdParties")); print ''; @@ -128,7 +132,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->produit->lire || $user->rights->service->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($chaine); print ''; @@ -167,7 +173,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if($user->rights->societe->lire || $user->rights->societe->contact->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("Commercial")); print ''; @@ -208,7 +216,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) || $user->rights->facture->lire || $user->rights->banque->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("MenuFinancial")); print ''; @@ -248,7 +258,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->banque->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("MenuBankCash")); print ''; @@ -287,7 +299,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->projet->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("Projects")); print ''; @@ -326,7 +340,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire || $user->rights->import->run) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("Tools")); print ''; @@ -363,32 +379,10 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $idsel='shop'; print_start_menu_entry($idsel); + print ''; print '
'; - print ''; - print_text_menu_entry($langs->trans("OSCommerce")); print ''; - print_end_menu_entry(); - } - - // OSCommerce WS - if (! empty($conf->oscommercews->enabled)) - { - $langs->load("shop"); - - $classname=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") - { - $classname='class="tmenusel"'; $_SESSION['idmenu']=''; - } - else - { - $classname = 'class="tmenu"'; - } - - $idsel='shop'; - print_start_menu_entry($idsel); - print '
'; - print ''; + print ''; print_text_menu_entry($langs->trans("OSCommerce")); print ''; print_end_menu_entry(); @@ -413,7 +407,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->adherent->lire) { print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($langs->trans("MenuMembers")); print ''; @@ -472,7 +468,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) else $classname='class="tmenu"'; print_start_menu_entry($idsel); + print ''; print '
'; + print ''; print ''; print_text_menu_entry($tabMenu[$i]['titre']); print ''; diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 0676988e7e1..28261b6b688 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -21,7 +21,6 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, 'auguria', 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__); insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN', 8__+MAX_llx_menu__, 'auguria', 'top', 'tools', '', 0, '/index.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8, __ENTITY__); insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11, __ENTITY__); -insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('! empty($conf->oscommercews->enabled)', 12__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/oscommerce_ws/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 12, __ENTITY__); insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, 'auguria', 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '', '', 2, 15, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', 'auguria', 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);