diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 3003edc9..d71f509e 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -494,23 +494,23 @@ - + - + - - + + - + @@ -524,14 +524,14 @@ - + - + - + - + @@ -549,10 +549,10 @@ - + - + @@ -671,7 +671,7 @@ - + @@ -1701,8 +1701,8 @@ - - + + @@ -1720,14 +1720,14 @@ - + - + diff --git a/OurUmbraco.Site/masterpages/Community.master b/OurUmbraco.Site/masterpages/__Community.master similarity index 100% rename from OurUmbraco.Site/masterpages/Community.master rename to OurUmbraco.Site/masterpages/__Community.master diff --git a/OurUmbraco.Site/masterpages/ContentLanding.master b/OurUmbraco.Site/masterpages/__ContentLanding.master similarity index 100% rename from OurUmbraco.Site/masterpages/ContentLanding.master rename to OurUmbraco.Site/masterpages/__ContentLanding.master diff --git a/OurUmbraco.Site/masterpages/DocumentationMainpage.master b/OurUmbraco.Site/masterpages/__DocumentationMainpage.master similarity index 100% rename from OurUmbraco.Site/masterpages/DocumentationMainpage.master rename to OurUmbraco.Site/masterpages/__DocumentationMainpage.master diff --git a/OurUmbraco.Site/masterpages/DocumentationMaster.master b/OurUmbraco.Site/masterpages/__DocumentationMaster.master similarity index 100% rename from OurUmbraco.Site/masterpages/DocumentationMaster.master rename to OurUmbraco.Site/masterpages/__DocumentationMaster.master diff --git a/OurUmbraco.Site/masterpages/DocumentationSubpage.master b/OurUmbraco.Site/masterpages/__DocumentationSubpage.master similarity index 100% rename from OurUmbraco.Site/masterpages/DocumentationSubpage.master rename to OurUmbraco.Site/masterpages/__DocumentationSubpage.master diff --git a/OurUmbraco.Site/masterpages/Download.master b/OurUmbraco.Site/masterpages/__Download.master similarity index 100% rename from OurUmbraco.Site/masterpages/Download.master rename to OurUmbraco.Site/masterpages/__Download.master diff --git a/OurUmbraco.Site/masterpages/Forum.master b/OurUmbraco.Site/masterpages/__Forum.master similarity index 100% rename from OurUmbraco.Site/masterpages/Forum.master rename to OurUmbraco.Site/masterpages/__Forum.master diff --git a/OurUmbraco.Site/masterpages/ForumMaster.master b/OurUmbraco.Site/masterpages/__ForumMaster.master similarity index 100% rename from OurUmbraco.Site/masterpages/ForumMaster.master rename to OurUmbraco.Site/masterpages/__ForumMaster.master diff --git a/OurUmbraco.Site/masterpages/Project.master b/OurUmbraco.Site/masterpages/__Project.master similarity index 100% rename from OurUmbraco.Site/masterpages/Project.master rename to OurUmbraco.Site/masterpages/__Project.master diff --git a/OurUmbraco.Site/masterpages/Projects.master b/OurUmbraco.Site/masterpages/__Projects.master similarity index 100% rename from OurUmbraco.Site/masterpages/Projects.master rename to OurUmbraco.Site/masterpages/__Projects.master diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/__Release.master similarity index 98% rename from OurUmbraco.Site/masterpages/Release.master rename to OurUmbraco.Site/masterpages/__Release.master index f844202b..c9687509 100644 --- a/OurUmbraco.Site/masterpages/Release.master +++ b/OurUmbraco.Site/masterpages/__Release.master @@ -1,376 +1,376 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> -<%@ Import Namespace="Umbraco.Web" %> -<%@ Import Namespace="OurUmbraco.Release" %> -<%@ Import Namespace="Umbraco.Core.Models" %> - - - - - - - @{ - if(Request.Params["fromdownload"] != null) { - var downloads = Model.ReleaseDownload.Where("Visible"); - if(downloads.Any()) - { - var downloadIds = new List(); - foreach (var item in downloads) - { - downloadIds.Add(item.Id); - } - Response.Redirect("/ReleaseDownload?id=" + downloadIds.First(), false); - } - } - } - -<% - var currentPage = UmbracoContext.Current.PublishedContentRequest.PublishedContent; - var allReleases = Release.GetAllReleaseFromFile(); - var release = allReleases.First(x => x.version == currentPage.Name); - var completedIssues = release.issues.Count(x => x.state == "Fixed"); - var totalIssues = release.issues.Count(); - var percentComplete = Math.Round(((double) 100/totalIssues)*completedIssues); - var releaseDateParsed = DateTime.Now; - if (release.releaseDate != string.Empty) - { - releaseDateParsed = DateTime.Parse(release.releaseDate.Substring(3, 2) + "-" + release.releaseDate.Substring(0, 2) + "-" + release.releaseDate.Substring(6)); - } - - var releaseDate = release.releaseDate == "" ? "Not yet determined" : releaseDateParsed.ToString("dddd, MMMM d yyyy"); - - - var umbracoHelper = new Umbraco.Web.UmbracoHelper(UmbracoContext.Current); - var releaseContent = umbracoHelper.TypedContent(umbracoHelper.UmbracoContext.PageId); - if (releaseContent != null) - { - var overrideDescription = releaseContent.GetPropertyValue("overrideYouTrackDescription"); - if (overrideDescription) - { - release.releaseDescription = releaseContent.GetPropertyValue("bodyText"); - } - var overrideReleaseDate = releaseContent.GetPropertyValue("overrideYouTrackReleaseDate"); - if (string.IsNullOrWhiteSpace(overrideReleaseDate) == false) - { - releaseDate = overrideReleaseDate; - } - } -%> -
-
-
-
-
- - - -
-
-
-
-
-
- -
- -
- - - -
-
- -
-

<%= percentComplete %>%

-
- -
-
-

- v -

- Status: <%= release.released ? "Released" : "In Progress" %> - <% if (release.released == false) - { %> -

- - <%= percentComplete %>% complete - <%= 100 - percentComplete %>% in progress -

-

Target release date: <%= releaseDate %>

- <% } %> - - - @if(Model.HasValue("releaseNotes")) { -

@Model.releaseNotes

 - } - - -
-
- -
- - @{ - var downloads = Model.ReleaseDownload.Where("Visible"); - var countIsOdd = ((downloads.Count() & 1) != 0) ? true : false; - if(downloads.Any()) - { -
- @foreach (var item in downloads) - { - var background = item.IsFirst() ? "/images/releases/download.png" : "/media/2483095/download.png"; - var width = (item.IsLast() && countIsOdd) ? 895 : 380; - var numberOfDownloads = 0; - int.TryParse(item.NumberOfDownloads, out numberOfDownloads); - numberOfDownloads = numberOfDownloads + OurUmbraco.Our.Utils.GetReleaseDownloadCount(item.Id); - if(item.Name.Contains("WebPI") == false) - { -
- -
-
- -

@item.Name

- @if(item.IsFirst()) - { -

This is the main Umbraco download, generally you won't need anything else.

- } - Downloaded @numberOfDownloads times - uploaded @item.UploadDate.ToString("D") -
- } else { - - } - } -
- } - } - - -
- -
- - <% if (release.releaseDescription != string.Empty && currentPage.HasValue("bodyText") == false) - { %> - -

Summary

-

<%= release.releaseDescription %>

- - <% } %> - - - @if(Model.HasValue("bodyText")) { -

Release notes

- @Model.BodyText - } - - - -

Related changes from the issue tracker

-
-
- -
-
-

Features

- <% - var features = release.issues.Where(x => x.type.ToLowerInvariant().Contains("feature")).ToList(); - if (features.Any()) - { - foreach (var issue in features) - { %> - - - <% } } else { %> -

No items to display

- <% } %> -
-
-

Breaking Changes

- <% - var breaking = release.issues.Where(x => x.breaking).ToList(); - if (breaking.Any()) - { - foreach (var issue in breaking) - { %> - - - <% } } else { %> -

No items to display

- <% } %> -
-
-

Issues & Tasks

- <% - var issues = release.issues.Where(x => x.breaking == false && x.type.ToLowerInvariant().Contains("feature") == false).ToList(); - if (issues.Any()) - { - foreach (var issue in issues) - { %> - - - <% } } else { %> -

No items to display

- <% } %> -
-
- -
-
- -
- -
- -

Getting started

-

Make sure to give the installation instructions a read.

-

Check the free foundation videos on how to get started building Umbraco sites. They're available from:
-

-

World's best community

-

You'll find our über active community working hard to help each other at Our Umbraco: http://our.umbraco.org

-

Upgrading from older versions

-

Make sure to read the upgrade instructions before you attempt an upgrade.

- - -

Found a bug?

-

We're happy to help you with any problems you encounter, so please report them in the issue tracker and use the “Affected versions” field to set it to @Model.Name.
Do a search first though, if the issue already exists, give it an extra vote.

- - @if(Model.HasValue("linkToChangeset")) { -

Source code

-

The source for this specific release is available for download from the repository (click the "ZIP" button).

- } - - @if(Model.HasNuGet) { -

Also available on NuGet

- -
- -

PM> Install-Package UmbracoCms -Version @Model.Name

- -
- - } - - -
- -
-
-
-
-
-
-
- - - - - - - +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> +<%@ Import Namespace="Umbraco.Web" %> +<%@ Import Namespace="OurUmbraco.Release" %> +<%@ Import Namespace="Umbraco.Core.Models" %> + + + + + + + @{ + if(Request.Params["fromdownload"] != null) { + var downloads = Model.ReleaseDownload.Where("Visible"); + if(downloads.Any()) + { + var downloadIds = new List(); + foreach (var item in downloads) + { + downloadIds.Add(item.Id); + } + Response.Redirect("/ReleaseDownload?id=" + downloadIds.First(), false); + } + } + } + +<% + var currentPage = UmbracoContext.Current.PublishedContentRequest.PublishedContent; + var allReleases = Release.GetAllReleaseFromFile(); + var release = allReleases.First(x => x.version == currentPage.Name); + var completedIssues = release.issues.Count(x => x.state == "Fixed"); + var totalIssues = release.issues.Count(); + var percentComplete = Math.Round(((double) 100/totalIssues)*completedIssues); + var releaseDateParsed = DateTime.Now; + if (release.releaseDate != string.Empty) + { + releaseDateParsed = DateTime.Parse(release.releaseDate.Substring(3, 2) + "-" + release.releaseDate.Substring(0, 2) + "-" + release.releaseDate.Substring(6)); + } + + var releaseDate = release.releaseDate == "" ? "Not yet determined" : releaseDateParsed.ToString("dddd, MMMM d yyyy"); + + + var umbracoHelper = new Umbraco.Web.UmbracoHelper(UmbracoContext.Current); + var releaseContent = umbracoHelper.TypedContent(umbracoHelper.UmbracoContext.PageId); + if (releaseContent != null) + { + var overrideDescription = releaseContent.GetPropertyValue("overrideYouTrackDescription"); + if (overrideDescription) + { + release.releaseDescription = releaseContent.GetPropertyValue("bodyText"); + } + var overrideReleaseDate = releaseContent.GetPropertyValue("overrideYouTrackReleaseDate"); + if (string.IsNullOrWhiteSpace(overrideReleaseDate) == false) + { + releaseDate = overrideReleaseDate; + } + } +%> +
+
+
+
+
+ + + +
+
+
+
+
+
+ +
+ +
+ + + +
+
+ +
+

<%= percentComplete %>%

+
+ +
+
+

+ v +

+ Status: <%= release.released ? "Released" : "In Progress" %> + <% if (release.released == false) + { %> +

+ + <%= percentComplete %>% complete + <%= 100 - percentComplete %>% in progress +

+

Target release date: <%= releaseDate %>

+ <% } %> + + + @if(Model.HasValue("releaseNotes")) { +

@Model.releaseNotes

 + } + + +
+
+ +
+ + @{ + var downloads = Model.ReleaseDownload.Where("Visible"); + var countIsOdd = ((downloads.Count() & 1) != 0) ? true : false; + if(downloads.Any()) + { +
+ @foreach (var item in downloads) + { + var background = item.IsFirst() ? "/images/releases/download.png" : "/media/2483095/download.png"; + var width = (item.IsLast() && countIsOdd) ? 895 : 380; + var numberOfDownloads = 0; + int.TryParse(item.NumberOfDownloads, out numberOfDownloads); + numberOfDownloads = numberOfDownloads + OurUmbraco.Our.Utils.GetReleaseDownloadCount(item.Id); + if(item.Name.Contains("WebPI") == false) + { +
+ +
+
+ +

@item.Name

+ @if(item.IsFirst()) + { +

This is the main Umbraco download, generally you won't need anything else.

+ } + Downloaded @numberOfDownloads times - uploaded @item.UploadDate.ToString("D") +
+ } else { + + } + } +
+ } + } + + +
+ +
+ + <% if (release.releaseDescription != string.Empty && currentPage.HasValue("bodyText") == false) + { %> + +

Summary

+

<%= release.releaseDescription %>

+ + <% } %> + + + @if(Model.HasValue("bodyText")) { +

Release notes

+ @Model.BodyText + } + + + +

Related changes from the issue tracker

+
+
+ +
+
+

Features

+ <% + var features = release.issues.Where(x => x.type.ToLowerInvariant().Contains("feature")).ToList(); + if (features.Any()) + { + foreach (var issue in features) + { %> + + + <% } } else { %> +

No items to display

+ <% } %> +
+
+

Breaking Changes

+ <% + var breaking = release.issues.Where(x => x.breaking).ToList(); + if (breaking.Any()) + { + foreach (var issue in breaking) + { %> + + + <% } } else { %> +

No items to display

+ <% } %> +
+
+

Issues & Tasks

+ <% + var issues = release.issues.Where(x => x.breaking == false && x.type.ToLowerInvariant().Contains("feature") == false).ToList(); + if (issues.Any()) + { + foreach (var issue in issues) + { %> + + + <% } } else { %> +

No items to display

+ <% } %> +
+
+ +
+
+ +
+ +
+ +

Getting started

+

Make sure to give the installation instructions a read.

+

Check the free foundation videos on how to get started building Umbraco sites. They're available from:
+

+

World's best community

+

You'll find our über active community working hard to help each other at Our Umbraco: http://our.umbraco.org

+

Upgrading from older versions

+

Make sure to read the upgrade instructions before you attempt an upgrade.

+ + +

Found a bug?

+

We're happy to help you with any problems you encounter, so please report them in the issue tracker and use the “Affected versions” field to set it to @Model.Name.
Do a search first though, if the issue already exists, give it an extra vote.

+ + @if(Model.HasValue("linkToChangeset")) { +

Source code

+

The source for this specific release is available for download from the repository (click the "ZIP" button).

+ } + + @if(Model.HasNuGet) { +

Also available on NuGet

+ +
+ +

PM> Install-Package UmbracoCms -Version @Model.Name

+ +
+ + } + + +
+ +
+
+
+
+
+
+
+ + + + + + + diff --git a/OurUmbraco.Site/masterpages/ReleaseLanding.master b/OurUmbraco.Site/masterpages/__ReleaseLanding.master similarity index 100% rename from OurUmbraco.Site/masterpages/ReleaseLanding.master rename to OurUmbraco.Site/masterpages/__ReleaseLanding.master diff --git a/OurUmbraco.Site/masterpages/ReleaseProgress.master b/OurUmbraco.Site/masterpages/__ReleaseProgress.master similarity index 100% rename from OurUmbraco.Site/masterpages/ReleaseProgress.master rename to OurUmbraco.Site/masterpages/__ReleaseProgress.master diff --git a/OurUmbraco.Site/masterpages/RoadMap.master b/OurUmbraco.Site/masterpages/__RoadMap.master similarity index 100% rename from OurUmbraco.Site/masterpages/RoadMap.master rename to OurUmbraco.Site/masterpages/__RoadMap.master diff --git a/OurUmbraco.Site/masterpages/Search.master b/OurUmbraco.Site/masterpages/__Search.master similarity index 100% rename from OurUmbraco.Site/masterpages/Search.master rename to OurUmbraco.Site/masterpages/__Search.master diff --git a/OurUmbraco.Site/masterpages/Textpage.master b/OurUmbraco.Site/masterpages/__Textpage.master similarity index 100% rename from OurUmbraco.Site/masterpages/Textpage.master rename to OurUmbraco.Site/masterpages/__Textpage.master