From c531c36cabb4c59e07ded331b6c28e929836f24d Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Wed, 11 Dec 2013 13:09:25 +0100
Subject: [PATCH] adds target to RTE link picker

---
 .../tinymce/plugins/umbracolink/plugin.min.js    |  3 ++-
 .../common/dialogs/linkpicker.controller.js      |  2 +-
 .../src/views/common/dialogs/linkpicker.html     | 16 +++++++++++++---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml    |  3 ++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
index 591e0d6c0e..82a882cddd 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
@@ -166,7 +166,8 @@ tinymce.PluginManager.add('umbracolink', function(editor) {
 			var anchor = $(anchorElm);
 			currentTarget = {
 				name: anchor.attr("title"),
-				url: anchor.attr("href")
+				url: anchor.attr("href"),
+				target: anchor.attr("target")
 			};
 
 			//locallink detection, we do this here, to avoid poluting the dialogservice
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index 85c859b0f9..b0c0b71dd1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -51,7 +51,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 		    }
 
 		    $scope.selectedEl = c;
-		    $scope.target = args.node;
+		    $scope.target.id = args.node.id;
 		    $scope.target.name = args.node.name;
 
 		    $scope.selectedEl.find("i.umb-tree-icon")
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index 01166f15b4..d4b593f07c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -2,8 +2,9 @@
 	<div class="umb-panel-body no-header with-footer compact">
 		<umb-pane>
 			<umb-control-group label="@content_urls">
-				<input type="text" 
-					placeholder="Enter url" 
+				<input type="text"
+					localize="placeholder" 
+					placeholder="@general_url" 
 					class="umb-editor umb-textstring" 
 					ng-model="target.url"
 					ng-disabled="target.id"
@@ -13,10 +14,19 @@
 			<umb-control-group label="@content_nodeName">
 				<input type="text"
 					localize="placeholder" 
-					placeholder="@assignDomain_domainCreated:target.name" 
+					placeholder="@placeholders_entername" 
 					class="umb-editor umb-textstring" 
 					ng-model="target.name" />
 			</umb-control-group>
+
+			<umb-control-group label="@content_target">
+				<select class="umb-editor umb-dropdown" ng-model="target.target">
+					<option value=""></option>
+					<option value="_blank">Opens the linked document in a new window or tab</option>
+					<option value="_top">Opens the linked document in the full body of the window</option>
+					<option value="_parent">Opens the linked document in the parent frame</option>
+				</select>
+			</umb-control-group>
 		</umb-pane>
 
 		
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index fd2c7656f3..d25f5904ca 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -164,8 +164,9 @@
     <key alias="urls">Link to document</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
-
+    
     <key alias="childItems" version="7.0">Child items</key>
+    <key alias="target" version="7.0">Target</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Where do you want to create the new %0%</key>