diff --git a/.gitignore b/.gitignore index 52c83f28..8f927492 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ OurUmbraco.Site/App_Data/Meetup/searchresults.json OurUmbraco.Site/[Dd]ocumentation/ OurUmbraco.Site_419 OurUmbraco.Site/App_Data/cache/ +*.sln.ide/ diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index b1915ec2..2d76d13f 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -47,24 +47,25 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll False @@ -85,15 +86,17 @@ ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll False @@ -101,10 +104,11 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -122,10 +126,11 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll @@ -135,11 +140,11 @@ True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -149,6 +154,10 @@ True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + True + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll @@ -175,43 +184,43 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll - - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll diff --git a/Notification/packages.config b/Notification/packages.config index 36698cff..f3551c7c 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -1,25 +1,26 @@  - - + + - + + - + - + \ No newline at end of file diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index ba446da5..aa7f69f2 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -47,24 +47,25 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll + True - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll False @@ -85,15 +86,17 @@ ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll False @@ -101,10 +104,11 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -122,25 +126,28 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + @@ -185,43 +192,43 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll - - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 8a19db24..f0032a3b 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -1,12 +1,12 @@  - - + + - + @@ -16,11 +16,12 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 2d281314..8e9ff448 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -51,25 +51,25 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - + False - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll + True False @@ -113,13 +113,13 @@ False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - + False - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll False @@ -127,7 +127,7 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll ..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll @@ -149,12 +149,12 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -174,7 +174,7 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\dependencies\Our\our.mapR.dll @@ -194,22 +194,24 @@ False ..\dependencies\Our\SignalR.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + @@ -256,56 +258,52 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll ..\dependencies\Our\Umbraco.Ecommerce.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll ..\dependencies\Our\umbraco.presentation.xslt.Exslt.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll ..\dependencies\Our\Umbraco.Support.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll - - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll False - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll ..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml new file mode 100644 index 00000000..50273483 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml @@ -0,0 +1,84 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates +@using Newtonsoft.Json.Linq + +@* + Razor helpers located at the bottom of this file +*@ + +@if (Model != null && Model.sections != null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) { +
+ @foreach (var row in section.rows) { + @renderRow(row, true); + } +
+ } + }else { +
+
+ @foreach (var s in Model.sections) { +
+
+ @foreach (var row in s.rows) { + @renderRow(row, false); + } +
+
+ } +
+
+ } +
+} + +@helper renderRow(dynamic row, bool singleColumn){ +
+ @Umbraco.If(singleColumn, "
") +
+ @foreach ( var area in row.areas ) { +
+
+ @foreach (var control in area.controls) { + if (control !=null && control.editor != null && control.editor.view != null ) { + @Html.Partial("grid/editors/base", (object)control) + } + } +
+
} +
+ @Umbraco.If(singleColumn, "
") +
+} + +@functions { + public static MvcHtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if(cfg != null) + foreach (JProperty property in cfg.Properties()) { + attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + } + + JObject style = contentItem.styles; + + if (style != null) { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); + + if (cssVals.Any()) + attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + } + + return new MvcHtmlString(string.Join(" ", attrs)); + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml new file mode 100644 index 00000000..a752042e --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml @@ -0,0 +1,84 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates +@using Newtonsoft.Json.Linq + +@* + Razor helpers located at the bottom of this file +*@ + +@if (Model != null && Model.sections != null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) { +
+ @foreach (var row in section.rows) { + @renderRow(row, true); + } +
+ } + }else { +
+
+ @foreach (var s in Model.sections) { +
+
+ @foreach (var row in s.rows) { + @renderRow(row, false); + } +
+
+ } +
+
+ } +
+} + +@helper renderRow(dynamic row, bool singleColumn){ +
+ @Umbraco.If(singleColumn, "
") +
+ @foreach ( var area in row.areas ) { +
+
+ @foreach (var control in area.controls) { + if (control !=null && control.editor != null && control.editor.view != null ) { + @Html.Partial("grid/editors/base", (object)control) + } + } +
+
} +
+ @Umbraco.If(singleColumn, "
") +
+} + +@functions { + public static MvcHtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if(cfg != null) + foreach (JProperty property in cfg.Properties()) { + attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + } + + JObject style = contentItem.styles; + + if (style != null) { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); + + if (cssVals.Any()) + attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + } + + return new MvcHtmlString(string.Join(" ", attrs)); + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml new file mode 100644 index 00000000..a86c0481 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml @@ -0,0 +1,24 @@ +@model dynamic +@using Umbraco.Web.Templates + +@functions { + public static string EditorView(dynamic contentItem) + { + string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString(); + view = view.ToLower().Replace(".html", ".cshtml"); + + if (!view.Contains("/")) { + view = "grid/editors/" + view; + } + + return view; + } +} +@try +{ + string editor = EditorView(Model); + @Html.Partial(editor, (object)Model) +} +catch (Exception ex) { +
@ex.ToString()
+} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml new file mode 100644 index 00000000..4fd66ddb --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml @@ -0,0 +1,3 @@ +@model dynamic +@using Umbraco.Web.Templates +@Html.Raw(Model.value) diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml new file mode 100644 index 00000000..e0822808 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml @@ -0,0 +1,17 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates + + +@if (Model.value != null) +{ + string macroAlias = Model.value.macroAlias.ToString(); + ViewDataDictionary parameters = new ViewDataDictionary(); + foreach (dynamic mpd in Model.value.macroParamsDictionary) + { + parameters.Add(mpd.Name, mpd.Value); + } + + + @Umbraco.RenderMacro(macroAlias, parameters) + +} diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml new file mode 100644 index 00000000..09d04219 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml @@ -0,0 +1,23 @@ +@model dynamic +@using Umbraco.Web.Templates + +@if (Model.value != null) +{ + var url = Model.value.image; + if(Model.editor.config != null && Model.editor.config.size != null){ + url += "?width=" + Model.editor.config.size.width; + url += "&height=" + Model.editor.config.size.height; + + if(Model.value.focalPoint != null){ + url += "¢er=" + Model.value.focalPoint.top +"," + Model.value.focalPoint.left; + url += "&mode=crop"; + } + } + + @Model.value.caption + + if (Model.value.caption != null) + { +

@Model.value.caption

+ } +} diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml new file mode 100644 index 00000000..d132e100 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml @@ -0,0 +1,4 @@ +@model dynamic +@using Umbraco.Web.Templates + +@Html.Raw(TemplateUtilities.ParseInternalLinks(Model.value.ToString())) diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml new file mode 100644 index 00000000..0cac4eb1 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml @@ -0,0 +1,20 @@ +@model dynamic +@using Umbraco.Web.Templates + +@if (Model.editor.config.markup != null) +{ + string markup = Model.editor.config.markup.ToString(); + + markup = markup.Replace("#value#", Model.value.ToString()); + markup = markup.Replace("#style#", Model.editor.config.style.ToString()); + + + @Html.Raw(markup) + +} +else +{ + +
@Model.value
+
+} diff --git a/OurUmbraco.Site/config/ClientDependency.config b/OurUmbraco.Site/config/ClientDependency.config index e4160d06..2566920d 100644 --- a/OurUmbraco.Site/config/ClientDependency.config +++ b/OurUmbraco.Site/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/OurUmbraco.Site/config/splashes/noNodes.aspx b/OurUmbraco.Site/config/splashes/noNodes.aspx index b66780d8..38415e32 100644 --- a/OurUmbraco.Site/config/splashes/noNodes.aspx +++ b/OurUmbraco.Site/config/splashes/noNodes.aspx @@ -2,148 +2,67 @@ <%@ Import Namespace="Umbraco.Core.Configuration" %> <%@ Import Namespace="Umbraco.Core.IO" %> - - - + + + + + + + + + + + + + - + + - Umbraco - no pages found - " /> + - + - - - - - - - - - - - - - - - - - -
+ - +
+
+
+ -
+

Welcome to your Umbraco installation

+

You're seeing the wonderful page because your website doesn't contain any published content yet.

-
+ - - +
+
+

Easy start with Umbraco.tv

+

We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.

+ + Umbraco.tv → +
- +
+

Be a part of the community

+

The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, were sure that you can get your answers from the community.

+ + our.Umbraco → +
+
-
- - +
+
-
+
- - $.post("../../install/InstallerRestService.aspx?feed=developervids", - function(data) { - jQuery("#ajax-developervids").html(data); - }); - }); - - - - - -
-
-

Looks like there's still work to do

-

- You're seeing the wonderful page because your website doesn't contain any published content yet. -

-

- So get rid of this page by starting umbraco and publishing some content. You can do this by clicking the "set up your new website" button below. -

- -
-
-
-   -
-
- - - -
-
-
-
- - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- + \ No newline at end of file diff --git a/OurUmbraco.Site/config/tinyMceConfig.config b/OurUmbraco.Site/config/tinyMceConfig.config index 2cae6d6f..992103dd 100644 --- a/OurUmbraco.Site/config/tinyMceConfig.config +++ b/OurUmbraco.Site/config/tinyMceConfig.config @@ -216,8 +216,8 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al -tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class], thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style], --span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], --h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style], +-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style], +-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style], dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*], param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]> @@ -227,6 +227,17 @@ param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|cla raw - GoogleSpellChecker.ashx + + { + "indentOnInit": false, + "path": "../../../../../umbraco_client/CodeMirror/Js", + "config": { + }, + "jsFiles": [ + ], + "cssFiles": [ + ] + } + \ No newline at end of file diff --git a/OurUmbraco.Site/config/trees.config b/OurUmbraco.Site/config/trees.config index 92e4f40c..a8b4ff45 100644 --- a/OurUmbraco.Site/config/trees.config +++ b/OurUmbraco.Site/config/trees.config @@ -22,7 +22,6 @@ - diff --git a/OurUmbraco.Site/config/uVersion.config b/OurUmbraco.Site/config/uVersion.config index 877de37a..9aab45be 100644 --- a/OurUmbraco.Site/config/uVersion.config +++ b/OurUmbraco.Site/config/uVersion.config @@ -9,6 +9,7 @@ + diff --git a/OurUmbraco.Site/config/umbracoSettings.config b/OurUmbraco.Site/config/umbracoSettings.config index 7d4f3852..268369d2 100644 --- a/OurUmbraco.Site/config/umbracoSettings.config +++ b/OurUmbraco.Site/config/umbracoSettings.config @@ -29,7 +29,8 @@ text - In Preview Mode - click to end]]> + + In Preview Mode - click to end]]> diff --git a/OurUmbraco.Site/images/our_logo.png b/OurUmbraco.Site/images/our_logo.png new file mode 100644 index 00000000..59d3511c Binary files /dev/null and b/OurUmbraco.Site/images/our_logo.png differ diff --git a/OurUmbraco.Site/macroScripts/repository-view-category.cshtml b/OurUmbraco.Site/macroScripts/repository-view-category.cshtml index 343f0ebb..eb68c481 100644 --- a/OurUmbraco.Site/macroScripts/repository-view-category.cshtml +++ b/OurUmbraco.Site/macroScripts/repository-view-category.cshtml @@ -11,7 +11,11 @@ if(Request.QueryString["version"] != null){ version = Request.QueryString["version"].ToLower(); } - + + if (!string.IsNullOrEmpty(fullversion) && fullversion.Substring(0, 1) == "7") + { + version = "v7"; + } var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; var qs = Request.RawUrl.Substring( Request.RawUrl.IndexOf('?')+1 ).Replace("&category_id=" + id, ""); diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index f5a3c99f..16b6703e 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -2,12 +2,12 @@ - - + + - + @@ -19,14 +19,15 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml b/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml index 2e920de4..99ba4410 100644 --- a/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml +++ b/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml @@ -55,7 +55,7 @@ @*And finally we can load in our angular app*@ - + diff --git a/OurUmbraco.Site/umbraco/Views/Default.cshtml b/OurUmbraco.Site/umbraco/Views/Default.cshtml index 2b3aa309..b17b8dfc 100644 --- a/OurUmbraco.Site/umbraco/Views/Default.cshtml +++ b/OurUmbraco.Site/umbraco/Views/Default.cshtml @@ -31,7 +31,7 @@ - +
diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html new file mode 100644 index 00000000..91b53f4d --- /dev/null +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html @@ -0,0 +1,7 @@ +
+
+
+
+
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html index fb353723..55e0cad2 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html @@ -6,19 +6,21 @@
-

{{model.entity.name}}

+
@@ -26,31 +28,32 @@
diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html index 02865391..590b569f 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html @@ -15,7 +15,11 @@
- diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html index cb47826c..a1728f30 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html @@ -29,14 +29,31 @@ - + + + +
- - + + + +
+ + +
+