From b5ca4ac505e279d2cdc76db84fe701dac3f6ac01 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 20 Aug 2013 18:01:49 +0000
Subject: [PATCH] fixed jdots/Stylite template to contain no more inline
 scripts

---
 phpgwapi/js/jsapi/egw.js       | 11 +++++++++++
 phpgwapi/js/jsapi/egw_links.js |  2 +-
 phpgwapi/js/jsapi/egw_open.js  |  9 +++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index cd7d3a8ee1..b8401efc18 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -155,4 +155,15 @@
 			}
 		}
 	});
+	
+	/**
+	 * 
+	 */
+	window.callManual = function()
+	{
+		if (window.framework)
+		{
+			window.framework.callManual.call(window.framework, window.location.href);
+		}
+	};
 })();
diff --git a/phpgwapi/js/jsapi/egw_links.js b/phpgwapi/js/jsapi/egw_links.js
index 8d6c61a893..268ef1ce05 100644
--- a/phpgwapi/js/jsapi/egw_links.js
+++ b/phpgwapi/js/jsapi/egw_links.js
@@ -441,7 +441,7 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
 			var self = this;
 			// bind change handler
 			select.change(function(){
-				if (this.value) self.open('', this.value, 'add');
+				if (this.value) self.open('', this.value, 'add', {}, this.value);
 				this.value = '';
 			});
 			// need to load common translations for app-names
diff --git a/phpgwapi/js/jsapi/egw_open.js b/phpgwapi/js/jsapi/egw_open.js
index 39fd4c07d4..f2abb8a46c 100644
--- a/phpgwapi/js/jsapi/egw_open.js
+++ b/phpgwapi/js/jsapi/egw_open.js
@@ -126,17 +126,18 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
 				}
 				popup = app_registry[type+'_popup'];
 			}
-			return this.open_link(this.link(url, params), target, popup);
+			return this.open_link(this.link(url, params), undefined, popup, target);
 		},
 		
 		/**
 		 * Open a link, which can be either a menuaction, a EGroupware relative url or a full url
 		 * 
 		 * @param string _link menuaction, EGroupware relative url or a full url (incl. "mailto:" or "javascript:")
-		 * @param string _target optional target
+		 * @param string _target optional target / window name
 		 * @param string _popup widthxheight, if a popup should be used
+		 * @param string _target_app app-name for opener
 		 */
-		open_link: function(_link, _target, _popup)
+		open_link: function(_link, _target, _popup, _target_app)
 		{
 			var url = _link;
 			if (url.indexOf('javascript:') == 0)
@@ -159,7 +160,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
 			{
 				var w_h = _popup.split('x');
 				if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
-				return _wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1],false,false,true);
+				return _wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1], false, _target_app, true);
 			}
 			else if (typeof _wnd.egw_link_handler == 'function' && (typeof _target == 'undefined' || _target =='_self' || typeof this.link_app_list()[_target] != "undefined"))
 			{