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

Update to latest examine (bug fixed), started Examine Management dashboard FF project.

Browse Source
This commit is contained in:
Shannon Deminick
2013-02-23 23:00:31 +06:00
parent 03aa7fd06b
commit 7deae8ea37
33 changed files with 408 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Core/UrlHelperExtensions.cs
View File

@@ -12,6 +12,18 @@ namespace Umbraco.Core
/// </summary>
public static class UrlHelperExtensions
{
/// <summary>
/// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public static string GetExamineManagementServicePath(this UrlHelper url)
{
var result = url.Action("Index", "ExamineManagement", new { area = GlobalSettings.UmbracoMvcArea });
return result.TrimEnd("Index").EnsureEndsWith('/');
}
/// <summary>
/// Returns the base path (not including the 'action') of the MVC controller "SaveFileController"
/// </summary>
@@ -20,7 +32,7 @@ namespace Umbraco.Core
public static string GetSaveFileServicePath(this UrlHelper url)
{
var result = url.Action("SavePartialView", "SaveFile", new {area = GlobalSettings.UmbracoMvcArea});
return result.TrimEnd("SavePartialView");
return result.TrimEnd("SavePartialView").EnsureEndsWith('/');
}
/// <summary>
@@ -31,7 +43,7 @@ namespace Umbraco.Core
public static string GetBulkPublishServicePath(this UrlHelper url)
{
var result = url.Action("PublishDocument", "BulkPublish", new { area = GlobalSettings.UmbracoMvcArea });
return result.TrimEnd("PublishDocument");
return result.TrimEnd("PublishDocument").EnsureEndsWith('/');
}
/// <summary>

4
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -48,9 +48,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.47.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.47.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/Umbraco.Tests/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.47.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />

20
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -103,6 +103,10 @@
<Reference Include="ClientDependency.Core.Mvc">
<HintPath>..\packages\ClientDependency-Mvc.1.5.1.0\lib\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll</HintPath>
@@ -355,6 +359,13 @@
<Compile Include="Umbraco\Create\PartialViewMacro.ascx.designer.cs">
<DependentUpon>PartialViewMacro.ascx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Dashboard\ExamineManagement.ascx.cs">
<DependentUpon>ExamineManagement.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Umbraco\Dashboard\ExamineManagement.ascx.designer.cs">
<DependentUpon>ExamineManagement.ascx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Developer\Macros\EditMacro.aspx.cs">
<DependentUpon>editMacro.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -515,6 +526,7 @@
<Content Include="Umbraco\Config\Lang\zh.xml" />
<Content Include="Umbraco\Controls\Tree\CustomTreeService.asmx" />
<Content Include="Umbraco\Create\PartialViewMacro.ascx" />
<Content Include="Umbraco\Dashboard\ExamineManagement.ascx" />
<Content Include="Umbraco\Dashboard\Images\access-denied.png" />
<Content Include="Umbraco\Dashboard\Scripts\swfobject.js" />
<Content Include="Umbraco\Dashboard\MediaDashboardFolderBrowser.ascx" />
@@ -726,6 +738,8 @@
<Content Include="Umbraco_Client\CodeMirror\Js\Theme\xq-dark.css" />
<Content Include="Umbraco_Client\ContextMenu\Css\jquery.contextMenu.css" />
<Content Include="Umbraco_Client\ContextMenu\Js\jquery.contextMenu.js" />
<Content Include="Umbraco_Client\Dashboards\ExamineManagement.css" />
<Content Include="Umbraco_Client\Dashboards\ExamineManagement.js" />
<Content Include="Umbraco_Client\Dialogs\CreateDialog.css" />
<Content Include="Umbraco_Client\Dialogs\EditMacro.css" />
<Content Include="Umbraco_Client\Dialogs\EditMacro.js" />
@@ -1942,6 +1956,8 @@
</Content>
<Content Include="Umbraco\Scripting\templates\cshtml\MultinodeTree-picker.cshtml" />
<Content Include="Umbraco\Scripting\templates\cshtml\TwitterFeed.cshtml" />
<Content Include="Umbraco\Views\ExamineManagement\ExamineDetails.cshtml" />
<Content Include="Umbraco\Views\Web.config" />
<None Include="umbraco_client\CodeMirror\js\mode\coffeescript\LICENSE" />
<None Include="umbraco_client\CodeMirror\js\mode\pascal\LICENSE" />
<None Include="umbraco_client\CodeMirror\js\mode\perl\LICENSE" />
@@ -2372,7 +2388,9 @@
<SubType>Designer</SubType>
</None>
<Content Include="Config\404handlers.config" />
<Content Include="Config\Dashboard.config" />
<Content Include="Config\Dashboard.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Config\metablogConfig.config" />
<Content Include="Config\restExtensions.config">
<SubType>Designer</SubType>

8
src/Umbraco.Web.UI/config/Dashboard.config
View File

@@ -100,4 +100,12 @@
<control>/umbraco/plugins/uGoLive/Dashboard.ascx</control>
</tab>
</section>
<section alias="ExamineManagement">
<areas>
<area>developer</area>
</areas>
<tab caption="Examine Management">
<control>/umbraco/dashboard/ExamineManagement.ascx</control>
</tab>
</section>
</dashBoard>

3
src/Umbraco.Web.UI/config/ExamineIndex.config
View File

@@ -14,4 +14,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
<IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/" />
<!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
<IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
</ExamineLuceneIndexSets>

15
src/Umbraco.Web.UI/config/ExamineSettings.Release.config
View File

@@ -12,21 +12,16 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<add name="InternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
supportUnpublished="true"
supportProtected="true"
interval="10"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
<add name="InternalMemberIndexer" type="UmbracoExamine.UmbracoMemberIndexer, UmbracoExamine"
supportUnpublished="true"
supportProtected="true"
interval="10"
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
<!-- default external indexer, which excludes protected and published pages-->
<add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
supportUnpublished="false"
supportProtected="false"
interval="10"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
<add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
</providers>
</ExamineIndexProviders>
@@ -35,11 +30,11 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<add name="InternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
<add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
<add name="InternalMemberSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
<add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
</providers>
</ExamineSearchProviders>

11
src/Umbraco.Web.UI/config/ExamineSettings.config
View File

@@ -12,24 +12,29 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<add name="InternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
supportUnpublished="true"
supportProtected="true"
interval="10"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
<add name="InternalMemberIndexer" type="UmbracoExamine.UmbracoMemberIndexer, UmbracoExamine"
supportUnpublished="true"
supportProtected="true"
interval="10"
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
<!-- default external indexer, which excludes protected and published pages-->
<add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
</providers>
</ExamineIndexProviders>
<ExamineSearchProviders defaultProvider="InternalSearcher">
<ExamineSearchProviders defaultProvider="ExternalSearcher">
<providers>
<add name="InternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
<add name="InternalMemberSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
<add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
</providers>
</ExamineSearchProviders>

2
src/Umbraco.Web.UI/packages.config
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.5.1.0" targetFramework="net40" />
<package id="Examine" version="0.1.47.2941" targetFramework="net40" />
<package id="ClientDependency-Mvc" version="1.5.1.0" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />

3
src/Umbraco.Web.UI/umbraco/Views/ExamineManagement/ExamineDetails.cshtml Normal file
View File

@@ -0,0 +1,3 @@
@model Umbraco.Web.Search.ExamineDashboardDetails
<div>Hello world</div>

55
src/Umbraco.Web.UI/umbraco/Views/Web.config Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0"?>
<configuration>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
<add namespace="System.Web.Mvc.Ajax" />
<add namespace="System.Web.Mvc.Html" />
<add namespace="System.Web.Routing" />
<add namespace="Umbraco.Web" />
<add namespace="Umbraco.Core" />
<add namespace="Umbraco.Core.Models" />
<add namespace="Umbraco.Web.Mvc" />
</namespaces>
</pages>
</system.web.webPages.razor>
<appSettings>
<add key="webpages:Enabled" value="false" />
</appSettings>
<system.web>
<httpHandlers>
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
</httpHandlers>
<!--
Enabling request validation in view pages would cause validation to occur
after the input has already been processed by the controller. By default
MVC performs request validation before a controller processes the input.
To change this behavior apply the ValidateInputAttribute to a
controller or action.
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<handlers>
<remove name="BlockViewHandler"/>
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
</handlers>
</system.webServer>
</configuration>

32
src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx Normal file
View File

@@ -0,0 +1,32 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ExamineManagement.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dashboard.ExamineManagement" %>
<%@ Import Namespace="Umbraco.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.Controls" Assembly="umbraco" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Dashboards/ExamineManagement.js" PathNameAlias="UmbracoClient" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="Dashboards/ExamineManagement.css" PathNameAlias="UmbracoClient" />
<script type="text/javascript">
(function ($) {
$(document).ready(function () {
var mgmt = new Umbraco.Dashboards.ExamineManagement({
container: $("#examineManagement"),
restServiceLocation: "<%=Url.GetExamineManagementServicePath() %>"
});
mgmt.init();
});
})(jQuery);
</script>
<div id="examineManagement">
<div data-bind="visible: loading()">
<cc1:ProgressBar runat="server" ID="ProgBar1" Text="Loading..." />
</div>
<div data-bind="html: summary"></div>
</div>

14
src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace Umbraco.Web.UI.Umbraco.Dashboard
{
public partial class ExamineManagement : Controls.UmbracoUserControl
{
}
}

42
src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.designer.cs generated Normal file
View File

@@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Web.UI.Umbraco.Dashboard {
public partial class ExamineManagement {
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
/// <summary>
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
/// <summary>
/// ProgBar1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web.UI.Controls.ProgressBar ProgBar1;
}
}

1
src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.css Normal file
View File

@@ -0,0 +1 @@

85
src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.js Normal file
View File

@@ -0,0 +1,85 @@
Umbraco.Sys.registerNamespace("Umbraco.Dashboards");
(function ($) {
Umbraco.Dashboards.ExamineManagement = base2.Base.extend({
//private methods/variables
_opts: null,
_koViewModel: null,
// Constructor
constructor: function (opts) {
// Merge options with default
this._opts = $.extend({
container: $("#examineManagement")
}, opts);
},
//public methods/variables
init: function () {
var self = this;
//The knockout js view model for the selected item
self._koViewModel = {
summary: ko.observable(""),
loading: ko.observable(false)
//publishAll: ko.observable(false),
//includeUnpublished: ko.observable(false)
};
ko.applyBindings(self._koViewModel, self._opts.container.get(0));
this.loadSummary();
},
loadSummary: function() {
var self = this;
self._koViewModel.loading(true);
$.get(self._opts.restServiceLocation + "Index",
function(e) {
self._koViewModel.loading(false);
self._koViewModel.summary(e);
}, "html").fail(function(a, b, c) {
alert("error: " + b);
});
}
//doSubmit: function () {
// /// <summary>Submits the data to the server for saving</summary>
// var codeVal = UmbClientMgr.contentFrame().UmbEditor.GetCode();
// var self = this;
// if (this._opts.editorType == "Template") {
// //saving a template view
// $.post(self._opts.restServiceLocation + "SaveTemplate",
// JSON.stringify({
// templateName: this._opts.nameTxtBox.val(),
// templateAlias: this._opts.aliasTxtBox.val(),
// templateContents: codeVal,
// templateId: this._opts.templateId,
// masterTemplateId: this._opts.masterPageDropDown.val()
// }),
// function (e) {
// if (e.success) {
// self.submitSuccess(e.message, e.header);
// } else {
// self.submitFailure(e.message, e.header);
// }
// });
// }
//},
});
//Set defaults for jQuery ajax calls.
$.ajaxSetup({
dataType: 'json',
cache: false,
contentType: 'application/json; charset=utf-8'
});
})(jQuery);

26
src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.Routing;
namespace Umbraco.Web.Routing
{
//public class WebServicesRouteConstraint : IRouteConstraint
//{
// public bool Match(
// HttpContextBase httpContext,
// Route route,
// string parameterName,
// RouteValueDictionary values,
// RouteDirection routeDirection)
// {
// if (routeDirection == RouteDirection.UrlGeneration)
// {
// }
// return true;
// }
//}
}

24
src/Umbraco.Web/Search/ExamineDetailsModel.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Examine;
namespace Umbraco.Web.Search
{
public class ExamineIndexerModel
{
public string Name { get; set; }
public bool SupportsUnpublished { get; set; }
public bool SupportsProtected { get; set; }
public IIndexCriteria IndexCriteria { get; set; }
}
/// <summary>
/// Model to use to render the dashboard details
/// </summary>
public class ExamineDashboardDetails
{
public IEnumerable<ExamineIndexerModel> Indexers { get; set; }
}
}

17
src/Umbraco.Web/UI/Controls/ProgressBar.cs Normal file
View File

@@ -0,0 +1,17 @@
using Umbraco.Core.IO;
namespace Umbraco.Web.UI.Controls
{
public class ProgressBar : System.Web.UI.WebControls.Image
{
public string Title { get; set; }
protected override void Render(System.Web.UI.HtmlTextWriter writer)
{
base.ImageUrl = SystemDirectories.UmbracoClient + "/images/progressBar.gif";
base.AlternateText = Title;
base.Render(writer);
}
}
}

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

@@ -100,9 +100,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.47.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.47.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.5.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -360,6 +360,8 @@
<Compile Include="Routing\NotFoundHandlerHelper.cs" />
<Compile Include="Routing\EnsureRoutableOutcome.cs" />
<Compile Include="Routing\PublishedContentRequestEngine.cs" />
<Compile Include="Routing\WebServicesRouteConstraint.cs" />
<Compile Include="Search\ExamineDetailsModel.cs" />
<Compile Include="Search\ExamineEvents.cs" />
<Compile Include="Security\WebSecurity.cs" />
<Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
@@ -373,6 +375,7 @@
<Compile Include="Trees\PartialViewMacrosTree.cs" />
<Compile Include="Trees\PartialViewsTree.cs" />
<Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
<Compile Include="UI\Controls\ProgressBar.cs" />
<Compile Include="UI\Controls\UmbracoControl.cs" />
<Compile Include="UI\Controls\UmbracoUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
@@ -1730,6 +1733,7 @@
</Compile>
<Compile Include="WebServices\BulkPublishController.cs" />
<Compile Include="WebServices\CoreStringsController.cs" />
<Compile Include="WebServices\ExamineManagementController.cs" />
<Compile Include="WebServices\FolderBrowserService.cs" />
<Compile Include="WebServices\SaveFileController.cs" />
<Content Include="umbraco.presentation\umbracobase\readme.txt" />

24
src/Umbraco.Web/WebServices/ExamineManagementController.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Web.Mvc;
namespace Umbraco.Web.WebServices
{
public class ExamineManagementController : UmbracoAuthorizedController
{
/// <summary>
/// Get the details
/// </summary>
/// <returns></returns>
public ActionResult Index()
{
return View("~" + GlobalSettings.Path.EnsureEndsWith('/').EnsureStartsWith('/') + "Views/ExamineManagement/ExamineDetails.cshtml");
}
}
}

2
src/Umbraco.Web/packages.config
View File

@@ -2,7 +2,7 @@
<packages>
<package id="ClientDependency" version="1.5.1.0" targetFramework="net40" />
<package id="CodeSharp.Package.AspNetWebPage" version="1.0" targetFramework="net40" />
<package id="Examine" version="0.1.47.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="HtmlAgilityPack" version="1.4.5" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />

4
src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj
View File

@@ -37,9 +37,9 @@
<Reference Include="AzureDirectory">
<HintPath>..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.45.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.45.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="Examine.Azure">
<HintPath>..\packages\Examine.Azure.0.1.43.2941\lib\Examine.Azure.dll</HintPath>

2
src/UmbracoExamine.Azure/packages.config
View File

@@ -2,7 +2,7 @@
<packages>
<package id="AnglicanGeek.WindowsAzure.ServiceRuntime" version="1.6" targetFramework="net40" />
<package id="AzureDirectory" version="1.0.5" targetFramework="net40" />
<package id="Examine" version="0.1.45.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="Examine.Azure" version="0.1.43.2941" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

4
src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj
View File

@@ -37,9 +37,9 @@
<Reference Include="AzureDirectory">
<HintPath>..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.45.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.45.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="Examine.Azure">
<HintPath>..\packages\Examine.Azure.0.1.43.2941\lib\Examine.Azure.dll</HintPath>

2
src/UmbracoExamine.PDF.Azure/packages.config
View File

@@ -2,7 +2,7 @@
<packages>
<package id="AnglicanGeek.WindowsAzure.ServiceRuntime" version="1.6" targetFramework="net40" />
<package id="AzureDirectory" version="1.0.5" targetFramework="net40" />
<package id="Examine" version="0.1.45.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="Examine.Azure" version="0.1.43.2941" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

4
src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
View File

@@ -44,9 +44,9 @@
<DocumentationFile>bin\Release\UmbracoExamine.PDF.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.45.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.45.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

2
src/UmbracoExamine.PDF/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.45.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="iTextSharp" version="5.3.3" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

4
src/UmbracoExamine/UmbracoExamine.csproj
View File

@@ -80,9 +80,9 @@
<AssemblyOriginatorKeyFile>..\Solution Items\TheFARM-Public.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.45.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.45.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/UmbracoExamine/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.45.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
</packages>

2
src/umbraco.MacroEngines/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.47.2941" targetFramework="net40" />
<package id="Examine" version="0.1.48.2941" targetFramework="net40" />
<package id="HtmlAgilityPack" version="1.4.5" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />

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

@@ -42,9 +42,9 @@
<DocumentationFile>bin\Release\umbraco.MacroEngines.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.47.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.48.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.47.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.48.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.5.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

1
src/umbraco.controls/ProgressBar.cs
View File

@@ -6,6 +6,7 @@ using System.Web.UI.WebControls;
namespace umbraco.uicontrols
{
[Obsolete("Use Umbraco.Web.UI.Controls.ProgressBar")]
public class ProgressBar : System.Web.UI.WebControls.Image
{
private string _title = umbraco.ui.Text("publish", "inProgress", null);