Adjust uForum namespaces to be correct

2015-07-26 20:31:59 +02:00
parent 1e7bef963b
commit 81aec9d30a
115 changed files with 171 additions and 298 deletions
@@ -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" %>

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" >
@@ -1,5 +1,4 @@
@using System.Drawing
-@using our
@using OurUmbraco.Our
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@{
@@ -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
@@ -6,4 +6,5 @@
        Response.Redirect("/member/profile");
    }
 }
+
@Html.Action("Render", "Register") 
@@ -1,6 +1,5 @@
@using System.Collections.Specialized
@using System.Drawing
-@using our
@using OurUmbraco.Our
@inherits Umbraco.Web.Macros.PartialViewMacroPage

@@ -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;
@@ -1,5 +1,4 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
-@using our.Controllers
@using OurUmbraco.Forum.Extensions
@using OurUmbraco.Our
@using OurUmbraco.Project.Services
@@ -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<SearchResult> result = new List<SearchResult>();
    var url = "orderBy=" + orderMode + "&q=" + term + "&version=" + version;
@@ -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
@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.ProfileModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.ProfileModel>
@{
    Html.EnableClientValidation(true);
    Html.EnableUnobtrusiveJavaScript(true);
@@ -21,7 +22,7 @@
        <strong>Change your profile</strong>
        <div class="profile-settings-forms">

-            @using (Html.BeginUmbracoForm<our.Controllers.ProfileController>("HandleSubmit"))
+            @using (Html.BeginUmbracoForm<ProfileController>("HandleSubmit"))
            {
                @Html.ValidationSummary()
                @Html.AntiForgeryToken()
@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.ProfileNotificationModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.ProfileNotificationModel>
@{
    Html.EnableClientValidation(true);
    Html.EnableUnobtrusiveJavaScript(true);
@@ -9,7 +10,7 @@
    
    <div class="profile-settings-forms">

-        @using (Html.BeginUmbracoForm<our.Controllers.ProfileNotificationController>("HandleSubmit"))
+        @using (Html.BeginUmbracoForm<ProfileNotificationController>("HandleSubmit"))
        {
            @Html.AntiForgeryToken()

@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.RegisterModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.RegisterModel>
@{
    Html.EnableClientValidation(true);
    Html.EnableUnobtrusiveJavaScript(true);
@@ -21,7 +22,7 @@
    <strong>Your details</strong>
    <div class="profile-settings-forms">

-        @using (Html.BeginUmbracoForm<our.Controllers.RegisterController>("HandleSubmit"))
+        @using (Html.BeginUmbracoForm<RegisterController>("HandleSubmit"))
        {
            @Html.ValidationSummary(true)
            @Html.AntiForgeryToken()
@@ -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" %>

 <asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
 </asp:Content>
@@ -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;

@@ -23,21 +23,21 @@ More information and documentation can be found on CodePlex: http://umbracoexami

      <add name="ForumIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
           autoOptimize="false"	  
-           dataService="our.Examine.ForumDataService, our.umbraco.org"
+           dataService="OurUmbraco.Our.Examine.ForumDataService, OurUmbraco"
           indexTypes="forum" /> 

      <add name="documentationIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
           autoOptimize="false"
           indexSet="documentationIndexSet"
-           dataService="our.Examine.DocumentationIndexDataService, our.umbraco.org"
+           dataService="OurUmbraco.Our.Examine.DocumentationIndexDataService, OurUmbraco"
           analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"
           indexTypes="documentation"/>
 
      <add name="projectIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
           autoOptimize="false"	  
          indexSet="projectIndexSet"
-          dataService="our.Examine.ProjectNodeIndexDataService, our.umbraco.org"
-          analyzer="our.Examine.ProjectAnalyzer, our.umbraco.org"
+          dataService="OurUmbraco.Our.Examine.ProjectNodeIndexDataService, OurUmbraco"
+          analyzer="OurUmbraco.Our.Examine.ProjectAnalyzer, OurUmbraco"
          indexTypes="project"/>
     
    </providers>  
@@ -56,7 +56,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
      <add name="ForumSearcher" type="Examine.LuceneEngine.Providers.LuceneSearcher, Examine" />

      <add name="projectSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
-           analyzer="our.Examine.ProjectAnalyzer, our.umbraco.org"/>
+           analyzer="OurUmbraco.Our.Examine.ProjectAnalyzer, OurUmbraco"/>

      <add name="documentationSearcher"
        type="Examine.LuceneEngine.Providers.LuceneSearcher, Examine"
@@ -2,7 +2,7 @@

 <%@ Import Namespace="Umbraco.Web" %>
 <%@ 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" %>

 <asp:Content ContentPlaceHolderID="ContentPlaceHolderDefault" runat="server">
    <!doctype html>
@@ -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) 
                                            {
                                                <div class="release @(item.IsFirst() == false ? "bin" : "zip") col-sm-1">
@@ -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" %>
 <link rel="stylesheet" media="all" type="text/css" href="/css/ui-lightness/jquery-ui-1.8.16.custom.css" />

@@ -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" %>
@@ -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" %>
 <asp:Panel runat="server" ID="message" Visible="False">
    <div class="notice">
        <p style="color: green;">A new password has been sent to the email address: <asp:Literal ID="lt_email" runat="server" /></p>
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="InsertImage.ascx.cs"
-    Inherits="our.usercontrols.InsertImage" %>
+    Inherits="OurUmbraco.Our.usercontrols.InsertImage" %>


 <script type="text/javascript">
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="our.usercontrols.Login" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Login" %>

 <asp:Panel runat="server" DefaultButton="bt_login">
    <div class="form simpleForm" id="registrationForm">
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="our.usercontrols.ProjectCollabRequest" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectCollabRequest" %>

 <h1><asp:Literal runat="server" ID="lt_title" Text="Create project"></asp:Literal> collaboration request</h1>

@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="our.usercontrols.ProjectContributors" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectContributors" %>

 <asp:Panel ID="holder" runat="server" Visible="false">

@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="our.usercontrols.ProjectEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectEditor" %>

 <asp:PlaceHolder runat="server" ID="notallowed" Visible="False">
    <h2>Sorry, your account is too new to create projects! If you're human, make sure to <a href="https://umbraco.com/about-us/team">get in touch with us</a> to get this restriction lifted.</h2>
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="our.usercontrols.ProjectFileUpload" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectFileUpload" %>


 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="our.usercontrols.ProjectForums" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectForums" %>

 <asp:PlaceHolder ID="holder" runat="server" Visible="false">

@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="our.usercontrols.Signup" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Signup" %>

 <asp:panel ID="MemberExists" Visible="False" runat="server">
    <p>There is already an account with this e-mail address! You can <a href="/member/login">login</a> or <a href="/member/forgot-password">reset your password</a>.</p>
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="our.usercontrols.SignupSimple" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.SignupSimple" %>


 <asp:panel ID="Panel1" runat="server" defaultbutton="bt_submit">
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="our.usercontrols.acceptTos" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.acceptTos" %>
 <asp:PlaceHolder ID="error" runat="server" Visible="false">
 <div class="error">You need to accept the ToS!</div>
 </asp:PlaceHolder>
@@ -1,21 +1,20 @@
 using System;
 using System.Drawing;
+using System.Dynamic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
+using System.Net.Http;
 using System.Web;
 using System.Web.Http;
 using System.Xml;
-using our.Businesslogic;
+using Newtonsoft.Json;
+using OurUmbraco.Our.Businesslogic;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Web.WebApi;
-using System.Net.Http;
-using System.Dynamic;
-using Newtonsoft.Json;

-namespace our.Api
+namespace OurUmbraco.Our.Api
 {
    public class CommunityController : UmbracoApiController
    {
@@ -1,18 +1,12 @@
-using Examine;
-using our.Examine;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Examine.SearchCriteria;
 using Lucene.Net.Documents;
-using our.Models;
 using OurUmbraco.Forum.Extensions;
+using OurUmbraco.Our.Examine;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.WebApi;

-namespace our.Api
+namespace OurUmbraco.Our.Api
 {
    public class OurSearchController : UmbracoApiController
    {
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using OurUmbraco.Our;
-
-namespace our.Businesslogic
+namespace OurUmbraco.Our.Businesslogic
 {
    public class ProjectContributor
    {
@@ -1,8 +1,7 @@
 using System.Web.Http;
-using OurUmbraco.Our;
 using Umbraco.Web.WebApi;

-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
    public class AvatarController : UmbracoApiController
    {
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Security;
 using Umbraco.Web.Mvc;

-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
    public class LoginController: SurfaceController
    {
@@ -1,15 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using OurUmbraco.Our;
-using Umbraco.Web;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;

-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
    public class ProfileController: SurfaceController
    {
@@ -1,13 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;

-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
    public class ProfileNotificationController: SurfaceController
    {
@@ -1,13 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;

-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
    public class RegisterController : SurfaceController
    {
@@ -4,9 +4,8 @@ using OurUmbraco.Powers.BusinessLogic;
 using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Data = OurUmbraco.Our.Data;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    /// <summary>
    /// This is a custom handler to catch all voting events on topics
@@ -3,7 +3,7 @@ using OurUmbraco.Powers.BusinessLogic;
 using umbraco.BusinessLogic;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
 	public class ExternalVote : ApplicationBase
 	{
@@ -1,14 +1,15 @@
 using Examine;
 using Examine.LuceneEngine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
 using OurUmbraco.Forum;
 using OurUmbraco.Forum.Services;
+using OurUmbraco.Our.Examine;
 using Umbraco.Core;
+
 //WB Added


-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    public class ForumIndexer : ApplicationEventHandler
    {
@@ -5,7 +5,7 @@ using OurUmbraco.Powers.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Web;

-namespace our.CustomHandlers {
+namespace OurUmbraco.Our.CustomHandlers {
    public class ForumPostsCounter : ApplicationEventHandler {

        /*
@@ -1,19 +1,14 @@
-using System.IO;
-using System.Web.Compilation;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
-using System.Web.UI;
 using Examine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
 using OurUmbraco.Documentation.Busineslogic;
 using OurUmbraco.Documentation.Busineslogic.GithubSourcePull;
+using OurUmbraco.Our.Examine;
 using Umbraco.Core;
 using Umbraco.Web;
-using Umbraco.Web.Security;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    /// <summary>
    /// Main Application startup handler
@@ -3,8 +3,7 @@ using System.Linq;
 using Examine;
 using Examine.LuceneEngine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
-using OurUmbraco.Our;
+using OurUmbraco.Our.Examine;
 using OurUmbraco.Wiki.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -12,7 +11,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Services;
 using Umbraco.Web;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    public class ProjectIndexer : ApplicationEventHandler
    {
@@ -4,9 +4,8 @@ using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Umbraco.Web;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Utils = OurUmbraco.Our.Utils;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    public class ProjectVoteHandler : ApplicationEventHandler
    {
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using OurUmbraco.Powers.Library;
 using OurUmbraco.Wiki.BusinessLogic;
-using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    public class ProjectsEnsureGuid : ApplicationEventHandler
    {
@@ -5,7 +5,7 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    /// <summary>
    /// Custom route handler for the search page
@@ -6,9 +6,8 @@ using OurUmbraco.Powers.BusinessLogic;
 using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Data = OurUmbraco.Our.Data;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    /// <summary>
    /// This is a custom handler to catch all voting events on topics
@@ -1,7 +1,7 @@
 using umbraco.cms.businesslogic.member;
 using Umbraco.Core;

-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
    public class MemberSave : ApplicationEventHandler
    {
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 using System.Web;
-using System.IO;

-namespace our
+namespace OurUmbraco.Our
 {
    public class DefaultMemberAvatarHandler: IHttpHandler
    {
@@ -1,6 +1,6 @@
 using System.Configuration;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    public sealed class DocumentationIndexConfig : ConfigurationSection
    {
@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Web;
 using Examine;
 using Examine.LuceneEngine;
 using OurUmbraco.Documentation.Busineslogic.GithubSourcePull;
-using umbraco.BusinessLogic;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    /// <summary>
    /// Used to index the documentation 
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -8,7 +7,7 @@ using Examine;
 using Examine.LuceneEngine;
 using Umbraco.Core.Logging;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    public static class ExamineHelper
    {
@@ -1,17 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Examine;
 using Examine.LuceneEngine;
 using OurUmbraco.Forum.Models;
 using OurUmbraco.Forum.Services;
-//WB Added
+using umbraco;
 using Umbraco.Core;
+//WB Added

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
-   
    /// <summary>
    /// The data service used by the LuceneEngine in order for it to reindex all data
    /// </summary>
@@ -25,7 +22,7 @@ namespace our.Examine
            foreach (var currentComment in topic.Comments)
                commentText += currentComment.Body;

-            var body = umbraco.library.StripHtml(topic.Body + commentText);
+            var body = library.StripHtml(topic.Body + commentText);

            simpleDataSet.NodeDefinition.NodeId = id;
            simpleDataSet.NodeDefinition.Type = indexType;
@@ -7,9 +7,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Examine;
 using Examine.LuceneEngine.Providers;
-using our.Models;
+using OurUmbraco.Our.Models;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    public class OurSearcher
    {
@@ -1,7 +1,7 @@
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    /// <summary>
    /// Custom analyzer for projects so that we can have different analyzers per field
@@ -1,15 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Hosting;
 using Examine;
 using Examine.LuceneEngine;
-using Lucene.Net.Documents;
-using Lucene.Net.Util;
-using OurUmbraco.Our;
 using OurUmbraco.Wiki.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -17,7 +12,7 @@ using Umbraco.Core.Models;
 using Umbraco.Web;
 using Umbraco.Web.Security;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    /// <summary>
    /// Data service used for projects
@@ -1,4 +1,4 @@
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    public class SearchFilter
    {
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Text;
 using Examine.SearchCriteria;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    public class SearchFilters
    {
@@ -1,7 +1,7 @@
 using System.IO;
 using Lucene.Net.Analysis;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    /// <summary>
    /// Custom version field analyzer which uses the Version Tokenizer
@@ -1,7 +1,7 @@
 using System.IO;
 using Lucene.Net.Analysis;

-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
    /// <summary>
    /// Custom tokenizer to ensure that only version information is indexed
@@ -3,7 +3,7 @@ using System.Web;
 using System.Web.UI;
 using ClientDependency.Core.Controls;

-namespace our
+namespace OurUmbraco.Our
 {
    /// <summary>
    /// This should not be necessary but we are mixing webforms with mvc sub forms and normally that should work or be done, without
@@ -2,7 +2,7 @@
 using System.Web.UI;
 using System.Web.UI.WebControls;

-namespace our
+namespace OurUmbraco.Our
 {
    public class Hiccup : Page
    {
@@ -10,7 +10,7 @@ using Umbraco.Core.Models;
 using Umbraco.Web;
 using File = System.IO.File;

-namespace our
+namespace OurUmbraco.Our
 {
    public class MigrationsHandler : ApplicationEventHandler
    {
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;

-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
    public class ProfileModel
    {
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;

-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
    public class ProfileNotificationModel
    {
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;

-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
    public class RegisterModel
    {
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Models;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;

-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
    /// <summary>
    /// An IPublishedContent model used to display the search results on the SearchResults controller
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using Examine;

-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
    /// <summary>
    /// A model to display search results
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Web;
-using OurUmbraco.Our;
 using OurUmbraco.Wiki.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic;
 using umbraco.cms.businesslogic.member;
+using umbraco.cms.businesslogic.web;

-namespace our {
+namespace OurUmbraco.Our {
    public class ProjectFileUploadHandler : IHttpHandler {

        #region IHttpHandler Members
@@ -1,12 +1,11 @@
 using System.Web;
 using System.Web.Security;
 using System.Xml.XPath;
-using OurUmbraco.Our;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
 using Umbraco.Web.BaseRest;

-namespace our
+namespace OurUmbraco.Our
 {
    /// <summary>
    /// Our mighty utill classes for looking stuff up quickly...
@@ -1,10 +1,9 @@
 using System.Threading;
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;

-namespace our.Scheduling
+namespace OurUmbraco.Our.Scheduling
 {
    /// <summary>
    /// Used to do the scheduling for tasks, publishing, etc...
@@ -3,7 +3,7 @@ using OurUmbraco.Release;
 using Umbraco.Core;
 using Umbraco.Core.Logging;

-namespace our.Scheduling
+namespace OurUmbraco.Our.Scheduling
 {
    internal class YouTrackSync
    {
@@ -6,7 +6,7 @@ using Examine;
 using umbraco;
 using Umbraco.Web;

-namespace our
+namespace OurUmbraco.Our
 {
    public static class SearchResultExtensions
    {
@@ -5,7 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using AjaxControlToolkit;

-namespace our.Controls
+namespace OurUmbraco.Our.controls
 {
    [ValidationProperty("SelectedDate")]
    public class DatePicker : System.Web.UI.WebControls.WebControl, System.Web.UI.INamingContainer
@@ -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" %>
 <link rel="stylesheet" media="all" type="text/css" href="/css/ui-lightness/jquery-ui-1.8.16.custom.css" />

@@ -1,16 +1,15 @@
 using System;
 using System.Configuration;
-using System.Linq;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Core.Models;
 using System.Net.Mail;
+using System.Web.UI;
 using OurUmbraco.Events.Relations;
 using umbraco.BusinessLogic;
+using Umbraco.Core;
+using Umbraco.Core.Models;
 using Umbraco.Web;
 using Member = umbraco.cms.businesslogic.member.Member;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class EventEditor : UserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class EventEditor {
@@ -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" %>
@@ -1,14 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 using OurUmbraco.Wiki.BusinessLogic;
 using BL = umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.member;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class FileDownloadProxy : System.Web.UI.UserControl
    {
@@ -1,18 +1,15 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols
-{
+namespace OurUmbraco.Our.usercontrols {
    
    
-    public partial class FileDownloadProxy
-    {
+    public partial class FileDownloadProxy {
    }
 }
@@ -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" %>
 <asp:Panel runat="server" ID="message" Visible="False">
    <div class="notice">
        <p style="color: green;">A new password has been sent to the email address: <asp:Literal ID="lt_email" runat="server" /></p>
@@ -6,7 +6,7 @@ using System.Text;
 using Umbraco.Core;
 using Umbraco.Web.UI.Controls;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class Forgotpassword : UmbracoUserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class Forgotpassword {
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="InsertImage.ascx.cs"
-    Inherits="our.usercontrols.InsertImage" %>
+    Inherits="OurUmbraco.Our.usercontrols.InsertImage" %>


 <script type="text/javascript">
@@ -1,9 +1,8 @@
 using System;
-using System.Linq;
-using System.Web.UI;
 using System.IO;
+using System.Web.UI;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class InsertImage : UserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class InsertImage {
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="our.usercontrols.Login" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Login" %>

 <asp:Panel runat="server" DefaultButton="bt_login">
    <div class="form simpleForm" id="registrationForm">
@@ -5,7 +5,7 @@ using umbraco;
 using Umbraco.Core;
 using Umbraco.Web.UI.Controls;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class Login : UmbracoUserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class Login {
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="our.usercontrols.ProjectCollabRequest" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectCollabRequest" %>

 <h1><asp:Literal runat="server" ID="lt_title" Text="Create project"></asp:Literal> collaboration request</h1>

@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using umbraco.cms.businesslogic.member;
 using System.Net.Mail;
+using umbraco.cms.businesslogic.member;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class ProjectCollabRequest : System.Web.UI.UserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class ProjectCollabRequest {
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="our.usercontrols.ProjectContributors" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectContributors" %>

 <asp:Panel ID="holder" runat="server" Visible="false">

@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using OurUmbraco.Our.Businesslogic;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;
-using our.Businesslogic;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class ProjectContributors : System.Web.UI.UserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class ProjectContributors {
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="our.usercontrols.ProjectEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectEditor" %>

 <asp:PlaceHolder runat="server" ID="notallowed" Visible="False">
    <h2>Sorry, your account is too new to create projects! If you're human, make sure to <a href="https://umbraco.com/about-us/team">get in touch with us</a> to get this restriction lifted.</h2>
@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Xml.XPath;
-using our.Api;
-using OurUmbraco.Our;
+using OurUmbraco.Our.Api;
 using OurUmbraco.Repository;
 using OurUmbraco.Wiki.BusinessLogic;
 using umbraco;
@@ -14,7 +13,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
 using umbraco.presentation.nodeFactory;

-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
    public partial class ProjectEditor : UserControl
    {
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
    
    
    public partial class ProjectEditor {
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="our.usercontrols.ProjectFileUpload" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectFileUpload" %>


 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
--- a/Show More
+++ b/Show More