JS-Menu: Bei Mittel-Klick Link im neuen Fenster öffnen(Ticket #1921)

diff --git a/css/kivitendo/dhtmlsuite/menu-item.css b/css/kivitendo/dhtmlsuite/menu-item.css
index 604b730cc47838dca58015aa77720beec24c38bc..5f753121af535b5ae6741f0c312f824c105a29d9 100644 (file)
--- a/css/kivitendo/dhtmlsuite/menu-item.css
+++ b/css/kivitendo/dhtmlsuite/menu-item.css
@@ -155,4 +155,9 @@
        background-color:#D1D1D1;\r
 }\r
 \r
        background-color:#D1D1D1;\r
 }\r
 \r

-\r
+.DHTMLSuite_menuItem_textContent\r
+{\r
+  border-bottom-style: none !important;\r
+  background-color: inherit !important;\r
+  color: inherit !important;\r
+}\r

diff --git a/css/lx-office-erp/dhtmlsuite/menu-item.css b/css/lx-office-erp/dhtmlsuite/menu-item.css
index b50805da44089723992355a5143f445ed1ec8627..992a60d3a959d45804595828f0f802b5c12454ef 100644 (file)
--- a/css/lx-office-erp/dhtmlsuite/menu-item.css
+++ b/css/lx-office-erp/dhtmlsuite/menu-item.css
@@ -181,4 +181,9 @@
        background-color:#6A8CCB;       /* background color for the separator - blue */\r
 }\r
 \r
        background-color:#6A8CCB;       /* background color for the separator - blue */\r
 }\r
 \r

-\r
+.DHTMLSuite_menuItem_textContent\r
+{\r
+  border-bottom-style: none !important;\r
+  background-color: inherit !important;\r
+  color: inherit !important;\r
+}\r

diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js
index 7a7d76e10e4897c75917236c6a90f2112dec221d..48d030336b082ecf09f9affeedcba85c44211eb8 100644 (file)
--- a/js/dhtmlsuite/menu-for-applications.js
+++ b/js/dhtmlsuite/menu-for-applications.js
@@ -1187,7 +1187,7 @@ DHTMLSuite.menuItem.prototype =
                }else{          \r
                        /* Add events */\r
                        var tmpVar = this.objectIndex/1;\r
                }else{          \r
                        /* Add events */\r
                        var tmpVar = this.objectIndex/1;\r

-                       this.divElement.onclick = function(e) { DHTMLSuite.variableStorage.arrayOfDhtmlSuiteObjects[tmpVar].__navigate(e); }\r
+                       //this.divElement.onclick = function(e) { DHTMLSuite.variableStorage.arrayOfDhtmlSuiteObjects[tmpVar].__navigate(e); }\r

                        this.divElement.onmousedown = this.__clickMenuItem;                     // on mouse down effect\r
                        this.divElement.onmouseup = this.__rolloverMenuItem;            // on mouse up effect\r
                        this.divElement.onmouseover = this.__rolloverMenuItem;          // mouse over effect\r
                        this.divElement.onmousedown = this.__clickMenuItem;                     // on mouse down effect\r
                        this.divElement.onmouseup = this.__rolloverMenuItem;            // on mouse up effect\r
                        this.divElement.onmouseover = this.__rolloverMenuItem;          // mouse over effect\r


@@ -1264,7 +1264,17 @@ DHTMLSuite.menuItem.prototype =
                        parentEl.style.backgroundPosition = 'left center';      \r
                }\r
                if(this.modelItemRef.itemText){\r
                        parentEl.style.backgroundPosition = 'left center';      \r
                }\r
                if(this.modelItemRef.itemText){\r

-                       var div = document.createElement('DIV');\r
+                 var div;\r
+                 if( this.modelItemRef.url )\r
+                 {\r
+                         div = document.createElement('a');\r
+                         div.href = this.modelItemRef.url;\r
+                         div.target = this.modelItemRef.frameTarget;\r
+                         div.style.display = 'block';\r
+                       }\r
+                       else\r
+                         div = document.createElement('div');\r
+                         \r

                        div.className = 'DHTMLSuite_textContent';\r
                        div.innerHTML = this.modelItemRef.itemText;     \r
                        div.className = this.cssPrefix + 'menuItem_textContent';\r
                        div.className = 'DHTMLSuite_textContent';\r
                        div.innerHTML = this.modelItemRef.itemText;     \r
                        div.className = this.cssPrefix + 'menuItem_textContent';\r