lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
This commit is contained in:
Daniel Stolt
2015-11-24 19:20:05 +01:00
parent c5fb96ca4f eb81c20f04
commit b6dc75d4f9
14 changed files with 181 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js
View File

@@ -14,6 +14,7 @@
var promptOnNavigate = element.data("prompt-on-navigate");
var showSaveWarning = element.data("show-save-warning");
var addButton = element.find(".button.add");
var saveButton = $('.button.save');
var removeAllButton = element.find(".button.remove");
var template =
'<li><div data-id="{contentItemId}" class="media-library-picker-item"><div class="thumbnail">{thumbnail}<div class="overlay"><h3>{title}</h3></div></div></div><a href="#" data-id="{contentItemId}" class="media-library-picker-remove">' + removeText + '</a>' + pipe + '<a href="{editLink}?ReturnUrl=' + returnUrl + '">' + editText + '</a></li>';
@@ -28,10 +29,12 @@
var itemsCount = element.find(".media-library-picker-item").length;
if(!multiple && itemsCount > 0) {
addButton.hide();
addButton.hide();
saveButton.show();
}
else {
addButton.show();
saveButton.hide();
}
if(itemsCount > 1) {

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css
View File

@@ -6,6 +6,8 @@
.media-library-modal-window #media-library-main-selection-select {
display: inherit;
position: absolute;
top: 25px;
}
.media-library-modal-window #main {

4
src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs
View File

@@ -35,7 +35,7 @@ namespace Orchard.Tokens.Providers {
// {Text.Format:<formatstring>}
.Token(
token => FilterTokenParam("Format:", token),
(token, d) => String.Format(d, token))
(token, d) => String.Format(token, d))
// {Text.TrimEnd:<chars|number>}
.Token(token => FilterTokenParam("TrimEnd:", token), TrimEnd)
.Token("UrlEncode", HttpUtility.UrlEncode)
@@ -54,7 +54,7 @@ namespace Orchard.Tokens.Providers {
return token.StartsWith(tokenName, StringComparison.OrdinalIgnoreCase) ? token.Substring(tokenName.Length) : null;
}
private static string TrimEnd(string token, string param) {
private static string TrimEnd(string param, string token) {
if (String.IsNullOrEmpty(param)) {
return token;
}

1
src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj
View File

@@ -59,6 +59,7 @@
<Compile Include="StubClock.cs" />
<Compile Include="StubOrchardServices.cs" />
<Compile Include="StubWorkContextAccessor.cs" />
<Compile Include="TextTokenTests.cs" />
<Compile Include="UserTokenTests.cs" />
<Compile Include="TokenManagerTests.cs" />
<Compile Include="TestTokenProvider.cs" />

121
src/Orchard.Web/Modules/Orchard.Tokens/Tests/TextTokenTests.cs Normal file
View File

@@ -0,0 +1,121 @@
using System.Web;
using Autofac;
using NUnit.Framework;
using Orchard.Tokens.Implementation;
using Orchard.Tokens.Providers;
namespace Orchard.Tokens.Tests {
[TestFixture]
public class TextTokenTests {
private IContainer _container;
private ITokenizer _tokenizer;
[SetUp]
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<Tokenizer>().As<ITokenizer>();
builder.RegisterType<TokenManager>().As<ITokenManager>();
builder.RegisterType<TextTokens>().As<ITokenProvider>();
builder.RegisterType<TestTokenProvider>().As<ITokenProvider>();
_container = builder.Build();
_tokenizer = _container.Resolve<ITokenizer>();
}
[Test]
public void TestLimitWhenStringShorterThanLimit() {
var str = "foo bar baz";
var result = _tokenizer.Replace("{Text.Limit:" + (str.Length + 1) + "}", new { Text = str });
Assert.That(result, Is.EqualTo("foo bar baz"));
}
[Test]
public void TestLimitWhenStringLengthEqualsLimit() {
var str = "foo bar baz";
var result = _tokenizer.Replace("{Text.Limit:" + str.Length + "}", new { Text = str });
Assert.That(result, Is.EqualTo("foo bar baz"));
}
[Test]
public void TestLimitWhenStringLongerThanLimit() {
var str = "foo bar baz";
var result = _tokenizer.Replace("{Text.Limit:" + (str.Length - 1) + "}", new { Text = str });
Assert.That(result, Is.EqualTo("foo bar ba"));
}
[Test]
public void TestLimitWhenStringEmpty() {
var str = "";
var result = _tokenizer.Replace("{Text.Limit:" + (str.Length - 1) + "}", new { Text = str });
Assert.That(result, Is.EqualTo(""));
}
[Test]
public void TestLimitWhenEllipsisSpecifed() {
var str = "foo bar baz";
var result = _tokenizer.Replace("{Text.Limit:" + (str.Length - 1) + ",...}", new { Text = str });
Assert.That(result, Is.EqualTo("foo bar ba..."));
}
[Test]
public void TestFormat() {
var str = "bar";
var result = _tokenizer.Replace("{Text.Format:foo {0} baz}", new { Text = str });
Assert.That(result, Is.EqualTo("foo bar baz"));
}
[Test]
public void TestTrimEnd() {
var str = "foo ";
var result = _tokenizer.Replace("{Text.TrimEnd: }", new { Text = str });
Assert.That(result, Is.EqualTo("foo"));
}
[Test]
public void TestTrimEndNumber() {
var str = "foobarbaz";
var result = _tokenizer.Replace("{Text.TrimEnd:3}", new { Text = str });
Assert.That(result, Is.EqualTo("foobar"));
}
[Test]
public void TestTrimEndWhenEmptyArg() {
var str = "foobarbaz";
var result = _tokenizer.Replace("{Text.TrimEnd:}", new { Text = str });
Assert.That(result, Is.EqualTo("foobarbaz"));
}
[TestCase("foo<bar", "foo%3cbar")]
[TestCase("foo>bar", "foo%3ebar")]
[TestCase("foo'bar", "foo%27bar")]
[TestCase("foo\"bar", "foo%22bar")]
[TestCase("foo bar", "foo+bar")]
public void TestUrlEncode(string str, string expected) {
var result = _tokenizer.Replace("{Text.UrlEncode}", new { Text = str });
Assert.That(result, Is.EqualTo(expected));
}
[TestCase("foo<bar", "foo&lt;bar")]
[TestCase("foo>bar", "foo&gt;bar")]
[TestCase("foo&bar", "foo&amp;bar")]
[TestCase("foo\"bar", "foo&quot;bar")]
[TestCase("foo'bar", "foo&#39;bar")]
public void TestHtmlEncode(string str, string expected) {
var result = _tokenizer.Replace("{Text.HtmlEncode}", new { Text = str }, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode });
Assert.That(result, Is.EqualTo(expected));
}
[Test]
public void TestJavaScriptEncode() {
var str = "f\"oo<bar>ba'z";
var result = _tokenizer.Replace("{Text.JavaScriptEncode}", new { Text = str }, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode });
Assert.That(result, Is.EqualTo(HttpUtility.JavaScriptStringEncode(str)));
}
[Test]
public void TestLineEncode() {
var str = "foo" + System.Environment.NewLine + "bar" + System.Environment.NewLine + "baz";
var result = _tokenizer.Replace("{Text.LineEncode}", new { Text = str }, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode });
Assert.That(result, Is.EqualTo("foo<br />bar<br />baz"));
}
}
}

7
src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
View File

@@ -39,7 +39,12 @@ namespace Orchard.Widgets {
widget.Classes.Add("widget-" + widgetPart.Name);
// Widget__Name__[Name]
displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name);
if (widgetPart.Name.Contains("-")) {
displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name.Replace("-", "__"));
}
else {
displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name);
}
}
// Adding other css classes to the widget.