diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index 406d869fab..3bb5aaa87f 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/src/Umbraco.Core/Services/PackagingService.cs @@ -261,10 +261,9 @@ namespace Umbraco.Core.Services propertyValue = string.Join(",", propertyValueList.ToArray()); } - - //set property value - content.SetValue(propertyTypeAlias, propertyValue); } + //set property value + content.SetValue(propertyTypeAlias, propertyValue); } } diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png b/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png new file mode 100644 index 0000000000..87c9ee8185 Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/videos/formsintro.mp4 b/src/Umbraco.Web.UI.Client/src/assets/videos/formsintro.mp4 new file mode 100644 index 0000000000..994b85667a Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/videos/formsintro.mp4 differ diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 1e2e655043..79b16605ad 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -54,7 +54,7 @@ @import "../../lib/bootstrap/less/thumbnails.less"; @import "../../lib/bootstrap/less/media.less"; @import "../../lib/bootstrap/less/labels-badges.less"; -@import "../../lib/bootstrap/less/progress-bars.less"; +@import "../../lib/bootstrap/less/progress-bars.less"; @import "../../lib/bootstrap/less/accordion.less"; @import "../../lib/bootstrap/less/carousel.less"; @import "../../lib/bootstrap/less/hero-unit.less"; @@ -63,7 +63,7 @@ @import "../../lib/bootstrap/less/utilities.less"; // Has to be last to override when necessary // Belle styles -@import "grid.less"; +@import "grid.less"; @import "login.less"; @import "buttons.less"; @import "forms.less"; @@ -78,9 +78,10 @@ @import "footer.less"; @import "animations.less"; @import "dragdrop.less"; +@import "dashboards.less"; //used for property editors @import "property-editors.less"; @import "typeahead.less"; -@import "hacks.less"; +@import "hacks.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less index 2aaf50cdbf..3fac647746 100644 --- a/src/Umbraco.Web.UI.Client/src/less/buttons.less +++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less @@ -171,6 +171,7 @@ input[type="button"] { .btn-primary { .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); } + // Warning appears are orange .btn-warning { .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); @@ -209,6 +210,20 @@ input[type="button"] { } +.btn-install { + margin: 40px auto; + display: block; + padding: 15px 50px; + font-size: 16px; + border: none; + background: @blue; + color: white; + + &:hover { + background: #2b8ee3; + } +} + // Cross-browser Jank // -------------------------------------------------- diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards.less b/src/Umbraco.Web.UI.Client/src/less/dashboards.less new file mode 100644 index 0000000000..e20525b0bc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/dashboards.less @@ -0,0 +1,61 @@ +.umb-dashboards-forms-install { + background: url('../img/forms/installer-background.png'); + background-repeat: repeat-x; + position: relative; + top: -30px; + padding-top: 30px; + box-shadow: inset 0px -40px 30px 25px rgba(255,255,255,1); + border-radius: 0px 0px 200px 200px; + -moz-border-radius: 0px 0px 200px 200px; + -webkit-border-radius: 0px 0px 200px 200px; + + small { + font-size: 14px; + opacity: .5; + } + + .umb-loader{ + width: 640px; + height: 4px; + } + + .video_player video { + width: 100%; + max-width: 640px; + border: 1px solid #ededed; + border-left: none; + border-bottom: none; + box-sizing:border-box; + -moz-box-sizing:border-box; + } + + .installer-top { + overflow: hidden; + margin: 0 auto 30px; + height: 80px; + line-height: 80px; + text-align: center; + position: relative; + + i, h3 { + display: inline-block; + } + + i { + position: absolute; + top: 50%; + margin-top: -40px; + } + + h3 { + margin: 0; + line-height: 80px; + font-weight: 700; + margin-left: 100px; + font-size: 36px; + letter-spacing: -1px; + } + } + + +} diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html index 8801c13517..43ca587952 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html @@ -1,60 +1,36 @@ -
+
+
-
+
+ +

Umbraco Forms

+
- +
-

Umbraco Forms Preivew

+
+ +
-

Umbraco forms makes creating contact forms, entry forms and questionnaires just as easy as using Word. You won't need to write a single line of code.

+

Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!

-

A new version of Umbraco Forms is coming. We've reimagined the entire product from ground up and would love - input from experienced users before we launch.

- - - -
- Preview version should not be used in production -
- -
-

{{state}}...

-
+ + Preview version should not be used in production
+
+

Installing...

-
- - -
-
-
- -

Easy to use

-

- Everything from simple contact forms to multiple page questionaries are possible to build in our visual form designer. -

+
+
+
+ {{state}} +
- -
- -
- -

In control

-

- Markup matters, thats why you are in full control, if there's part you don't like, simply swap with one that fits. -

-
- - -
-
-

Connected and flexible

-

Your form doesnt just collect entries, it can send it off to remote services, database, or simply to your inbox

-
-
-
-
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2ddc434590..08e4af853c 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2516,9 +2516,9 @@ 11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 diff --git a/src/Umbraco.Web.UI/config/applications.config b/src/Umbraco.Web.UI/config/applications.config index b65f7027c1..c35a68e941 100644 --- a/src/Umbraco.Web.UI/config/applications.config +++ b/src/Umbraco.Web.UI/config/applications.config @@ -4,7 +4,8 @@ - + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index bf5f2b0b87..7cbe4ed809 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -202,6 +202,8 @@ + + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 51bf67db49..c5ae7c0c02 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -2138,9 +2138,9 @@ 11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0