diff --git a/OurUmbraco.Site/Hiccup.aspx b/OurUmbraco.Site/Hiccup.aspx index d84174ba..d5020038 100644 --- a/OurUmbraco.Site/Hiccup.aspx +++ b/OurUmbraco.Site/Hiccup.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Hiccup.aspx.cs" Inherits="our.Hiccup" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Hiccup.aspx.cs" Inherits="OurUmbraco.Our.Hiccup" %> diff --git a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml index 776c2086..db53ade5 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml @@ -1,5 +1,4 @@ @using System.Drawing -@using our @using OurUmbraco.Our @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml index 732e818d..d484ee29 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml @@ -1,3 +1,3 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage - - @Html.Action("Render", "Profile") + +@Html.Action("Render", "Profile") diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml index ff5962c7..70e578c7 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml @@ -1,6 +1,5 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @using System.Drawing -@using our @using OurUmbraco.Forum.Extensions @using OurUmbraco.Forum.Services @using OurUmbraco.Our diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml index cbb709bc..0263dfc1 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml @@ -6,4 +6,5 @@ Response.Redirect("/member/profile"); } } + @Html.Action("Render", "Register") \ No newline at end of file diff --git a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml index 985ee56b..eb0c9fb3 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml @@ -1,6 +1,5 @@ @using System.Collections.Specialized @using System.Drawing -@using our @using OurUmbraco.Our @inherits Umbraco.Web.Macros.PartialViewMacroPage diff --git a/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml b/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml index 7b7ddd56..841f066c 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml @@ -1,6 +1,6 @@ @using Examine.SearchCriteria -@using our.Examine @using OurUmbraco.Our +@using OurUmbraco.Our.Examine @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ const int pagesToShowLeft = 4; diff --git a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml index 4fe88458..cd6a38ef 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml @@ -1,5 +1,4 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage -@using our.Controllers @using OurUmbraco.Forum.Extensions @using OurUmbraco.Our @using OurUmbraco.Project.Services diff --git a/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml b/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml index 1e8498fa..1ca72016 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml @@ -1,3 +1,4 @@ +@using OurUmbraco.Our.Examine @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ @@ -8,7 +9,7 @@ var term = Request["term"]; var pageSize = 50; - our.Examine.OurSearcher searcher = new our.Examine.OurSearcher(term, orderBy: orderMode); + OurSearcher searcher = new OurSearcher(term, orderBy: orderMode); IEnumerable result = new List(); var url = "orderBy=" + orderMode + "&q=" + term + "&version=" + version; diff --git a/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml b/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml index 0db2e520..4a5ea9fc 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml @@ -1,5 +1,4 @@ -@using our -@using OurUmbraco.Forum.Extensions +@using OurUmbraco.Forum.Extensions @using OurUmbraco.Forum.Services @using OurUmbraco.Our @inherits Umbraco.Web.Macros.PartialViewMacroPage diff --git a/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml b/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml index a4dceee4..879fda55 100644 --- a/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml +++ b/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml @@ -1,4 +1,5 @@ -@inherits Umbraco.Web.Mvc.UmbracoViewPage +@using OurUmbraco.Our.Controllers +@inherits Umbraco.Web.Mvc.UmbracoViewPage @{ Html.EnableClientValidation(true); Html.EnableUnobtrusiveJavaScript(true); @@ -21,7 +22,7 @@ Change your profile
- @using (Html.BeginUmbracoForm("HandleSubmit")) + @using (Html.BeginUmbracoForm("HandleSubmit")) { @Html.ValidationSummary() @Html.AntiForgeryToken() diff --git a/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml b/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml index 82e832fa..7cf44644 100644 --- a/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml +++ b/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml @@ -1,4 +1,5 @@ -@inherits Umbraco.Web.Mvc.UmbracoViewPage +@using OurUmbraco.Our.Controllers +@inherits Umbraco.Web.Mvc.UmbracoViewPage @{ Html.EnableClientValidation(true); Html.EnableUnobtrusiveJavaScript(true); @@ -9,7 +10,7 @@
- @using (Html.BeginUmbracoForm("HandleSubmit")) + @using (Html.BeginUmbracoForm("HandleSubmit")) { @Html.AntiForgeryToken() diff --git a/OurUmbraco.Site/Views/Partials/Members/Register.cshtml b/OurUmbraco.Site/Views/Partials/Members/Register.cshtml index a6769fa3..24797937 100644 --- a/OurUmbraco.Site/Views/Partials/Members/Register.cshtml +++ b/OurUmbraco.Site/Views/Partials/Members/Register.cshtml @@ -1,4 +1,5 @@ -@inherits Umbraco.Web.Mvc.UmbracoViewPage +@using OurUmbraco.Our.Controllers +@inherits Umbraco.Web.Mvc.UmbracoViewPage @{ Html.EnableClientValidation(true); Html.EnableUnobtrusiveJavaScript(true); @@ -21,7 +22,7 @@ Your details
- @using (Html.BeginUmbracoForm("HandleSubmit")) + @using (Html.BeginUmbracoForm("HandleSubmit")) { @Html.ValidationSummary(true) @Html.AntiForgeryToken() diff --git a/OurUmbraco.Site/Views/Search/Search.aspx b/OurUmbraco.Site/Views/Search/Search.aspx index f045b538..35d5e116 100644 --- a/OurUmbraco.Site/Views/Search/Search.aspx +++ b/OurUmbraco.Site/Views/Search/Search.aspx @@ -1,7 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" CodeBehind="Search.aspx.cs" Inherits="OurUmbraco.Site.Views.Search.Search" %> <%@ Import Namespace="Umbraco.Web" %> -<%@ Import Namespace="our" %> +<%@ Import Namespace="OurUmbraco.Our" %> diff --git a/OurUmbraco.Site/Views/Search/Search.aspx.cs b/OurUmbraco.Site/Views/Search/Search.aspx.cs index e8d240aa..1c70e61e 100644 --- a/OurUmbraco.Site/Views/Search/Search.aspx.cs +++ b/OurUmbraco.Site/Views/Search/Search.aspx.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using Examine.SearchCriteria; -using our.Examine; -using our.Models; +using OurUmbraco.Our.Examine; +using OurUmbraco.Our.Models; using Umbraco.Web; using Umbraco.Web.UI.Pages; diff --git a/OurUmbraco.Site/config/ExamineSettings.config b/OurUmbraco.Site/config/ExamineSettings.config index d8a84cea..deb19a32 100644 --- a/OurUmbraco.Site/config/ExamineSettings.config +++ b/OurUmbraco.Site/config/ExamineSettings.config @@ -23,21 +23,21 @@ More information and documentation can be found on CodePlex: http://umbracoexami @@ -56,7 +56,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami + analyzer="OurUmbraco.Our.Examine.ProjectAnalyzer, OurUmbraco"/> <%@ Register TagPrefix="CD" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="CD" Namespace="our" Assembly="our.umbraco.org" %> +<%@ Register TagPrefix="CD" Namespace="OurUmbraco.Our" Assembly="OurUmbraco" %> diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/Release.master index 3ab7546b..e94eed3c 100644 --- a/OurUmbraco.Site/masterpages/Release.master +++ b/OurUmbraco.Site/masterpages/Release.master @@ -182,7 +182,7 @@ var width = (item.IsLast() && countIsOdd) ? 895 : 380; var numberOfDownloads = 0; int.TryParse(item.NumberOfDownloads, out numberOfDownloads); - numberOfDownloads = numberOfDownloads + our.Utils.GetReleaseDownloadCount(item.Id); + numberOfDownloads = numberOfDownloads + OurUmbraco.Our.Utils.GetReleaseDownloadCount(item.Id); if(item.Name.Contains("WebPI") == false) {
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx index 4507edab..c997a648 100644 --- a/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx +++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="our.usercontrols.EventEditor" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.EventEditor" %> <%@ Import Namespace="umbraco.cms.businesslogic.member" %> diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx index 47ca1bc1..aabffe71 100644 --- a/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx +++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx @@ -1 +1 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="our.usercontrols.FileDownloadProxy" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.FileDownloadProxy" %> diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx index 5b0c9692..dbdaaf8c 100644 --- a/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx +++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="our.usercontrols.Forgotpassword" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Forgotpassword" %>

A new password has been sent to the email address:

diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx index 361d7ffa..60d80248 100644 --- a/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx +++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="InsertImage.ascx.cs" - Inherits="our.usercontrols.InsertImage" %> + Inherits="OurUmbraco.Our.usercontrols.InsertImage" %>