Skip to content

Commit

Permalink
Merge pull request #445 from Jeavon/hotfix/444
Browse files Browse the repository at this point in the history 
Fix for #444
  • Loading branch information
@Shazwazza
Shazwazza authored Feb 20, 2024
2 parents 18fd03f + a20eeed commit b26f120
Show file tree
Hide file tree
Showing 11 changed files with 466 additions and 166 deletions.
2 changes: 1 addition & 1 deletion build/Articulate.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<iconUrl>https://raw.githubusercontent.com/Shazwazza/Articulate/master/assets/Icon-transparent.png</iconUrl>
<dependencies>
<group targetFramework="net472">
<dependency id="UmbracoCms.Web" version="[8.1.2, 9.0.0)" />
<dependency id="UmbracoCms.Web" version="[8.18.13, 9.0.0)" />
<dependency id="xmlrpcnet" version="[3.0.0.266, 4.0.0)" />
<dependency id="xmlrpcnet-server" version="[3.0.0.266, 4.0.0)" />
<dependency id="Argotic.Core" version="2008.0.2" />
Expand Down
113 changes: 70 additions & 43 deletions src/Articulate.Web/Articulate.Web.csproj
View file

Large diffs are not rendered by default.

57 changes: 36 additions & 21 deletions src/Articulate.Web/Web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
<section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" />
</sectionGroup>

<sectionGroup name="imageProcessor">
<section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
Expand Down Expand Up @@ -82,9 +81,8 @@
<httpModules>
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />

<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
</httpModules>
<httpHandlers>
<remove verb="*" path="*.asmx" />
Expand Down Expand Up @@ -119,14 +117,14 @@
<add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
</providers>
</roleManager>
<pages>
<namespaces>
<add namespace="ClientDependency.Core" />
<add namespace="ClientDependency.Core.Mvc" /></namespaces>
</pages>
<pages>
<namespaces>
<add namespace="ClientDependency.Core.Mvc" />
<add namespace="ClientDependency.Core" />
</namespaces>
</pages>
</system.web>
<system.webServer>

<modules runAllManagedModulesForAllRequests="true">
<remove name="WebDAVModule" />
<remove name="UmbracoModule" />
Expand All @@ -137,10 +135,9 @@
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />

<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
<remove name="ClientDependencyModule" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
</modules>
<handlers accessPolicy="Read, Write, Script, Execute">
<remove name="WebServiceHandlerFactory-Integrated" />
Expand All @@ -149,15 +146,11 @@
<remove name="ScriptResource" />
<remove name="ClientDependency" />
<remove name="MiniProfiler" />



<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
<add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />

<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler" />
<remove name="TRACEVerbHandler" />
Expand Down Expand Up @@ -202,8 +195,6 @@
<rules></rules>
</rewrite>
-->


<validation validateIntegratedModeConfiguration="false" />
</system.webServer>
<runtime>
Expand All @@ -217,8 +208,16 @@
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Host.SystemWeb" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
Expand All @@ -242,7 +241,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
Expand All @@ -260,6 +259,22 @@
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="4.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="4.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<location path="umbraco">
Expand All @@ -283,4 +298,4 @@
<caching configSource="config\imageprocessor\cache.config" />
<processing configSource="config\imageprocessor\processing.config" />
</imageProcessor>
</configuration>
</configuration>
63 changes: 47 additions & 16 deletions src/Articulate.Web/config/BackOfficeTours/getting-started.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
[
{
"name": "Email Marketing",
"alias": "umbEmailMarketing",
"group": "Email Marketing",
"groupOrder": 10,
"hidden": true,
"requiredSections": [
"content"
],
"steps": [
{
"title": "Do you want to stay updated on everything Umbraco?",
"content": "<p>Thank you for using Umbraco! Would you like to stay up-to-date with Umbraco product updates, security advisories, community news and special offers? Sign up for our newsletter and never miss out on the latest Umbraco news.</p> <p class='notice'>By signing up, you agree that we can use your info according to our <a href='https://umbraco.com/about-us/privacy/'>privacy policy</a>.</p>",
"view": "emails",
"type": "promotion"
},
{
"title": "Thank you for subscribing to our mailing list",
"view": "confirm"
}
]
},
{
"name": "Introduction",
"alias": "umbIntroIntroduction",
Expand All @@ -25,7 +47,15 @@
"element": "[data-element='section-content']",
"elementPreventClick": true,
"title": "Sections",
"content": "Each area in Umbraco is called a <b>Section</b>. Right now you are in the Content section, when you want to go to another section simply click on the appropriate name in the main menu and you'll be there in no time.",
"content": "Each area in Umbraco is called a <b>Section</b>. The current section is highlighted in the main menu, when you want to go to another section click on the name and you'll be there in no time.",
"backdropOpacity": 0.6
},
{
"element": "[data-element='section-content']",
"skipStepIfVisible": "[data-element='dashboard']",
"title": "Content section",
"content": "Try clicking <b>Content</b> to enter the content section.",
"event": "click",
"backdropOpacity": 0.6
},
{
Expand Down Expand Up @@ -130,10 +160,16 @@
"title": "Enter a description",
"content": "<p>A description helps to pick the right document type when creating content.</p><p>Write a description for our Home page. It could be: <br/><pre>The home page of the website</pre></p>"
},
{
"element": "[data-element='groups-builder']",
"elementPreventClick": true,
"title": "Properties, groups, and tabs",
"content": "A Document Type consist of Properties (data fields/attributes) where an editor can input data. For complex Document Types you can organize Properties in groups and tabs."
},
{
"element": "[data-element='group-add']",
"title": "Add group",
"content": "Group are used to organize properties on content in the Content section. Click <b>Add Group</b> to add a group.",
"content": "In this tour we only need a group. Click <b>Add Group</b> to add a group.",
"event": "click"
},
{
Expand Down Expand Up @@ -166,27 +202,21 @@
"event": "click"
},
{
"element": "[data-element~='editor-data-type-picker']",
"element": "[ng-controller*='Umbraco.Editors.DataTypePickerController'] [data-element='editor-data-type-picker']",
"elementPreventClick": true,
"title": "Editor picker",
"content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p><p><em>You can choose from preconfigured data types (Reuse) or create a new configuration (Available editors)</em>.</p>"
"content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p>"
},
{
"element": "[data-element~='editor-data-type-picker'] [data-element='editor-Textarea']",
"element": "[data-element~='editor-data-type-picker'] [data-element='datatype-Textarea']",
"title": "Select editor",
"content": "Select the <b>Textarea</b> editor. This will add a textarea to the Welcome Text property.",
"event": "click"
},
{
"element": "[data-element~='editor-data-type-settings']",
"elementPreventClick": true,
"element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea']",
"title": "Editor settings",
"content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed."
},
{
"element": "[data-element~='editor-data-type-settings'] [data-element='button-submit']",
"title": "Save editor",
"content": "Click <b>Submit</b> to save the changes.",
"content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed.",
"event": "click"
},
{
Expand Down Expand Up @@ -256,9 +286,9 @@
"view": "nodename"
},
{
"element": "[data-element='editor-content'] [data-element='property-welcomeText']",
"element": "[data-element='editor-content'] [data-element='property-welcomeText'] > div",
"title": "Add a welcome text",
"content": "<p>Add content to the <b>Welcome Text</b> field.</p><p>If you don't have any ideas here is a start:<br/> <pre>I am learning Umbraco. High Five I Rock #H5IR</pre>.</p>"
"content": "<p>Add content to the <b>Welcome Text</b> field.</p><p>If you don't have any ideas here is a start:<br/> <pre>I am learning Umbraco. High Five I Rock #H5IR</pre></p>"
},
{
"element": "[data-element='editor-content'] [data-element='button-saveAndPublish']",
Expand Down Expand Up @@ -295,7 +325,8 @@
"content": "<p>To see all our templates click the <b>small triangle</b> to the left of the templates node.</p>",
"event": "click",
"eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-expand']",
"view": "templatetree"
"view": "templatetree",
"skipStepIfVisible": "#tree [data-element='tree-item-templates'] > div > button[data-element=tree-item-expand] span.icon-navigation-down"
},
{
"element": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page']",
Expand Down
6 changes: 5 additions & 1 deletion src/Articulate.Web/config/grid.editors.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
},
{
"name": "Image",
"nameTemplate": "{{ value && value.udi ? (value.udi | ncNodeName) : '' }}",
"alias": "media",
"view": "media",
"icon": "icon-picture"
},
{
"name": "Macro",
"nameTemplate": "{{ value && value.macroAlias ? value.macroAlias : '' }}",
"alias": "macro",
"view": "macro",
"icon": "icon-settings-alt"
Expand All @@ -25,6 +27,7 @@
},
{
"name": "Headline",
"nameTemplate": "{{ value }}",
"alias": "headline",
"view": "textstring",
"icon": "icon-coin",
Expand All @@ -35,6 +38,7 @@
},
{
"name": "Quote",
"nameTemplate": "{{ value ? value.substring(0,32) + (value.length > 32 ? '...' : '') : '' }}",
"alias": "quote",
"view": "textstring",
"icon": "icon-quote",
Expand All @@ -43,4 +47,4 @@
"markup": "<blockquote>#value#</blockquote>"
}
}
]
]
Loading

0 comments on commit b26f120

Please sign in to comment.