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

Last of the yui related markup cleanup

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043781
This commit is contained in:
skewed 2009-12-11 08:29:52 +00:00
parent ff412f1f7e
commit f9be656e6c
20 changed files with 267 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CREDITS.txt
View File

@ -118,12 +118,6 @@ TinyMCE
WebSite: http://tinymce.moxiecode.com/
Copyright: Copyright (c) 2003-2009 Moxiecode Systems AB
License: LGPL 2.1
Yahoo UI
-----
Website: http://developer.yahoo.com/yui
Copyright: Copyright (c) 2009, Yahoo! Inc. All rights reserved.
License: New BSD
Yamlnet
-----

406
src/Orchard.Web/Content/Admin/css/Site.css
View File

@ -1,406 +0,0 @@
/* YUI Overrides
----------------------------------------------------------*/
#doc4 {margin:10px auto;}
#doc3 {margin: auto 0px; min-width:970px;}
#bd {padding:14px; background:#f9faf5; margin:0 4px;}
#ft {text-align:center;}
/* TinyMCE Overides
----------------------------------------------------------*/
.defaultSkin table.mceLayout {
width:90% !important;
margin: 0 0 20px 0 !important;
}
/*Defaults
----------------------------------------------------------*/
/*TODO - Remove one of the background colors*/
html {height: 100%; color:#525e50; background-color:#b0b4a1; background-color:#8a8f7a;}
body {font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
height: 100%;
width:100%;
text-align:left;
color:#5a5b32;
font-size: 93%; /*12px*/
}
/* ---------- Headings and defaults ---------- */
h1,h2,h3,h4,h5,h6,legend {padding:4px 0; font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif; font-weight:normal; font-style: normal;}
h1 {font-size: 182%;} /*24px*/
h2 {font-size: 161.6%;} /*21px*/
h3 {font-size: 138.5%;} /*18px*/
h4 {font-size: 123.1%;} /*16px*/
h5 {font-size: 116%;} /*15px*/
h6 {font-size: 108%;} /*14px*/
.largeText {font-size: 108%;} /*14px*/
.defaultText {font-size: 100%;} /*13px*/
.smallText {font-size: 85%;} /*12px*/
p {margin:4px;}
strong {font-weight:700;}
/* ---------- Links ---------- */
a, a:link, a:visited {text-decoration:none; color:#1e5d7d;}
a:hover, a:active {text-decoration:underline; color:#1e5d7d;}
a.linkButton, a.linkButton:visited {
font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
display:inline-block;
text-align:center;
text-decoration:none;
padding: 3px 8px 3px 8px;
margin:20px 4px 0 4px;
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
border:1px solid #d2d6c6;
color:#5a5b32;
cursor:pointer;
}
/* Header - Branding and Login
----------------------------------------------------------*/
#hd {
min-width:960px;
display:block;
height:60px;
background:url(images/background_header.jpg) no-repeat bottom right #8a8f7a;
}
#hd h1 a {
background:url(images/orchardLogo.jpg) no-repeat;
float:left;
width:105px;
height:60px;
position:relative;
top:-4px;
margin:0 0 -14px 18px;
z-index:0;
}
#hd a, #hd a:visited, #hd a:active {
display:block;
position:relative;
padding:14px 0 0 12px;
color: #e2e4dd;
}
#login{
float:right;
display:block;
margin:20px 20px 0 0;
color:#1a1505;
}
#login a, #login a:visited, #login a:active {color: #e2e4dd; display:inline; padding:0px;}
#login a:hover {color:#ffea9b;}
/* Left navigation pane
----------------------------------------------------------*/
.leftNavMod {
/*border:1px #bdb791 solid; Old border color*/
border:1px solid #d2d6c6;
margin: 10px 0 14px 0;
background:#FFF;
}
.leftNavMod h4 {
padding: 4px 4px 6px 8px;
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
cursor:pointer;
}
/* Unordered list links in left navigation pane
----------------------------------------------------------*/
.leftNavMod ul a {
color:#5a5b32;
display:block;
height:28px;
line-height:28px;
padding:0px 0px 0px 12px;
text-decoration:none;
}
.leftNavMod ul a:visited{
color: #2b2b2b;
}
.leftNavMod ul a:hover {
color: #3e4301;
background:#f0ecd2;
text-decoration:underline;
}
/* Confirmations;
----------------------------------------------------------*/
div.confirmation, div.warning, div.critical {
padding:4px;
margin: 10px 0 4px 0;
}
.confirmation {
background:#e6f1c9;
border:1px solid #cfe493;
}
.warning {
background:#fdf5bc;
border:1px solid #ffea9b;
}
.critical {
background:#e68585;
border:1px solid #990808;
color:#fff;
}
/* Forms
----------------------------------------------------------*/
.formList li {
line-height:24px;
}
fieldset {
margin:10px;
padding:10px;
border:1px solid #d2d6c6;
}
label {
display: block;
font-weight:700;
margin:8px 4px -2px 0px;
}
label span {
font-weight:normal;
}
legend {
font-size:150%;
color:#525e50;
}
select, textarea, #PublishLaterDate, .inputText{
font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size:102%;
margin:4px 4px 4px 0;
padding:2px;
border:1px solid #d2d6c6;
color:#5a5b32;
}
textarea {
width:80%;
height:260px;
}
.radioButton {
margin:0 6px 0 0;
}
input[button], button, .button {
font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
text-align:center;
padding: 0px 8px;
height: 26px;
margin:20px 4px 0 4px;
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
border:1px solid #d2d6c6;
color:#5a5b32;
cursor:pointer;
}
.buttonFocus {color:#f6faea; border:1px solid #666d51; background:#8a8f7a;}
#permalink{
width:200px;
}
.inputText {
width:80%;
}
.inputTextLarge {
font-size:130%;
font-weight:500;
}
.helperText {
margin:-4px 0 8px 0;
}
#Revision_Slug{
width:245px;
}
/* ---------- Sidebar forms ---------- */
.sideBar fieldset {margin:0px; border:none;}
#Date {width:80px; margin:4px 4px 4px 16px;}
#Hour, #Minutes {width:30px;}
/* ---------- Actions form elements and filtering ---------- */
ol.actions {margin:20px 0 0 0;}
ol.actions .button {margin:4px 4px 4px -8px;}
ol.actions label {
margin:6px 0 0 0;
font-size:112%;
}
.filterActions {
float:right;
margin:10px 2px 0 0;
}
/* Tables;
----------------------------------------------------------*/
table {
border-collapse: separate;
width: 100%;
border-spacing: 0px;
border:1px solid #B0B083;
background:#fff;
}
tbody
{
border-spacing: 0px;
vertical-align: middle;
}
thead, th {
font-size:100%; /*13px*/
font-weight:700;
text-align:left;
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
overflow:hidden;
}
.trhover{background-color:#f0f3d6;}
th, td {
padding: 8px 12px;
border-spacing: 0px;
display:table-cell;
vertical-align: middle;
border-bottom: 1px solid #EAE9D9;
}
caption {
text-indent: 0px;
font-size:110%;
padding:8px 0 8px 0;
}
col {
border-spacing: 0px;
display: table-column;
}
colgroup
{
border-spacing: 0px;
display: table-column-group;
}
tr.critical {background:#e68585; border:inherit;}
tr.warning {background:#fdf5bc; border:inherit;}
/* Horizontal lists
----------------------------------------------------------*/
ul.horizontal, ol.horizontal {
margin:0;
padding:0;
list-style:none;
}
ul.horizontal li, ol.horizontal li {
float:left;
margin:0 4px;
}
ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.horizontal li a, ol.horizontal li a:visited, ol.horizontal li a:active {
display:block;
text-decoration: none;
}
/* Miscellaneous;
----------------------------------------------------------*/
.templateThumbnail{
width: 124px;
height: 144px;
border:1px solid #000;
margin: 4px 4px 20px 16px;
}
.previewImage {
width:70%;
height:70%;
border:1px solid #525e50;
}
/* Extensions;
----------------------------------------------------------*/
.floatLeft {float: left;} /*Use this class to float anything to the left*/
.floatRight {float: right;} /*Use this class to float anything to the right*/
.alignRight {text-align: right;}
.Inline {display: inline;}
.center {margin:0 auto;} /*Center*/
.clearLayout {clear:both;} /*Use this class clear layout*/
.disabled {color:#CCC;}
.topSpacer{margin-top: 20px;}
.bottomSpacer{margin-bottom: 20px;}
.displayText {display:none;}
.separator {border-bottom:1px dashed #E4E7DC; margin-bottom:8px; padding-bottom:2px;}
/*TODO - Remove roundCorners class*/
table, textarea, #bd, .button, .inputText, .inputTextLarge, .inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, div.warning, div.critical, .roundCorners {
-moz-border-radius-bottomleft:4px;
-moz-border-radius-bottomright:4px;
-moz-border-radius-topleft:4px;
-moz-border-radius-topright:4px;
-webkit-border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
}

35
src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx
View File

@ -1,23 +1,20 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
<%@ Import Namespace="Orchard.Utility" %>
<h3>Global Settings</h3>
<ol>
<%=Html.EditorFor(s=>s.Id) %>
<li>
<%= Html.LabelFor(x=>x.SiteName) %>
<%= Html.EditorFor(x=>x.SiteName) %>
<%= Html.ValidationMessage("SiteName", "*")%>
</li>
<li>
<%= Html.LabelFor(x => x.SuperUser)%>
<%= Html.EditorFor(x=>x.SuperUser) %>
<%= Html.ValidationMessage("SuperUser", "*")%>
</li>
</ol>
<% foreach(var e in Model.EditorModel.Editors) {%>
<fieldset>
<legend>Global Settings</legend>
<fieldset>
<%=Html.LabelFor(x=>x.SiteName) %>
<%=Html.EditorFor(x=>x.SiteName) %>
<%=Html.ValidationMessage("SiteName", "*") %>
</fieldset>
<fieldset>
<%=Html.LabelFor(x => x.SuperUser) %>
<%=Html.EditorFor(x=>x.SuperUser) %>
<%=Html.ValidationMessage("SuperUser", "*") %>
</fieldset>
<%=Html.EditorFor(s=>s.Id) %>
</fieldset>
<% foreach(var e in Model.EditorModel.Editors) { %>
<%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
<%} %>
<% } %>

28
src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
View File

@ -1,24 +1,12 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Include("AdminHead"); %>
<div class="yui-u">
<h2 class="separator">
Edit Settings</h2>
</div>
<div class="yui-u">
<%using (Html.BeginForm()) { %>
<ol>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>
<li class="clearLayout">
<%--<label for="SiteName">Site Name:</label>
<input id="SiteName" class="inputText inputTextLarge roundCorners" name="SiteName" type="text" value="<%= Model.SiteSettings.SiteName %>" />
<label for="SuperUser">Super User Name:</label>
<input id="SuperUser" class="inputText inputTextLarge roundCorners" name="SuperUser" type="text" value="<%= Model.SiteSettings.SuperUser %>" />
--%> <input class="button" type="submit" value="Save" />
<%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %>
</li>
</ol>
<%}/*EndForm*/%>
</div>
<h2>Edit Settings</h2>
<%using (Html.BeginForm()) { %>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>
<fieldset>
<input class="button" type="submit" value="Save" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

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

@ -1,22 +1,13 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<ThemesIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%
Html.Include("AdminHead");%>
<div class="yui-u">
<h2 class="separator">
Manage Themes</h2>
</div>
<div class="yui-u">
<ul class="templates">
<li>
<div>
<%Html.Include("AdminHead");%>
<h2>Manage Themes</h2>
<h3>Current Theme</h3>
<% if (Model.CurrentTheme == null) { %>
<p>There is no current theme in the application. The built-in theme will be used.<br />
<%=Html.ActionLink("Install a new Theme", "Install") %></p>
<% } else { %>
<h4><%= Model.CurrentTheme.DisplayName %> </h4>
<% if (Model.CurrentTheme == null) {
%><p>There is no current theme in the application. The built-in theme will be used.<br /><%=Html.ActionLink("Install a new Theme", "Install") %></p><%
} else {
%><h4><%= Model.CurrentTheme.DisplayName %></h4>
<p><img src="<%= ResolveUrl("~/Themes/" + Model.CurrentTheme.ThemeName + "/Theme.gif")%>" alt="<%= Model.CurrentTheme.DisplayName %>" /><br />
By <%= Model.CurrentTheme.Author %><br />
<%= Model.CurrentTheme.Version %><br />
@ -25,14 +16,11 @@
<%=Html.ActionLink("Install a new Theme", "Install") %>
</p>
<% } %>
</div>
</li>
<li>
<div>
<h3>Available Themes</h3>
<ul class="templates">
<% foreach (var theme in Model.Themes) {
if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {%>
if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
%><li>
<h4><%= theme.DisplayName %> </h4>
<p><img src="<%= ResolveUrl("~/Themes/" + theme.ThemeName + "/Theme.gif") %>" alt="<%= theme.DisplayName %>" /><br />
By <%= theme.Author %><br />
@ -41,10 +29,8 @@
<%= theme.HomePage %><br />
<%=Html.ActionLink("Activate", "Activate", new {themeName = theme.ThemeName}) %>
</p>
</li>
<% }
} %>
</div>
</li>
</ul>
</div>
</ul>
<% Html.Include("AdminFoot"); %>

1
src/Orchard.Web/Orchard.Web.csproj
View File

@ -167,7 +167,6 @@
<Content Include="Content\Admin\css\base.css" />
<Content Include="Content\Admin\css\images\icons.png" />
<Content Include="Content\Admin\css\images\tableHeaderBackgroundRed.gif" />
<Content Include="Content\Admin\css\Site.css" />
<Content Include="Content\Images\headerBackground.gif" />
<Content Include="Content\Images\header_background.gif" />
<Content Include="Content\Images\innerheader_background.gif" />

47
src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
View File

@ -2,34 +2,21 @@
<%@ Import Namespace="Orchard.Comments.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<%= Html.ValidationSummary() %>
<div class="yui-g">
<h2 class="separator">Add a Comment</h2>
<h3>Information</h3>
<ol>
<li>
<label for="Name">Name:</label>
<input id="Text1" class="inputText inputTextLarge" name="Name" type="text" value="<%= Model.Name %>" />
</li>
<li>
<label for="Email">Email:</label>
<input id="Email" class="inputText inputTextLarge" name="Email" type="text" value="<%= Model.Email%>" />
</li>
<li>
<label for="SiteName">SiteName:</label>
<input id="SiteName" class="inputText inputTextLarge" name="SiteName" type="text" value="<%= Model.SiteName %>" />
</li>
<li>
<label for="CommentText">Leave a comment</label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText">
<%= Model.CommentText %>
</textarea>
</li>
<li>
<input type="submit" class="button" value="Save" />
</li>
</ol>
</div>
<% Html.EndForm(); %>
<h2>Add Comment</h2>
<% using(Html.BeginForm()) { %>
<%= Html.ValidationSummary() %>
<fieldset class="who">
<label for="CommentName">Name</label>
<input id="CommentName" class="text" name="Name" type="text" value="<%=Model.Name %>" /><br />
<label for="CommentEmail">Email</label>
<input id="CommentEmail" class="text" name="Email" type="text" value="<%=Model.Email%>" /> <br />
<label for="CommentSiteName">SiteName</label>
<input id="CommentSiteName" class="text" name="SiteName" type="text" value="<%=Model.SiteName %>" />
</fieldset>
<fieldset class="what">
<label for="CommentText">Leave a comment</label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"><%=Model.CommentText %></textarea>
<input type="submit" class="button" value="Save" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

70
src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
View File

@ -3,46 +3,32 @@
<%@ Import Namespace="Orchard.Comments.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<%= Html.ValidationSummary() %>
<div class="yui-g">
<h2 class="separator">Edit a Comment</h2>
<h3>Information</h3>
<ol>
<li>
<label for="Name">Name:</label>
<input id="CommentId" name="Id" type="hidden" value="<%=Model.Id %>" />
<input id="Text1" class="inputText inputTextLarge" name="Name" type="text" value="<%= Model.Name %>" />
</li>
<li>
<label for="Email">Email:</label>
<input id="Email" class="inputText inputTextLarge" name="Email" type="text" value="<%= Model.Email%>" />
</li>
<li>
<label for="SiteName">SiteName:</label>
<input id="SiteName" class="inputText inputTextLarge" name="SiteName" type="text" value="<%= Model.SiteName %>" />
</li>
<li>
<label for="CommentText">Leave a comment</label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText">
<%= Model.CommentText %>
</textarea>
</li>
<h3>Status</h3>
<li>
<label for="Status_Approved">
<%=Html.RadioButton("Status", "Approved", (Model.Status == CommentStatus.Approved), new { id = "Status_Approved" }) %> Approved
</label>
</li>
<li>
<label for="Status_Spam">
<%=Html.RadioButton("Status", "Spam", (Model.Status == CommentStatus.Spam), new { id = "Status_Spam" }) %> Mark As Spam
</label>
</li>
<li>
<input type="submit" class="button" value="Save" />
</li>
</ol>
</div>
<% Html.EndForm(); %>
<h2>Edit Comment</h2>
<% using(Html.BeginForm()) { %>
<%= Html.ValidationSummary() %>
<fieldset class="who">
<label for="CommentName">Name</label>
<input id="CommentName" class="text" name="Name" type="text" value="<%=Model.Name %>" /><br />
<label for="CommentEmail">Email</label>
<input id="CommentEmail" class="text" name="Email" type="text" value="<%=Model.Email%>" /> <br />
<label for="CommentSiteName">SiteName</label>
<input id="CommentSiteName" class="text" name="SiteName" type="text" value="<%=Model.SiteName %>" />
</fieldset>
<fieldset class="what">
<label for="CommentText">Leave a comment</label>
<textarea id="Textarea1" rows="10" cols="30" name="CommentText"><%=Model.CommentText %></textarea>
<input id="CommentId" name="Id" type="hidden" value="<%=Model.Id %>" />
</fieldset>
<fieldset>
<label for="Status_Approved">
<%=Html.RadioButton("Status", "Approved", (Model.Status == CommentStatus.Approved), new { id = "Status_Approved" }) %> Approved
</label>
<label for="Status_Spam">
<%=Html.RadioButton("Status", "Spam", (Model.Status == CommentStatus.Spam), new { id = "Status_Spam" }) %> Mark As Spam
</label>
</fieldset>
<fieldset>
<input type="submit" class="button" value="Save" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

73
src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
View File

@ -2,39 +2,42 @@
<%@ Import Namespace="Orchard.Roles.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<%= Html.ValidationSummary() %>
<div class="yui-g">
<h2 class="separator">Add a Role</h2>
<h3>Information</h3>
<label for="pageTitle">Role Name:</label>
<input id="Name" class="inputText inputTextLarge" name="Name" type="text" value="<%= Model.Name %>" />
<h3>Permissions</h3>
<% foreach (var packageName in Model.PackagePermissions.Keys) { %>
<h4><%= packageName %> Module</h4>
<table id="pluginListTable" cellspacing="0" class="roundCorners clearLayout" >
<colgroup>
<col id="Permission" />
<col id="Allow" />
</colgroup>
<thead>
<tr>
<th scope="col">Permission</th>
<th scope="col">Allow</th>
</tr>
</thead>
<% foreach (var permission in Model.PackagePermissions[packageName]) {%>
<tr>
<td><%=permission.Description%></td>
<td>
<input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>"/>
</td>
</tr>
<% } %>
</table>
<% } %>
<input type="submit" class="button" value="Save" />
</div>
<% Html.EndForm(); %>
<h2>Add Role</h2>
<% using (Html.BeginForm()) { %>
<%=Html.ValidationSummary()%>
<fieldset>
<legend>Information</legend>
<label for="pageTitle">Role Name:</label>
<input id="Name" class="inputText inputTextLarge" name="Name" type="text" value="<%= Model.Name %>" />
</fieldset>
<fieldset>
<legend>Permissions</legend>
<% foreach (var packageName in Model.PackagePermissions.Keys) { %>
<fieldset>
<legend><%=packageName%> Module</legend>
<table id="pluginListTable" cellspacing="0" class="roundCorners clearLayout" >
<colgroup>
<col id="Permission" />
<col id="Allow" />
</colgroup>
<thead>
<tr>
<th scope="col">Permission</th>
<th scope="col">Allow</th>
</tr>
</thead>
<% foreach (var permission in Model.PackagePermissions[packageName]) {%>
<tr>
<td><%=permission.Description%></td>
<td style="width:60px;/* todo: (heskew) make not inline :("><input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>"/></td>
</tr>
<% } %>
</table>
</fieldset>
<% } %>
</fieldset>
<fieldset>
<input type="submit" class="button" value="Save" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

87
src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
View File

@ -2,45 +2,50 @@
<%@ Import Namespace="Orchard.Roles.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<%= Html.ValidationSummary() %>
<div class="yui-g">
<h2 class="separator">Edit a Role</h2>
<h3>Information</h3>
<label for="pageTitle">Role Name:</label>
<input id="Name" class="inputText inputTextLarge" name="Name" type="text" value="<%=Model.Name %>"/>
<input type="hidden" value="<%= Model.Id %>" name="Id" />
<h3>Permissions</h3>
<% foreach (var packageName in Model.PackagePermissions.Keys) { %>
<h4><%= packageName %> Module</h4>
<table id="Table1" cellspacing="0" class="roundCorners clearLayout" >
<colgroup>
<col id="Col1" />
<col id="Col2" />
</colgroup>
<thead>
<tr>
<th scope="col">Permission</th>
<th scope="col">Allow</th>
</tr>
</thead>
<% foreach (var permission in Model.PackagePermissions[packageName]) {%>
<tr>
<td><%=permission.Description%></td>
<td>
<% if (Model.CurrentPermissions.Contains(permission.Name)) {%>
<input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>" checked="checked"/>
<% } else {%>
<input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>"/>
<% }%>
</td>
</tr>
<% } %>
</table>
<% } %>
<input type="submit" class="button" name="submit.Save" value="Save" />
<input type="submit" class="button" name="submit.Delete" value="Delete" />
</div>
<% Html.EndForm(); %>
<h2>Edit Role</h2>
<% using(Html.BeginForm()) { %>
<%=Html.ValidationSummary() %>
<fieldset>
<legend>Information</legend>
<label for="pageTitle">Role Name:</label>
<input id="Name" class="inputText inputTextLarge" name="Name" type="text" value="<%=Model.Name %>"/>
<input type="hidden" value="<%= Model.Id %>" name="Id" />
</fieldset>
<fieldset>
<legend>Permissions</legend>
<% foreach (var packageName in Model.PackagePermissions.Keys) { %>
<fieldset>
<legend><%=packageName%> Module</legend>
<table id="Table1" cellspacing="0" class="roundCorners clearLayout" >
<colgroup>
<col id="Col1" />
<col id="Col2" />
</colgroup>
<thead>
<tr>
<th scope="col">Permission</th>
<th scope="col">Allow</th>
</tr>
</thead>
<% foreach (var permission in Model.PackagePermissions[packageName]) {%>
<tr>
<td><%=permission.Description%></td>
<td style="width:60px;/* todo: (heskew) make not inline :(">
<% if (Model.CurrentPermissions.Contains(permission.Name)) {%>
<input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>" checked="checked"/>
<% } else {%>
<input type="checkbox" value="true" name="<%="Checkbox." + permission.Name%>"/>
<% }%>
</td>
</tr>
<% } %>
</table>
</fieldset>
<% } %>
</fieldset>
<fieldset>
<input type="submit" class="button" name="submit.Save" value="Save" />
<input type="submit" class="button" name="submit.Delete" value="Delete" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

71
src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
View File

@ -1,42 +1,39 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Roles.ViewModels.RolesIndexViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<div class="yui-g">
<h2 class="separator">Manage Roles</h2>
<ol class="horizontal actions floatLeft">
<li><label class="floatLeft" for="bulkActions">Actions:</label>
<select id="Select1" name="roleActions">
<option value="1">Delete</option>
</select> </li>
<li>
<input class="button roundCorners" type="submit" value="Apply" />
</li>
</ol>
<h2>Manage Roles</h2>
<% using(Html.BeginForm()) { %>
<%=Html.ValidationSummary() %>
<%=Html.ActionLink("Add a new role", "Create", new {}, new {@class="floatRight topSpacer"}) %>
<table id="Table1" cellspacing="0" class="roundCorners clearLayout" summary="This is a table of the roles currently available for use in your application.">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
</colgroup>
<thead>
<tr>
<th scope="col"><%--<input type="checkbox" value="" />--%></th>
<th scope="col">Name</th>
<th scope="col"></th>
</tr>
</thead>
<%foreach (var row in Model.Rows) { %>
<tr>
<td><input type="checkbox" value="true" name="<%= "Checkbox." + row.Id %>"/></td>
<td><%=Html.Encode(row.Name) %></td>
<td><%=Html.ActionLink("Edit", "Edit", new { row.Id })%></td>
</tr>
<%}%>
</table>
</div>
<% Html.EndForm(); %>
<fieldset class="actions bulk">
<label for="publishActions">Actions: </label>
<select id="Select1" name="roleActions">
<option value="1">Delete</option>
</select>
<input class="button" type="submit" value="Apply" />
</fieldset>
<div class="manage"><%=Html.ActionLink("Add a role", "Create", new {}, new { @class = "button" }) %></div>
<fieldset>
<table summary="This is a table of the roles currently available for use in your application.">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
</colgroup>
<thead>
<tr>
<th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
<th scope="col">Name</th>
<th scope="col"></th>
</tr>
</thead>
<%foreach (var row in Model.Rows) { %>
<tr>
<td><input type="checkbox" value="true" name="<%= "Checkbox." + row.Id %>"/></td>
<td><%=Html.Encode(row.Name) %></td>
<td><%=Html.ActionLink("Edit", "Edit", new { row.Id })%></td>
</tr>
<%}%>
</table>
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

30
src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx
View File

@ -1,17 +1,15 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Roles.ViewModels.UserRolesViewModel>" %>
<h3>
Roles</h3>
<ol>
<%
var index = 0; foreach (var entry in Model.Roles) {%>
<li>
<%= Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%>
<%= Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
<label for="<%="Roles[" + index + "]_Granted"%>"><%= Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> <%=Html.Encode(entry.Name)%></label>
</li>
<%++index;
} %>
</ol>
<fieldset>
<legend>Roles</legend>
<% if (Model.Roles.Count > 0) {
var index = 0;
foreach (var entry in Model.Roles)
{%>
<%=Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%>
<%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
<label for="<%="Roles[" + index + "]_Granted"%>"><%= Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> <%=Html.Encode(entry.Name)%></label>
<%++index;
}
} else {
%><p>There are no roles</p><%
} %>

2
src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx
View File

@ -11,7 +11,7 @@
<%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, "Choose action...")%>
<%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, "Delete")%>
</select>
<input class="button roundCorners" type="submit" name="submit" value="Apply" />
<input class="button" type="submit" name="submit" value="Apply" />
</fieldset>
<div class="manage"><%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%></div>
<fieldset>

52
src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx
View File

@ -3,32 +3,28 @@
<%@ Import Namespace="Orchard.Tags.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<div class="yui-g">
<h2 class="separator">List of contents tagged with <%= Model.TagName %></h2>
<%=Html.ValidationSummary() %>
<table id="Table1" cellspacing="0" class="roundCorners clearLayout">
<colgroup>
<col id="Col1" />
<col id="Col2" />
</colgroup>
<thead>
<tr>
<th scope="col">Name</th>
<th scope="col">Link to the content item</th>
</tr>
</thead>
<% foreach (var contentItem in Model.Contents) { %>
<tr>
<td>
<%=Html.ItemDisplayText(contentItem)%>
</td>
<td>
<%=Html.ItemDisplayLink(contentItem)%>
</td>
</tr>
<% } %>
</table>
</div>
<% Html.EndForm(); %>
<h2>List of contents tagged with <%=Model.TagName %></h2>
<% using(Html.BeginForm()) { %>
<%=Html.ValidationSummary() %>
<fieldset>
<table cellspacing="0" class="roundCorners clearLayout">
<colgroup>
<col id="Col1" />
<col id="Col2" />
</colgroup>
<thead>
<tr>
<th scope="col">Name</th>
<th scope="col">Link to the content item</th>
</tr>
</thead>
<% foreach (var contentItem in Model.Contents) { %>
<tr>
<td><%=Html.ItemDisplayText(contentItem)%></td>
<td><%=Html.ItemDisplayLink(contentItem)%></td>
</tr>
<% } %>
</table>
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

23
src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx
View File

@ -3,17 +3,14 @@
<%@ Import Namespace="Orchard.Tags.Models"%>
<%--<h3>Tags</h3>
<% Html.BeginForm("Edit", "Home", new { area = "Orchard.Tags" }); %>
<%= Html.ValidationSummary() %>
<div class="yui-g">
<%= Html.Hidden("TaggedContentId", Model.ContentItem.Id) %>
<%= Html.Hidden("ReturnUrl", Context.Request.Url) %>
<h3>Add new tags</h3>
<ol>
<li>
<input id="NewTagName" class="inputText inputTextLarge" name="NewTagName" type="text" value="" />
<input type="submit" class="button" name="submit.Add" value="Add" />
</li>
</ol>
</div>
<%= Html.ValidationSummary() %>
<%= Html.Hidden("TaggedContentId", Model.ContentItem.Id) %>
<%= Html.Hidden("ReturnUrl", Context.Request.Url) %>
<h3>Add new tags</h3>
<ol>
<li>
<input id="NewTagName" class="inputText inputTextLarge" name="NewTagName" type="text" value="" />
<input type="submit" class="button" name="submit.Add" value="Add" />
</li>
</ol>
<% Html.EndForm(); %>--%>

2
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
View File

@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Security" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<h2>Add a new User</h2>
<h2>Add User</h2>
<%using (Html.BeginForm()) { %>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>

28
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
View File

@ -2,23 +2,13 @@
<%@ Import Namespace="Orchard.Security" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<div class="yui-u">
<h2 class="separator">
Edit User</h2>
<p class="bottomSpacer">
<%=Html.ActionLink("Users", "Index") %> > Edit #<%= Model.Id%> <strong><%=Html.Encode(Model.UserName)%></strong>
</p>
</div>
<div class="yui-u">
<%using (Html.BeginForm()) { %>
<ol>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>
<li class="clearLayout">
<input class="button" type="submit" value="Save" />
<%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %>
</li>
</ol>
<%}/*EndForm*/%>
</div>
<h2>Edit User</h2>
<%using (Html.BeginForm()) { %>
<ol>
<%= Html.ValidationSummary() %>
<%= Html.EditorForModel() %>
<fieldset>
<input class="button" type="submit" value="Save" />
</fieldset>
<% } %>
<% Html.Include("AdminFoot"); %>

5
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx
View File

@ -1,14 +1,11 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Users.ViewModels.UserCreateViewModel>" %>
<%@ Import Namespace="Orchard.Utility" %>
<fieldset>
<%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
<%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
<%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
<%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
</fieldset><%
<%
foreach(var e in Model.EditorModel.Editors) {
var editor = e;%>
<fieldset>
<%=Html.EditorFor(m => editor.Model, editor.TemplateName, editor.Prefix)%>
</fieldset>
<% } %>

4
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx
View File

@ -1,12 +1,8 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Users.ViewModels.UserEditViewModel>" %>
<%@ Import Namespace="Orchard.Utility" %>
<ol>
<%=Html.EditorFor(m=>m.Id) %>
<%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
<%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
</ol>
<% foreach(var e in Model.EditorModel.Editors) {%>
<%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
<%} %>

20
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
View File

@ -3,13 +3,10 @@
<%@ Import Namespace="Orchard.Security" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<% Html.Include("AdminHead"); %>
<% Html.BeginForm(); %>
<div class="yui-g">
<h2>
Manage Users</h2>
<%=Html.ValidationSummary() %>
<%=Html.ActionLink("Add a new user", "Create", new {}, new {@class="floatRight topSpacer"}) %>
<h2>Manage Users</h2>
<% using (Html.BeginForm()) { %>
<%=Html.ValidationSummary()%>
<%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "floatRight topSpacer" })%>
<table id="pluginListTable" cellspacing="0" class="clearLayout">
<colgroup>
<col id="Name" />
@ -28,13 +25,14 @@
</th>
</tr>
</thead>
<% foreach (var row in Model.Rows) { %>
<% foreach (var row in Model.Rows)
{ %>
<tr>
<td>
<%=Html.Encode(row.User.UserName) %>
<%=Html.Encode(row.User.UserName)%>
</td>
<td>
<%=Html.Encode(row.User.Email) %>
<%=Html.Encode(row.User.Email)%>
</td>
<td>
<%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%>
@ -43,5 +41,5 @@
<%}%>
</table>
</div>
<% Html.EndForm(); %>
<% } %>
<% Html.Include("AdminFoot"); %>