From aa4b890bfd56419f6a0e572dcdc3ee5e5496fe0e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 2 Nov 2010 09:10:43 +0000 Subject: [PATCH] Fix: compatibility with ecm layout --- htdocs/ecm/index.php | 9 ++++--- htdocs/main.inc.php | 60 +++++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index c5071f136ee..ac032a0d7d1 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2008-2009 Regis Houssin + * Copyright (C) 2008-2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ * \author Laurent Destailleur */ +if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1'); + require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); @@ -290,10 +292,11 @@ if (GETPOST("action") == 'refreshmanual') /******************************************************************* * View ********************************************************************/ - +/* $morejs=array( "/includes/jquery/plugins/layout/jquery.layout-latest.js" ); +*/ $morehead="