From: Sven Schöling Date: Tue, 16 Oct 2012 14:30:21 +0000 (+0200) Subject: Css vom Menü nicht nachträglich laden, sondern schon im Layout laden. X-Git-Tag: release-3.0.0beta1~120 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a888cd0873a108e928d63b8a6f02d46c2090f49c;p=kivitendo-erp.git Css vom Menü nicht nachträglich laden, sondern schon im Layout laden. Idee ist prinziipell gut, gibt aber Probleme mit dem auflösen von user stylesheets bei ajax layouts --- diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js index f99b27aad..bf23469a8 100644 --- a/js/dhtmlsuite/menu-for-applications.js +++ b/js/dhtmlsuite/menu-for-applications.js @@ -1138,7 +1138,7 @@ DHTMLSuite.menuItem = function() var cssPrefix; // Css prefix for the menu items. var modelItemRef; // Reference to menuModelItem - this.layoutCSS = 'menu-item.css'; +// this.layoutCSS = 'menu-item.css'; this.cssPrefix = 'DHTMLSuite_'; if(!standardObjectsCreated)DHTMLSuite.createStandardObjects(); @@ -1160,7 +1160,7 @@ DHTMLSuite.menuItem.prototype = */ createItem : function(menuModelItemObj) { - DHTMLSuite.commonObj.loadCSS(this.layoutCSS); // Load css +// DHTMLSuite.commonObj.loadCSS(this.layoutCSS); // Load css DHTMLSuite.variableStorage.arrayOfDhtmlSuiteObjects[this.objectIndex] = this; @@ -1594,7 +1594,7 @@ DHTMLSuite.menuBar = function() var globalObjectIndex; // Global index of this object - used to refer to the object of this class outside this.cssPrefix = 'DHTMLSuite_'; this.menuItemLayoutCss = false; // false = use default for the menuItem class. - this.layoutCSS = 'menu-bar.css'; +// this.layoutCSS = 'menu-bar.css'; this.menuBarBackgroundImage = 'menu_strip_bg.jpg'; this.menuItem_objects = new Array(); DHTMLSuite.variableStorage.menuBar_highlightedItems = new Array(); @@ -1630,7 +1630,7 @@ DHTMLSuite.menuBar.prototype = { init : function() { - DHTMLSuite.commonObj.loadCSS(this.layoutCSS); +// DHTMLSuite.commonObj.loadCSS(this.layoutCSS); this.__createDivs(); // Create general divs this.__createMenuItems(); // Create menu items this.__setBasicEvents(); // Set basic events. diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html index f7460923a..0a33c65b1 100644 --- a/templates/webpages/menu/menunew.html +++ b/templates/webpages/menu/menunew.html @@ -77,7 +77,6 @@ $(clockon); $(function(){ DHTMLSuite.createStandardObjects(); - DHTMLSuite.configObj.setCssPath('[% myconfig.css_path %]/dhtmlsuite/'); DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/'); var menu_model = new DHTMLSuite.menuModel();