lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-28 09:22:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-03-28 12:15:54 -07:00
parent 132dad57e2 6bc856ca7b
commit 0afaf13b47
4 changed files with 409 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Startup/Properties/AssemblyInfo.cs
View File

@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -33,3 +34,6 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.20")]
[assembly: AssemblyFileVersion("1.0.20")]
// Enable web application to call this assembly in Full Trust
[assembly: AllowPartiallyTrustedCallers]

7
src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
View File

@@ -1,5 +1,4 @@
(function ($) {
$(document).ready(function () {
jQuery(function($) {
// default shape window height when first opened
var defaultHeight = 200;
@@ -435,8 +434,6 @@
event.stopPropagation();
});
});
// recursively create a node for the shapes tree
function createTreeNode(shapeNode) {
var node = $('<li></li>');
@@ -461,4 +458,4 @@
return node;
}
})(jQuery);
});

2
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml
View File

@@ -8,7 +8,7 @@
</div>
<div>
@Html.EditorFor(m => m.EnableLostPassword)
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.EnableLostPassword)">@T("Display a link to enable users to reset their email")</label>
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.EnableLostPassword)">@T("Display a link to enable users to reset their password")</label>
</div>
<div>
@Html.EditorFor(m => m.UsersMustValidateEmail)

10
src/Orchard/UI/Notify/NotifyFilter.cs
View File

@@ -69,18 +69,24 @@ namespace Orchard.UI.Notify {
var delimiterIndex = line.IndexOf(':');
if (delimiterIndex != -1) {
var type = (NotifyType)Enum.Parse(typeof(NotifyType), line.Substring(0, delimiterIndex));
var message = new LocalizedString(line.Substring(delimiterIndex + 1));
if (!messageEntries.Any(ne => ne.Message.TextHint == message.TextHint)) {
messageEntries.Add(new NotifyEntry {
Type = type,
Message = new LocalizedString(line.Substring(delimiterIndex + 1))
Message = message
});
}
}
else {
var message = new LocalizedString(line.Substring(delimiterIndex + 1));
if (!messageEntries.Any(ne => ne.Message.TextHint == message.TextHint)) {
messageEntries.Add(new NotifyEntry {
Type = NotifyType.Information,
Message = new LocalizedString(line.Substring(delimiterIndex + 1))
Message = message
});
}
}
}
if (!messageEntries.Any())
return;