yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames canvas editor into grid again

Browse Source
This commit is contained in:
per ploug
2014-10-07 13:39:18 +02:00
parent bba4db46d2
commit b6fd0489e2
32 changed files with 78 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -537,7 +537,7 @@
<Compile Include="Umbraco\TreeInit.aspx.designer.cs">
<DependentUpon>treeInit.aspx</DependentUpon>
</Compile>
<Content Include="Config\canvas.editors.config.js" />
<Content Include="Config\grid.editors.config.js" />
<Content Include="Umbraco\Config\Lang\cs.xml" />
<Content Include="Umbraco\Install\Legacy\loadStarterKits.ascx" />
<Content Include="Umbraco\ClientRedirect.aspx" />
@@ -2075,13 +2075,13 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Views\Partials\Canvas\bootstrap3.cshtml" />
<Content Include="Views\Partials\Canvas\Editors\embed.cshtml" />
<Content Include="Views\Partials\Canvas\Editors\macro.cshtml" />
<Content Include="Views\Partials\Canvas\Editors\media.cshtml" />
<Content Include="Views\Partials\Canvas\Editors\rte.cshtml" />
<Content Include="Views\Partials\Canvas\Editors\textstring.cshtml" />
<Content Include="Views\Partials\Canvas\bootstrap2.cshtml" />
<Content Include="Views\Partials\Grid\bootstrap3.cshtml" />
<Content Include="Views\Partials\Grid\Editors\embed.cshtml" />
<Content Include="Views\Partials\Grid\Editors\macro.cshtml" />
<Content Include="Views\Partials\Grid\Editors\media.cshtml" />
<Content Include="Views\Partials\Grid\Editors\rte.cshtml" />
<Content Include="Views\Partials\Grid\Editors\textstring.cshtml" />
<Content Include="Views\Partials\Grid\bootstrap2.cshtml" />
<None Include="Web.Debug.config.transformed" />
<None Include="web.Template.Debug.config">
<DependentUpon>Web.Template.config</DependentUpon>

3
src/Umbraco.Web.UI/Views/Partials/Canvas/Editors/embed.cshtml
View File

@@ -1,3 +0,0 @@
@model dynamic
@using Umbraco.Web.Templates
@Html.Raw(Model.value)

17
src/Umbraco.Web.UI/Views/Partials/Canvas/Editors/macro.cshtml
View File

@@ -1,17 +0,0 @@
@inherits UmbracoViewPage<dynamic>
@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);
}
<text>
@Umbraco.RenderMacro(macroAlias, parameters)
</text>
}

13
src/Umbraco.Web.UI/Views/Partials/Canvas/Editors/media.cshtml
View File

@@ -1,13 +0,0 @@
@model dynamic
@using Umbraco.Web.Templates
@if (Model.value != null)
{
<div class="thumbnail">
<img src="@Model.value.image" alt="@Model.value.caption">
</div>
if (Model.value.caption != null)
{
<p class="caption">@Model.value.caption</p>
}
}

4
src/Umbraco.Web.UI/Views/Partials/Canvas/Editors/rte.cshtml
View File

@@ -1,4 +0,0 @@
@model dynamic
@using Umbraco.Web.Templates
@Html.Raw(TemplateUtilities.ParseInternalLinks(Model.value.ToString()))

20
src/Umbraco.Web.UI/Views/Partials/Canvas/Editors/textstring.cshtml
View File

@@ -1,20 +0,0 @@
@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());
<text>
@Html.Raw(markup)
</text>
}
else
{
<text>
<div style="@Model.editor.config.style">@Model.value</div>
</text>
}

47
src/Umbraco.Web.UI/Views/Partials/Canvas/bootstrap2.cshtml
View File

@@ -1,47 +0,0 @@
@inherits UmbracoViewPage<dynamic>
@using Umbraco.Web.Templates
@using Newtonsoft.Json.Linq;
@if (Model != null && !string.IsNullOrEmpty(Model.ToString()))
{
var onlyOneColumn = Model.sections != null ? ((System.Collections.ICollection)Model.sections).Count : 0;
<div class="uSky-grid @(onlyOneColumn > 1 ? "container-fluid" : "")">
<div class="row-fluid clearfix">
@foreach (var s in Model.sections)
{
<div class="@("span" + s.grid)">
@foreach (var row in s.rows)
{
<div class="gridrow_@row.uniqueId" >
<div>
<div class="row-fluid clearfix">
@foreach (var area in row.areas)
{
<div class="@("span" + area.grid)">
@foreach (var control in area.controls)
{
if (control != null && control.editor != null && control.editor.view != null)
{
string editor = "canvas/editors/" + control.editor.view.ToString();
<text>
@Html.Partial(editor, (object)control)
</text>
}
}
</div>
}
</div>
</div>
</div>
}
</div>
}
</div>
</div>
}

45
src/Umbraco.Web.UI/Views/Partials/Canvas/bootstrap3.cshtml
View File

@@ -1,45 +0,0 @@
@inherits UmbracoViewPage<dynamic>
@using Umbraco.Web.Templates
@if (Model != null && !string.IsNullOrEmpty(Model.ToString()))
{
var onlyOneColumn = Model.sections != null ? ((System.Collections.ICollection)Model.sections).Count : 0;
<div class="uSky-grid @(onlyOneColumn > 1 ? "container" : "")">
<div class="row clearfix">
@foreach (var s in Model.sections)
{
<div class="col-md-@s.grid column">
@foreach (var row in s.rows)
{
<div class="gridrow_@row.uniqueId" >
<div class="container">
<div class="row clearfix">
@foreach (var area in row.areas)
{
<div class="col-md-@area.grid column">
@foreach (var control in area.controls)
{
if (control != null && control.editor != null && control.editor.view != null)
{
string editor = "canvas/editors/" + control.editor.view.ToString();
<text>
@Html.Partial(editor, (object)control)
</text>
}
}
</div>
}
</div>
</div>
</div>
}
</div>
}
</div>
</div>
}

0
src/Umbraco.Web.UI/config/canvas.editors.config.js → src/Umbraco.Web.UI/config/grid.editors.config.js
View File