From 26e2c564242dc6957627a89ab48d2dd7a103ec2f Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 11 Sep 2016 12:55:52 +0200 Subject: [PATCH] Move old package repo to MVC --- OurUmbraco.Site/OurUmbraco.Site.csproj | 13 ++- .../Views/MacroPartials/Members/Login.cshtml | 9 +- OurUmbraco.Site/Views/Repository.cshtml | 20 +++++ .../Views/RepositoryFrontpage.cshtml | 9 ++ OurUmbraco.Site/Views/RepositoryMaster.cshtml | 84 +++++++++++++++++++ OurUmbraco.Site/Views/RepositoryPage.cshtml | 18 ++++ 6 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 OurUmbraco.Site/Views/Repository.cshtml create mode 100644 OurUmbraco.Site/Views/RepositoryFrontpage.cshtml create mode 100644 OurUmbraco.Site/Views/RepositoryMaster.cshtml create mode 100644 OurUmbraco.Site/Views/RepositoryPage.cshtml diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index a4f18649..2b756086 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -532,10 +532,10 @@ - - - - + + + + @@ -1767,6 +1767,7 @@ + Designer @@ -4433,6 +4434,10 @@ + + + + web.config diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/Login.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/Login.cshtml index f5614c54..26716e24 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/Login.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/Login.cshtml @@ -3,7 +3,14 @@ @{ if (Members.IsLoggedIn()) { - Response.Redirect("/member/profile"); + if (Model.MacroParameters["NextPage"] != null && string.IsNullOrWhiteSpace(Model.MacroParameters["NextPage"].ToString()) == false) + { + // It's being called from the old package repository, don't redirect + } + else + { + Response.Redirect("/member/profile"); + } } } diff --git a/OurUmbraco.Site/Views/Repository.cshtml b/OurUmbraco.Site/Views/Repository.cshtml new file mode 100644 index 00000000..32fdb9b8 --- /dev/null +++ b/OurUmbraco.Site/Views/Repository.cshtml @@ -0,0 +1,20 @@ +@inherits UmbracoTemplatePage + + + + Umbraco Package Repository + + + + + + +
+
+
+ @Umbraco.RenderMacro("Repository") +
+
+
+ + \ No newline at end of file diff --git a/OurUmbraco.Site/Views/RepositoryFrontpage.cshtml b/OurUmbraco.Site/Views/RepositoryFrontpage.cshtml new file mode 100644 index 00000000..30b5e05f --- /dev/null +++ b/OurUmbraco.Site/Views/RepositoryFrontpage.cshtml @@ -0,0 +1,9 @@ +@inherits UmbracoTemplatePage +@{ + Layout = "~/Views/RepositoryMaster.cshtml"; +} +@Umbraco.RenderMacro("Repository-PopularPackages") +
+

Log in using your our.umbraco.org credentials

+ @Umbraco.RenderMacro("MemberLogin", new { NextPage = "30186", ErrorMessage = "Unknown Login" }) +
\ No newline at end of file diff --git a/OurUmbraco.Site/Views/RepositoryMaster.cshtml b/OurUmbraco.Site/Views/RepositoryMaster.cshtml new file mode 100644 index 00000000..05e89ee1 --- /dev/null +++ b/OurUmbraco.Site/Views/RepositoryMaster.cshtml @@ -0,0 +1,84 @@ +@inherits UmbracoTemplatePage +@inherits UmbracoTemplatePage +@{ + HttpContext.Current.Response.AddHeader("p3p", "CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""); +} + + + Umbraco Package Repository + + + + + + + + + + + + @RenderSection("head", false) + + +
+
+ +
+ +
+

No luck!

+

There's no project that matches .

+

Maybe it doesn't exist, maybe it hasn't been approved yet. After all, it does take community kudos from at least 15 people to make it inside this repository

+
+
+ @RenderBody() +
+
+
+
+ + \ No newline at end of file diff --git a/OurUmbraco.Site/Views/RepositoryPage.cshtml b/OurUmbraco.Site/Views/RepositoryPage.cshtml new file mode 100644 index 00000000..9c7d27d3 --- /dev/null +++ b/OurUmbraco.Site/Views/RepositoryPage.cshtml @@ -0,0 +1,18 @@ +@inherits UmbracoTemplatePage +@{ + Layout = "~/Views/RepositoryMaster.cshtml"; +} +@section head +{ + + + + +} +@Umbraco.Field("bodyText") \ No newline at end of file