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

Updated html/css for settings page. Added a primary button style.

Browse Source
This commit is contained in:
jowall
2010-02-12 16:11:08 -08:00
parent fd0e034ea6
commit 49d95c1f13
5 changed files with 100 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,6 @@
<%= Html.EditorForItem(Model.ViewModel) %> <%= Html.EditorForItem(Model.ViewModel) %>
<fieldset> <fieldset>
<%=Html.EditorFor(s => s.Id) %> <%=Html.EditorFor(s => s.Id) %>
<input class="button" type="submit" value="<%=_Encoded("Save") %>" /> <input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" />
</fieldset> </fieldset>
<% } %> <% } %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx
View File

@@ -10,7 +10,7 @@
<div class="secondary"> <div class="secondary">
<% Html.Zone("secondary");%> <% Html.Zone("secondary");%>
<fieldset> <fieldset>
<input class="button" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/> <input class="button primaryAction" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/>
<% if (Model.IsDraft) { %> <% if (Model.IsDraft) { %>
<%=Html.ActionLink(T("Discard Draft").ToString(), "DiscardDraft", new { Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id=Model.Item.Id }, new { @class = "button" })%> <%=Html.ActionLink(T("Discard Draft").ToString(), "DiscardDraft", new { Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id=Model.Item.Id }, new { @class = "button" })%>
<% } %> <% } %>

107
src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx
View File

@@ -27,80 +27,81 @@
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/> <input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<table class="items" summary="<%=_Encoded("This is a table of the PageEntries currently available for use in your application.") %>"> <ul class="contentItems" style="margin-top:0;">
<colgroup>
<col id="Actions" />
<col id="Status" />
<col id="Title" />
<col id="Author" />
<col id="LastUpdated" />
<col id="Draft" />
<col id="Timer" />
<col id="Edit" />
</colgroup>
<thead>
<tr>
<th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
<th scope="col"><%=_Encoded("Status")%></th>
<th scope="col"><%=_Encoded("Title")%></th>
<th scope="col"><%=_Encoded("Slug")%></th>
<th scope="col"><%=_Encoded("Author")%></th>
<th scope="col"><%=_Encoded("Draft")%></th>
<th scope="col"><%=_Encoded("Scheduled")%></th>
<th scope="col"></th>
</tr>
</thead>
<% <%
int pageIndex = 0; int pageIndex = 0;
foreach (var pageEntry in Model.PageEntries) foreach (var pageEntry in Model.PageEntries)
{ {
var pi = pageIndex; %> var pi = pageIndex; %>
<tr> <li style="padding:1em .5em;">
<td> <div style="float:left;">
<input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pi].PageId) %>"/> <input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pi].PageId) %>"/>
<input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pi].IsChecked) %>"/> <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pi].IsChecked) %>"/>
</td>
<td> <h3 style="border-bottom:none; margin:0; padding:0; display:inline;"><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString())%></h3>
<p style="margin:.5em 0;">
<%--Published or not--%>
<% if (pageEntry.Page.HasPublished) <% if (pageEntry.Page.HasPublished)
{ %> { %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" /> <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" style="<%=_Encoded("margin:0 0 -2px 0;") %>" /><%=_Encoded(" Published |") %>
<% } <% }
else else
{ %> { %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" /> <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" style="margin:0 0 -2px 0;" /><%=_Encoded(" Not Published |")%>
<% } %> <% } %>
</td>
<td><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString())%></td> <%--Does the page have a draft--%>
<td><% if (pageEntry.Page.HasPublished) <% if (pageEntry.Page.HasDraft)
{ %> { %>
<%=Html.ActionLink(pageEntry.Page.Slug ?? T("(no slug)").ToString(), "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug })%> <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/draft.gif") %>" alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" style="margin:0 0 -2px 0;" /><%=_Encoded(" Draft")%>
<% } <% }
else else
{%> { %>
<%=Html.Encode(pageEntry.Page.Slug ?? T("(no slug)").ToString())%> <%=_Encoded("No Draft")%>
<% } %> <% } %>
</td> <%--Scheduled--%>
<td><%=_Encoded("By {0}", pageEntry.Page.Creator.UserName)%></td>
<td>
<% if (pageEntry.Page.HasDraft)
{ %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/draft.gif") %>" alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" />
<% } %>
</td>
<td>
<% if (!pageEntry.Page.IsPublished) <% if (!pageEntry.Page.IsPublished)
{ %> { %>
<%=pageEntry.Page.ScheduledPublishUtc != null <%if (pageEntry.Page.ScheduledPublishUtc != null) { %>
? string.Format("{0:d}<br />{0:t}", pageEntry.Page.ScheduledPublishUtc.Value) <%=" | " %>
: ""%> <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif") %>" alt="<%=_Encoded("Scheduled") %>" title="<%=_Encoded("The page is scheduled for publishing") %>" style="margin:0 0 -2px 0;" />
<%=string.Format("Scheduled: {0:d}", pageEntry.Page.ScheduledPublishUtc.Value) %>
<% }%>
<% } %> <% } %>
</td>
<td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { id = pageEntry.PageId })%></td> <%--Author--%>
</tr> <%=_Encoded(" | By {0}", pageEntry.Page.Creator.UserName)%>
</p>
</div>
<div style="float:right;">
<span style="margin:0; text-align:right; font-size:1.4em;">
<% if (pageEntry.Page.HasPublished)
{ %>
<%=Html.ActionLink("View", "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug })%>
<%=_Encoded("|")%>
<% }
else
{%>
<%=""%>
<% } %>
<%=Html.ActionLink(T("Edit").ToString(), "Edit", new { id = pageEntry.PageId })%>
</span>
</div>
<div style="clear:both;"></div>
</li>
<% <%
pageIndex++; pageIndex++;
} %> } %>
</table> </ul>
</fieldset> </fieldset>
<% } %> <% } %>
<div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button" })%></div> <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button" })%></div>

2
src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx
View File

@@ -10,7 +10,7 @@
<div class="secondary"> <div class="secondary">
<% Html.Zone("secondary");%> <% Html.Zone("secondary");%>
<fieldset> <fieldset>
<input class="button" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/> <input class="button primaryAction" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/>
<% if (Model.IsDraft) { %> <% if (Model.IsDraft) { %>
<%=Html.ActionLink(T("Discard Draft").ToString(), "DiscardDraft", new { Area = "Orchard.Pages", Controller = "Admin", Model.Item.Id }, new { @class = "button" })%> <%=Html.ActionLink(T("Discard Draft").ToString(), "DiscardDraft", new { Area = "Orchard.Pages", Controller = "Admin", Model.Item.Id }, new { @class = "button" })%>
<% } %> <% } %>

58
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -60,7 +60,7 @@ body#preview {
min-width:0; min-width:0;
} }
#content { #content {
background:#fff; background:#fcfcfc;
} }
@@ -134,7 +134,6 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
width:23.629%; width:23.629%;
} }
/* Headings and defaults /* Headings and defaults
----------------------------------------------------------*/ ----------------------------------------------------------*/
h1, h2, h3, h4, h5, legend { h1, h2, h3, h4, h5, legend {
@@ -149,9 +148,9 @@ h3 { font-size:1.8em; } /* 18px */
h4 { font-size:1.6em; } /* 16px */ h4 { font-size:1.6em; } /* 16px */
h5 { font-size:1.4em; } /* 14px */ h5 { font-size:1.4em; } /* 14px */
h6, p, legend, label, input, select, .button, h6, p, label, input, select, .button,
.message, .validation-summary-errors, .message, .validation-summary-errors,
table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 15px */ table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 14px */
p .button { font-size:inherit; } p .button { font-size:inherit; }
.meta, .hint { font-size:1.2em; } /* 12px */ .meta, .hint { font-size:1.2em; } /* 12px */
@@ -232,7 +231,6 @@ a:hover, a:active, a:focus {
} }
#navigation li { #navigation li {
background:#fff;
margin:7px 0 20px 0; margin:7px 0 20px 0;
} }
#navigation ul li { #navigation ul li {
@@ -329,8 +327,14 @@ span.message {
color:#fff; color:#fff;
} }
.info.message { .info.message {
background:#fff; /* orange :P */ background:#e4ebef; /* blue */
border:1px dashed #D2D6C6; border:1px solid #4687AD;
color:#062232;
}
.info.message {
background:#e6e7ef; /* blue */
border:1px solid #b5b9c4;
color:#062232;
} }
.debug.message { .debug.message {
background:#eee; background:#eee;
@@ -357,13 +361,18 @@ fieldset.bulk.actions {
margin:0 1.4em 0 0; margin:0 1.4em 0 0;
padding-top:0; padding-top:0;
} }
legend {
font-size:1.6em;
font-weight:600;
font-weight:bold;
}
label { label {
display: block; display: block;
font-weight:600; color:#1d1b1b;
} }
label.forcheckbox { label.forcheckbox {
display:inline; display:inline;
line-height:1.8em;
} }
fieldset.bulk.actions label, label.sub { fieldset.bulk.actions label, label.sub {
display:inline; display:inline;
@@ -383,8 +392,7 @@ label input {
/* todo: (heskew) try to get .text on stuff like .text-box */ /* todo: (heskew) try to get .text on stuff like .text-box */
select, textarea, input.text, input.text-box { select, textarea, input.text, input.text-box {
padding:2px; padding:2px;
border:1px solid #ddd; border:1px solid #bdbcbc;
color:#000;
} }
input.text, input.text-box { input.text, input.text-box {
line-height:1.2em; line-height:1.2em;
@@ -412,7 +420,22 @@ input.large.text, textarea, fieldset {
clear:both; clear:both;
} }
fieldset { fieldset {
margin:.7em 0 .4em; margin:1.8em 0 .4em 0;
}
/* Settings page styles */
.settings fieldset {
margin:.5em 0;
border-bottom:1px solid #eaeaea;
padding:1em;
}
.settings fieldset div, .settings .button {
margin:1em 0 .5em 1em;
}
.settings legend {
margin:0 0 -.4em 0;
}
.settings input.text, .settings input.text-box {
width:26em;
} }
textarea { textarea {
min-height:8em; min-height:8em;
@@ -422,7 +445,6 @@ textarea {
padding:4px; padding:4px;
width:98%; width:98%;
} }
/* todo: (heskew) move editor specific style elsewhere */ /* todo: (heskew) move editor specific style elsewhere */
.primary .mceEditor { .primary .mceEditor {
display:block; display:block;
@@ -442,16 +464,17 @@ button, .button, .button:link, .button:visited {
text-align:center; text-align:center;
padding:0 .8em .1em .8em; padding:0 .8em .1em .8em;
} }
.primaryAction{
background:#4687ad;
border:1px solid #8f8f8f;
color:#fff;
}
button.remove, .remove.button, .remove.button:link, .remove.button:visited { button.remove, .remove.button, .remove.button:link, .remove.button:visited {
background-color:#DECCCA; background-color:#DECCCA;
background-image:url(images/tableHeaderBackgroundRed.gif); background-image:url(images/tableHeaderBackgroundRed.gif);
border-color:#d6c9c7; border-color:#d6c9c7;
color:#5c3732; color:#5c3732;
} }
a.button, a.button:link, a.button:visited {
line-height:1em;
padding:.2em .6em;
}
button:hover, .button:hover, button:hover, .button:hover,
button:active, .button:active, button:active, .button:active,
button:focus, .button:focus { button:focus, .button:focus {
@@ -505,7 +528,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
float:right; float:right;
height:inherit; height:inherit;
margin-left:.3em; margin-left:.3em;
padding-bottom:.3em;
} }