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

Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002

Browse Source
This commit is contained in:
Stephan
2016-01-15 12:35:58 +01:00
parent 46f3d0c647
commit fb1a72600e
7 changed files with 26 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,12 +350,16 @@
<Name>umbraco.providers</Name>
</ProjectReference>
<Reference Include="System.Xml.Linq" />
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Reference Include="Umbraco.ModelsBuilder, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.2.2.0-beta002\lib\Umbraco.ModelsBuilder.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Zbu.ModelsBuilder, Version=2.2.0.59, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zbu.ModelsBuilder.2.2.0-beta001\lib\Zbu.ModelsBuilder.dll</HintPath>
<Reference Include="Umbraco.ModelsBuilder.AspNet, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta002\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Zbu.ModelsBuilder.AspNet, Version=2.2.0.59, Culture=neutral, processorArchitecture=MSIL">
@@ -582,6 +586,8 @@
<Compile Include="Umbraco\TreeInit.aspx.designer.cs">
<DependentUpon>treeInit.aspx</DependentUpon>
</Compile>
<Content Include="App_Plugin\ModelsBuilder\modelsbuilder.controller.js" />
<Content Include="App_Plugin\ModelsBuilder\modelsbuilder.htm" />
<Content Include="Config\grid.editors.config.js" />
<Content Include="Config\Lang\cs-CZ.user.xml" />
<Content Include="Config\Lang\da-DK.user.xml" />
@@ -640,6 +646,7 @@
</SubType>
</Content>
<Content Include="Umbraco\Install\Views\Web.config" />
<Content Include="App_Plugin\ModelsBuilder\package.manifest" />
<None Include="Config\404handlers.Release.config">
<DependentUpon>404handlers.config</DependentUpon>
</None>
@@ -1962,8 +1969,6 @@
<Content Include="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml" />
<Content Include="Umbraco\Views\AuthorizeUpgrade.cshtml" />
<Content Include="Umbraco\Translation\translationTasks.dtd" />
<Content Include="UserControls\Zbu\ModelsBuilder\BuildModels.ascx" />
<Content Include="UserControls\Zbu\ModelsBuilder\logo32x32.png" />
<Content Include="Views\Web.config">
<SubType>Designer</SubType>
</Content>

112
src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/BuildModels.ascx
View File

@@ -1,112 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" %>
<%@ Import Namespace="Zbu.ModelsBuilder.Configuration" %>
<%@ Import Namespace="Zbu.ModelsBuilder.AspNet" %>
<script runat="server">
protected override void OnLoad(EventArgs e)
{
// <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
// <umb:CssInclude runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />
phGenerate.Visible = Config.EnableAppDataModels || Config.EnableAppCodeModels || Config.EnableDllModels;
phGenerateWarning.Visible = Config.EnableAppCodeModels || Config.EnableDllModels;
var sb = new StringBuilder();
sb.Append("Config: ");
if (Config.EnableApi) sb.Append(" +EnableApi");
if (Config.EnableAppDataModels) sb.Append(" +EnableAppDataModels");
if (Config.EnableAppCodeModels) sb.Append(" +EnableAppCodeModels");
if (Config.EnableDllModels) sb.Append(" +EnableDllModels");
if (Config.EnableLiveModels) sb.Append(" +EnableLiveModels");
if (Config.EnablePublishedContentModelsFactory) sb.Append(" +EnablePublishedContentModelsFactory");
if (Config.FlagOutOfDateModels) sb.Append(" +FlagOutOfDateModels");
sb.AppendFormat("<br />Config.ModelsNameSpace: \"{0}\"", Config.ModelsNamespace);
sb.AppendFormat("<br />Config.StaticMixinGetters: {0}", Config.StaticMixinGetters ? "enabled" : "disabled");
if (Config.StaticMixinGetters)
sb.AppendFormat(", Config.StaticMixinGetterPattern: \"{0}\"", Config.StaticMixinGetterPattern);
txtReport.Text = sb.ToString();
txtGenerate.Text = "Click button to generate models.";
if (OutOfDateModelsStatus.IsOutOfDate)
txtGenerate.Text = "Models are <strong>out-of-date</strong>, click button to generate models.";
var ver = Umbraco.Core.Configuration.UmbracoVersion.Current;
if (ver.Major == 6)
Umbraco6();
}
private void Umbraco6()
{
var css = new ClientDependency.Core.Controls.CssInclude();
css.FilePath = "propertypane/style.css";
css.PathNameAlias = "UmbracoClient";
Page.Controls.Add(css);
}
</script>
<script type="text/javascript">
jQuery(document).ready(function () {
function buildModelsOnServer(callback) {
// encodeURIComponent(args)...
$.getJSON('<%=Zbu.ModelsBuilder.AspNet.ModelsBuilderApiController.BuildModelsUrl%>', function (json) {
callback(json);
});
}
function nl2br(s) {
s = s.replace(/\r/g, '');
s = s.replace(/\n/g, '<br />');
return s;
}
jQuery('#generateModels').click(function (event) {
jQuery('#generateModelsPane').hide();
jQuery('#generateModelsRun').show();
buildModelsOnServer(function (json) {
if (json.Success) {
$('#generateModelsRunMessage').html('Success! Reloading...');
window.location.reload();
}
else {
$('#generateModelsRunMessage').html('Failed. I\'m so sorry.');
$('#generateModelsRunProgress').html(nl2br(json.Message));
}
});
event.preventDefault();
return false;
});
});
</script>
<div class="propertypane">
<div>
<div class="propertyItem">
<div class="dashboardWrapper">
<h2>Zbu.ModelsBuilder</h2>
<img class="dashboardIcon" alt="Umbraco" src="/UserControls/Zbu/ModelsBuilder/logo32x32.png">
<div style="margin-top: 24px;">
<asp:Literal runat="server" ID="txtReport" />
</div>
<asp:PlaceHolder runat="server" ID="phGenerate">
<div style="margin-top: 24px;">
<div id="generateModelsPane" style="min-height: 240px;">
<p><asp:Literal runat="server" ID="txtGenerate"/></p>
<asp:PlaceHolder runat="server" ID="phGenerateWarning">
<p style="color:red;">Beware! This will restart the application.</p>
</asp:PlaceHolder>
<p><button id="generateModels">Generate</button></p>
</div>
<div style="display:none;min-height: 240px;" id="generateModelsRun">
<span id="generateModelsRunMessage">Please wait...</span>
<br />&nbsp;<br />
<span id="generateModelsRunProgress" style="color:#999999;"/>
</div>
</div>
</asp:PlaceHolder>
</div>
</div>
</div>
</div>

BIN
src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/logo32x32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

2
src/Umbraco.Web.UI/Views/Web.config
View File

@@ -22,8 +22,6 @@
<add namespace="Umbraco.Web.Mvc" />
<add namespace="umbraco" />
<add namespace="Examine" />
<add namespace="Umbraco.Web.PublishedContentModels"/>
</namespaces>
</pages>
</system.web.webPages.razor>

10
src/Umbraco.Web.UI/config/Dashboard.config
View File

@@ -94,4 +94,14 @@
<control>plugins/umbracocontour/formsdashboard.ascx</control>
</tab>
</section>
<section alias="UmbracoModelsBuilder">
<areas>
<area>developer</area>
</areas>
<tab caption="Models Builder">
<control>
/App_Plugins/ModelsBuilder/modelsbuilder.htm
</control>
</tab>
</section>
</dashBoard>

4
src/Umbraco.Web.UI/packages.config
View File

@@ -37,7 +37,7 @@
<package id="SqlServerCE" version="4.0.0.0" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder" version="2.2.0-beta002" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder.AspNet" version="2.2.0-beta002" targetFramework="net45" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
<package id="Zbu.ModelsBuilder" version="2.2.0-beta001" targetFramework="net45" />
<package id="Zbu.ModelsBuilder.AspNet" version="2.2.0-beta001" targetFramework="net45" />
</packages>

5
src/Umbraco.Web.UI/web.Template.config
View File

@@ -53,8 +53,9 @@
<add key="log4net.Config" value="config\log4net.config" />
<add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
<add key="Zbu.ModelsBuilder.EnableLiveModels" value="true"/>
<add key="Zbu.ModelsBuilder.EnableDllModels" value="false"/>
<add key="Umbraco.ModelsBuilder.Enable" value="true"/>
<add key="Umbraco.ModelsBuilder.EnableLiveModels" value="true"/>
<add key="Umbraco.ModelsBuilder.EnableDllModels" value="false"/>
</appSettings>
<connectionStrings>