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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-19 12:20:28 -07:00
parent 6fa161ca9b 3456c94727
commit 686782b2ea
15 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml
View File

@@ -1,7 +1,7 @@
@model OwnerEditorViewModel
@using Orchard.Core.Common.ViewModels;
<fieldset>
@Html.LabelFor(m=>m.Owner)
@Html.LabelFor(m => m.Owner, T("Owner"))
@Html.EditorFor(m=>m.Owner)
@Html.ValidationMessageFor(m=>m.Owner)
</fieldset>

2
src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
View File

@@ -3,7 +3,7 @@
@{ Script.Require("Slugify"); }
<fieldset>
@Html.LabelFor(m => m.Title)
@Html.LabelFor(m => m.Title, T("Title"))
@Html.TextBoxFor(m => m.Title, new { @class = "large text" })
</fieldset>
<fieldset class="permalink">

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml
View File

@@ -1,5 +1,5 @@
@model Orchard.Blogs.Models.BlogPart
<fieldset>
@Html.LabelFor(m => m.Description)
@Html.LabelFor(m => m.Description, T("Description"))
@Html.TextAreaFor(m => m.Description, 5, 60, null)
</fieldset>

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml
View File

@@ -1,7 +1,7 @@
@model Orchard.Blogs.Models.BlogArchivesPart
<fieldset>
<div>
@Html.LabelFor(m => m.ForBlog)
@Html.LabelFor(m => m.ForBlog, T("For Blog"))
@Html.TextBoxFor(m => m.ForBlog)
<span class="hint">@T("Show the archives for which blog? Note: specify the blog's slug.")</span>
</div>

4
src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml
View File

@@ -1,11 +1,11 @@
@model Orchard.Blogs.Models.RecentBlogPostsPart
<fieldset>
<div>
@Html.LabelFor(m => m.ForBlog)
@Html.LabelFor(m => m.ForBlog, T("For Blog"))
@Html.TextBoxFor(m => m.ForBlog)
</div>
<div>
@Html.LabelFor(m => m.Count)
@Html.LabelFor(m => m.Count, T("Count"))
@Html.TextBoxFor(m => m.Count)
</div>
</fieldset>

2
src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml
View File

@@ -12,7 +12,7 @@
</li>
}
</ul>
@Html.LabelFor(m => m.CommandLine)
@Html.LabelFor(m => m.CommandLine, T("Command Line"))
@Html.TextBoxFor(m => m.CommandLine, new { style = "width:100%;" })
@Html.ValidationMessageFor(m => m.CommandLine)
<pre>@Model.Results</pre>

2
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml
View File

@@ -22,7 +22,7 @@
</fieldset>
}
<fieldset>
@Html.LabelFor(m=>m.FeedUrl)
@Html.LabelFor(m => m.FeedUrl, T("Feed Url"))
@Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text=T("Download").ToString(),Value="Download"}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = T("Push to {0}", x.FeedUrl).ToString(), Value = x.FeedUrl })))
@Html.ValidationMessageFor(m=>m.FeedUrl)
</fieldset>

2
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml
View File

@@ -5,7 +5,7 @@
@Html.ValidationSummary()
<fieldset>
@Html.LabelFor(m=>m.TagName)
@Html.LabelFor(m => m.TagName, T("Tag Name"))
@Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
</fieldset>

2
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml
View File

@@ -5,7 +5,7 @@
@Html.ValidationSummary()
<fieldset>
@Html.HiddenFor(m=>m.Id)
@Html.LabelFor(m=>m.TagName)
@Html.LabelFor(m => m.TagName, T("Tag Name"))
@Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
</fieldset>

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

@@ -1,6 +1,6 @@
@model Orchard.Tags.ViewModels.EditTagsViewModel
<fieldset>
@Html.LabelFor(m => m.Tags)
@Html.LabelFor(m => m.Tags, T("Tags"))
@Html.TextBoxFor(m => m.Tags, new { @class = "large text" })
</fieldset>

8
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
View File

@@ -5,25 +5,25 @@
@Html.ValidationSummary()
<fieldset>
@Html.LabelFor(m=>m.UserName)
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m=>m.Email)
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m=>m.Password)
@Html.LabelFor(m => m.Password, T("Password"))
@Html.PasswordFor(m=>m.Password, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Password, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m=>m.ConfirmPassword)
@Html.LabelFor(m => m.ConfirmPassword, T("Confirm Password"))
@Html.PasswordFor(m=>m.ConfirmPassword, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
</fieldset>

4
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
View File

@@ -5,13 +5,13 @@
@Html.ValidationSummary()
@Html.EditorFor(m=>m.Id)
<fieldset>
@Html.LabelFor(m=>m.UserName)
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m=>m.Email)
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>

6
src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
View File

@@ -1,16 +1,16 @@
@model Orchard.Widgets.Models.LayerPart
<fieldset>
@Html.LabelFor(layer => layer.Name)
@Html.LabelFor(layer => layer.Name, T("Name"))
@Html.TextBoxFor(layer => layer.Name)
</fieldset>
<fieldset>
@Html.LabelFor(layer => layer.Description)
@Html.LabelFor(layer => layer.Description, T("Description"))
@Html.TextAreaFor(layer => layer.Description)
</fieldset>
<fieldset>
@Html.LabelFor(layer => layer.LayerRule)
@Html.LabelFor(layer => layer.LayerRule, T("Layer Rule"))
@Html.TextAreaFor(layer => layer.LayerRule)
</fieldset>

4
src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
View File

@@ -1,11 +1,11 @@
@model Orchard.Widgets.Models.WidgetPart
<fieldset>
@Html.LabelFor(widget => widget.Zone)
@Html.LabelFor(widget => widget.Zone, T("Zone"))
@Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))
</fieldset>
<fieldset>
@Html.LabelFor(widget => widget.Title)
@Html.LabelFor(widget => widget.Title, T("Title"))
@Html.TextBoxFor(widget => widget.Title)
</fieldset>

2
src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
View File

@@ -194,7 +194,7 @@ namespace Orchard.Data.Migration.Interpreters {
}
else {
if(command.Length > 0 || command.Precision > 0 || command.Scale > 0) {
throw new OrchardException(T("Error while executing data migration: you need to specify the field's type in order to change it's properies"));
throw new OrchardException(T("Error while executing data migration: you need to specify the field's type in order to change its properties"));
}
}