lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-20 10:47:56 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix error from previous merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-06-04 19:23:52 -07:00
parent 30444e7696
commit 7ea379596d
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard/Localization/LocalizedString.cs
View File

@@ -12,6 +12,10 @@ namespace Orchard.Localization {
return new LocalizedString(x); return new LocalizedString(x);
} }
public string Text {
get { return _localized; }
}
public override string ToString() { public override string ToString() {
return _localized; return _localized;
} }

17
src/Orchard/UI/Navigation/NavigationBuilder.cs
View File

@@ -1,35 +1,32 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Orchard.Localization;
namespace Orchard.UI.Navigation { namespace Orchard.UI.Navigation {
public class NavigationBuilder { public class NavigationBuilder {
IEnumerable<MenuItem> Contained { get; set; } IEnumerable<MenuItem> Contained { get; set; }
public NavigationBuilder Add(string caption, string position, Action<NavigationItemBuilder> itemBuilder) { public NavigationBuilder Add(LocalizedString caption, string position, Action<NavigationItemBuilder> itemBuilder) {
var childBuilder = new NavigationItemBuilder(); var childBuilder = new NavigationItemBuilder();
if (!string.IsNullOrEmpty(caption)) childBuilder.Caption(caption);
childBuilder.Caption(caption); childBuilder.Position(position);
if (!string.IsNullOrEmpty(position))
childBuilder.Position(position);
itemBuilder(childBuilder); itemBuilder(childBuilder);
Contained = (Contained ?? Enumerable.Empty<MenuItem>()).Concat(childBuilder.Build()); Contained = (Contained ?? Enumerable.Empty<MenuItem>()).Concat(childBuilder.Build());
return this; return this;
} }
public NavigationBuilder Add(string caption, Action<NavigationItemBuilder> itemBuilder) { public NavigationBuilder Add(LocalizedString caption, Action<NavigationItemBuilder> itemBuilder) {
return Add(caption, null, itemBuilder); return Add(caption, null, itemBuilder);
} }
public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder) { public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder) {
return Add(null, null, itemBuilder); return Add(null, null, itemBuilder);
} }
public NavigationBuilder Add(string caption, string position) { public NavigationBuilder Add(LocalizedString caption, string position) {
return Add(caption, position, x=> { }); return Add(caption, position, x=> { });
} }
public NavigationBuilder Add(string caption) { public NavigationBuilder Add(LocalizedString caption) {
return Add(caption, null, x => { }); return Add(caption, null, x => { });
} }

6
src/Orchard/UI/Navigation/NavigationItemBuilder.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web.Routing; using System.Web.Routing;
using Orchard.Localization;
using Orchard.Security.Permissions; using Orchard.Security.Permissions;
namespace Orchard.UI.Navigation { namespace Orchard.UI.Navigation {
@@ -11,8 +12,9 @@ namespace Orchard.UI.Navigation {
_item = new MenuItem(); _item = new MenuItem();
} }
public NavigationItemBuilder Caption(string caption) { public NavigationItemBuilder Caption(LocalizedString caption) {
_item.Text = caption; if (caption != null)
_item.Text = caption.Text;
return this; return this;
} }