+
+
+*/
+var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("
+ 
+ /// Panel1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel Panel1;
+
+ ///
+ /// Panel2 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel Panel2;
}
}
diff --git a/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx
index b541b26635..b5fbfe8d4c 100644
--- a/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx
+++ b/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx
@@ -8,7 +8,7 @@
diff --git a/umbraco/presentation/umbraco/dashboard/air/DesktopMediaUploader.air b/umbraco/presentation/umbraco/dashboard/air/DesktopMediaUploader.air
new file mode 100644
index 0000000000..e2f5107eed
Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/air/DesktopMediaUploader.air differ
diff --git a/umbraco/presentation/umbraco/dashboard/images/dmu.png b/umbraco/presentation/umbraco/dashboard/images/dmu.png
new file mode 100644
index 0000000000..f4cb2889d9
Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/dmu.png differ
diff --git a/umbraco/presentation/umbraco/dashboard/scripts/swfobject.js b/umbraco/presentation/umbraco/dashboard/scripts/swfobject.js
new file mode 100644
index 0000000000..08fb27000e
--- /dev/null
+++ b/umbraco/presentation/umbraco/dashboard/scripts/swfobject.js
@@ -0,0 +1,5 @@
+/* SWFObject v2.1 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. +
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs
index 96756a2085..4aa65271a3 100644
--- a/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs
+++ b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs
@@ -1,9 +1,12 @@
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
{
@@ -13,5 +16,55 @@ namespace umbraco.presentation.umbraco.dashboard
{
}
+
+ 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
index f671cd5a67..3b39f7a09a 100644
--- a/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs
+++ b/umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs
@@ -3,15 +3,31 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace umbraco.presentation.umbraco.dashboard
-{
-
-
- public partial class DesktopMediaUploader
- {
+namespace umbraco.presentation.umbraco.dashboard {
+
+
+ public partial class DesktopMediaUploader {
+
+ /// This application requires Adobe® AIR™ to be installed for Mac OS or Windows. +
+
+
-
-
-
+
+
+
+
+
+
+ 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. +
For a quick guide on how to use the Desktop Media Uploader, checkout this video.
+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.