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

UI cleanup pass (progress - Orchard.Users, TinyMce and remaining Core modules)

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045045
This commit is contained in:
skewed
2010-01-06 09:06:55 +00:00
parent e8b1e2c294
commit 81ab21f645
19 changed files with 121 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx
View File

@@ -1,7 +1,3 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyDisplayViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
<%@ Import Namespace="Orchard.Utility" %>
<%= Model.BodyAspect.Record.Text %>
<%=Model.BodyAspect.Record.Text %>

10
src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.ascx
View File

@@ -1,9 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyEditorViewModel>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyEditorViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
<%@ Import Namespace="Orchard.Core.Common.Models" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
<%@ Import Namespace="Orchard.Utility" %>
<fieldset>
<label>Body</label>
<%=Html.EditorFor(m=>m.Text, Model.TextEditorTemplate) %>
<label><%=_Encoded("Body")%></label>
<%=Html.EditorFor(m => m.Text, Model.TextEditorTemplate) %>
<%=Html.ValidationMessageFor(m => m.Text) %>
</fieldset>

10
src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.ascx
View File

@@ -1,11 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<OwnerEditorViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
<%@ Import Namespace="Orchard.Core.Common.Models" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
<%@ Import Namespace="Orchard.Utility" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<OwnerEditorViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
<fieldset>
<legend>System</legend>
<%=Html.LabelFor(m=>m.Owner) %>
<%=Html.EditorFor(m=>m.Owner) %>
<%=Html.ValidationMessageFor(m=>m.Owner) %>
</fieldset>
</fieldset>

13
src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
View File

@@ -1,11 +1,10 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
<h2>
<%=Html.TitleForPage("Edit Settings")%></h2>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
<h1><%=Html.TitleForPage(T("Edit Settings").ToString())%></h1>
<%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %>
<fieldset>
<legend>Global Settings</legend>
<legend><%=_Encoded("Global Settings")%></legend>
<fieldset>
<%=Html.LabelFor(x=>x.SiteName) %>
<%=Html.EditorFor(x=>x.SiteName) %>
@@ -23,10 +22,8 @@
</fieldset>
<%=Html.EditorFor(s=>s.Id) %>
</fieldset>
<%= Html.EditorForItem(Model.ViewModel) %>
<fieldset>
<input class="button" type="submit" value="Save" />
<input class="button" type="submit" value="<%=_Encoded("Save") %>" />
</fieldset>
<% } %>

2
src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ThemesIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
<h1><%=Html.TitleForPage("Manage Themes") %></h1>
<h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
<h2><%=_Encoded("Current Theme")%></h2>
<% if (Model.CurrentTheme == null) {
%><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")

2
src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<object>" %>
<h2><%=Html.TitleForPage("Install Theme") %></h2>
<h1><%=Html.TitleForPage(T("Install Theme").ToString()) %></h1>
<% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%>
<%=Html.ValidationSummary() %>
<fieldset>