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

More updates to the CMSPages admin UI. Have only the bulk action progress pages left on this pass.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4042011
This commit is contained in:
skewed
2009-11-24 07:43:07 +00:00
parent 0649975813
commit e60eda23d3
9 changed files with 71 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Orchard.Web/Content/Admin/css/base.css
View File

@@ -149,7 +149,7 @@ h2 { font-size:2.4em; } /* 24px */
h3 { font-size:2.1em; } /* 21px */ h3 { font-size:2.1em; } /* 21px */
h4 { font-size:1.8em; } /* 18px */ h4 { font-size:1.8em; } /* 18px */
h5 { font-size:1.6em; } /* 16px */ h5 { font-size:1.6em; } /* 16px */
h6, p, label, input, select, th, td { font-size:1.5em; } /* 15px */ h6, p, label, input, .button, .cancel, select, th, td { font-size:1.5em; } /* 15px */
/* ---------- Links ---------- */ /* ---------- Links ---------- */
a, a:link { a, a:link {
@@ -300,7 +300,7 @@ div.confirmation, div.warning, div.critical {
fieldset.bulk.actions { fieldset.bulk.actions {
display:inline; display:inline;
margin:.4em 1.4em -.8em 0; margin:0 1.4em -.7em 0;
} }
label { label {
@@ -325,7 +325,7 @@ input.large.text, textarea, fieldset {
clear:both; clear:both;
} }
fieldset { fieldset {
margin:.7em 0 .2em; margin:.7em 0 .4em;
} }
textarea { textarea {
min-height:8em; min-height:8em;
@@ -370,10 +370,13 @@ button:focus, .button:focus {
.button { .button {
line-height:26px; line-height:26px;
} }
.cancel {
margin:0 0 0 .93em;
}
#main .manage { #main .manage {
float:right; float:right;
overflow:hidden; overflow:hidden;
margin:4px 0 4px 4px; margin:3px 0 6px 4px;
} }
.manage a.button { .manage a.button {
float:right; float:right;
@@ -498,11 +501,16 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho
/* Miscellaneous; /* Miscellaneous;
----------------------------------------------------------*/ ----------------------------------------------------------*/
.templateThumbnail{ /* CMSPages */
width: 124px; .templates p {
height: 144px; overflow:hidden;
border:1px solid #000; }
margin: 4px 4px 20px 16px; .templates p img {
border:1px solid #000;
float:left;
height:144px;
margin:.27em .93em .93em .54em;
width:124px;
} }
.previewImage { .previewImage {

2
src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
View File

@@ -127,11 +127,11 @@
<Content Include="Views\Admin\BulkDeleteConfirm.aspx" /> <Content Include="Views\Admin\BulkDeleteConfirm.aspx" />
<Content Include="Views\Admin\BulkPublishLater.aspx" /> <Content Include="Views\Admin\BulkPublishLater.aspx" />
<Content Include="Views\Admin\EditorTemplates\inputTextPermalink.ascx" /> <Content Include="Views\Admin\EditorTemplates\inputTextPermalink.ascx" />
<Content Include="Views\Admin\EditorTemplates\TemplateDescriptor.ascx" />
<Content Include="Views\Admin\Export.aspx" /> <Content Include="Views\Admin\Export.aspx" />
<Content Include="Views\Admin\Edit.aspx" /> <Content Include="Views\Admin\Edit.aspx" />
<Content Include="Views\Admin\Create.aspx" /> <Content Include="Views\Admin\Create.aspx" />
<Content Include="Views\Admin\EditorTemplates\PageCreateViewModel.ascx" /> <Content Include="Views\Admin\EditorTemplates\PageCreateViewModel.ascx" />
<Content Include="Views\Admin\EditorTemplates\inputTextArea.ascx" />
<Content Include="Views\Admin\EditorTemplates\inputTextLarge.ascx" /> <Content Include="Views\Admin\EditorTemplates\inputTextLarge.ascx" />
<Content Include="Views\Templates\ExtraUserControl.ascx" /> <Content Include="Views\Templates\ExtraUserControl.ascx" />
<Content Include="Views\Templates\ThreeColumns.aspx" /> <Content Include="Views\Templates\ThreeColumns.aspx" />

55
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
View File

@@ -2,40 +2,23 @@
<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("Head"); %> <% Html.Include("Head"); %>
<div class="yui-u"> <h2>Change Template</h2>
<h2>Change Template</h2> <p>Select your layout from one of the templates below.</p>
<p class="bottomSpacer"> <% using (Html.BeginForm()) {
Select your layout from one of the templates below.</p> %><%= Html.ValidationSummary() %>
</div> <fieldset>
<ol class="templates">
<div class="yui-u"> <% foreach (var template in Model.Templates) {
<%using (Html.BeginForm()) { %> var t = template; %>
<%= Html.ValidationSummary() %> <li>
<%=Html.EditorFor(m => t) %>
</li>
<div class="yui-u first"> <% } %>
</ol>
<ol> </fieldset>
<% foreach (TemplateDescriptor template in Model.Templates) {%> <div>
<li> <input class="button" type="submit" value="Save Template Change" />
<ul> <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%>
<li class="clearLayout"> </div><%
<h3><%=Html.Encode(template.DisplayName)%></h3> } %>
</li>
<li>
<label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
<%=Html.RadioButton("TemplateName", template.Name, Model.TemplateName == template.Name, new{id="TemplateName_" + template.Name})%>
Select this template</label>
</li>
<li class="floatLeft"><img src="<%=Html.Encode(template.Name)%>.gif" alt="<%=Html.Encode(template.DisplayName)%>" class="templateThumbnail" /></li>
<li class="floatLeft"><p><%=Html.Encode(template.Description)%></p></li>
</ul>
</li>
<% } %>
<li class="clearLayout"><input class="button" type="submit" value="Save Template Change" /><%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "linkButton" })%></li>
</ol>
</div>
<%}/*EndForm*/%>
</div>
<% Html.Include("Foot"); %> <% Html.Include("Foot"); %>

17
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
View File

@@ -1,15 +1,10 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %> <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("Head"); %> <% Html.Include("Head"); %>
<div class="yui-u"> <h2>Add a Page</h2>
<h2>Add a Page</h2> <p>Select your layout from one of the templates below.</p>
<p class="bottomSpacer"> <%using (Html.BeginForm()) { %>
Select your layout from one of the templates below.</p> <%=Html.ValidationSummary() %>
</div> <%=Html.EditorForModel() %>
<div class="yui-u"> <% } %>
<%using (Html.BeginForm()) { %>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>
<%}/*EndForm*/%>
</div>
<% Html.Include("Foot"); %> <% Html.Include("Foot"); %>

35
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
View File

@@ -1,32 +1,15 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PageCreateViewModel>" %>
<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %> <%@ Import Namespace="Orchard.CmsPages.Services.Templates" %>
<%@ Import Namespace="Orchard.CmsPages.ViewModels" %> <%@ Import Namespace="Orchard.CmsPages.ViewModels" %>
<%@ Import Namespace="Orchard.Utility" %> <%@ Import Namespace="Orchard.Utility" %>
<%-- <fieldset>
<ol> <ol class="templates">
<%=Html.EditorFor(m=>m.Title, "inputTextLarge") %> <% foreach (var template in Model.Templates) {
<%=Html.EditorFor(m=>m.Slug, "inputTextLarge") %> var t = template; %>
</ol>--%>
<div class="yui-u first">
<ol>
<% foreach (TemplateDescriptor template in Model.Templates) {%>
<li> <li>
<ul> <%=Html.EditorFor(m => t) %>
<li class="clearLayout">
<h3><%=Html.Encode(template.DisplayName)%></h3>
</li>
<li>
<label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
<%=Html.RadioButton("TemplateName", template.Name, Model.TemplateName == template.Name, new{id="TemplateName_" + template.Name})%>
Select this template</label>
</li>
<li class="floatLeft"><img src="<%=Html.Encode(template.Name)%>.gif" alt="<%=Html.Encode(template.DisplayName)%>" class="templateThumbnail" /></li>
<li class="floatLeft"><p><%=Html.Encode(template.Description)%></p></li>
</ul>
</li> </li>
<% } %> <% } %>
<li class="clearLayout"><input class="button" type="submit" value="Create" /></li> </ol>
</ol> </fieldset>
<div><input class="button" type="submit" value="Create" /></div>
</div>

6
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextArea.ascx
View File

@@ -1,6 +0,0 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
<li>
<%=Html.LabelForModel() %>
<%=Html.TextArea("",Model) %>
<%=Html.ValidationMessage("","*") %>
</li>

2
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<fieldset> <fieldset>
<label class="sub" for="permalink">Permalink: <span>http://localhost/</span></label> <label class="sub" for="permalink">Permalink: <span>http://localhost/</span></label>
<span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> <span class="helperText smallText clearLayout"> &laquo; How to write a permalink. &raquo; </span></span> <span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> <span> &laquo; How to write a permalink. &raquo; </span></span>
</fieldset> </fieldset>

32
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
View File

@@ -1,19 +1,19 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Collections.Generic.IEnumerable<Orchard.CmsPages.Models.Page>>" %> <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Orchard.CmsPages.Models.Page>>" %>
<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("Head"); %> <% Html.Include("Head"); %>
<div class="yui-g"> <h2>Export</h2>
<h2>Export</h2> <p>Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.</p>
<p class="bottomSpacer"> <ol>
Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur <% foreach (var page in Model) {
adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris %><li>Page Id <%=page.Id %>
et neque eget justo suscipit blandit.</p> <ol>
<ol><%foreach (var page in Model) { %><li> <% foreach (var revision in page.Revisions) {
Page Id <%=page.Id %> %><li>Revision <%=revision.Number %> <strong><%=revision.Title %></strong> ~/<%=revision.Slug %>
<ol><%foreach (var revision in page.Revisions) { %> <br />Modified: <%=revision.ModifiedDate %>
<li>Revision <%=revision.Number %> <b><%=revision.Title %></b> ~/<%=revision.Slug %> <br />Published: <%=revision.PublishedDate %></li><%
<br />Modified:<%=revision.ModifiedDate %> } %>
<br />Published:<%=revision.PublishedDate %></li> </ol>
<%} %></ol> </li><%
</li><%} %></ol> } %>
</div> </ol>
<% Html.Include("Foot"); %> <% Html.Include("Foot"); %>

4
src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
View File

@@ -29,7 +29,7 @@
</select> </select>
<input class="button" type="submit" name="submit.Filter" value="Apply"/> <input class="button" type="submit" name="submit.Filter" value="Apply"/>
</fieldset> </fieldset>
<p class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %></p> <div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %></div>
<fieldset> <fieldset>
<table summary="This is a table of the PageEntries currently available for use in your application."> <table summary="This is a table of the PageEntries currently available for use in your application.">
<colgroup> <colgroup>
@@ -95,6 +95,6 @@
}%> }%>
</table> </table>
</fieldset> </fieldset>
<p class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></p> <div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></div>
<% } %> <% } %>
<% Html.Include("Foot"); %> <% Html.Include("Foot"); %>