Skip to content

Commit 03ba8c9

Browse files
nul800sebastiaannul800sebastiaan
committed
Update to 6.2.2, removes airinstallbadge
1 parent 13b57c7 commit 03ba8c9

File tree

6 files changed

+19
-68
lines changed

6 files changed

+19
-68
lines changed

‎build/NuSpecs/build/UmbracoCms.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<UmbracoVersion>6.2.1</UmbracoVersion>
4+
<UmbracoVersion>6.2.2</UmbracoVersion>
55
</PropertyGroup>
66
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
77
<PropertyGroup>

‎src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,6 @@
16111611
<Content Include="Umbraco\Dashboard\Images\starterkit32x32.png" />
16121612
<Content Include="Umbraco\Dashboard\Images\TV.png" />
16131613
<Content Include="Umbraco\Dashboard\Images\ZipFile.png" />
1614-
<Content Include="Umbraco\Dashboard\Swfs\AIRInstallBadge.swf" />
16151614
<Content Include="Umbraco\Dashboard\Swfs\expressinstall.swf" />
16161615
<Content Include="Umbraco\Images\Editor\insMacroSB.png" />
16171616
<Content Include="Umbraco\Images\Editor\insRazorMacro.png" />
@@ -2676,7 +2675,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
26762675
<WebProjectProperties>
26772676
<UseIIS>True</UseIIS>
26782677
<AutoAssignPort>True</AutoAssignPort>
2679-
<DevelopmentServerPort>6210</DevelopmentServerPort>
2678+
<DevelopmentServerPort>6220</DevelopmentServerPort>
26802679
<DevelopmentServerVPath>/</DevelopmentServerVPath>
26812680
<IISUrl>http://localhost:6220</IISUrl>
26822681
<NTLMAuthentication>False</NTLMAuthentication>

‎src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,25 @@
11
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DesktopMediaUploader.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.DesktopMediaUploader" %>
2-
<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %>
32
<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %>
43

54
<umb:CssInclude runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />
6-
<umb:JsInclude runat="server" FilePath="dashboard/scripts/swfobject.js" PathNameAlias="UmbracoRoot" />
75

86
<div class="dashboardWrapper">
97
<h2>Desktop Media Uploader</h2>
108
<img src="./dashboard/images/dmu.png" alt="Umbraco" class="dashboardIcon" />
119
<p><strong>Desktop Media Uploader</strong> 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.</p>
12-
<p>The badge below will auto configure itself based upon whether you already have <strong>Desktop Media Uploader</strong> installed or not.</p>
13-
<p>Just click the <strong>Install Now / Upgrade Now / Launch Now</strong> link to perform that action.</p>
1410
<div class="dashboardColWrapper">
1511
<div class="dashboardCols">
1612
<div class="dashboardCol">
1713
<asp:Panel ID="Panel1" runat="server"></asp:Panel>
1814
<asp:Panel ID="Panel2" runat="server">
19-
<p>
20-
<div id="dmu-badge">
21-
Download <a href="<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air">Desktop Media Uploader</a> now.<br /><br /><span id="Span1">This application requires Adobe&#174;&nbsp;AIR&#8482; to be installed for <a href="http://airdownload.adobe.com/air/mac/download/latest/AdobeAIR.dmg">Mac OS</a> or <a href="http://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe">Windows</a>.
22-
</div>
23-
</p>
24-
<script type="text/javascript">
25-
// <![CDATA[
26-
var flashvars = {
27-
appid: "org.umbraco.DesktopMediaUploader",
28-
appname: "Desktop Media Uploader",
29-
appversion: "v2.1.0",
30-
appurl: "<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air",
31-
applauncharg: "<%= AppLaunchArg %>",
32-
image: "/umbraco/dashboard/images/dmu-badge.jpg?2.1.0",
33-
airversion: "2.0"
34-
};
35-
var params = {
36-
menu: "false",
37-
wmode: "opaque"
38-
};
39-
var attributes = {
40-
style: "margin-bottom:10px;"
41-
};
42-
43-
swfobject.embedSWF("/umbraco/dashboard/swfs/airinstallbadge.swf", "dmu-badge", "215", "180", "9.0.115", "/umbraco/dashboard/swfs/expressinstall.swf", flashvars, params, attributes);
44-
// ]]>
45-
</script>
15+
<div id="dmu-badge">
16+
<p>
17+
<span id="Span1">This application requires Adobe&#174;&nbsp;AIR&#8482; to be installed for <a href="http://airdownload.adobe.com/air/mac/download/latest/AdobeAIR.dmg">Mac OS</a> or <a href="http://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe">Windows</a></span>.<br />
18+
After Air is installed you can install the <a href="<%= FullyQualifiedAppPath %>umbraco/Dashboard/air/DesktopMediaUploader.air">Desktop Media Uploader by clicking here</a>.
19+
</p>
20+
</div>
4621
</asp:Panel>
4722
</div>
4823
</div>
4924
</div>
50-
</div>
25+
</div>

‎src/Umbraco.Web.UI/umbraco/dashboard/swfs/AIRInstallBadge.swf

-66.4 KB
Binary file not shown.

‎src/Umbraco.Web/Umbraco.Web.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,9 @@
17951795
<Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
17961796
<Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
17971797
<Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
1798-
<Content Include="umbraco.presentation\umbraco\dashboard\DesktopMediaUploader.ascx" />
1798+
<Content Include="umbraco.presentation\umbraco\dashboard\DesktopMediaUploader.ascx">
1799+
<SubType>ASPXCodeBehind</SubType>
1800+
</Content>
17991801
<Content Include="umbraco.presentation\umbraco\dashboard\DeveloperDashboardIntro.ascx" />
18001802
<Content Include="umbraco.presentation\umbraco\dashboard\DeveloperDashboardVideos.ascx" />
18011803
<Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />

‎src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,25 @@
11
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DesktopMediaUploader.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.DesktopMediaUploader" %>
2-
<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %>
32
<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %>
43

54
<umb:CssInclude runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />
6-
<umb:JsInclude runat="server" FilePath="dashboard/scripts/swfobject.js" PathNameAlias="UmbracoRoot" />
75

86
<div class="dashboardWrapper">
97
<h2>Desktop Media Uploader</h2>
108
<img src="./dashboard/images/dmu.png" alt="Umbraco" class="dashboardIcon" />
119
<p><strong>Desktop Media Uploader</strong> 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.</p>
12-
<p>The badge below will auto configure itself based upon whether you already have <strong>Desktop Media Uploader</strong> installed or not.</p>
13-
<p>Just click the <strong>Install Now / Upgrade Now / Launch Now</strong> link to perform that action.</p>
1410
<div class="dashboardColWrapper">
1511
<div class="dashboardCols">
1612
<div class="dashboardCol">
1713
<asp:Panel ID="Panel1" runat="server"></asp:Panel>
1814
<asp:Panel ID="Panel2" runat="server">
19-
<p>
20-
<div id="dmu-badge">
21-
Download <a href="<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air">Desktop Media Uploader</a> now.<br /><br /><span id="Span1">This application requires Adobe&#174;&nbsp;AIR&#8482; to be installed for <a href="http://airdownload.adobe.com/air/mac/download/latest/AdobeAIR.dmg">Mac OS</a> or <a href="http://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe">Windows</a>.
22-
</div>
23-
</p>
24-
<script type="text/javascript">
25-
// <![CDATA[
26-
var flashvars = {
27-
appid: "org.umbraco.DesktopMediaUploader",
28-
appname: "Desktop Media Uploader",
29-
appversion: "v2.1.0",
30-
appurl: "<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air",
31-
applauncharg: "<%= AppLaunchArg %>",
32-
image: "/umbraco/dashboard/images/dmu-badge.jpg?2.1.0",
33-
airversion: "2.0"
34-
};
35-
var params = {
36-
menu: "false",
37-
wmode: "opaque"
38-
};
39-
var attributes = {
40-
style: "margin-bottom:10px;"
41-
};
42-
43-
swfobject.embedSWF("/umbraco/dashboard/swfs/airinstallbadge.swf", "dmu-badge", "215", "180", "9.0.115", "/umbraco/dashboard/swfs/expressinstall.swf", flashvars, params, attributes);
44-
// ]]>
45-
</script>
15+
<div id="dmu-badge">
16+
<p>
17+
<span id="Span1">This application requires Adobe&#174;&nbsp;AIR&#8482; to be installed for <a href="http://airdownload.adobe.com/air/mac/download/latest/AdobeAIR.dmg">Mac OS</a> or <a href="http://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe">Windows</a></span>.<br />
18+
After Air is installed you can install the <a href="<%= FullyQualifiedAppPath %>umbraco/Dashboard/air/DesktopMediaUploader.air">Desktop Media Uploader by clicking here</a>.
19+
</p>
20+
</div>
4621
</asp:Panel>
4722
</div>
4823
</div>
4924
</div>
50-
</div>
25+
</div>

0 commit comments

Comments
 (0)