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

More of the Smidge initial implementation. Adding TODOs for next steps

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-03-24 17:34:34 +01:00
parent 85730eadb0
commit ccfaebb09f
20 changed files with 176 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Smidge">
<HintPath>..\..\..\..\.nuget\packages\smidge\3.1.0\lib\netcoreapp3.0\Smidge.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -108,6 +111,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Smidge">
<Version>3.1.0</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
<PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
</ItemGroup>

13
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
View File

@@ -1,5 +1,7 @@
@using System.Web.Mvc.Html
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Core
@using Umbraco.Web
@using Umbraco.Web.Composing
@using Umbraco.Web.Controllers
@@ -10,15 +12,18 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
SmidgeHelper
.CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
var success = TempData["ProfileUpdateSuccess"] != null;
}
@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
@Html.RenderJsHere()
@Current.RuntimeMinifier.RenderJsHere("default-js")
@if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
{

14
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
View File

@@ -1,6 +1,9 @@
@using System.Web.Mvc.Html
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Web
@using Umbraco.Core
@using Umbraco.Web.Composing
@using Umbraco.Web.Models
@using Umbraco.Web.Controllers
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@@ -11,13 +14,16 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
SmidgeHelper
.CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
}
@* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
@Html.RenderJsHere()
@Current.RuntimeMinifier.RenderJsHere("default-js")
@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
{

13
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
View File

@@ -1,5 +1,7 @@
@using System.Web.Mvc.Html
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Core
@using Umbraco.Web
@using Umbraco.Web.Composing
@using Umbraco.Web.Controllers
@@ -34,15 +36,18 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
SmidgeHelper
.CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
.RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
var success = TempData["FormSuccess"] != null;
}
@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
@Html.RenderJsHere()
@Current.RuntimeMinifier.RenderJsHere("default-js")
@if (success)
{

7
src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
View File

@@ -1,8 +1,11 @@
@using Umbraco.Core
@using ClientDependency.Core
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Web.Composing
@using Umbraco.Web
@using Constants = Umbraco.Core.Constants
using Umbraco.Core
@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@{
Layout = null;
@@ -11,6 +14,10 @@
.RequiresCss("assets/css/umbraco.css", "Umbraco")
.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
SmidgeHelper
.CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
.RequiresCss("~/assets/css/canvasdesigner.css");
}
<!DOCTYPE html>

12
src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
View File

@@ -1,8 +1,10 @@
@using Umbraco.Core
@using ClientDependency.Core
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Web.Composing
@using Umbraco.Web
@using Constants = Umbraco.Core.Constants
@inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@@ -18,10 +20,9 @@
}
}
Html
.RequiresCss("assets/css/umbraco.css", "Umbraco")
.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
SmidgeHelper
.CreateCssBundle(Constants.RuntimeMinification.CssBundles.Default)
.RequiresCss("~/assets/css/umbraco.css", "~/lib/bootstrap-social/bootstrap-social.css", "~/lib/font-awesome/css/font-awesome.min.css");
}
<!DOCTYPE html>
@@ -38,8 +39,7 @@
<title ng-bind="$root.locationTitle">Umbraco</title>
@Html.RenderCssHere(
new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath)))
@Current.RuntimeMinifier.RenderCssHere("default-css")
</head>
<body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">

14
src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
View File

@@ -1,14 +1,18 @@
@using Umbraco.Core
@using Umbraco.Core
@using ClientDependency.Core
@using ClientDependency.Core.Mvc
@using Smidge
@using Umbraco.Web.Composing
@using Umbraco.Web
@using Constants = Umbraco.Core.Constants
@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
@{
var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
Html.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
SmidgeHelper
.CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
.RequiresCss("~/assets/css/canvasdesigner.css");
}
<!DOCTYPE html>
<html lang="en">
@@ -18,8 +22,7 @@
<meta name="robots" content="noindex, nofollow">
<meta name="pinterest" content="nopin" />
@Html.RenderCssHere(
new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath)))
@Current.RuntimeMinifier.RenderCssHere("index-css")
</head>
<body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
@@ -64,7 +67,8 @@
</div>
}
<button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
<button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline">
<i class="icon icon-power"></i><span>Exit</span>
</button>
</div>