+ 
+
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs
new file mode 100644
index 0000000000..4aa65271a3
--- /dev/null
+++ b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using umbraco.BasePages;
+
+namespace umbraco.presentation.umbraco.dashboard
+{
+ public partial class DesktopMediaUploader : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ protected string FullyQualifiedAppPath
+ {
+ get
+ {
+ var appPath = "";
+ var context = HttpContext.Current;
+
+ if (context != null)
+ {
+ appPath = string.Format("{0}://{1}{2}{3}",
+ context.Request.Url.Scheme,
+ context.Request.Url.Host,
+ (context.Request.Url.Port == 80) ? string.Empty : ":" + context.Request.Url.Port,
+ context.Request.ApplicationPath);
+ }
+
+ if (!appPath.EndsWith("/"))
+ appPath += "/";
+
+ return appPath;
+ }
+ }
+
+ protected string AppLaunchArg
+ {
+ get
+ {
+ //var ticket = ((FormsIdentity) HttpContext.Current.User.Identity).Ticket;
+ var ticket = new FormsAuthenticationTicket(1,
+ UmbracoEnsuredPage.CurrentUser.LoginName,
+ DateTime.Now,
+ DateTime.Now,
+ false,
+ "");
+
+ return HttpUtility.UrlEncode(Base64Encode(string.Format("{0};{1};{2}",
+ FullyQualifiedAppPath.TrimEnd('/'),
+ UmbracoEnsuredPage.CurrentUser.LoginName,
+ FormsAuthentication.Encrypt(ticket)
+ )));
+ }
+ }
+
+ private string Base64Encode(string input)
+ {
+ byte[] toEncodeAsBytes = UTF8Encoding.UTF8.GetBytes(input);
+
+ return Convert.ToBase64String(toEncodeAsBytes);
+ }
+ }
+}
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs
new file mode 100644
index 0000000000..3b39f7a09a
--- /dev/null
+++ b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// Desktop Media Uploader
+
+ Desktop Media Uploader is a small desktop application that you can install on your computer which allows you to easily upload media items directly to the media section.
+The badge below will auto configure itself based upon whether you already have Desktop Media Uploader installed or not.
+Just click the Install Now / Upgrade Now / Launch Now link to perform that action.
+
+
+
+
+
+
+
+
+
+
+ +
+ Download Desktop Media Uploader now.
This application requires Adobe® AIR™ to be installed for Mac OS or Windows. +
+
+
+ This application requires Adobe® AIR™ to be installed for Mac OS or Windows. +
Get started with Media right now
- Use the tool below to upload a ZIP file of your images or documents to a media folder. + Use the tool below to upload your images or documents to a media folder.
Follow these steps:
@@ -16,15 +16,13 @@-
-
- Create a media folder by right-clicking on the Media root folder, selecting Create, - then give your folder a name, select the Media Type Folder, and click create -
- Select the created folder by click the Choose link -
- Use the Browse button below to select a ZIP file containing your images (you can - even organize them into folders and the tool will create these for you) -
- Click the Upload zip file button -
- Refresh the Media section by right-clicking the Media root folder and selecting - Reload Nodes +
- Click Install and follow the on screen instructions to install the Desktop Media Uploader +
- Enter your login details for the site and click Sign In +
- Choose a media folder to upload files to from the Upload files to... dropdown list +
- Drag the files and folders you wish to upload directly into the Desktop Media Uploader application +
- Click Upload to start uploading
For a more thorough guide on how to use the Desktop Media Uploader, checkout this video.