From 45f6d4f9112cd39d7ef9336a1a06bba94bf14ad1 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 7 Mar 2014 11:57:21 +0100
Subject: [PATCH 1/6] ensures the installer clears angular cache

---
 .../src/installer/installer.controller.js                    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
index 30bf96a329..04d21f80b2 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
@@ -30,3 +30,8 @@ angular.module("umbraco.install").controller("Umbraco.InstallerController",
 	    installerService.gotoStep(0);
 	};
 });
+
+//this ensure that we start with a clean slate on every install and upgrade
+angular.module("umbraco.install").run(function($templateCache){
+	$templateCache.removeAll();
+});
\ No newline at end of file

From b816e7f4db43fcf9b28e574f283768ff19f48c8e Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 7 Mar 2014 12:09:30 +0100
Subject: [PATCH 2/6] Fixes: sites cannot run the new installer if they have
 /install directory

---
 src/Umbraco.Web.UI/config/ClientDependency.config | 2 +-
 src/Umbraco.Web/Install/InstallHelper.cs          | 9 ++++++++-
 src/Umbraco.Web/WebBootManager.cs                 | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index e09251e424..d26bfe176a 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="394389720" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1469612626" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
index af953292a2..9fbf29bb41 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -2,13 +2,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.UI;
-
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.Install.InstallSteps;
 using Umbraco.Web.Install.Models;
@@ -65,6 +66,12 @@ namespace Umbraco.Web.Install
             return _installationType ?? (_installationType = IsBrandNewInstall ? InstallationType.NewInstall : InstallationType.Upgrade).Value;
         }
 
+        internal void DeleteLegacyInstaller()
+        {
+            if(Directory.Exists( IOHelper.MapPath( SystemDirectories.Install )))
+                Directory.Move(IOHelper.MapPath(SystemDirectories.Install), IOHelper.MapPath("~/app_data/temp/install_backup"));
+        }
+
         /// <summary>
         /// Checks if this is a brand new install meaning that there is no configured version and there is no configured database connection
         /// </summary>
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index ab31fba02d..65112efce7 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -103,6 +103,9 @@ namespace Umbraco.Web
             renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection { { "compositeFileHandlerPath", "~/DependencyHandler.axd" } });
             ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
 
+            InstallHelper insHelper = new InstallHelper(UmbracoContext.Current);
+            insHelper.DeleteLegacyInstaller();
+
             return this;
         }
 

From fce31a2e0224360439ae7997bdbe6058280ca409 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 7 Mar 2014 15:26:28 +0100
Subject: [PATCH 3/6] 7.1 beta

---
 build/Build.bat                                  | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index 122eec9af6..6cfb3af5c7 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 SET release=7.1.0
-SET comment=
+SET comment=beta
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index e9a948c125..c4f0678fd4 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return ""; } }
+        public static string CurrentComment { get { return "beta"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

From c95e7c245e8a3de35fdaeb53c8f83fecb9314e13 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Fri, 7 Mar 2014 22:24:28 +0100
Subject: [PATCH 4/6] U4-3691: Use empty alt text instead of 'Some description'

---
 .../src/common/services/tinymce.service.js                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a5eb08da98..df820d9647 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -92,7 +92,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
                             if (img) {
                                 var imagePropVal = imageHelper.getImagePropertyValue({ imageModel: img, scope: $scope });
                                 var data = {
-                                    alt: "Some description",
+                                    alt: "",
                                     src: (imagePropVal) ? imagePropVal : "nothing.jpg",
                                     id: '__mcenew'
                                 };

From 3ff04f585c1d3958f547b72bce02a9079837ccd6 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Sun, 9 Mar 2014 22:21:36 +0100
Subject: [PATCH 5/6] Fixes issue with late-loaded file resolvers

---
 .../fileupload/fileupload.controller.js       | 11 ++++++-----
 .../imagecropper/imagecropper.controller.js   | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 54886e3580..6d78fe52b0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -15,10 +15,6 @@
 */
 function fileUploadController($scope, $element, $compile, imageHelper, fileManager, umbRequestHelper, mediaHelper) {
 
-    mediaHelper.registerFileResolver("Umbraco.UploadField", function(property){
-            return property.value;
-    });
-
     /** Clears the file collections when content is saving (if we need to clear) or after saved */
     function clearFiles() {
         //clear the files collection (we don't want to upload any!)
@@ -127,4 +123,9 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
     });
 };
 angular.module("umbraco")
-    .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController);
\ No newline at end of file
+    .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
+    .run(function(mediaHelper){
+        mediaHelper.registerFileResolver("Umbraco.UploadField", function(property){
+                return property.value;
+        });
+    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index e55a83c72b..35b71ba2af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -1,19 +1,11 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco')   
-
     .controller("Umbraco.PropertyEditors.ImageCropperController",
     function ($rootScope, $routeParams, $scope, $log, mediaHelper, cropperHelper, $timeout, editorState, umbRequestHelper, fileManager) {
 
         var config = $scope.model.config;
-        mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property) {
-            if (property.value.src) {
-                return property.value.src;
-            } else if (angular.isString(property.value)) {
-                return property.value;
-            }
-        });
-
+        
         //move previously saved value to the editor
         if ($scope.model.value) {
             //backwards compat with the old file upload (incase some-one swaps them..)
@@ -102,4 +94,13 @@ angular.module('umbraco')
                 reader.readAsDataURL(args.files[0]);
             }
         });
+    })
+    .run(function(mediaHelper){
+        mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property) {
+                    if (property.value.src) {
+                        return property.value.src;
+                    } else if (angular.isString(property.value)) {
+                        return property.value;
+                    }
+                });
     });
\ No newline at end of file

From 38509f9d5a761add274bd917ac70a2639ec055ca Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Sun, 9 Mar 2014 22:21:55 +0100
Subject: [PATCH 6/6] Adds details view to media picker to edit alt text

---
 .../src/common/services/tinymce.service.js    | 23 ++++--
 .../common/dialogs/mediapicker.controller.js  | 40 +++++++---
 .../src/views/common/dialogs/mediapicker.html | 76 +++++++++++++++----
 3 files changed, 111 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a5eb08da98..5f5dbb2141 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -85,19 +85,34 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
                 icon: 'custom icon-picture',
                 tooltip: 'Media Picker',
                 onclick: function () {
+
+                    var selectedElm = editor.selection.getNode(),
+                        currentTarget;
+
+
+                    if(selectedElm.nodeName === 'IMG'){
+                        var img = $(selectedElm);
+                        currentTarget = {
+                            name: img.attr("alt"),
+                            url: img.attr("src"),
+                            id: img.attr("rel")
+                        };
+                    }
+
                     dialogService.mediaPicker({
+                        currentTarget: currentTarget,
                         onlyImages: true,
                         scope: $scope, callback: function (img) {
 
                             if (img) {
                                 var imagePropVal = imageHelper.getImagePropertyValue({ imageModel: img, scope: $scope });
                                 var data = {
-                                    alt: "Some description",
-                                    src: (imagePropVal) ? imagePropVal : "nothing.jpg",
+                                    alt: img.name,
+                                    src: (img.url) ? img.url : "nothing.jpg",
+                                    rel: img.id,
                                     id: '__mcenew'
                                 };
 
-
                                 editor.insertContent(editor.dom.createHTML('img', data));
 
                                 $timeout(function () {
@@ -131,8 +146,6 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
         */
         createLinkPicker: function (editor, $scope) {
 
-            
-            
             /*
             editor.addButton('link', {
                 icon: 'custom icon-link',
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
index 2ef6679e90..87bde9b6c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Dialogs.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, imageHelper, eventsService, treeService, $cookies) {
+        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $cookies) {
 
             var dialogOptions = $scope.$parent.dialogOptions;
             $scope.onlyImages = dialogOptions.onlyImages;
@@ -15,6 +15,12 @@ angular.module("umbraco")
                 }
             };
 
+            //preload selected item
+            $scope.target = undefined;
+            if(dialogOptions.currentTarget){
+                $scope.target = dialogOptions.currentTarget;
+            }
+
             $scope.submitFolder = function(e) {
                 if (e.keyCode === 13) {
                     e.preventDefault();
@@ -57,6 +63,7 @@ angular.module("umbraco")
                     .then(function(data) {
 
                         $scope.images = [];
+
                         $scope.searchTerm = "";
                         if(data.items){
                              $scope.images = data.items;
@@ -64,9 +71,9 @@ angular.module("umbraco")
                        
 
                         //update the thumbnail property
-                        _.each($scope.images, function(img) {
-                            img.thumbnail = imageHelper.getThumbnail({ imageModel: img, scope: $scope });
-                        });
+                        //_.each($scope.images, function(img) {
+                        //    img.thumbnail = imageHelper.getThumbnail({ imageModel: img, scope: $scope });
+                        //});
 
                         //reject all images that have an empty thumbnail - this can occur if there's an image item
                         // that doesn't have an uploaded image.
@@ -79,11 +86,9 @@ angular.module("umbraco")
                     });
 
                 $scope.options.formData.currentFolder = folder.id;
-                $scope.currentFolder = folder;   
-                
+                $scope.currentFolder = folder;      
             };
 
-
             $scope.$on('fileuploadstop', function(event, files) {
                 $scope.gotoFolder($scope.currentFolder);
             });
@@ -100,13 +105,27 @@ angular.module("umbraco")
                         $scope.select(image);
                         image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
                     }else {
-                        $scope.submit(image);
+
+                        $scope.target= {};
+                        $scope.target.id = image.id;
+                        $scope.target.name = image.name;
+                        $scope.target.url = mediaHelper.resolveFile(image); // getMediaPropertyValue({mediaModel: image});
+
+                        //$scope.submit(image);
                     }
                 }
 
                 
             };
 
+            $scope.exitDetails = function(){
+                if(!$scope.currentFolder){
+                    $scope.gotoFolder();
+                }
+
+                $scope.target = undefined;
+            };
+
             $scope.selectFolder= function(folder) {
                 if ($scope.multiPicker) {
                     $scope.select(folder);
@@ -132,5 +151,8 @@ angular.module("umbraco")
             };
 
             //default root item
-            $scope.gotoFolder();
+            if(!$scope.target){
+                $scope.gotoFolder();    
+            }
+            
         });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index 7b6307ec2f..a351f0986a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -1,7 +1,55 @@
 <form ng-controller="Umbraco.Dialogs.MediaPickerController" id="fileupload" method="POST" enctype="multipart/form-data" 
 data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
 
-<div class="umb-panel umb-dialogs-mediapicker">
+<div class="umb-panel umb-dialogs-mediapicker" ng-if="target">
+ 	<div class="umb-panel-body no-header with-footer compact">
+ 			<umb-pane>
+ 				<umb-control-group ng-if="target.url">
+	 				<div class="thumbnail span6 clearfix">
+	 					<img ng-src="{{target.url}}" />
+	 				</div>
+ 				</umb-control-group>
+
+ 				<umb-control-group label="@general_url">
+ 					<input type="text"
+ 						localize="placeholder" 
+ 						placeholder="@general_url" 
+ 						class="umb-editor umb-textstring" 
+ 						ng-model="target.url"
+ 						ng-disabled="target.id"/>	
+ 				</umb-control-group>
+
+ 				<umb-control-group label="@content_titleOptional">
+ 					
+ 					<input type="text"
+ 						localize="placeholder" 
+ 						placeholder="@placeholders_entername" 
+ 						class="umb-editor umb-textstring" 
+ 						ng-model="target.name" />
+
+ 				</umb-control-group>
+ 			</umb-pane>
+ 		</div>
+
+ 		<div class="umb-panel-footer" >
+ 			<div class="umb-el-wrap umb-panel-buttons">
+ 		        <div class="btn-toolbar umb-btn-toolbar pull-right">
+ 		        	<a href ng-click="exitDetails()" class="btn btn-link">
+ 		        		<localize key="general_cancel">Cancel</localize>
+ 					</a>
+
+ 					<button
+ 						class="btn btn-primary"
+ 						ng-click="submit(target)">
+ 						<localize key="general_insert">Insert</localize>
+ 					</button>
+ 		        </div>
+ 			</div>
+ 		</div>
+</div>
+
+
+<div class="umb-panel umb-dialogs-mediapicker" ng-hide="target">
 	<div class="umb-panel-header">
 		
 		<div class="umb-el-wrap umb-panel-buttons">
@@ -64,23 +112,23 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 
 
 	<div class="umb-panel-footer" >
-			<div class="umb-el-wrap umb-panel-buttons">
-		        <div class="btn-toolbar umb-btn-toolbar pull-right">
+		<div class="umb-el-wrap umb-panel-buttons">
+	        <div class="btn-toolbar umb-btn-toolbar pull-right">
 
-		        	<a href ng-click="close()" class="btn btn-link">
-		        		<localize key="general_cancel">Cancel</localize>
-					</a>
+	        	<a href ng-click="close()" class="btn btn-link">
+	        		<localize key="general_cancel">Cancel</localize>
+				</a>
 
-					<button
-						class="btn btn-primary"
-						ng-show="multiPicker" 
-						ng-click="submit(dialogData.selection)">
-						<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
-					</button>
+				<button
+					class="btn btn-primary"
+					ng-show="multiPicker" 
+					ng-click="submit(dialogData.selection)">
+					<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
+				</button>
 
-		        </div>
-			</div>
+	        </div>
 		</div>
+	</div>
 
 </div>