yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move FolderBrowser control to Umbraco.Web project

Browse Source
This commit is contained in:
Matt@MBP13-PC
2012-07-24 06:19:30 -01:00
parent 82ca2609ec
commit 135bfc6d94
6 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols.FolderBrowser" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="Umbraco.Web.UI.Controls" Assembly="umbraco" %>
<umb:FolderBrowser runat="server" />

2
src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
View File

@@ -46,7 +46,7 @@
text-align: center;
border: solid 1px #ccc;
width: 120px;
height: 160px;
height: 150px;
float: left;
-moz-box-shadow: 2px 2px 2px #e0e0e0;
-webkit-box-shadow: 2px 2px 2px #e0e0e0;

13
src/umbraco.controls/FolderBrowser/FolderBrowser.cs → src/Umbraco.Web/UI/Controls/FolderBrowser.cs
View File

@@ -1,22 +1,19 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using ClientDependency.Core;
using umbraco.BasePages;
using umbraco.cms.businesslogic.media;
namespace umbraco.uicontrols.FolderBrowser
namespace Umbraco.Web.UI.Controls
{
[ClientDependency(ClientDependencyType.Css, "FolderBrowser/css/folderbrowser.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 1)]
[ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 1)]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient", Priority = 2)]
[ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient", Priority = 3)]
[ToolboxData("<{0}:FolderBrowser runat=server></{0}:FolderBrowser>")]
public class FolderBrowser : WebControl
{

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -233,6 +233,7 @@
<Compile Include="..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="UI\Controls\FolderBrowser.cs" />
<Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
<Compile Include="umbraco.presentation\install\steps\database.ascx.cs">
<DependentUpon>database.ascx</DependentUpon>

1
src/umbraco.controls/umbraco.controls.csproj
View File

@@ -86,7 +86,6 @@
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="DatePicker\DateTimePicker.cs" />
<Compile Include="FolderBrowser\FolderBrowser.cs" />
<Compile Include="ProgressBar.cs" />
<Compile Include="TreePicker\BaseTreePicker.cs" />
<Compile Include="TreePicker\BaseTreePickerScripts.Designer.cs">

4
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -164,10 +164,6 @@
</ProjectReference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="umbraco, Version=1.0.4581.20076, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\umbraco.presentation\Bin\umbraco.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\SolutionInfo.cs">