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 2 Packages Projects Releases Wiki Activity

#18992, 19574: Adding more chained tokens by default

Browse Source 
Work Items: 18992, 19574

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-07-08 17:54:39 -07:00
parent 0b81eb4136
commit 4a3fd1a75d
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard.Web/Core/Settings/Tokens/SettingsTokens.cs
View File

@@ -27,11 +27,11 @@ namespace Orchard.Core.Settings.Tokens {
public void Describe(dynamic context) {
context.For("Site", T("Site Settings"), T("Tokens for Site Settings"))
.Token("SiteName", T("Site Name"), T("The name of the site."))
.Token("SuperUser", T("Super User"), T("The name of the super user."))
.Token("Culture", T("Site Culture"), T("The current culture of the site."))
.Token("BaseUrl", T("Base Url"), T("The base url the site."))
.Token("TimeZone", T("Time Zone"), T("The current time zone of the site."))
.Token("SiteName", T("Site Name"), T("The name of the site."), "Text")
.Token("SuperUser", T("Super User"), T("The name of the super user."), "Text")
.Token("Culture", T("Site Culture"), T("The current culture of the site."), "Text")
.Token("BaseUrl", T("Base Url"), T("The base url the site."), "Text")
.Token("TimeZone", T("Time Zone"), T("The current time zone of the site."), "Text")
;
// Token descriptors for fields
@@ -54,10 +54,15 @@ namespace Orchard.Core.Settings.Tokens {
forContent
.Token("SiteName", (Func<ISite, object>)(content => content.SiteName))
.Chain("SiteName", "Text", (Func<ISite, object>)(content => content.SiteName))
.Token("SuperUser", (Func<ISite, object>)(content => content.SuperUser))
.Token("Culture", (Func<ISite, object>) (content => content.SiteCulture))
.Token("BaseUrl", (Func<ISite, object>) (content => content.BaseUrl))
.Token("TimeZone", (Func<ISite, object>) (content => content.SiteTimeZone))
.Chain("SuperUser", "Text", (Func<ISite, object>)(content => content.SuperUser))
.Token("Culture", (Func<ISite, object>)(content => content.SiteCulture))
.Chain("Culture", "Text", (Func<ISite, object>)(content => content.SiteCulture))
.Token("BaseUrl", (Func<ISite, object>)(content => content.BaseUrl))
.Chain("BaseUrl", "Text", (Func<ISite, object>)(content => content.BaseUrl))
.Token("TimeZone", (Func<ISite, object>)(content => content.SiteTimeZone))
.Chain("TimeZone", "Text", (Func<ISite, object>)(content => content.SiteTimeZone))
;
if (context.Target == "Site") {

14
src/Orchard.Web/Modules/Orchard.MediaPicker/Tokens/FieldTokens.cs
View File

@@ -20,11 +20,11 @@ namespace Orchard.MediaPicker.Tokens {
public void Describe(dynamic context) {
context.For("MediaPickerField", T("Media Picker Field"), T("Tokens for Media Picker Fields"))
.Token("Url", T("Url"), T("The url of the media."))
.Token("AlternateText", T("Alternate Text"), T("The alternate text of the media."))
.Token("Class", T("Class"), T("The class of the media."))
.Token("Style", T("Style"), T("The style of the media."))
.Token("Alignment", T("Alignment"), T("The alignment of the media."))
.Token("Url", T("Url"), T("The url of the media."), "Url")
.Token("AlternateText", T("Alternate Text"), T("The alternate text of the media."), "Text")
.Token("Class", T("Class"), T("The class of the media."), "Text")
.Token("Style", T("Style"), T("The style of the media."), "Text")
.Token("Alignment", T("Alignment"), T("The alignment of the media."), "Text")
.Token("Width", T("Width"), T("The width of the media."))
.Token("Height", T("Height"), T("The height of the media."))
;
@@ -35,9 +35,13 @@ namespace Orchard.MediaPicker.Tokens {
.Token("Url", (Func<MediaPickerField, object>)(field => field.Url))
.Chain("Url", "Url", (Func<MediaPickerField, object>)(field => field.Url))
.Token("AlternateText", (Func<MediaPickerField, object>)(field => field.AlternateText))
.Chain("AlternateText", "Text", (Func<MediaPickerField, object>)(field => field.AlternateText))
.Token("Class", (Func<MediaPickerField, object>)(field => field.Class))
.Chain("Class", "Text", (Func<MediaPickerField, object>)(field => field.Class))
.Token("Style", (Func<MediaPickerField, object>)(field => field.Style))
.Chain("Style", "Text", (Func<MediaPickerField, object>)(field => field.Style))
.Token("Alignment", (Func<MediaPickerField, object>)(field => field.Alignment))
.Chain("Alignment", "Text", (Func<MediaPickerField, object>)(field => field.Alignment))
.Token("Width", (Func<MediaPickerField, object>)(field => field.Width))
.Token("Height", (Func<MediaPickerField, object>)(field => field.Height))
;

8
src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs
View File

@@ -60,7 +60,7 @@ namespace Orchard.Tokens.Providers {
.Token("Length", T("Length"), T("The length of the field."));
context.For("Url", T("Url"), T("Tokens for Urls"))
.Token("Absolute", T("Absolute"), T("Absolute url."));
.Token("Absolute", T("Absolute"), T("Absolute url."), "Text");
context.For("TypeDefinition", T("Type Definition"), T("Tokens for Content Types"))
.Token("Name", T("Name"), T("Name of the content type."))
@@ -86,7 +86,7 @@ namespace Orchard.Tokens.Providers {
.Token("EditUrl", EditUrl)
.Chain("EditUrl", "Url", EditUrl)
.Token("Container", content => DisplayText(Container(content)))
.Chain("Container", "Content", content => Container(content))
.Chain("Container", "Content", Container)
;
if (context.Target == "Content") {
@@ -111,7 +111,9 @@ namespace Orchard.Tokens.Providers {
}
context.For<string>("Url")
.Token("Absolute", url => new UrlHelper(_workContextAccessor.GetContext().HttpContext.Request.RequestContext).MakeAbsolute(url));
.Token("Absolute", url => new UrlHelper(_workContextAccessor.GetContext().HttpContext.Request.RequestContext).MakeAbsolute(url))
.Chain("Absolute", "Text", url => new UrlHelper(_workContextAccessor.GetContext().HttpContext.Request.RequestContext).MakeAbsolute(url))
;
context.For<TextField>("TextField")
.Token("Length", field => (field.Value ?? "").Length)

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

@@ -31,8 +31,8 @@ namespace Orchard.Tokens.Providers {
public void Describe(DescribeContext context) {
context.For("Date", T("Date/time"), T("Current date/time tokens"))
.Token("Since", T("Since"), T("Relative to the current date/time."))
.Token("Local", T("Local"), T("Based on the configured time zone."))
.Token("Since", T("Since"), T("Relative to the current date/time."), "Date")
.Token("Local", T("Local"), T("Based on the configured time zone."), "Date")
.Token("ShortDate", T("Short Date"), T("Short date format."))
.Token("ShortTime", T("Short Time"), T("Short time format."))
.Token("Long", T("Long Date and Time"), T("Long date and time format."))