diff --git a/src/Umbraco.Core/UrlHelperExtensions.cs b/src/Umbraco.Core/UrlHelperExtensions.cs index 8cda789aaf..d2a12bbca8 100644 --- a/src/Umbraco.Core/UrlHelperExtensions.cs +++ b/src/Umbraco.Core/UrlHelperExtensions.cs @@ -12,6 +12,18 @@ namespace Umbraco.Core /// public static class UrlHelperExtensions { + + /// + /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController" + /// + /// + /// + public static string GetExamineManagementServicePath(this UrlHelper url) + { + var result = url.Action("Index", "ExamineManagement", new { area = GlobalSettings.UmbracoMvcArea }); + return result.TrimEnd("Index").EnsureEndsWith('/'); + } + /// /// Returns the base path (not including the 'action') of the MVC controller "SaveFileController" /// @@ -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('/'); } /// @@ -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('/'); } /// diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index b27d632994..5a308c239a 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -48,9 +48,9 @@ 4 - + False - ..\packages\Examine.0.1.47.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll False diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index f674dadc33..fad9bf56f9 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 07ad1d3a4e..615947cd83 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -103,6 +103,10 @@ ..\packages\ClientDependency-Mvc.1.5.1.0\lib\ClientDependency.Core.Mvc.dll + + False + ..\packages\Examine.0.1.48.2941\lib\Examine.dll + False ..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll @@ -355,6 +359,13 @@ PartialViewMacro.ascx + + ExamineManagement.ascx + ASPXCodeBehind + + + ExamineManagement.ascx + editMacro.aspx ASPXCodeBehind @@ -515,6 +526,7 @@ + @@ -726,6 +738,8 @@ + + @@ -1942,6 +1956,8 @@ + + @@ -2372,7 +2388,9 @@ Designer - + + Designer + Designer diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index e4c09f3efd..fd9f356b72 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -100,4 +100,12 @@ /umbraco/plugins/uGoLive/Dashboard.ascx +
+ + developer + + + /umbraco/dashboard/ExamineManagement.ascx + +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.config b/src/Umbraco.Web.UI/config/ExamineIndex.config index 519e9d79eb..a6c3820659 100644 --- a/src/Umbraco.Web.UI/config/ExamineIndex.config +++ b/src/Umbraco.Web.UI/config/ExamineIndex.config @@ -13,5 +13,8 @@ More information and documentation can be found on CodePlex: http://umbracoexami - + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/ExamineSettings.Release.config b/src/Umbraco.Web.UI/config/ExamineSettings.Release.config index 2ab27fbf57..bf35c02d76 100644 --- a/src/Umbraco.Web.UI/config/ExamineSettings.Release.config +++ b/src/Umbraco.Web.UI/config/ExamineSettings.Release.config @@ -12,21 +12,16 @@ More information and documentation can be found on CodePlex: http://umbracoexami - + + @@ -34,12 +29,12 @@ More information and documentation can be found on CodePlex: http://umbracoexami - - + + + diff --git a/src/Umbraco.Web.UI/config/ExamineSettings.config b/src/Umbraco.Web.UI/config/ExamineSettings.config index 4955628ce7..6eb98eaa69 100644 --- a/src/Umbraco.Web.UI/config/ExamineSettings.config +++ b/src/Umbraco.Web.UI/config/ExamineSettings.config @@ -12,24 +12,29 @@ More information and documentation can be found on CodePlex: http://umbracoexami + + + + - + + + + diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index b929b40d4c..67fd408348 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -1,8 +1,8 @@  - + diff --git a/src/Umbraco.Web.UI/umbraco/Views/ExamineManagement/ExamineDetails.cshtml b/src/Umbraco.Web.UI/umbraco/Views/ExamineManagement/ExamineDetails.cshtml new file mode 100644 index 0000000000..bdff15311c --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/Views/ExamineManagement/ExamineDetails.cshtml @@ -0,0 +1,3 @@ +@model Umbraco.Web.Search.ExamineDashboardDetails + +
Hello world
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Web.config b/src/Umbraco.Web.UI/umbraco/Views/Web.config new file mode 100644 index 0000000000..edac1a2296 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/Views/Web.config @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx new file mode 100644 index 0000000000..5aca9fed9b --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx @@ -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" %> + + + + + + + + +
+ +
+ +
+
+ +
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.cs b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.cs new file mode 100644 index 0000000000..bb5dc13c99 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.cs @@ -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 + { + + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.designer.cs new file mode 100644 index 0000000000..1cae9c47a1 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Umbraco.Web.UI.Umbraco.Dashboard { + + + public partial class ExamineManagement { + + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + + /// + /// CssInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; + + /// + /// ProgBar1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Umbraco.Web.UI.Controls.ProgressBar ProgBar1; + } +} diff --git a/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.css b/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.css new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.js b/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.js new file mode 100644 index 0000000000..cf44c67b0c --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco_client/Dashboards/ExamineManagement.js @@ -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 () { + // /// Submits the data to the server for saving + // 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); \ No newline at end of file diff --git a/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs b/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs new file mode 100644 index 0000000000..0f9d6305b1 --- /dev/null +++ b/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs @@ -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; + // } + //} +} diff --git a/src/Umbraco.Web/Search/ExamineDetailsModel.cs b/src/Umbraco.Web/Search/ExamineDetailsModel.cs new file mode 100644 index 0000000000..ac72b6a832 --- /dev/null +++ b/src/Umbraco.Web/Search/ExamineDetailsModel.cs @@ -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; } + } + + /// + /// Model to use to render the dashboard details + /// + public class ExamineDashboardDetails + { + public IEnumerable Indexers { get; set; } + } +} diff --git a/src/Umbraco.Web/UI/Controls/ProgressBar.cs b/src/Umbraco.Web/UI/Controls/ProgressBar.cs new file mode 100644 index 0000000000..b4cfa55555 --- /dev/null +++ b/src/Umbraco.Web/UI/Controls/ProgressBar.cs @@ -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); + } + } +} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 817b3edb97..3a5af5165a 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -100,9 +100,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.47.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll False @@ -360,6 +360,8 @@ + + @@ -373,6 +375,7 @@ + ASPXCodeBehind @@ -1730,6 +1733,7 @@ + diff --git a/src/Umbraco.Web/WebServices/ExamineManagementController.cs b/src/Umbraco.Web/WebServices/ExamineManagementController.cs new file mode 100644 index 0000000000..19e92cffeb --- /dev/null +++ b/src/Umbraco.Web/WebServices/ExamineManagementController.cs @@ -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 + { + /// + /// Get the details + /// + /// + public ActionResult Index() + { + return View("~" + GlobalSettings.Path.EnsureEndsWith('/').EnsureStartsWith('/') + "Views/ExamineManagement/ExamineDetails.cshtml"); + } + + } +} diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index f069f6fe8b..c6ea776acd 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj b/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj index 36bf7d8d51..2f0547f464 100644 --- a/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj +++ b/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj @@ -37,9 +37,9 @@ ..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll - + False - ..\packages\Examine.0.1.45.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll ..\packages\Examine.Azure.0.1.43.2941\lib\Examine.Azure.dll diff --git a/src/UmbracoExamine.Azure/packages.config b/src/UmbracoExamine.Azure/packages.config index 39cf794068..aabc30238c 100644 --- a/src/UmbracoExamine.Azure/packages.config +++ b/src/UmbracoExamine.Azure/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj b/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj index 6066f0a7fe..1380ec5150 100644 --- a/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj +++ b/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj @@ -37,9 +37,9 @@ ..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll - + False - ..\packages\Examine.0.1.45.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll ..\packages\Examine.Azure.0.1.43.2941\lib\Examine.Azure.dll diff --git a/src/UmbracoExamine.PDF.Azure/packages.config b/src/UmbracoExamine.PDF.Azure/packages.config index 39cf794068..aabc30238c 100644 --- a/src/UmbracoExamine.PDF.Azure/packages.config +++ b/src/UmbracoExamine.PDF.Azure/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj index bd9d07a868..65c8f13da0 100644 --- a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj +++ b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj @@ -44,9 +44,9 @@ bin\Release\UmbracoExamine.PDF.XML - + False - ..\packages\Examine.0.1.45.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll diff --git a/src/UmbracoExamine.PDF/packages.config b/src/UmbracoExamine.PDF/packages.config index 4464039e3f..a553d45fe3 100644 --- a/src/UmbracoExamine.PDF/packages.config +++ b/src/UmbracoExamine.PDF/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 3a462c8efe..44774e2782 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -80,9 +80,9 @@ ..\Solution Items\TheFARM-Public.snk - + False - ..\packages\Examine.0.1.45.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll False diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index d818042df7..292f780796 100644 --- a/src/UmbracoExamine/packages.config +++ b/src/UmbracoExamine/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config index 14c921b9e7..a5cdc1eff1 100644 --- a/src/umbraco.MacroEngines/packages.config +++ b/src/umbraco.MacroEngines/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index 97814acdff..2f8df2c6ec 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -42,9 +42,9 @@ bin\Release\umbraco.MacroEngines.xml - + False - ..\packages\Examine.0.1.47.2941\lib\Examine.dll + ..\packages\Examine.0.1.48.2941\lib\Examine.dll False diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs index dd58fd0fb8..5304e92fb5 100644 --- a/src/umbraco.controls/ProgressBar.cs +++ b/src/umbraco.controls/ProgressBar.cs @@ -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);