lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: possibility to have more hooks in the same page

Browse Source 
New: add left search block hook and extra left block hook
This commit is contained in:
Regis Houssin 2011-05-31 17:42:51 +00:00
parent 1f4fd52d84
commit 9aebbcfc7b
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com> * Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Jean Heimburger <jean@tiaris.info> * Copyright (C) 2006 Jean Heimburger <jean@tiaris.info>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

26
htdocs/main.inc.php
View File

@ -1373,10 +1373,14 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Search form hook of thirdparty module // Search form hook of thirdparty module
if (! empty($object->hooks['searchform'])) if (! empty($object->hooks['searchform']))
{ {
$searchform.='<!-- Begin search form hook area -->'."\n";
foreach($object->hooks['searchform'] as $module) foreach($object->hooks['searchform'] as $module)
{ {
$searchform.=$module->printSearchForm(); $searchform.=$module->printSearchForm();
} }
$searchform.="\n".'<!-- End of search form hook area -->'."\n";
} }
// Define $bookmarks // Define $bookmarks
@ -1482,20 +1486,24 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
} }
print "\n"; print "\n";
// Left block hook of thirdparty module
if (! empty($object->hooks['leftblock']))
{
foreach($object->hooks['leftblock'] as $module)
{
$module->printLeftBlock();
}
}
print "</div>\n"; print "</div>\n";
print "<!-- End left vertical menu -->\n"; print "<!-- End left vertical menu -->\n";
print "\n"; print "\n";
// Left block hook of thirdparty module
if (! empty($object->hooks['leftblock']))
{
print '<!-- Begin left block hook area -->'."\n";
foreach($object->hooks['leftblock'] as $module)
{
$module->printLeftBlock();
}
print "\n".'<!-- End of left block hook area -->'."\n";
}
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n"; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n";
else print '</td>'; else print '</td>';