From f9be656e6c55f3cb9f6eaffb9db26af52101fcbf Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 11 Dec 2009 08:29:52 +0000 Subject: [PATCH] Last of the yui related markup cleanup --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043781 --- CREDITS.txt | 6 - src/Orchard.Web/Content/Admin/css/Site.css | 406 ------------------ .../SettingsIndexViewModel.ascx | 35 +- .../Core/Settings/Views/Admin/Index.aspx | 28 +- .../Core/Themes/Views/Admin/Index.aspx | 36 +- src/Orchard.Web/Orchard.Web.csproj | 1 - .../Orchard.Comments/Views/Admin/Create.aspx | 47 +- .../Orchard.Comments/Views/Admin/Edit.aspx | 70 ++- .../Orchard.Roles/Views/Admin/Create.aspx | 73 ++-- .../Orchard.Roles/Views/Admin/Edit.aspx | 87 ++-- .../Orchard.Roles/Views/Admin/Index.aspx | 71 ++- .../EditorTemplates/UserRolesViewModel.ascx | 30 +- .../Orchard.Tags/Views/Admin/Index.aspx | 2 +- .../Orchard.Tags/Views/Admin/Search.aspx | 52 ++- .../Models/DisplayTemplates/HasTags.ascx | 23 +- .../Orchard.Users/Views/Admin/Create.aspx | 2 +- .../Orchard.Users/Views/Admin/Edit.aspx | 28 +- .../EditorTemplates/UserCreateViewModel.ascx | 5 +- .../EditorTemplates/UserEditViewModel.ascx | 4 - .../Orchard.Users/Views/Admin/Index.aspx | 20 +- 20 files changed, 267 insertions(+), 759 deletions(-) delete mode 100644 src/Orchard.Web/Content/Admin/css/Site.css diff --git a/CREDITS.txt b/CREDITS.txt index b97d63068..a9e25ce9d 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -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 ----- diff --git a/src/Orchard.Web/Content/Admin/css/Site.css b/src/Orchard.Web/Content/Admin/css/Site.css deleted file mode 100644 index 4dd0a73d4..000000000 --- a/src/Orchard.Web/Content/Admin/css/Site.css +++ /dev/null @@ -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; -} - diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx index 47b39e3bc..02dba507c 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx @@ -1,23 +1,20 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Settings.ViewModels"%> <%@ Import Namespace="Orchard.Utility" %> - -

Global Settings

-
    -<%=Html.EditorFor(s=>s.Id) %> -
  1. - <%= Html.LabelFor(x=>x.SiteName) %> - <%= Html.EditorFor(x=>x.SiteName) %> - <%= Html.ValidationMessage("SiteName", "*")%> -
    2. -
  2. - <%= Html.LabelFor(x => x.SuperUser)%> - <%= Html.EditorFor(x=>x.SuperUser) %> - <%= Html.ValidationMessage("SuperUser", "*")%> -
    3. -
- - -<% foreach(var e in Model.EditorModel.Editors) {%> +
+ Global Settings +
+ <%=Html.LabelFor(x=>x.SiteName) %> + <%=Html.EditorFor(x=>x.SiteName) %> + <%=Html.ValidationMessage("SiteName", "*") %> +
+
+ <%=Html.LabelFor(x => x.SuperUser) %> + <%=Html.EditorFor(x=>x.SuperUser) %> + <%=Html.ValidationMessage("SuperUser", "*") %> +
+ <%=Html.EditorFor(s=>s.Id) %> +
+<% foreach(var e in Model.EditorModel.Editors) { %> <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%> -<%} %> +<% } %> diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx index d087e9eb6..fd071b51c 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx @@ -1,24 +1,12 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <% Html.Include("AdminHead"); %> -
-

- Edit Settings

-
-
- <%using (Html.BeginForm()) { %> -
    - <%= Html.ValidationSummary() %> - <%= Html.EditorForModel() %> -
  1. - <%-- - - - ---%> - <%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %> -
    2. -
- <%}/*EndForm*/%> -
+

Edit Settings

+ <%using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + <%= Html.EditorForModel() %> +
+ +
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx index c4dc206ab..655dfdf40 100644 --- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx @@ -1,22 +1,13 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% - Html.Include("AdminHead");%> -
-

- Manage Themes

-
-
-
    -
  • -
    +<%Html.Include("AdminHead");%> +

    Manage Themes

    Current Theme

    - <% if (Model.CurrentTheme == null) { %> -

    There is no current theme in the application. The built-in theme will be used.
    - <%=Html.ActionLink("Install a new Theme", "Install") %>

    - <% } else { %> -

    <%= Model.CurrentTheme.DisplayName %>

    + <% if (Model.CurrentTheme == null) { + %>

    There is no current theme in the application. The built-in theme will be used.
    <%=Html.ActionLink("Install a new Theme", "Install") %>

    <% + } else { + %>

    <%= Model.CurrentTheme.DisplayName %>

    " alt="<%= Model.CurrentTheme.DisplayName %>" />
    By <%= Model.CurrentTheme.Author %>
    <%= Model.CurrentTheme.Version %>
    @@ -25,14 +16,11 @@ <%=Html.ActionLink("Install a new Theme", "Install") %>

    <% } %> -
    -
    • -
  • - -

    Available Themes

    +
      <% foreach (var theme in Model.Themes) { - if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {%> + if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) { + %>

    • <%= theme.DisplayName %>

      " alt="<%= theme.DisplayName %>" />
      By <%= theme.Author %>
      @@ -41,10 +29,8 @@ <%= theme.HomePage %>
      <%=Html.ActionLink("Activate", "Activate", new {themeName = theme.ThemeName}) %>

      +
      • <% } } %> -
    -
    • -
-
+ <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 268e97ab8..c5bd99e4a 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -167,7 +167,6 @@ - diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx index 604ea1cea..a2de6f90f 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx @@ -2,34 +2,21 @@ <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Add a Comment

-

Information

-
    -
  1. - - -
    2. -
  2. - - -
    3. -
  3. - - -
    4. -
  4. - - -
    5. -
  5. - -
    6. -
-
- <% Html.EndForm(); %> +

Add Comment

+ <% using(Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> +
+ +
+ +
+ + +
+
+ + + +
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx index 25020a9a7..feea7f6b5 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx @@ -3,46 +3,32 @@ <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Edit a Comment

-

Information

-
    -
  1. - - - -
    2. -
  2. - - -
    3. -
  3. - - -
    4. -
  4. - - -
    5. -

    Status

    -
  5. - -
    6. -
  6. - -
    7. -
  7. - -
    8. -
-
- <% Html.EndForm(); %> +

Edit Comment

+ <% using(Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> +
+ +
+ +
+ + +
+
+ + + +
+
+ + +
+
+ +
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx index e83ae3c28..1c69131e2 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx @@ -2,39 +2,42 @@ <%@ Import Namespace="Orchard.Roles.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Add a Role

-

Information

- - - -

Permissions

- <% foreach (var packageName in Model.PackagePermissions.Keys) { %> -

<%= packageName %> Module

- - - - - - - - - - - - <% foreach (var permission in Model.PackagePermissions[packageName]) {%> - - - - - <% } %> -
PermissionAllow
<%=permission.Description%> - "/> -
- <% } %> - -
- <% Html.EndForm(); %> +

Add Role

+ <% using (Html.BeginForm()) { %> + <%=Html.ValidationSummary()%> +
+ Information + + +
+
+ Permissions + <% foreach (var packageName in Model.PackagePermissions.Keys) { %> +
+ <%=packageName%> Module + + + + + + + + + + + + <% foreach (var permission in Model.PackagePermissions[packageName]) {%> + + + + + <% } %> +
PermissionAllow
<%=permission.Description%>"/>
+
+ <% } %> +
+
+ +
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx index 96d0d79c8..4b6dd732f 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx @@ -2,45 +2,50 @@ <%@ Import Namespace="Orchard.Roles.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Edit a Role

-

Information

- - - -

Permissions

- - <% foreach (var packageName in Model.PackagePermissions.Keys) { %> -

<%= packageName %> Module

- - - - - - - - - - - - <% foreach (var permission in Model.PackagePermissions[packageName]) {%> - - - - - <% } %> -
PermissionAllow
<%=permission.Description%> - <% if (Model.CurrentPermissions.Contains(permission.Name)) {%> - " checked="checked"/> - <% } else {%> - "/> - <% }%> -
- <% } %> - - -
- <% Html.EndForm(); %> +

Edit Role

+ <% using(Html.BeginForm()) { %> + <%=Html.ValidationSummary() %> +
+ Information + + + +
+
+ Permissions + <% foreach (var packageName in Model.PackagePermissions.Keys) { %> +
+ <%=packageName%> Module + + + + + + + + + + + + <% foreach (var permission in Model.PackagePermissions[packageName]) {%> + + + + + <% } %> +
PermissionAllow
<%=permission.Description%> + <% if (Model.CurrentPermissions.Contains(permission.Name)) {%> + " checked="checked"/> + <% } else {%> + "/> + <% }%> +
+
+ <% } %> +
+
+ + +
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx index bd24f1d5c..3ab51b06f 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx @@ -1,42 +1,39 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> -
-

Manage Roles

-
    -
  1. -
    2. -
  2. - -
    3. -
- +

Manage Roles

+ <% using(Html.BeginForm()) { %> <%=Html.ValidationSummary() %> - <%=Html.ActionLink("Add a new role", "Create", new {}, new {@class="floatRight topSpacer"}) %> - - - - - - - - - - - - - - <%foreach (var row in Model.Rows) { %> - - - - - - <%}%> -
<%----%>Name
"/><%=Html.Encode(row.Name) %><%=Html.ActionLink("Edit", "Edit", new { row.Id })%>
-
- <% Html.EndForm(); %> +
+ + + +
+
<%=Html.ActionLink("Add a role", "Create", new {}, new { @class = "button" }) %>
+
+ + + + + + + + + + + + + + <%foreach (var row in Model.Rows) { %> + + + + + + <%}%> +
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>Name
"/><%=Html.Encode(row.Name) %><%=Html.ActionLink("Edit", "Edit", new { row.Id })%>
+
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx index 94ae0ed02..3dfdf8bb8 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx @@ -1,17 +1,15 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -

- Roles

-
    -<% - var index = 0; foreach (var entry in Model.Roles) {%> -
  1. - - <%= Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%> - <%= Html.Hidden("Roles[" + index + "].Name", entry.Name)%> - - -
    2. -<%++index; - } %> -
- +
+ Roles + <% 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)%> + + <%++index; + } + } else { + %>

There are no roles

<% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx index 36fe4ae64..2dcde4cc5 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx @@ -11,7 +11,7 @@ <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, "Choose action...")%> <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, "Delete")%> - +
<%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%>
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx index 1cadb6e2f..db4b5167c 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx @@ -3,32 +3,28 @@ <%@ Import Namespace="Orchard.Tags.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> -
-

List of contents tagged with <%= Model.TagName %>

- <%=Html.ValidationSummary() %> - - - - - - - - - - - - <% foreach (var contentItem in Model.Contents) { %> - - - - - <% } %> -
NameLink to the content item
- <%=Html.ItemDisplayText(contentItem)%> - - <%=Html.ItemDisplayLink(contentItem)%> -
-
- <% Html.EndForm(); %> +

List of contents tagged with <%=Model.TagName %>

+ <% using(Html.BeginForm()) { %> + <%=Html.ValidationSummary() %> +
+ + + + + + + + + + + + <% foreach (var contentItem in Model.Contents) { %> + + + + + <% } %> +
NameLink to the content item
<%=Html.ItemDisplayText(contentItem)%><%=Html.ItemDisplayLink(contentItem)%>
+
+ <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx index 25d1270bb..5e38cef2b 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx @@ -3,17 +3,14 @@ <%@ Import Namespace="Orchard.Tags.Models"%> <%--

Tags

<% Html.BeginForm("Edit", "Home", new { area = "Orchard.Tags" }); %> -<%= Html.ValidationSummary() %> -
- <%= Html.Hidden("TaggedContentId", Model.ContentItem.Id) %> - <%= Html.Hidden("ReturnUrl", Context.Request.Url) %> - -

Add new tags

-
    -
  1. - - -
    2. -
-
+ <%= Html.ValidationSummary() %> + <%= Html.Hidden("TaggedContentId", Model.ContentItem.Id) %> + <%= Html.Hidden("ReturnUrl", Context.Request.Url) %> +

Add new tags

+
    +
  1. + + +
    2. +
<% Html.EndForm(); %>--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx index 2633c4644..b3a4bc4f0 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx @@ -2,7 +2,7 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -

Add a new User

+

Add User

<%using (Html.BeginForm()) { %> <%= Html.ValidationSummary() %> <%= Html.EditorForModel() %> diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx index 263545c49..941c65fdb 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx @@ -2,23 +2,13 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -
-

- Edit User

-

- <%=Html.ActionLink("Users", "Index") %> > Edit #<%= Model.Id%> <%=Html.Encode(Model.UserName)%> -

-
-
- <%using (Html.BeginForm()) { %> -
    - <%= Html.ValidationSummary() %> - <%= Html.EditorForModel() %> -
  1. - - <%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %> -
    2. -
- <%}/*EndForm*/%> -
+

Edit User

+ <%using (Html.BeginForm()) { %> +
    + <%= Html.ValidationSummary() %> + <%= Html.EditorForModel() %> +
    + +
    + <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx index 22c62c7d1..cabd0a41a 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx @@ -1,14 +1,11 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Utility" %> -
    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %> <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %> <%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %> <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %> -
    <% +<% foreach(var e in Model.EditorModel.Editors) { var editor = e;%> -
    <%=Html.EditorFor(m => editor.Model, editor.TemplateName, editor.Prefix)%> -
    <% } %> diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx index 263498cf8..2ab94b63e 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx @@ -1,12 +1,8 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Utility" %> - -
      <%=Html.EditorFor(m=>m.Id) %> <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %> <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %> -
    - <% foreach(var e in Model.EditorModel.Editors) {%> <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%> <%} %> diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx index 9d155f5fe..400606592 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx @@ -3,13 +3,10 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> - <% Html.BeginForm(); %> -
    -

    - Manage Users

    - - <%=Html.ValidationSummary() %> - <%=Html.ActionLink("Add a new user", "Create", new {}, new {@class="floatRight topSpacer"}) %> +

    Manage Users

    + <% using (Html.BeginForm()) { %> + <%=Html.ValidationSummary()%> + <%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "floatRight topSpacer" })%> @@ -28,13 +25,14 @@ - <% foreach (var row in Model.Rows) { %> + <% foreach (var row in Model.Rows) + { %>
    - <%=Html.Encode(row.User.UserName) %> + <%=Html.Encode(row.User.UserName)%> - <%=Html.Encode(row.User.Email) %> + <%=Html.Encode(row.User.Email)%> <%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%> @@ -43,5 +41,5 @@ <%}%>
    - <% Html.EndForm(); %> + <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file