From 5450e539f0d3fe238799ece2abbc0888bb318de8 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 9 Nov 2010 14:03:41 -0800
Subject: [PATCH] Moved dashboard link up and removed some line work.

--HG--
branch : dev
---
 src/Orchard.Web/Core/Dashboard/AdminMenu.cs   |  4 +--
 src/Orchard.Web/Core/Orchard.Core.csproj      |  4 ++-
 .../Core/Settings/Views/Admin/Index.cshtml    |  2 +-
 .../Modules/Orchard.Themes/Styles/admin.css   |  3 --
 .../Themes/TheAdmin/Styles/site.css           | 29 +++++++------------
 5 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/Orchard.Web/Core/Dashboard/AdminMenu.cs b/src/Orchard.Web/Core/Dashboard/AdminMenu.cs
index 88be2cbd4..b886e51fc 100644
--- a/src/Orchard.Web/Core/Dashboard/AdminMenu.cs
+++ b/src/Orchard.Web/Core/Dashboard/AdminMenu.cs
@@ -8,8 +8,8 @@ namespace Orchard.Core.Dashboard {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Dashboard"), "0",
-                        menu => menu.Add(T("Orchard"), "0", item => item.Action("Index", "Admin", new { area = "Dashboard" })
+            builder.Add(T("Dashboard"), "-5",
+                        menu => menu.Add(T("Orchard"), "-5", item => item.Action("Index", "Admin", new { area = "Dashboard" })
                             .Permission(StandardPermissions.AccessAdminPanel)));
         }
     }
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 755359884..ecb0e05f6 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -360,7 +360,9 @@
     <Content Include="Shapes\Views\Web.config" />
     <Content Include="Common\Placement.info" />
     <Content Include="Common\Views\Parts\Common.Metadata.Summary.cshtml" />
-    <Content Include="Contents\Placement.info" />
+    <Content Include="Contents\Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Contents\Views\Content.ControlWrapper.cshtml" />
     <Content Include="Contents\Views\Item\Display.cshtml" />
     <Content Include="Localization\Placement.info" />
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
index f66b9244a..b1504ef3c 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
@@ -2,7 +2,7 @@
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     @Display(Model.Content)
-    <fieldset class="edit-item-commit group">
+    <fieldset>
         <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css
index 362db6edd..9b9d5807b 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css
@@ -10,9 +10,6 @@
     zoom:1;
     *display: inline;
 }
-.templates .inline button {
-    font-size:1.2em;
-}
 .templates .wasFormInlineLink {
     font-size:1.4em;
 }
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 274176c91..2172176c3 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -193,22 +193,10 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
     display:inline;
     float:left;
     width:15.401%;
-    border-right:1px solid #eaeaea;
 }
 .wrapper, .sections {
     overflow:hidden;
 }
-/*.edit-item-primary {
-    display:inline;
-    float:left;
-    width:69.452%;
-}
-.edit-item-secondary {
-    display:inline;
-    float:left;
-    margin-left:1.71%;
-    width:28.721%;
-}*/
 
 
 /* Links
@@ -315,7 +303,15 @@ form.link button:hover {
 	color: #000;
 	text-decoration:underline;
 }
-
+#menu .menu-admin li.section-dashboard h3 {
+    padding:.4em 0;
+    font-size:1.308em;
+}
+.section-new {
+    border-top:1px solid #d3d3d3;
+    border-bottom:1px solid #d3d3d3;
+    padding:12px 0;
+}
 /* todo: make generic so all toggles can use this and clean up jQuery */
 .expando-glyph-container {
     display:inline !important;
@@ -368,9 +364,7 @@ form.link button:hover {
 
 /* Content
 ***************************************************************/
-#main h1 {
-    margin:0 0 1em;
-}
+#main h1 {
    margin:0 0 1em;
}
 #main h2, #main h3 {
     margin:.5em 0;
 }
@@ -870,8 +864,7 @@ table .button {
 }
 /* Core Contents and Orchard.PublishLater */
 
-
-.edit-item-commit, .edit-item-sidebar 
+.orchard-blogs .edit-item-sidebar, .contents .edit-item-sidebar 
 {
     border:1px solid #d3d3d3;
     padding:6px;