From 61571ade9859e05d48ca7f16c13a21676700fe29 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 26 Jul 2015 19:57:02 +0200 Subject: [PATCH] Move our.umbraco.org and uProject --- Marketplace/uProject.csproj | 70 -- OurUmbraco.Site/OurUmbraco.Site.csproj | 10 +- .../MacroPartials/Forum/LatestActivity.cshtml | 3 +- .../MacroPartials/Global/AlertBar.cshtml | 1 + .../Members/ProfileProjectTeam.cshtml | 3 +- .../Members/PublicProfile.cshtml | 9 +- .../MacroPartials/Members/QuickMenu.cshtml | 3 +- .../Navigation/TopNavigation.cshtml | 3 +- .../Projects/ListProjects.cshtml | 3 +- .../Projects/ProjectDetails.cshtml | 17 +- .../Views/MacroPartials/Spam/Overview.cshtml | 1 + .../Views/Partials/Forum/Comment.cshtml | 2 +- .../Views/Partials/Forum/Question.cshtml | 2 +- .../Projects/CompatibilityReport.cshtml | 4 +- .../macroScripts/ProjectsVersionList.cshtml | 3 +- .../macroScripts/ProjectsVersioned.cshtml | 3 +- .../usercontrols/Deli/Package/Editor.ascx | 2 +- .../Deli/Package/Steps/Complete.ascx | 2 +- .../Deli/Package/Steps/Details.ascx | 2 +- .../Deli/Package/Steps/Files.ascx | 2 +- .../Deli/Package/Steps/Screenshots.ascx | 2 +- .../usercontrols/Deli/Profile/MyProjects.ascx | 6 +- .../Our}/Api/CommunityController.cs | 0 .../Our}/Api/SearchController.cs | 0 .../Our}/Businesslogic/ProjectContributor.cs | 81 +- .../Our}/Controllers/AvatarController.cs | 1 + .../Our}/Controllers/LoginController.cs | 0 .../Our}/Controllers/ProfileController.cs | 1 + .../ProfileNotificationController.cs | 0 .../Our}/Controllers/RegisterController.cs | 0 .../Our}/CustomHandlers/CommentVote.cs | 3 +- .../Our}/CustomHandlers/ExternalVote.cs | 0 .../Our}/CustomHandlers/ForumIndexer.cs | 0 .../Our}/CustomHandlers/ForumPostsCounter.cs | 0 .../OurApplicationStartupHandler.cs | 0 .../Our}/CustomHandlers/ProjectIndexer.cs | 1 + .../Our/CustomHandlers/ProjectVote.cs | 1 + .../Our}/CustomHandlers/ProjectsEnsureGuid.cs | 0 .../CustomHandlers/SearchPageRouteHandler.cs | 0 .../Our}/CustomHandlers/TopicVote.cs | 3 +- .../Our}/CustomHandlers/memberSave.cs | 0 .../data.cs => OurUmbraco/Our/Data.cs | 60 +- .../Our}/DefaultMemberAvatarHandler.cs | 80 +- .../Our}/Examine/DocumentationIndexConfig.cs | 0 .../Examine/DocumentationIndexDataService.cs | 0 .../Our}/Examine/ExamineHelper.cs | 0 .../Our}/Examine/ForumDataService.cs | 0 .../Our}/Examine/OurSearcher.cs | 0 .../Our}/Examine/ProjectAnalyzer.cs | 0 .../Examine/ProjectNodeIndexDataService.cs | 1 + .../Our}/Examine/SearchFilter.cs | 0 .../Our}/Examine/SearchFilters.cs | 0 .../Our}/Examine/VersionAnalyzer.cs | 0 .../Our}/Examine/VersionTokenizer.cs | 0 .../Our}/HackedCdfLoader.cs | 0 {our.umbraco.org => OurUmbraco/Our}/Hiccup.cs | 0 .../Our}/MigrationsHandler.cs | 0 .../Our}/Models/ProfileModel.cs | 0 .../Our}/Models/ProfileNotificationModel.cs | 0 .../Our}/Models/RegisterModel.cs | 0 .../Our}/Models/SearchResultContentModel.cs | 0 .../Our}/Models/SearchResultModel.cs | 0 .../Our}/ProjectFileUploadHandler.cs | 125 ++-- {our.umbraco.org => OurUmbraco/Our}/Rest.cs | 311 ++++---- .../Our}/Scheduling/Scheduler.cs | 0 .../Our}/Scheduling/YouTrackSync.cs | 0 .../Our}/SearchResultExtensions.cs | 0 .../library.cs => OurUmbraco/Our/Utils.cs | 609 ++++++++------- .../Our}/controls/DateTimePicker.cs | 284 +++---- .../Our}/usercontrols/EventEditor.ascx | 382 +++++----- .../Our}/usercontrols/EventEditor.ascx.cs | 420 +++++------ .../usercontrols/EventEditor.ascx.designer.cs | 336 ++++----- .../Our}/usercontrols/FileDownloadProxy.ascx | 2 +- .../usercontrols/FileDownloadProxy.ascx.cs | 172 ++--- .../FileDownloadProxy.ascx.designer.cs | 36 +- .../Our}/usercontrols/Forgotpassword.ascx | 80 +- .../Our}/usercontrols/Forgotpassword.ascx.cs | 216 +++--- .../Forgotpassword.ascx.designer.cs | 156 ++-- .../Our}/usercontrols/InsertImage.ascx | 298 ++++---- .../Our}/usercontrols/InsertImage.ascx.cs | 208 +++--- .../usercontrols/InsertImage.ascx.designer.cs | 210 +++--- .../Our}/usercontrols/Login.ascx | 74 +- .../Our}/usercontrols/Login.ascx.cs | 194 ++--- .../Our}/usercontrols/Login.ascx.designer.cs | 156 ++-- .../usercontrols/ProjectCollabRequest.ascx | 72 +- .../usercontrols/ProjectCollabRequest.ascx.cs | 120 +-- .../ProjectCollabRequest.ascx.designer.cs | 102 +-- .../usercontrols/ProjectContributors.ascx | 122 +-- .../usercontrols/ProjectContributors.ascx.cs | 154 ++-- .../ProjectContributors.ascx.designer.cs | 138 ++-- .../Our}/usercontrols/ProjectEditor.ascx | 280 +++---- .../Our}/usercontrols/ProjectEditor.ascx.cs | 692 +++++++++--------- .../ProjectEditor.ascx.designer.cs | 642 ++++++++-------- .../Our}/usercontrols/ProjectFileUpload.ascx | 374 +++++----- .../usercontrols/ProjectFileUpload.ascx.cs | 267 +++---- .../ProjectFileUpload.ascx.designer.cs | 84 +-- .../Our}/usercontrols/ProjectForums.ascx | 154 ++-- .../Our}/usercontrols/ProjectForums.ascx.cs | 340 ++++----- .../ProjectForums.ascx.designer.cs | 212 +++--- .../Our}/usercontrols/Signup.ascx | 388 +++++----- .../Our}/usercontrols/Signup.ascx.cs | 408 +++++------ .../Our}/usercontrols/Signup.ascx.designer.cs | 516 ++++++------- .../Our}/usercontrols/SignupSimple.ascx | 94 +-- .../Our}/usercontrols/SignupSimple.ascx.cs | 124 ++-- .../SignupSimple.ascx.designer.cs | 174 ++--- .../Our}/usercontrols/acceptTos.ascx | 14 +- .../Our}/usercontrols/acceptTos.ascx.cs | 68 +- .../usercontrols/acceptTos.ascx.designer.cs | 85 ++- OurUmbraco/OurUmbraco.csproj | 257 +++++++ .../Api/ProjectCompatibilityController.cs | 6 +- .../Api/ProjectContributionController.cs | 9 +- .../Project}/Api/ProjectForumController.cs | 10 +- .../ProjectCompatibilityReportController.cs | 10 +- .../Controllers/RepositoryController.cs | 2 +- .../Project}/Extensions.cs | 5 +- .../Project}/Helpers/ExtensionMethods.cs | 8 +- .../Project}/Helpers/Helper.cs | 10 +- .../Project}/Models/ProjectContributor.cs | 8 +- .../Project}/Models/ProjectForum.cs | 2 +- .../Project}/Models/VersionCompatibility.cs | 2 +- .../Models/VersionCompatibilityReportModel.cs | 4 +- .../Project}/ProjectFileUploadHandler.cs | 11 +- .../Project}/Services/ContributionService.cs | 9 +- .../Services/VersionCompatibilityService.cs | 6 +- .../Project}/Singleton.cs | 6 +- .../Project}/uVersion/config.cs | 8 +- .../Project}/uVersion/uVersion.cs | 7 +- .../usercontrols/Deli/Package/Editor.ascx | 2 +- .../usercontrols/Deli/Package/Editor.ascx.cs | 7 +- .../Deli/Package/Editor.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Complete.ascx | 2 +- .../Deli/Package/Steps/Complete.ascx.cs | 4 +- .../Package/Steps/Complete.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Details.ascx | 2 +- .../Deli/Package/Steps/Details.ascx.cs | 4 +- .../Package/Steps/Details.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Files.ascx | 2 +- .../Deli/Package/Steps/Files.ascx.cs | 6 +- .../Deli/Package/Steps/Files.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Screenshots.ascx | 2 +- .../Deli/Package/Steps/Screenshots.ascx.cs | 6 +- .../Steps/Screenshots.ascx.designer.cs | 2 +- .../usercontrols/Deli/Profile/MyProjects.ascx | 6 +- .../Deli/Profile/MyProjects.ascx.cs | 2 +- .../Deli/Profile/MyProjects.ascx.designer.cs | 2 +- our.umbraco.org.sln | 24 - our.umbraco.org/our.umbraco.org.csproj | 177 ----- 147 files changed, 5438 insertions(+), 5478 deletions(-) rename {our.umbraco.org => OurUmbraco/Our}/Api/CommunityController.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Api/SearchController.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Businesslogic/ProjectContributor.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/Controllers/AvatarController.cs (94%) rename {our.umbraco.org => OurUmbraco/Our}/Controllers/LoginController.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Controllers/ProfileController.cs (99%) rename {our.umbraco.org => OurUmbraco/Our}/Controllers/ProfileNotificationController.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Controllers/RegisterController.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/CommentVote.cs (89%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/ExternalVote.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/ForumIndexer.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/ForumPostsCounter.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/OurApplicationStartupHandler.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/ProjectIndexer.cs (99%) rename our.umbraco.org/CustomHandlers/projectVote.cs => OurUmbraco/Our/CustomHandlers/ProjectVote.cs (98%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/ProjectsEnsureGuid.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/SearchPageRouteHandler.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/TopicVote.cs (92%) rename {our.umbraco.org => OurUmbraco/Our}/CustomHandlers/memberSave.cs (100%) rename our.umbraco.org/data.cs => OurUmbraco/Our/Data.cs (54%) rename {our.umbraco.org => OurUmbraco/Our}/DefaultMemberAvatarHandler.cs (95%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/DocumentationIndexConfig.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/DocumentationIndexDataService.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/ExamineHelper.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/ForumDataService.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/OurSearcher.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/ProjectAnalyzer.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/ProjectNodeIndexDataService.cs (99%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/SearchFilter.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/SearchFilters.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/VersionAnalyzer.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Examine/VersionTokenizer.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/HackedCdfLoader.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Hiccup.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/MigrationsHandler.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Models/ProfileModel.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Models/ProfileNotificationModel.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Models/RegisterModel.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Models/SearchResultContentModel.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Models/SearchResultModel.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/ProjectFileUploadHandler.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/Rest.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/Scheduling/Scheduler.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/Scheduling/YouTrackSync.cs (100%) rename {our.umbraco.org => OurUmbraco/Our}/SearchResultExtensions.cs (100%) rename our.umbraco.org/library.cs => OurUmbraco/Our/Utils.cs (96%) rename {our.umbraco.org => OurUmbraco/Our}/controls/DateTimePicker.cs (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/EventEditor.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/EventEditor.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/EventEditor.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/FileDownloadProxy.ascx (99%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/FileDownloadProxy.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/FileDownloadProxy.ascx.designer.cs (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Forgotpassword.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Forgotpassword.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Forgotpassword.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/InsertImage.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/InsertImage.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/InsertImage.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Login.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Login.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Login.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectCollabRequest.ascx (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectCollabRequest.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectCollabRequest.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectContributors.ascx (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectContributors.ascx.cs (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectContributors.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectEditor.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectEditor.ascx.cs (89%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectEditor.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectFileUpload.ascx (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectFileUpload.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectFileUpload.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectForums.ascx (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectForums.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/ProjectForums.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Signup.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Signup.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/Signup.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/SignupSimple.ascx (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/SignupSimple.ascx.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/SignupSimple.ascx.designer.cs (97%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/acceptTos.ascx (98%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/acceptTos.ascx.cs (96%) rename {our.umbraco.org => OurUmbraco/Our}/usercontrols/acceptTos.ascx.designer.cs (92%) rename {Marketplace => OurUmbraco/Project}/Api/ProjectCompatibilityController.cs (91%) rename {Marketplace => OurUmbraco/Project}/Api/ProjectContributionController.cs (95%) rename {Marketplace => OurUmbraco/Project}/Api/ProjectForumController.cs (94%) rename {Marketplace => OurUmbraco/Project}/Controllers/ProjectCompatibilityReportController.cs (86%) rename {Marketplace => OurUmbraco/Project}/Controllers/RepositoryController.cs (97%) rename {Marketplace => OurUmbraco/Project}/Extensions.cs (91%) rename {Marketplace => OurUmbraco/Project}/Helpers/ExtensionMethods.cs (92%) rename {Marketplace => OurUmbraco/Project}/Helpers/Helper.cs (73%) rename {Marketplace => OurUmbraco/Project}/Models/ProjectContributor.cs (61%) rename {Marketplace => OurUmbraco/Project}/Models/ProjectForum.cs (94%) rename {Marketplace => OurUmbraco/Project}/Models/VersionCompatibility.cs (90%) rename {Marketplace => OurUmbraco/Project}/Models/VersionCompatibilityReportModel.cs (86%) rename {Marketplace => OurUmbraco/Project}/ProjectFileUploadHandler.cs (95%) rename {Marketplace => OurUmbraco/Project}/Services/ContributionService.cs (91%) rename {Marketplace => OurUmbraco/Project}/Services/VersionCompatibilityService.cs (96%) rename {Marketplace => OurUmbraco/Project}/Singleton.cs (70%) rename {Marketplace => OurUmbraco/Project}/uVersion/config.cs (97%) rename {Marketplace => OurUmbraco/Project}/uVersion/uVersion.cs (91%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Editor.ascx (87%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Editor.ascx.cs (97%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Editor.ascx.designer.cs (96%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Complete.ascx (91%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Complete.ascx.cs (94%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs (97%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Details.ascx (98%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Details.ascx.cs (98%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs (99%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Files.ascx (99%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Files.ascx.cs (98%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs (97%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Screenshots.ascx (97%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs (98%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs (96%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Profile/MyProjects.ascx (97%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Profile/MyProjects.ascx.cs (96%) rename {Marketplace => OurUmbraco/Project}/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs (96%) diff --git a/Marketplace/uProject.csproj b/Marketplace/uProject.csproj index 12ef65db..cc751e6b 100644 --- a/Marketplace/uProject.csproj +++ b/Marketplace/uProject.csproj @@ -259,82 +259,12 @@ - - - - - - - - - - - - True True Settings.settings - - - - - - Complete.ascx - ASPXCodeBehind - - - Complete.ascx - - - Screenshots.ascx - ASPXCodeBehind - - - Screenshots.ascx - - - Details.ascx - ASPXCodeBehind - - - Details.ascx - - - Editor.ascx - ASPXCodeBehind - - - Editor.ascx - - - Files.ascx - ASPXCodeBehind - - - Files.ascx - - - MyProjects.ascx - ASPXCodeBehind - - - MyProjects.ascx - - - - - - - - - - - - ASPXCodeBehind - diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index e0a0b1d5..d6541521 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -4694,10 +4694,6 @@ - - {6a2b659e-8bae-4cd5-8764-851dfbe95fbf} - uProject - {6cf53d68-bd81-47bb-8f56-350a1b04f114} NotificationsWeb @@ -4706,9 +4702,9 @@ {80e5f59d-a7a0-4cee-aeb6-6c626c44b2b2} Notification - - {a625544f-660a-4c01-ba49-1b467d0322d9} - our.umbraco.org + + {A8E5C936-ECAB-45B3-BFDA-D12F680EB2A6} + OurUmbraco diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml index 79dde383..5649725e 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml @@ -1,6 +1,7 @@ @using OurUmbraco.Forum.Extensions @using OurUmbraco.Forum.Models @using OurUmbraco.Forum.Services +@using OurUmbraco.Our @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ @@ -23,7 +24,7 @@
@if(mem != null) { - @Html.Raw(our.Utils.GetMemberAvatar(mem, 100)) + @Html.Raw(Utils.GetMemberAvatar(mem, 100)) }
diff --git a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml index fd5476dc..776c2086 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml @@ -1,5 +1,6 @@ @using System.Drawing @using our +@using OurUmbraco.Our @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ var home = Umbraco.TypedContentAtRoot().First(); diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml index bf27fcac..7515c56c 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml @@ -1,3 +1,4 @@ +@using OurUmbraco.Project.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ @@ -13,7 +14,7 @@ var openForCollab = project.GetPropertyValue("openForCollab"); - var cs = new uProject.Services.ContributionService(ApplicationContext.Current.DatabaseContext); + var cs = new ContributionService(ApplicationContext.Current.DatabaseContext); var contris = cs.GetContributors(id).ToList(); - - - - - - - -
- -
- - - - - - - +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="our.usercontrols.Signup" %> + + +

There is already an account with this e-mail address! You can login or reset your password.

+ + + +
+
+Basic Information +

+ We just need the most basic information from you. +

+

+ Name + +

+

+ Company + +

+

+ Email + +

+

+ Password + +

+

+ Bio
No html allowed + + +

+ +
+ +
+Services +

+ Share your ideas, topics and photos related to umbraco. +

+

+ Twitter Alias + +

+

+ Flickr Alias + +

+

+ +

+
+ +
+Newsletters and threshold +

+Threshold is a way to control what items are displayed to you. Any item with a score lower than your set threshold, will not be displayed in the forum. +

+

+ Threshold + +

+ +

+ Email + Do not send me any notifications or newsletters from our.umbraco.org +

+ +
+ + +
+Where do you live? +

+ Tell us where you live, you can leave out streetnames, but city, zip-code and country is mandatory. When your location is displayed correctly on the map below, + enough information has been provided. +

+ +

+ + + + + +

+
+
+ + + + + + +
+ + +
+ +
+ +
+ + + + + \ No newline at end of file diff --git a/our.umbraco.org/usercontrols/Signup.ascx.cs b/OurUmbraco/Our/usercontrols/Signup.ascx.cs similarity index 97% rename from our.umbraco.org/usercontrols/Signup.ascx.cs rename to OurUmbraco/Our/usercontrols/Signup.ascx.cs index 63a6bb42..934e1bbf 100644 --- a/our.umbraco.org/usercontrols/Signup.ascx.cs +++ b/OurUmbraco/Our/usercontrols/Signup.ascx.cs @@ -1,205 +1,205 @@ -using System; -using System.Configuration; -using System.Linq; -using System.Net; -using System.Web.Hosting; -using umbraco; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Web; -using File = System.IO.File; -using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl; - -namespace our.usercontrols -{ - public partial class Signup : UmbracoUserControl - { - // Needs to be lower case, macro depends on that - public string memberType { get; set; } - - public string Group { get; set; } - public int NextPage { get; set; } - - protected void Page_Load(object sender, EventArgs e) - { - var memberService = Services.MemberService; - var currentMember = memberService.GetById(Members.GetCurrentMemberId()); - - MemberExists.Visible = false; - - if (Page.IsPostBack == false && currentMember != null) - { - tb_name.Text = currentMember.Name; - tb_email.Text = currentMember.Email; - - //make sure that it is not required to enter the password.. - tb_password.CssClass = "title"; - - //hack on the save button... - bt_submit.Text = "Save"; - - //treshold and newsletter - cb_bugMeNot.Checked = currentMember.GetValue("bugMeNot"); - - tb_treshold.Text = currentMember.GetValue("treshold"); - - //optional.. - tb_twitter.Text = currentMember.GetValue("twitter"); - tb_flickr.Text = currentMember.GetValue("flickr"); - tb_company.Text = currentMember.GetValue("company"); - tb_bio.Text = currentMember.GetValue("profileText"); - - //Location - tb_lat.Value = currentMember.GetValue("latitude"); - tb_lng.Value = currentMember.GetValue("longitude"); - tb_location.Text = currentMember.GetValue("location"); - } - - // ReCaptcha is wrong when Page.IsValid is false - Page.Validate(); - if (Page.IsPostBack && Page.IsValid == false) - { - tb_password.Attributes["value"] = tb_password.Text; - } - - } - - protected void CreateMember(object sender, EventArgs e) - { - var memberService = Services.MemberService; - var currentMember = memberService.GetById(Members.GetCurrentMemberId()); - - //Member is already logged in, and we just need to save his new data... - if (currentMember != null) - { - currentMember.Name = tb_name.Text; - currentMember.Email = tb_email.Text; - currentMember.Username = tb_email.Text; - currentMember.SetValue("twitter", tb_twitter.Text); - currentMember.SetValue("flickr", tb_flickr.Text); - currentMember.SetValue("company", tb_company.Text); - currentMember.SetValue("profileText", tb_bio.Text); - currentMember.SetValue("location", tb_location.Text); - currentMember.SetValue("latitude", tb_lat.Value); - currentMember.SetValue("longitude", tb_lng.Value); - currentMember.SetValue("treshold", tb_treshold.Text); - currentMember.SetValue("bugMeNot", cb_bugMeNot.Checked); - - memberService.Save(currentMember); - memberService.SavePassword(currentMember, tb_password.Text); - - OurUmbraco.Forum.Library.Utils.CheckForSpam(currentMember); - - Response.Redirect(library.NiceUrl(NextPage)); - } - else - { - if (tb_email.Text != string.Empty && Page.IsValid) - { - var member = memberService.GetByEmail(tb_email.Text); - if (member == null) - { - // If spammer then this will stop account creation - var spamResult = OurUmbraco.Forum.Library.Utils.CheckForSpam(tb_email.Text, tb_name.Text, true); - if (spamResult != null && spamResult.Blocked) - return; - - member = memberService.CreateMember(tb_email.Text, tb_email.Text, tb_name.Text, memberType); - - member.Name = tb_name.Text; - member.Email = tb_email.Text; - member.Username = tb_email.Text; - member.SetValue("twitter", tb_twitter.Text); - member.SetValue("flickr", tb_flickr.Text); - member.SetValue("company", tb_company.Text); - member.SetValue("profileText", tb_bio.Text); - member.SetValue("location", tb_location.Text); - member.SetValue("latitude", tb_lat.Value); - member.SetValue("longitude", tb_lng.Value); - member.SetValue("treshold", tb_treshold.Text); - member.SetValue("bugMeNot", cb_bugMeNot.Checked); - - member.SetValue("reputationTotal", 20); - member.SetValue("reputationCurrent", 20); - member.SetValue("forumPosts", 0); - - member.IsApproved = false; - memberService.Save(member); - - // Now that we have a memberId we can use it - var avatarPath = GetAvatarPath(member); - member.SetValue("avatar", avatarPath); - memberService.Save(member); - - memberService.AssignRole(member.Id, Group); - memberService.SavePassword(member, tb_password.Text); - - if (spamResult != null && spamResult.TotalScore >= int.Parse(ConfigurationManager.AppSettings["PotentialSpammerThreshold"])) - { - spamResult.MemberId = member.Id; - - memberService.AssignRole(member.Id, "potentialspam"); - OurUmbraco.Forum.Library.Utils.SendPotentialSpamMemberMail(spamResult); - } - else - { - OurUmbraco.Forum.Library.Utils.SendActivationMail(member); - OurUmbraco.Forum.Library.Utils.SendMemberSignupMail(member); - } - memberService.AssignRole(member.Id, "notactivated"); - - var redirectPage = "/"; - var contentService = UmbracoContext.Current.Application.Services.ContentService; - var rootNode = contentService.GetRootContent().OrderBy(x => x.SortOrder).First(x => x.ContentType.Alias == "Community"); - - var memberNode = rootNode.Children().FirstOrDefault(x => x.Name == "Member"); - if (memberNode != null) - { - var pendingActivationPage = memberNode.Children().FirstOrDefault(x => x.Name == "Pending activation"); - if (pendingActivationPage != null) - redirectPage = library.NiceUrl(pendingActivationPage.Id); - } - - Response.Redirect(redirectPage); - } - else - { - MemberExists.Visible = true; - Panel1.Visible = false; - } - } - } - } - - private static string GetAvatarPath(IMember member) - { - var url = "http://www.gravatar.com/avatar/" + member.Email.ToMd5() + "?s=400&d=retro"; - - try - { - var avatarFileName = "/media/avatar/" + member.Id + ".jpg"; - var path = HostingEnvironment.MapPath(avatarFileName); - - if (path != null) - { - if (File.Exists(path)) - File.Delete(path); - - using (var webClient = new WebClient()) - { - webClient.DownloadFile(url, path); - } - - return avatarFileName; - } - } - catch (Exception ex) - { - LogHelper.Error("Could not save gravatar locally", ex); - } - - return url; - } - } +using System; +using System.Configuration; +using System.Linq; +using System.Net; +using System.Web.Hosting; +using umbraco; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Core.Models; +using Umbraco.Web; +using File = System.IO.File; +using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl; + +namespace our.usercontrols +{ + public partial class Signup : UmbracoUserControl + { + // Needs to be lower case, macro depends on that + public string memberType { get; set; } + + public string Group { get; set; } + public int NextPage { get; set; } + + protected void Page_Load(object sender, EventArgs e) + { + var memberService = Services.MemberService; + var currentMember = memberService.GetById(Members.GetCurrentMemberId()); + + MemberExists.Visible = false; + + if (Page.IsPostBack == false && currentMember != null) + { + tb_name.Text = currentMember.Name; + tb_email.Text = currentMember.Email; + + //make sure that it is not required to enter the password.. + tb_password.CssClass = "title"; + + //hack on the save button... + bt_submit.Text = "Save"; + + //treshold and newsletter + cb_bugMeNot.Checked = currentMember.GetValue("bugMeNot"); + + tb_treshold.Text = currentMember.GetValue("treshold"); + + //optional.. + tb_twitter.Text = currentMember.GetValue("twitter"); + tb_flickr.Text = currentMember.GetValue("flickr"); + tb_company.Text = currentMember.GetValue("company"); + tb_bio.Text = currentMember.GetValue("profileText"); + + //Location + tb_lat.Value = currentMember.GetValue("latitude"); + tb_lng.Value = currentMember.GetValue("longitude"); + tb_location.Text = currentMember.GetValue("location"); + } + + // ReCaptcha is wrong when Page.IsValid is false + Page.Validate(); + if (Page.IsPostBack && Page.IsValid == false) + { + tb_password.Attributes["value"] = tb_password.Text; + } + + } + + protected void CreateMember(object sender, EventArgs e) + { + var memberService = Services.MemberService; + var currentMember = memberService.GetById(Members.GetCurrentMemberId()); + + //Member is already logged in, and we just need to save his new data... + if (currentMember != null) + { + currentMember.Name = tb_name.Text; + currentMember.Email = tb_email.Text; + currentMember.Username = tb_email.Text; + currentMember.SetValue("twitter", tb_twitter.Text); + currentMember.SetValue("flickr", tb_flickr.Text); + currentMember.SetValue("company", tb_company.Text); + currentMember.SetValue("profileText", tb_bio.Text); + currentMember.SetValue("location", tb_location.Text); + currentMember.SetValue("latitude", tb_lat.Value); + currentMember.SetValue("longitude", tb_lng.Value); + currentMember.SetValue("treshold", tb_treshold.Text); + currentMember.SetValue("bugMeNot", cb_bugMeNot.Checked); + + memberService.Save(currentMember); + memberService.SavePassword(currentMember, tb_password.Text); + + OurUmbraco.Forum.Library.Utils.CheckForSpam(currentMember); + + Response.Redirect(library.NiceUrl(NextPage)); + } + else + { + if (tb_email.Text != string.Empty && Page.IsValid) + { + var member = memberService.GetByEmail(tb_email.Text); + if (member == null) + { + // If spammer then this will stop account creation + var spamResult = OurUmbraco.Forum.Library.Utils.CheckForSpam(tb_email.Text, tb_name.Text, true); + if (spamResult != null && spamResult.Blocked) + return; + + member = memberService.CreateMember(tb_email.Text, tb_email.Text, tb_name.Text, memberType); + + member.Name = tb_name.Text; + member.Email = tb_email.Text; + member.Username = tb_email.Text; + member.SetValue("twitter", tb_twitter.Text); + member.SetValue("flickr", tb_flickr.Text); + member.SetValue("company", tb_company.Text); + member.SetValue("profileText", tb_bio.Text); + member.SetValue("location", tb_location.Text); + member.SetValue("latitude", tb_lat.Value); + member.SetValue("longitude", tb_lng.Value); + member.SetValue("treshold", tb_treshold.Text); + member.SetValue("bugMeNot", cb_bugMeNot.Checked); + + member.SetValue("reputationTotal", 20); + member.SetValue("reputationCurrent", 20); + member.SetValue("forumPosts", 0); + + member.IsApproved = false; + memberService.Save(member); + + // Now that we have a memberId we can use it + var avatarPath = GetAvatarPath(member); + member.SetValue("avatar", avatarPath); + memberService.Save(member); + + memberService.AssignRole(member.Id, Group); + memberService.SavePassword(member, tb_password.Text); + + if (spamResult != null && spamResult.TotalScore >= int.Parse(ConfigurationManager.AppSettings["PotentialSpammerThreshold"])) + { + spamResult.MemberId = member.Id; + + memberService.AssignRole(member.Id, "potentialspam"); + OurUmbraco.Forum.Library.Utils.SendPotentialSpamMemberMail(spamResult); + } + else + { + OurUmbraco.Forum.Library.Utils.SendActivationMail(member); + OurUmbraco.Forum.Library.Utils.SendMemberSignupMail(member); + } + memberService.AssignRole(member.Id, "notactivated"); + + var redirectPage = "/"; + var contentService = UmbracoContext.Current.Application.Services.ContentService; + var rootNode = contentService.GetRootContent().OrderBy(x => x.SortOrder).First(x => x.ContentType.Alias == "Community"); + + var memberNode = rootNode.Children().FirstOrDefault(x => x.Name == "Member"); + if (memberNode != null) + { + var pendingActivationPage = memberNode.Children().FirstOrDefault(x => x.Name == "Pending activation"); + if (pendingActivationPage != null) + redirectPage = library.NiceUrl(pendingActivationPage.Id); + } + + Response.Redirect(redirectPage); + } + else + { + MemberExists.Visible = true; + Panel1.Visible = false; + } + } + } + } + + private static string GetAvatarPath(IMember member) + { + var url = "http://www.gravatar.com/avatar/" + member.Email.ToMd5() + "?s=400&d=retro"; + + try + { + var avatarFileName = "/media/avatar/" + member.Id + ".jpg"; + var path = HostingEnvironment.MapPath(avatarFileName); + + if (path != null) + { + if (File.Exists(path)) + File.Delete(path); + + using (var webClient = new WebClient()) + { + webClient.DownloadFile(url, path); + } + + return avatarFileName; + } + } + catch (Exception ex) + { + LogHelper.Error("Could not save gravatar locally", ex); + } + + return url; + } + } } \ No newline at end of file diff --git a/our.umbraco.org/usercontrols/Signup.ascx.designer.cs b/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs similarity index 97% rename from our.umbraco.org/usercontrols/Signup.ascx.designer.cs rename to OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs index 8bd81072..77dc318b 100644 --- a/our.umbraco.org/usercontrols/Signup.ascx.designer.cs +++ b/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs @@ -1,258 +1,258 @@ -//------------------------------------------------------------------------------ -// -// 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 our.usercontrols { - - - public partial class Signup { - - /// - /// MemberExists control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel MemberExists; - - /// - /// Panel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel Panel1; - - /// - /// Label1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label1; - - /// - /// tb_name control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_name; - - /// - /// Label2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label2; - - /// - /// tb_company control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_company; - - /// - /// Label3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label3; - - /// - /// tb_email control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_email; - - /// - /// Label4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label4; - - /// - /// tb_password control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password; - - /// - /// Label10 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label10; - - /// - /// tb_bio control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_bio; - - /// - /// Label5 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label5; - - /// - /// tb_twitter control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_twitter; - - /// - /// Label6 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label6; - - /// - /// tb_flickr control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_flickr; - - /// - /// tb_emailConfirm control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_emailConfirm; - - /// - /// Label7 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label7; - - /// - /// tb_treshold control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_treshold; - - /// - /// Label9 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label9; - - /// - /// cb_bugMeNot control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox cb_bugMeNot; - - /// - /// Label8 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label8; - - /// - /// tb_location control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_location; - - /// - /// tb_lat control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HiddenField tb_lat; - - /// - /// tb_lng control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HiddenField tb_lng; - - /// - /// CommentBody control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox CommentBody; - - /// - /// bt_submit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_submit; - } -} +//------------------------------------------------------------------------------ +// +// 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 our.usercontrols { + + + public partial class Signup { + + /// + /// MemberExists control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel MemberExists; + + /// + /// Panel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel Panel1; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// tb_name control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_name; + + /// + /// Label2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// tb_company control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_company; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// tb_email control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_email; + + /// + /// Label4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// tb_password control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_password; + + /// + /// Label10 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label10; + + /// + /// tb_bio control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_bio; + + /// + /// Label5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// tb_twitter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_twitter; + + /// + /// Label6 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label6; + + /// + /// tb_flickr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_flickr; + + /// + /// tb_emailConfirm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_emailConfirm; + + /// + /// Label7 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label7; + + /// + /// tb_treshold control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_treshold; + + /// + /// Label9 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label9; + + /// + /// cb_bugMeNot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox cb_bugMeNot; + + /// + /// Label8 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label8; + + /// + /// tb_location control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_location; + + /// + /// tb_lat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField tb_lat; + + /// + /// tb_lng control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField tb_lng; + + /// + /// CommentBody control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CommentBody; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + } +} diff --git a/our.umbraco.org/usercontrols/SignupSimple.ascx b/OurUmbraco/Our/usercontrols/SignupSimple.ascx similarity index 97% rename from our.umbraco.org/usercontrols/SignupSimple.ascx rename to OurUmbraco/Our/usercontrols/SignupSimple.ascx index f3b70304..a2b48b89 100644 --- a/our.umbraco.org/usercontrols/SignupSimple.ascx +++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx @@ -1,48 +1,48 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="our.usercontrols.SignupSimple" %> - - - -
-
-Basic Information -

- We just need the most basic information from you. -

-

- Name - -

-

- Email - -

-

- Password - -

-
- - - -
- -
- -
- - - - \ No newline at end of file diff --git a/our.umbraco.org/usercontrols/SignupSimple.ascx.cs b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs similarity index 97% rename from our.umbraco.org/usercontrols/SignupSimple.ascx.cs rename to OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs index 50042b28..5d01106e 100644 --- a/our.umbraco.org/usercontrols/SignupSimple.ascx.cs +++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs @@ -1,62 +1,62 @@ -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; - -namespace our.usercontrols -{ - public partial class SignupSimple : System.Web.UI.UserControl - { - public string Group { get; set; } - public string memberType { get; set; } - public int NextPage { get; set; } - - private Member m = umbraco.cms.businesslogic.member.Member.GetCurrentMember(); - - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack && m != null) - Response.Redirect(umbraco.library.NiceUrl(NextPage)); - } - - protected void createMember(object sender, EventArgs e) - { - if (tb_email.Text != "") - { - m = Member.GetMemberFromEmail(tb_email.Text); - if (m == null) - { - MemberType mt = MemberType.GetByAlias(memberType); - m = Member.MakeNew(tb_name.Text, mt, new umbraco.BusinessLogic.User(0)); - m.Email = tb_email.Text; - m.Password = tb_password.Text; - m.LoginName = tb_email.Text; - - - //Standard values - m.getProperty("reputationTotal").Value = 20; - m.getProperty("reputationCurrent").Value = 20; - m.getProperty("forumPosts").Value = 0; - - if (!string.IsNullOrEmpty(Group)) - { - MemberGroup mg = MemberGroup.GetByName(Group); - if (mg != null) - m.AddGroup(mg.Id); - } - - //set a default avatar - Api.CommunityController.SetAvatar(m.Id, "gravatar"); - - m.Save(); - m.XmlGenerate(new System.Xml.XmlDocument()); - Member.AddMemberToCache(m); - Response.Redirect(umbraco.library.NiceUrl(NextPage)); - } - } - } - } - } +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; + +namespace our.usercontrols +{ + public partial class SignupSimple : System.Web.UI.UserControl + { + public string Group { get; set; } + public string memberType { get; set; } + public int NextPage { get; set; } + + private Member m = umbraco.cms.businesslogic.member.Member.GetCurrentMember(); + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack && m != null) + Response.Redirect(umbraco.library.NiceUrl(NextPage)); + } + + protected void createMember(object sender, EventArgs e) + { + if (tb_email.Text != "") + { + m = Member.GetMemberFromEmail(tb_email.Text); + if (m == null) + { + MemberType mt = MemberType.GetByAlias(memberType); + m = Member.MakeNew(tb_name.Text, mt, new umbraco.BusinessLogic.User(0)); + m.Email = tb_email.Text; + m.Password = tb_password.Text; + m.LoginName = tb_email.Text; + + + //Standard values + m.getProperty("reputationTotal").Value = 20; + m.getProperty("reputationCurrent").Value = 20; + m.getProperty("forumPosts").Value = 0; + + if (!string.IsNullOrEmpty(Group)) + { + MemberGroup mg = MemberGroup.GetByName(Group); + if (mg != null) + m.AddGroup(mg.Id); + } + + //set a default avatar + Api.CommunityController.SetAvatar(m.Id, "gravatar"); + + m.Save(); + m.XmlGenerate(new System.Xml.XmlDocument()); + Member.AddMemberToCache(m); + Response.Redirect(umbraco.library.NiceUrl(NextPage)); + } + } + } + } + } diff --git a/our.umbraco.org/usercontrols/SignupSimple.ascx.designer.cs b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs similarity index 97% rename from our.umbraco.org/usercontrols/SignupSimple.ascx.designer.cs rename to OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs index 4de0721c..6bea4aaa 100644 --- a/our.umbraco.org/usercontrols/SignupSimple.ascx.designer.cs +++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs @@ -1,87 +1,87 @@ -//------------------------------------------------------------------------------ -// -// 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 our.usercontrols { - - - public partial class SignupSimple { - - /// - /// Panel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel Panel1; - - /// - /// Label1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label1; - - /// - /// tb_name control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_name; - - /// - /// Label3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label3; - - /// - /// tb_email control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_email; - - /// - /// Label4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label4; - - /// - /// tb_password control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password; - - /// - /// bt_submit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_submit; - } -} +//------------------------------------------------------------------------------ +// +// 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 our.usercontrols { + + + public partial class SignupSimple { + + /// + /// Panel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel Panel1; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// tb_name control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_name; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// tb_email control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_email; + + /// + /// Label4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// tb_password control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_password; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + } +} diff --git a/our.umbraco.org/usercontrols/acceptTos.ascx b/OurUmbraco/Our/usercontrols/acceptTos.ascx similarity index 98% rename from our.umbraco.org/usercontrols/acceptTos.ascx rename to OurUmbraco/Our/usercontrols/acceptTos.ascx index 61897308..07b06f7a 100644 --- a/our.umbraco.org/usercontrols/acceptTos.ascx +++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx @@ -1,7 +1,7 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="our.usercontrols.acceptTos" %> - -
You need to accept the ToS!
- - - +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="our.usercontrols.acceptTos" %> + +
You need to accept the ToS!
+ + + diff --git a/our.umbraco.org/usercontrols/acceptTos.ascx.cs b/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs similarity index 96% rename from our.umbraco.org/usercontrols/acceptTos.ascx.cs rename to OurUmbraco/Our/usercontrols/acceptTos.ascx.cs index 5753ef60..b6d91eb7 100644 --- a/our.umbraco.org/usercontrols/acceptTos.ascx.cs +++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs @@ -1,35 +1,35 @@ -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; - -namespace our.usercontrols -{ - public partial class acceptTos : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) - { - - } - - protected void cool_Click(object sender, EventArgs e) - { - if (fair.Checked) - { - Member mem = Member.GetCurrentMember(); - if (mem != null) - { - mem.getProperty("tos").Value = - DateTime.Now.ToString("s"); - Response.Redirect("/"); - } - } - else { - error.Visible = true; - } - } - } +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; + +namespace our.usercontrols +{ + public partial class acceptTos : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void cool_Click(object sender, EventArgs e) + { + if (fair.Checked) + { + Member mem = Member.GetCurrentMember(); + if (mem != null) + { + mem.getProperty("tos").Value = + DateTime.Now.ToString("s"); + Response.Redirect("/"); + } + } + else { + error.Visible = true; + } + } + } } \ No newline at end of file diff --git a/our.umbraco.org/usercontrols/acceptTos.ascx.designer.cs b/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs similarity index 92% rename from our.umbraco.org/usercontrols/acceptTos.ascx.designer.cs rename to OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs index 5b0af2f7..01471f89 100644 --- a/our.umbraco.org/usercontrols/acceptTos.ascx.designer.cs +++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs @@ -1,43 +1,42 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.3074 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace our.usercontrols { - - - public partial class acceptTos { - - /// - /// error control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder error; - - /// - /// fair control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox fair; - - /// - /// cool control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button cool; - } -} +//------------------------------------------------------------------------------ +// +// 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 our.usercontrols { + + + public partial class acceptTos { + + /// + /// error control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder error; + + /// + /// fair control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox fair; + + /// + /// cool control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button cool; + } +} diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj index e92a63cc..d7f03131 100644 --- a/OurUmbraco/OurUmbraco.csproj +++ b/OurUmbraco/OurUmbraco.csproj @@ -146,6 +146,7 @@ True + @@ -157,6 +158,7 @@ ..\packages\UmbracoCms.Core.7.2.8-build103\lib\System.Data.SqlServerCe.Entity.dll True + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll True @@ -325,6 +327,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ASPXCodeBehind + + + + + + + + + + + + + + acceptTos.ascx + ASPXCodeBehind + + + acceptTos.ascx.cs + + + EventEditor.ascx + ASPXCodeBehind + + + EventEditor.ascx.cs + + + FileDownloadProxy.ascx + ASPXCodeBehind + + + FileDownloadProxy.ascx.cs + + + Forgotpassword.ascx + ASPXCodeBehind + + + Forgotpassword.ascx.cs + + + InsertImage.ascx + ASPXCodeBehind + + + InsertImage.ascx.cs + + + Login.ascx + ASPXCodeBehind + + + Login.ascx.cs + + + ProjectCollabRequest.ascx + ASPXCodeBehind + + + ProjectCollabRequest.ascx.cs + + + ProjectContributors.ascx + ASPXCodeBehind + + + ProjectContributors.ascx.cs + + + ProjectEditor.ascx + ASPXCodeBehind + + + ProjectEditor.ascx.cs + + + ProjectFileUpload.ascx + ASPXCodeBehind + + + ProjectFileUpload.ascx.cs + + + ProjectForums.ascx + ASPXCodeBehind + + + ProjectForums.ascx.cs + + + Signup.ascx + ASPXCodeBehind + + + Signup.ascx.cs + + + SignupSimple.ascx + ASPXCodeBehind + + + SignupSimple.ascx.cs + + @@ -334,6 +476,66 @@ + + + + + + + + + + + + + + + + + + Editor.ascx + ASPXCodeBehind + + + Editor.ascx.cs + + + Complete.ascx + ASPXCodeBehind + + + Complete.ascx.cs + + + Details.ascx + ASPXCodeBehind + + + Details.ascx.cs + + + Files.ascx + ASPXCodeBehind + + + Files.ascx.cs + + + Screenshots.ascx + ASPXCodeBehind + + + Screenshots.ascx.cs + + + MyProjects.ascx + ASPXCodeBehind + + + MyProjects.ascx.cs + + + @@ -384,9 +586,60 @@ + + ASPXCodeBehind + + + ASPXCodeBehind + + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + ASPXCodeBehind @@ -400,6 +653,10 @@ + + XCOPY "$(ProjectDir)Project\usercontrols\Deli\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\Deli" /y /s +XCOPY "$(ProjectDir)Our\usercontrols\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\our.umbraco.org" /y +