From 48eeafe5ca2d631b24a652553e4fda64a7ec64f0 Mon Sep 17 00:00:00 2001 From: Dale Newman Date: Thu, 23 Jun 2016 15:14:36 -0400 Subject: [PATCH 1/6] Adding SiteName to New Account Subject (#6935) * Add SiteName to New Account Subject When you run more than one Orchard CMS site, and you have to moderate the logins, it's nice to know which site a new account was created on. * Update MembershipService.cs Fixes #6935 --- .../Modules/Orchard.Users/Services/MembershipService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs index 55fe0a697..317d0d200 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs @@ -118,7 +118,7 @@ namespace Orchard.Users.Services { template.Metadata.Wrappers.Add("Template_User_Wrapper"); var parameters = new Dictionary { - {"Subject", T("New account").Text}, + {"Subject", T("New account on {0}.", _orchardServices.WorkContext.CurrentSite.SiteName).Text}, {"Body", _shapeDisplay.Display(template)}, {"Recipients", recipient.Email } }; From 13f34738682c1d97d1ce29db4b44dcae9f5b098d Mon Sep 17 00:00:00 2001 From: Lombiq Date: Tue, 28 Jun 2016 17:03:04 +0200 Subject: [PATCH 2/6] Some grammar fixes (I hope) in NavigationAliasProvider --- .../Orchard.Alias/Navigation/NavigationAliasProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Navigation/NavigationAliasProvider.cs b/src/Orchard.Web/Modules/Orchard.Alias/Navigation/NavigationAliasProvider.cs index 837fe2e3d..1ac201900 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Navigation/NavigationAliasProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Navigation/NavigationAliasProvider.cs @@ -41,14 +41,14 @@ namespace Orchard.Alias.Navigation { var urlLevel = endsWithSlash ? requestUrl.Count(l => l == '/') - 1 : requestUrl.Count(l => l == '/'); var menuLevel = menuPosition.Count(l => l == '.'); - // Checking menu item if it's the leaf element or it's an intermediate element + // Checking the menu item whether it's the leaf element or it's an intermediate element // or it's an unneccessary element according to the url. RouteValueDictionary contentRoute; if (menuLevel == urlLevel) { contentRoute = request.RequestContext.RouteData.Values; } else { - // If menuLevel doesn't equal with urlLevel it can mean that this menu item is + // If menuLevel doesn't equal to urlLevel it can mean that this menu item is // an intermediate element (the difference is a positive value) or this menu // item is lower in the navigation hierarchy according to the url (negative // value). If the value is negative, removing the menu item, if the value From 31f07a44e4b0003d9c2989350f9a9c8473a21c36 Mon Sep 17 00:00:00 2001 From: Lombiq Date: Tue, 28 Jun 2016 23:48:50 +0200 Subject: [PATCH 3/6] The TinyMce toolbar is now always visible in the editor, even if scrolled down, fixes #5769 --- src/Orchard.Web/Modules/TinyMce/Assets.json | 8 ++++ .../TinyMce/Assets/Less/orchard-tinymce.css | 12 +++++ .../TinyMce/Assets/Less/orchard-tinymce.less | 12 +++++ .../Assets/Less/orchard-tinymce.min.css | 1 + .../Modules/TinyMce/ResourceManifest.cs | 1 + .../TinyMce/Scripts/orchard-tinymce.js | 48 ++++++++++++++++++- .../Modules/TinyMce/Styles/Web.config | 12 +++++ .../TinyMce/Styles/orchard-tinymce.css | 19 ++++++++ .../TinyMce/Styles/orchard-tinymce.min.css | 1 + .../Modules/TinyMce/TinyMce.csproj | 16 +++++++ .../TinyMce/Views/Body-Html.Editor.cshtml | 1 + 11 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Modules/TinyMce/Assets.json create mode 100644 src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.css create mode 100644 src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.less create mode 100644 src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.min.css create mode 100644 src/Orchard.Web/Modules/TinyMce/Styles/Web.config create mode 100644 src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.css create mode 100644 src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.min.css diff --git a/src/Orchard.Web/Modules/TinyMce/Assets.json b/src/Orchard.Web/Modules/TinyMce/Assets.json new file mode 100644 index 000000000..c2eab346d --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Assets.json @@ -0,0 +1,8 @@ +[ + { + "inputs": [ + "Assets/Less/orchard-tinymce.less" + ], + "output": "Styles/orchard-tinymce.css" + } +] \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.css b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.css new file mode 100644 index 000000000..e0501ffdf --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.css @@ -0,0 +1,12 @@ +#stickyContainer.sticky-top { + top: 0; + position: fixed; + background-color: white; +} +#stickyContainer.container-layout { + width: 100%; +} +#stickyContainer.sticky-container-layout { + border-top: 1px solid #9e9e9e; + border-bottom: 1px solid #9e9e9e; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.less b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.less new file mode 100644 index 000000000..4cf833fb3 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.less @@ -0,0 +1,12 @@ +#stickyContainer.sticky-top { + top: 0; + position: fixed; + background-color: white; +} +#stickyContainer.container-layout { + width: 100%; +} +#stickyContainer.sticky-container-layout { + border-top: 1px solid #9e9e9e; + border-bottom: 1px solid #9e9e9e; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.min.css b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.min.css new file mode 100644 index 000000000..152e1faf0 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Assets/Less/orchard-tinymce.min.css @@ -0,0 +1 @@ +#stickyContainer.sticky-top{top:0;position:fixed;background-color:#fff;}#stickyContainer.container-layout{width:100%;}#stickyContainer.sticky-container-layout{border-top:1px solid #9e9e9e;border-bottom:1px solid #9e9e9e;} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs b/src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs index a1c938388..9b89b8092 100644 --- a/src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs +++ b/src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs @@ -6,6 +6,7 @@ namespace TinyMce { var manifest = builder.Add(); manifest.DefineScript("TinyMce").SetUrl("tinymce.min.js").SetVersion("4.1.6").SetDependencies("jQuery"); manifest.DefineScript("OrchardTinyMce").SetUrl("orchard-tinymce.js").SetDependencies("TinyMce"); + manifest.DefineStyle("OrchardTinyMce").SetUrl("orchard-tinymce.css"); } } } diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js index 63e5a4927..aeb3f6c97 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js @@ -35,4 +35,50 @@ tinyMCE.init({ editor.getBody().dir = directionality; }); } -}); \ No newline at end of file +}); + +// If the editable area is taller than the window, make the menu and the toolbox sticky-positioned within the editor +// to help the user avoid excessive vertical scrolling. +// There is a built-in fixed_toolbar_container option in the TinyMCE, but we can't use it, because it is only +// available if the selector is a DIV with inline mode. + +$(window).load(function () { + + var $container = $("
", { id: "stickyContainer", class: "container-layout" }); + $(".mce-stack-layout:first").prepend($container); + $container.append($(".mce-menubar")); + $container.append($(".mce-toolbar-grp")); + + var containerPosition = $container.get(0).getBoundingClientRect(); + var $placeholder = $("
"); + var isAdded = false; + + $(window).scroll(function (event) { + var $statusbarPosition = $(".mce-statusbar").offset(); + if ($(window).scrollTop() >= containerPosition.top && !isAdded) { + $container.addClass("sticky-top"); + $placeholder.insertBefore($container); + $container.width($placeholder.width()); + $placeholder.height($container.height()); + $(window).on("resize", function () { + $container.width($placeholder.width()); + $placeholder.height($container.height()); + }); + $container.addClass("sticky-container-layout"); + isAdded = true; + } else if ($(window).scrollTop() < containerPosition.top && isAdded) { + $container.removeClass("sticky-top"); + $placeholder.remove(); + $container.removeClass("sticky-container-layout"); + $(window).on("resize", function () { + $container.width("100%"); + }); + isAdded = false; + } + if ($(window).scrollTop() >= ($statusbarPosition.top - $container.height())) { + $container.hide(); + } else if ($(window).scrollTop() < ($statusbarPosition.top - $container.height()) && isAdded) { + $container.show(); + } + }); +}); diff --git a/src/Orchard.Web/Modules/TinyMce/Styles/Web.config b/src/Orchard.Web/Modules/TinyMce/Styles/Web.config new file mode 100644 index 000000000..93eab9a73 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Styles/Web.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.css b/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.css new file mode 100644 index 000000000..bb0acd05e --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.css @@ -0,0 +1,19 @@ +/* +** NOTE: This file is generated by Gulp and should not be edited directly! +** Any changes made directly to this file will be overwritten next time its asset group is processed by Gulp. +*/ + +#stickyContainer.sticky-top { + top: 0; + position: fixed; + background-color: white; +} +#stickyContainer.container-layout { + width: 100%; +} +#stickyContainer.sticky-container-layout { + border-top: 1px solid #9e9e9e; + border-bottom: 1px solid #9e9e9e; +} + +/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9yY2hhcmQtdGlueW1jZS5jc3MiLCJvcmNoYXJkLXRpbnltY2UubGVzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsQUNMQTtFQUNFLE9BQUE7RUFDQSxnQkFBQTtFQUNBLHdCQUFBO0NEQ0Q7QUNDRDtFQUNFLFlBQUE7Q0RDRDtBQ0NEO0VBQ0UsOEJBQUE7RUFDQSxpQ0FBQTtDRENEIiwiZmlsZSI6Im9yY2hhcmQtdGlueW1jZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIjc3RpY2t5Q29udGFpbmVyLnN0aWNreS10b3Age1xuICB0b3A6IDA7XG4gIHBvc2l0aW9uOiBmaXhlZDtcbiAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7XG59XG4jc3RpY2t5Q29udGFpbmVyLmNvbnRhaW5lci1sYXlvdXQge1xuICB3aWR0aDogMTAwJTtcbn1cbiNzdGlja3lDb250YWluZXIuc3RpY2t5LWNvbnRhaW5lci1sYXlvdXQge1xuICBib3JkZXItdG9wOiAxcHggc29saWQgIzllOWU5ZTtcbiAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkICM5ZTllOWU7XG59XG4iLCLvu78jc3RpY2t5Q29udGFpbmVyLnN0aWNreS10b3Age1xyXG4gIHRvcDogMDtcclxuICBwb3NpdGlvbjogZml4ZWQ7XHJcbiAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7XHJcbn1cclxuI3N0aWNreUNvbnRhaW5lci5jb250YWluZXItbGF5b3V0IHtcclxuICB3aWR0aDogMTAwJTtcclxufVxyXG4jc3RpY2t5Q29udGFpbmVyLnN0aWNreS1jb250YWluZXItbGF5b3V0IHtcclxuICBib3JkZXItdG9wOiAxcHggc29saWQgIzllOWU5ZTtcclxuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgIzllOWU5ZTtcclxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== */ diff --git a/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.min.css b/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.min.css new file mode 100644 index 000000000..a0cb9dd89 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Styles/orchard-tinymce.min.css @@ -0,0 +1 @@ +#stickyContainer.sticky-top{top:0;position:fixed;background-color:#fff}#stickyContainer.container-layout{width:100%}#stickyContainer.sticky-container-layout{border-top:1px solid #9e9e9e;border-bottom:1px solid #9e9e9e} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj index 9b47ca460..85b983fca 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -88,6 +88,12 @@ + + orchard-tinymce.less + + + orchard-tinymce.css + @@ -258,6 +264,7 @@ + @@ -305,6 +312,15 @@ + + + Designer + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml index 9a06658b1..42ffeddcf 100644 --- a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml +++ b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml @@ -18,6 +18,7 @@ Script.Require("OrchardTinyMce"); Script.Require("jQueryColorBox"); Style.Require("jQueryColorBox"); + Style.Require("OrchardTinyMce"); } @Html.TextArea("Text", (string)Model.Text, 25, 80, From c004545eebddeda3c524d16a68dd758830b27cac Mon Sep 17 00:00:00 2001 From: Lombiq Date: Wed, 29 Jun 2016 22:36:08 +0200 Subject: [PATCH 4/6] Updating README from the dev branch --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3e61a0bcd..7a1e7bd63 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,13 @@ Our mission is to empower our users and foster a dedicated and diverse community ## Project Status -Orchard is currently in version 1.9.2. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. -Our 1.9.2 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://docs.orchardproject.net/Documentation/Installing-Orchard). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project. +Orchard is currently in version **1.10** and **1.9.3**: + +- *1.10* is the latest major version which introduces more impactful changes and new features as well. If you're new to Orchard, you should start with this version. +- *1.9.3* contains further bugfixes in addition to *1.9.2* and these versions are based on the feature set of Orchard *1.9*. + +We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. +All our releases are available on our [Releases](https://github.com/OrchardCMS/Orchard/releases) page, and it's easy to [Install Orchard using the Web Platform Installer](http://docs.orchardproject.net/Documentation/Installing-Orchard) as well. We encourage interested developers to check out the source code on the Orchard GitHub site and get involved with the project. * [Download the latest release](https://github.com/OrchardCMS/Orchard/releases) * [Feature roadmap](http://docs.orchardproject.net/Documentation/feature-roadmap) @@ -51,4 +56,4 @@ There are many ways you can [contribute to Orchard](http://orchardproject.net/co ## The Future Of Orchard CMS: Orchard 2 -As the underlying frameworks (.NET, ASP.NET and ASP.NET MVC) are constantly evolving, Orchard of course keeps track of the changes and improvements of these: Orchard 2 is the next generation of Orchard releases that is based on [ASP.NET vNext](http://www.asp.net/vnext). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (as a framework) is being built from scratch: it's still in development and does not share any of its code base (at least directly) with the current versions of Orchard. +As the underlying frameworks (.NET, ASP.NET and ASP.NET MVC) are constantly evolving, Orchard of course keeps track of the changes and improvements of these: Orchard 2 is the next generation of Orchard releases that is based on [ASP.NET Core](http://www.asp.net/core). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (as a framework) is being built from scratch: it's still in development and does not share any of its code base (at least directly) with the current versions of Orchard. From 7aa6371ec17026bb00c371ea69aa4e579cb2f87a Mon Sep 17 00:00:00 2001 From: Lombiq Date: Wed, 29 Jun 2016 22:44:07 +0200 Subject: [PATCH 5/6] README: updating released versions, adding links to releases, fixing Azure deploy link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a1e7bd63..ded4f4ce4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Orchard is a free, open source, community-focused Content Management System buil You can try it for free on [DotNest.com](https://dotnest.com) or on Microsoft Azure by clicking on this button. -[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/OutercurveFoundation.OrchardCMS.1.0.4) +[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/OutercurveFoundation.OrchardCMS) ## About The Orchard Project @@ -22,7 +22,7 @@ Our mission is to empower our users and foster a dedicated and diverse community ## Project Status -Orchard is currently in version **1.10** and **1.9.3**: +Orchard is currently in version **[1.10.1](https://github.com/OrchardCMS/Orchard/releases/tag/1.10.1)** and **[1.9.3](https://github.com/OrchardCMS/Orchard/releases/tag/1.9.3)**: - *1.10* is the latest major version which introduces more impactful changes and new features as well. If you're new to Orchard, you should start with this version. - *1.9.3* contains further bugfixes in addition to *1.9.2* and these versions are based on the feature set of Orchard *1.9*. From 74011e659b9ff9bd003985b5836173c686c1348c Mon Sep 17 00:00:00 2001 From: Lombiq Date: Wed, 29 Jun 2016 22:57:47 +0200 Subject: [PATCH 6/6] README: updating 1.10.1 release description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ded4f4ce4..18e08652b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Our mission is to empower our users and foster a dedicated and diverse community Orchard is currently in version **[1.10.1](https://github.com/OrchardCMS/Orchard/releases/tag/1.10.1)** and **[1.9.3](https://github.com/OrchardCMS/Orchard/releases/tag/1.9.3)**: -- *1.10* is the latest major version which introduces more impactful changes and new features as well. If you're new to Orchard, you should start with this version. +- *1.10.1* is the latest minor version that contains bugfixes and the more impactful changes and new features added in the latest major version (*1.10*). **If you're new to Orchard, you should use this version.** - *1.9.3* contains further bugfixes in addition to *1.9.2* and these versions are based on the feature set of Orchard *1.9*. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach.