A bit of CSS cleanup and reorg

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -122,6 +122,7 @@
     <Content Include="Scripts\jquery.ui.widget.js" />
     <Content Include="Scripts\jquery.utils.js" />
     <Content Include="Scripts\ui.timepickr.js" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Styles\archives.css" />
     <Content Include="Styles\datetime.css" />
     <Content Include="Styles\images\ui-bg_flat_0_aaaaaa_40x100.png" />

src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css

@@ -0,0 +1,3 @@
+.blogdescription {
+    margin-top:1em;
+}

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx

@@ -2,9 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<h1 class="withActions">
+<h1><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.TitleForPage(Model.Item.Name) %></a></h1>
-    <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.TitleForPage(Model.Item.Name) %></a>
-</h1>
 <% Html.Zone("manage"); %><%--
 <form>
 <div class="actions bulk">

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx

@@ -9,8 +9,8 @@
         <a href="<%=Url.BlogPostCreate(Model.Item) %>" title="<%=_Encoded("New Post") %>"><%=_Encoded("New Post") %></a><%=_Encoded(" | ")%>
         <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" title="<%=_Encoded("Settings") %>"><%=_Encoded("Settings") %></a><%=_Encoded(" | ")%>
         <%-- todo: (heskew) this is waaaaa too verbose. need template helpers for all ibuttons --%>
-        <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline" })) { %>
+        <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline link" })) { %>
-        <button type="submit" class="linkButton" title="<%=_Encoded("Remove") %>"><%=_Encoded("Remove") %></button><%
+        <button type="submit" title="<%=_Encoded("Remove") %>"><%=_Encoded("Remove") %></button><%
         } %>
     </div>
     <div class="properties">

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx

@@ -2,6 +2,7 @@
 <%@ Import Namespace="Orchard.Blogs"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%><%
+Html.RegisterStyle("admin.css"); 
 if (AuthorizedFor(Permissions.ManageBlogs)) { %>
 <div class="folderProperties">
     <p><a href="<%=Url.BlogEdit(Model.Slug) %>" class="edit"><%=_Encoded("Edit") %></a></p>

src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj

@@ -93,6 +93,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\folder.gif" />
     <Content Include="Module.txt" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Views\Admin\Add.aspx" />
     <Content Include="Views\Admin\Create.aspx" />
     <Content Include="Views\Admin\Edit.aspx" />

src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css

@@ -0,0 +1,7 @@
+.breadCrumbs, .folderProperties {
+    float:left;
+    margin:-2em 0 0;
+}
+.folderProperties {
+    float:right;
+}

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx

@@ -1,7 +1,8 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaItemAddViewModel>" %>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.Models"%>
-<%@ Import Namespace="Orchard.Media.ViewModels"%>
+<%@ Import Namespace="Orchard.Media.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Add Media").ToString()) %></h1>
 <div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62; 

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx

@@ -1,7 +1,8 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.Models"%>
-<%@ Import Namespace="Orchard.Media.ViewModels"%>
+<%@ Import Namespace="Orchard.Media.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Add a Folder").ToString()) %></h1>
 <div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62; 

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx

@@ -1,7 +1,8 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderEditViewModel>" %>
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
-<%@ Import Namespace="Orchard.Media.ViewModels"%>
+<%@ Import Namespace="Orchard.Media.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Manage Folder").ToString())%></h1>
 
 

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx

@@ -1,7 +1,8 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaItemEditViewModel>" %>
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
-<%@ Import Namespace="Orchard.Media.ViewModels"%>
+<%@ Import Namespace="Orchard.Media.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%></h1>
 
 <div class="breadCrumbs">

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx

@@ -1,7 +1,8 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderEditPropertiesViewModel>" %>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.Models"%>
-<%@ Import Namespace="Orchard.Media.ViewModels"%>
+<%@ Import Namespace="Orchard.Media.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Folder Properties").ToString())%></h1>
 <div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62; 

src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj

@@ -93,6 +93,7 @@
     <Compile Include="ViewModels\PageViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Styles\admin.css" />
     <Content Include="Content\Admin\images\draft.gif" />
     <Content Include="Content\Admin\images\offline.gif" />
     <Content Include="Content\Admin\images\online.gif" />

src/Orchard.Web/Modules/Orchard.Pages/Styles/admin.css

@@ -0,0 +1,19 @@
+.pageList {
+     margin:0;
+     padding:0;
+     /*background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;*/
+}
+.orchard-pages .contentItems {
+     margin:.5em 0 0;
+     padding:0;
+ }
+.contentItems .properties ul {
+    margin:0.8em 0 0 2em;
+}    
+.contentItems .properties ul li {
+    margin:0;
+    padding:0 0 .1em 0;
+}
+.properties h3 {
+    display:inline;
+}

src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx

@@ -3,7 +3,8 @@
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Pages.ViewModels"%>
+<%@ Import Namespace="Orchard.Pages.ViewModels"%><%
+Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Manage Pages").ToString())%></h1>
 <%-- todo: Add helper text here when ready. <p><%=_Encoded("Possible text about setting up a page goes here.")%></p>--%>
 <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div><%

src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj

@@ -88,6 +88,7 @@
   <ItemGroup>
     <Content Include="Content\orchard.ico" />
     <Content Include="Scripts\base.js" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Styles\Images\toolBarActiveButtonBackground.gif" />
     <Content Include="Styles\Images\toolBarBackground.gif" />
     <Content Include="Styles\Images\toolBarHoverButtonBackground.gif" />

src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css

@@ -0,0 +1,38 @@
+#main .templates p {
+    margin:0 0 .3em 0;
+}
+.templates li {
+    margin:.8em;
+    width:30%;
+    display: -moz-inline-stack;
+    display:inline-block;
+    vertical-align:top;
+    zoom:1;
+    *display: inline;
+}
+.templates .inline button {
+    font-size:1.2em;
+}
+.templates .wasFormInlineLink {
+    font-size:1.4em;
+}
+.templates p {
+    overflow:hidden;
+}
+.templates img, .themePreviewImage {
+	border:1px solid #e8e8e8;
+    height:200px;
+    margin:.27em 0 .93em 0;
+    display:block;
+}
+.previewImage {
+	border:1px solid #525e50;
+	height:50%;
+	width:50%;
+}
+.themes #main h2 {
+    margin:1em 0 0 0;
+}
+.themePreviewImage {
+	height:300px;
+}

src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx

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

src/Orchard.Web/Themes/TheAdmin/Styles/ie.css

@@ -1 +1,7 @@
-
+.contentItems {
+    /* need an alternative to:
+    box-shadow:inset 0 1px 2px #878686;
+    -moz-box-shadow:inset 0 1px 3px #878686;
+    -webkit-box-shadow:inset 0 1px 2px #878686;
+    */
+}

src/Orchard.Web/Themes/TheAdmin/Styles/site.css

@@ -40,7 +40,6 @@ table {
 }
 /* end: reset */
 
-
 /* Base setup
 ----------------------------------------------------------*/
 html {
@@ -56,7 +55,6 @@ body {
     min-width:94.6em; /* 946px */
     padding:0;
 }
-/*todo: (heskew) find out why I need this...*/
 button {
     font-family:Segoe UI,Trebuchet,Arial,Sans-Serif;
     font-size:1.01em;
@@ -68,7 +66,6 @@ body#preview {
     background:#fcfcfc;
 }
 
-
 /* Layout
 
 number of columns: 24; actual width: 946; column width: 26; gutter width:14
@@ -232,7 +229,6 @@ form.link button:hover {
     color:#ffea9b;
 }
 
-
 /* Navigation
 ----------------------------------------------------------*/
 #navshortcut {
@@ -276,7 +272,6 @@ form.link button:hover {
 	text-decoration:underline;
 }
 
-
 /* Content
 ----------------------------------------------------------*/
 #main h1 {
@@ -325,7 +320,6 @@ span.message {
 .message a {
     font-weight:bold;
 }
-
 .confirmation.message {
 	background:#D1F2A5; /* green */
 	border:1px solid #BCD994;
@@ -358,7 +352,6 @@ span.message {
     content:"DEBUG » ";
 }
 
-
 /* Forms   
 ----------------------------------------------------------*/
 form.inline, form.inline fieldset { /* todo: (heskew) need something other than .inline ... */
@@ -381,7 +374,7 @@ legend span {
     font-weight:normal;
 }
 label {
-	display: block;
+	display:block;
 	color:#4c4c4c;
 	font-weight:bold;
 }
@@ -401,9 +394,6 @@ label input {
 .hint {
     display:block;
 }
-.hint.forcheckbox {
-    text-indent:3ex; /* todo: (heskew) this might look out of place */
-}
 /* todo: (heskew) try to get .text on stuff like .text-box */
 select, textarea, input.text, input.textMedium, input.text-box {
 	padding:2px;
@@ -422,18 +412,6 @@ input.check-box {
     margin-left:0;
     vertical-align:-.1em;
 }
-.permalink input {
-    background:transparent;
-    border-color:#EAE9D9;
-    border-style:dashed;
-    margin-left:0;
-	width:350px;
-}
-.permalink input:focus {
-    background:#FFF;
-    border-color:#666d51;
-    border-style:solid;
-}
 input.large.text, textarea, fieldset {
     clear:both;
 }
@@ -441,21 +419,6 @@ fieldset {
     margin:0 0 1.3em 0;
     padding:6px 0 0;
 }
-/* Settings page styles */
-.settings fieldset {
-    margin:.5em 0;
-    padding:1em;
-}
-.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
-    margin:1em 0 .5em 1em;
-}
-.settings legend {
-    margin:0 0 -.4em 0;
-}
-/* todo: This style is the same as textMedium. Consolidate if possible */
-.settings input.text, .settings input.text-box {
-    width:26em;
-}
 textarea {
     min-height:8em;
 }
@@ -542,9 +505,8 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
     overflow:hidden;
 }
 .actions {
-    height:2em;
+    clear:right;
-    overflow:hidden;
+    padding:0;
-    padding:.6em 0 .1em;
     text-align:right;
 }
 .contentItems .actions li {
@@ -608,58 +570,6 @@ button.ibutton {
 .ibutton.blog:hover, .ibutton.blog:active, .ibutton.blog:focus { background-position:-120px 0; }
 
 
-/* todo: (heskew) needs attention */
-.withActions {
-    overflow:hidden;
-}
-.withActions a {
-    display:inline;
-    float:left;
-    margin-right:7px;
-}
-
-
-/* Content item lists
-----------------------------------------------------------*/
-.contentItems {
-    background:#FFF;
-    box-shadow:inset 0 1px 2px #878686;
-    -moz-box-shadow:inset 0 1px 3px #878686;
-    -webkit-box-shadow:inset 0 1px 2px #878686;
-    margin:1.4em 0;
-    padding:2px;
-}
-.contentItems li {
-    border-bottom:1px solid #eaeaea;
-    margin:0;
-    overflow:hidden;
-    padding:0 1.4em .8em;
-}
-.contentItems li.last {
-    border-bottom:0;
-}
-#main .contentItems li .actions {
-    color:#EAE9D9;
-    height:auto;
-    margin:-1.3em 0 0;
-    padding:0 0 .1em;
-}
-#main .contentItems li .actions .ibutton {
-    margin-right:6px;
-}
-#main .contentItems li .actions .destruct .ibutton {
-    margin-left:8px;
-    margin-right:0;
-}
-#main .contentItems li:hover .ibutton { background-position:0 0; }
-#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; }
-#main .contentItems li:hover .ibutton.view { background-position:-40px 0; }
-#main .contentItems li:hover .ibutton.add.page { background-position:-60px 0; }
-#main .contentItems li:hover .ibutton.edit { background-position:-80px 0; }
-#main .contentItems li:hover .ibutton.publish { background-position:-100px 0; }
-#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; }
-
-
 /* (Items) Tables
 ----------------------------------------------------------*/
 table.items {
@@ -715,170 +625,106 @@ table .button {
 }
 
 
-/* MISC.
+/* Content item lists
-todo: (heskew) pull out into relevant modules where appropriate
 ----------------------------------------------------------*/
-
+.contentItems {
-/* Pages
+    background:#FFF;
-----------------------------------------------------------*/
+    box-shadow:inset 0 1px 2px #878686;
-#main .templates p {
+    -moz-box-shadow:inset 0 1px 3px #878686;
-    margin:0 0 .3em 0;
+    -webkit-box-shadow:inset 0 1px 2px #878686;
+    clear:both;
+    margin:1.4em 0;
 }
-.templates li {
+.contentItems li {
-    margin:.8em;
+    border-bottom:1px solid #eaeaea;
-    width:30%;
+    margin:0;
-    display: -moz-inline-stack;
-    display:inline-block;
-    vertical-align:top;
-    zoom:1;
-    *display: inline;
-}
-.templates .inline button {
-    font-size:1.2em;
-}
-.templates .wasFormInlineLink {
-    font-size:1.4em;
-}
-.templates p {
     overflow:hidden;
+    padding:0 1.4em .8em;
 }
-.templates img, .themePreviewImage {
+.contentItems li.last {
-	border:1px solid #e8e8e8;
+    border-bottom:0;
-    height:200px;
-    margin:.27em 0 .93em 0;
-    display:block;
 }
-.previewImage {
+#main .contentItems li .actions {
-	border:1px solid #525e50;
+    color:#EAE9D9;
-	height:50%;
+    height:auto;
-	width:50%;
+    margin:-1.3em 0 0;
+    padding:0 0 .1em;
 }
-.themes #main h2 {
+#main .contentItems li .actions .ibutton {
-    margin:1em 0 0 0;
+    margin-right:6px;
 }
-.themePreviewImage {
+#main .contentItems li .actions .destruct .ibutton {
-	height:300px;
+    margin-left:8px;
+    margin-right:0;
 }
+#main .contentItems li:hover .ibutton { background-position:0 0; }
+#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; }
+#main .contentItems li:hover .ibutton.view { background-position:-40px 0; }
+#main .contentItems li:hover .ibutton.add.page { background-position:-60px 0; }
+#main .contentItems li:hover .ibutton.edit { background-position:-80px 0; }
+#main .contentItems li:hover .ibutton.publish { background-position:-100px 0; }
+#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; }
 
-/* Rounded borders and other "works in some browsers" additions
+.contentItems .summary {
-----------------------------------------------------------
-#content, #navigation li, button, .button,
-table.items, textarea, input.text, input.text-box,
-.contentItems, .message, .validation-summary-errors {
-	-moz-border-radius:4px;
-	-webkit-border-radius:4px;
-	border-radius:4px;
-}
-#navigation li h4 a {
-	-moz-border-radius:3px 3px 0 0;
-	-webkit-border-radius:3px 3px 0 0;
-	border-radius:3px 3px 0 0;
-}*/
-
-
-
-/* Added classes for new blog list layout
----------------------------------------------------------- */
-.blogdescription {
-    margin-top:1em;
-}
-.summary {
     overflow:auto;
     padding:1.2em .4em;
 }
-.actions {
+.contentItems .properties {
-    clear:right;
-    height:auto;
-    overflow:visible;
-    padding:0;
-    text-align:right;
-}
-.contentItems {
-    clear:both;
-    padding:0;
-}
-.properties {
     float:left;
 }
-.blogs.contentItems .properties {
+.contentItems .properties li {
-    float:none;
-}
-#main .contentItems .properties h3 {
-    border-bottom:none;
-    margin:0;
-    padding:0;
-}
-.related{
-     font-size:1.4em;
-     float:right;
-     text-align:right;
-}
-/*todo: (heskew) cleanup */
-.related .button {
-    font-size:1em;    
-}
-/*end todo*/
-.commentcount {
-    line-height:2em;
-}
-.contentItems .properties ul li{
     border:0;
     float:left;
-    padding:.8em 0;
     font-size:1.4em;
-    background:inherit;
+    padding:.8em 0;
 }
-.icon {
+.contentItems .properties .icon {
-    margin:0 .2em -.2em .2em;
+    margin:0 .2em -.2em;
 }
-h3 .icon {
+.contentItems .related{
-    margin-bottom:-.05em;
-}
-.linkButton {
-    border:none;
-    padding:0;
-    background:none;
-    color:#1E5D7D; 
-    }   
-.linkButton:hover {
-    background-color:Transparent;
-    text-decoration:underline;
-    color:#1E5D7D;
-    }
-   
- /* Added classes for new page list layout
----------------------------------------------------------- */  
-.pageList {
-     margin:0;
-     padding:0;
-     /*background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;*/
-     }
-.orchard-pages .contentItems {
-     margin:.5em 0 0;
-     padding:0;
- }
-.contentItems .properties ul.pageStatus {
-    margin:0.8em 0 0 2em;
-}    
-.contentItems .properties ul.pageStatus li {
-    margin:0;
-    padding:0 0 .1em 0;
-}
-.properties h3 {
-    display:inline;
-}
-
-/* Added classes for media
----------------------------------------------------------- */  
-.breadCrumbs, .folderProperties {
-    float:left;
-    margin:-2em 0 0 0;
-}
-.folderProperties {
     float:right;
+    font-size:1.4em;
+    text-align:right;
+}
+.contentItems .commentcount {
+    line-height:2em;
 }
-/* ---------- Generic ---------- */
 
+
+/* Core Modules
+----------------------------------------------------------*/
+/* Routable */
+.permalink input {
+    background:transparent;
+    border-color:#EAE9D9;
+    border-style:dashed;
+    margin-left:0;
+	width:350px;
+}
+.permalink input:focus {
+    background:#FFF;
+    border-color:#666d51;
+    border-style:solid;
+}
+/* Settings */
+.settings fieldset {
+    margin:.5em 0;
+    padding:1em;
+}
+.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
+    margin:1em 0 .5em 1em;
+}
+.settings legend {
+    margin:0 0 -.4em 0;
+}
+/* todo: This style is the same as textMedium. Consolidate if possible */
+.settings input.text, .settings input.text-box {
+    width:26em;
+}
+
+
+/* ---------- Generic ---------- */
+/* todo: needed? */
 .clearBoth {
 	clear:both;
 }