From 4e76be69ebcd49c35a7040aceffb24c218243129 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 9 Jan 2008 16:03:28 +0000 Subject: [PATCH] Layer menu cleanup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8268 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_MultiSelectWindow.inc | 2 +- gosa-core/include/class_location.inc | 36 +++++++++---------- .../include/{ => utils}/layer-menu/COPYING | 0 .../{ => utils}/layer-menu/lib/PHPLIB.php | 0 .../lib/layersmenu-browser_detection.php | 0 .../layer-menu/lib/layersmenu-common.inc.php | 0 .../layer-menu/lib/layersmenu-process.inc.php | 0 .../layer-menu/lib/layersmenu.inc.php | 0 .../layer-menu/lib/phptreemenu.inc.php | 0 .../layer-menu/lib/plainmenu.inc.php | 0 .../layer-menu/lib/treemenu.inc.php | 0 .../libjs/layersmenu-browser_detection.js | 0 .../layer-menu/libjs/layersmenu-footer.ijs | 0 .../layer-menu/libjs/layersmenu-header.ijs | 0 .../layer-menu/libjs/layersmenu-library.js | 0 .../libjs/layersmenu-see-through.js | 0 .../layer-menu/libjs/layersmenu.js | 0 .../libjs/layerstreemenu-cookies.js | 0 .../layer-menu/libjs/layerstreemenu.ijs | 0 19 files changed, 19 insertions(+), 19 deletions(-) rename gosa-core/include/{ => utils}/layer-menu/COPYING (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/PHPLIB.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/layersmenu-browser_detection.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/layersmenu-common.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/layersmenu-process.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/layersmenu.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/phptreemenu.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/plainmenu.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/lib/treemenu.inc.php (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu-browser_detection.js (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu-footer.ijs (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu-header.ijs (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu-library.js (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu-see-through.js (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layersmenu.js (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layerstreemenu-cookies.js (100%) rename gosa-core/include/{ => utils}/layer-menu/libjs/layerstreemenu.ijs (100%) diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index 8295cb300..e21e91ccc 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -89,7 +89,7 @@ class MultiSelectWindow{ $mid = new LayersMenu(6, 7, 2, 1); $mid->setImgwww("./images/"); $mid->setIcondir("./images/"); - $mid->setDirroot("../include/layer-menu/"); + $mid->setDirroot("../include/utils/layer-menu/"); $mid->setHorizontalMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeader.ihtml'); $mid->setSubMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeaderSubEntry.ihtml'); $mid->setMenuStructureString($this->string_ListDropDown); diff --git a/gosa-core/include/class_location.inc b/gosa-core/include/class_location.inc index 7996d313c..6d437276b 100644 --- a/gosa-core/include/class_location.inc +++ b/gosa-core/include/class_location.inc @@ -16,6 +16,19 @@ $class_mapping= array( "setup_step" => "setup/class_setupStep.inc", "debconf" => "include/class_debconfTemplate.inc", "certificate" => "include/class_certificate.inc", + "writeexcel_biffwriter" => "include/utils/excel/class.writeexcel_biffwriter.inc.php", + "writeexcel_worksheet" => "include/utils/excel/class.writeexcel_worksheet.inc.php", + "writeexcel_olewriter" => "include/utils/excel/class.writeexcel_olewriter.inc.php", + "writeexcel_formula" => "include/utils/excel/class.writeexcel_formula.inc.php", + "writeexcel_workbook" => "include/utils/excel/class.writeexcel_workbook.inc.php", + "writeexcel_format" => "include/utils/excel/class.writeexcel_format.inc.php", + "Template_PHPLIB" => "include/utils/layer-menu/lib/PHPLIB.php", + "PHPTreeMenu" => "include/utils/layer-menu/lib/phptreemenu.inc.php", + "ProcessLayersMenu" => "include/utils/layer-menu/lib/layersmenu-process.inc.php", + "TreeMenu" => "include/utils/layer-menu/lib/treemenu.inc.php", + "LayersMenu" => "include/utils/layer-menu/lib/layersmenu.inc.php", + "LayersMenuCommon" => "include/utils/layer-menu/lib/layersmenu-common.inc.php", + "PlainMenu" => "include/utils/layer-menu/lib/plainmenu.inc.php", "pgre_sql" => "include/class_pgsql_opengw.inc", "divlist" => "include/class_divlist.inc", "passwordMethodClear" => "include/password-methods/class_password-methods-clear.inc", @@ -35,11 +48,6 @@ $class_mapping= array( "glpiDB" => "include/class_glpi.inc", "acl" => "include/class_acl.inc", "pluglist" => "include/class_pluglist.inc", - "HTML_TreeMenu" => "html/TreeMenu.php", - "HTML_TreeNode" => "html/TreeMenu.php", - "HTML_TreeMenu_Presentation" => "html/TreeMenu.php", - "HTML_TreeMenu_DHTML" => "html/TreeMenu.php", - "HTML_TreeMenu_Listbox" => "html/TreeMenu.php", "sieve" => "include/sieve/class_sieve.inc", "sieve_if" => "include/sieve/class_sieveElement_If.inc", "sieve_elsif" => "include/sieve/class_sieveElement_Else_Elsif.inc", @@ -64,25 +72,12 @@ $class_mapping= array( "sieve_discard" => "include/sieve/class_sieveElement_Discard.inc", "My_Scanner" => "include/sieve/class_My_Scanner.inc", "ogw" => "include/class_opengw.inc", - "Template_PHPLIB" => "include/layer-menu/lib/PHPLIB.php", - "PHPTreeMenu" => "include/layer-menu/lib/phptreemenu.inc.php", - "ProcessLayersMenu" => "include/layer-menu/lib/layersmenu-process.inc.php", - "TreeMenu" => "include/layer-menu/lib/treemenu.inc.php", - "LayersMenu" => "include/layer-menu/lib/layersmenu.inc.php", - "LayersMenuCommon" => "include/layer-menu/lib/layersmenu-common.inc.php", - "PlainMenu" => "include/layer-menu/lib/plainmenu.inc.php", "gosa_cache" => "include/class_cache_handler.inc", "Socket_Client" => "include/class_socketClient.inc", "log" => "include/class_log.inc", "multi_plug" => "include/class_multi_plug.inc", "msg_dialog" => "include/class_msg_dialog.inc", "parseXml" => "include/functions_helpviewer.inc", - "writeexcel_biffwriter" => "include/php_writeexcel/class.writeexcel_biffwriter.inc.php", - "writeexcel_worksheet" => "include/php_writeexcel/class.writeexcel_worksheet.inc.php", - "writeexcel_olewriter" => "include/php_writeexcel/class.writeexcel_olewriter.inc.php", - "writeexcel_formula" => "include/php_writeexcel/class.writeexcel_formula.inc.php", - "writeexcel_workbook" => "include/php_writeexcel/class.writeexcel_workbook.inc.php", - "writeexcel_format" => "include/php_writeexcel/class.writeexcel_format.inc.php", "session" => "include/class_session.inc", "sambaMungedDial" => "include/class_sambaMungedDial.inc", "MultiSelectWindow" => "include/class_MultiSelectWindow.inc", @@ -303,5 +298,10 @@ $class_mapping= array( "csvimport" => "plugins/addons/ldapmanager/class_csvimport.inc", "ldiftab" => "plugins/addons/ldapmanager/tabs_ldif.inc", "bugsubmitter" => "plugins/addons/bugsubmitter/class_bugsubmitter.inc", + "HTML_TreeMenu" => "html/TreeMenu.php", + "HTML_TreeNode" => "html/TreeMenu.php", + "HTML_TreeMenu_Presentation" => "html/TreeMenu.php", + "HTML_TreeMenu_DHTML" => "html/TreeMenu.php", + "HTML_TreeMenu_Listbox" => "html/TreeMenu.php", ); ?> \ No newline at end of file diff --git a/gosa-core/include/layer-menu/COPYING b/gosa-core/include/utils/layer-menu/COPYING similarity index 100% rename from gosa-core/include/layer-menu/COPYING rename to gosa-core/include/utils/layer-menu/COPYING diff --git a/gosa-core/include/layer-menu/lib/PHPLIB.php b/gosa-core/include/utils/layer-menu/lib/PHPLIB.php similarity index 100% rename from gosa-core/include/layer-menu/lib/PHPLIB.php rename to gosa-core/include/utils/layer-menu/lib/PHPLIB.php diff --git a/gosa-core/include/layer-menu/lib/layersmenu-browser_detection.php b/gosa-core/include/utils/layer-menu/lib/layersmenu-browser_detection.php similarity index 100% rename from gosa-core/include/layer-menu/lib/layersmenu-browser_detection.php rename to gosa-core/include/utils/layer-menu/lib/layersmenu-browser_detection.php diff --git a/gosa-core/include/layer-menu/lib/layersmenu-common.inc.php b/gosa-core/include/utils/layer-menu/lib/layersmenu-common.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/layersmenu-common.inc.php rename to gosa-core/include/utils/layer-menu/lib/layersmenu-common.inc.php diff --git a/gosa-core/include/layer-menu/lib/layersmenu-process.inc.php b/gosa-core/include/utils/layer-menu/lib/layersmenu-process.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/layersmenu-process.inc.php rename to gosa-core/include/utils/layer-menu/lib/layersmenu-process.inc.php diff --git a/gosa-core/include/layer-menu/lib/layersmenu.inc.php b/gosa-core/include/utils/layer-menu/lib/layersmenu.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/layersmenu.inc.php rename to gosa-core/include/utils/layer-menu/lib/layersmenu.inc.php diff --git a/gosa-core/include/layer-menu/lib/phptreemenu.inc.php b/gosa-core/include/utils/layer-menu/lib/phptreemenu.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/phptreemenu.inc.php rename to gosa-core/include/utils/layer-menu/lib/phptreemenu.inc.php diff --git a/gosa-core/include/layer-menu/lib/plainmenu.inc.php b/gosa-core/include/utils/layer-menu/lib/plainmenu.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/plainmenu.inc.php rename to gosa-core/include/utils/layer-menu/lib/plainmenu.inc.php diff --git a/gosa-core/include/layer-menu/lib/treemenu.inc.php b/gosa-core/include/utils/layer-menu/lib/treemenu.inc.php similarity index 100% rename from gosa-core/include/layer-menu/lib/treemenu.inc.php rename to gosa-core/include/utils/layer-menu/lib/treemenu.inc.php diff --git a/gosa-core/include/layer-menu/libjs/layersmenu-browser_detection.js b/gosa-core/include/utils/layer-menu/libjs/layersmenu-browser_detection.js similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu-browser_detection.js rename to gosa-core/include/utils/layer-menu/libjs/layersmenu-browser_detection.js diff --git a/gosa-core/include/layer-menu/libjs/layersmenu-footer.ijs b/gosa-core/include/utils/layer-menu/libjs/layersmenu-footer.ijs similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu-footer.ijs rename to gosa-core/include/utils/layer-menu/libjs/layersmenu-footer.ijs diff --git a/gosa-core/include/layer-menu/libjs/layersmenu-header.ijs b/gosa-core/include/utils/layer-menu/libjs/layersmenu-header.ijs similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu-header.ijs rename to gosa-core/include/utils/layer-menu/libjs/layersmenu-header.ijs diff --git a/gosa-core/include/layer-menu/libjs/layersmenu-library.js b/gosa-core/include/utils/layer-menu/libjs/layersmenu-library.js similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu-library.js rename to gosa-core/include/utils/layer-menu/libjs/layersmenu-library.js diff --git a/gosa-core/include/layer-menu/libjs/layersmenu-see-through.js b/gosa-core/include/utils/layer-menu/libjs/layersmenu-see-through.js similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu-see-through.js rename to gosa-core/include/utils/layer-menu/libjs/layersmenu-see-through.js diff --git a/gosa-core/include/layer-menu/libjs/layersmenu.js b/gosa-core/include/utils/layer-menu/libjs/layersmenu.js similarity index 100% rename from gosa-core/include/layer-menu/libjs/layersmenu.js rename to gosa-core/include/utils/layer-menu/libjs/layersmenu.js diff --git a/gosa-core/include/layer-menu/libjs/layerstreemenu-cookies.js b/gosa-core/include/utils/layer-menu/libjs/layerstreemenu-cookies.js similarity index 100% rename from gosa-core/include/layer-menu/libjs/layerstreemenu-cookies.js rename to gosa-core/include/utils/layer-menu/libjs/layerstreemenu-cookies.js diff --git a/gosa-core/include/layer-menu/libjs/layerstreemenu.ijs b/gosa-core/include/utils/layer-menu/libjs/layerstreemenu.ijs similarity index 100% rename from gosa-core/include/layer-menu/libjs/layerstreemenu.ijs rename to gosa-core/include/utils/layer-menu/libjs/layerstreemenu.ijs -- 2.30.2