From 37b4735fa226cc635f1a48baf22f9d7a9fe955fe Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 19 Oct 2010 11:58:44 -0700
Subject: [PATCH] Updated Manage Widgets UI.

--HG--
branch : dev
---
 .../Modules/Orchard.Widgets/Styles/admin.css  | 16 ++++-
 .../Orchard.Widgets/Views/Admin/Index.cshtml  | 58 ++++++++++---------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
index c6cfaa63b..9fa9a23d8 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
@@ -4,20 +4,23 @@
 }
 
 .widgets-availableWidgets {
+    float: right;
     float: left;
     width: 30%;
+    margin: 0 0 0 2em;
 }
 
 .widgets-availableLayers {
     float: left;
     margin: 0 0 0 2em;
-    width: 45%;
+    width: 60%;
+    min-width: 40%;
 }
 
 .widgets-layerZones {
     font-size: 1.4em;
     float: left;
-    width: 70%;
+    width: 60%;
     border: 1px solid #eaeaea;
     background: #fff;
 }
@@ -65,4 +68,13 @@
 .widgets-layerZones ul li ul {
 	margin: 0;
 	padding: 0;
+}
+
+.new-layer {
+    padding: .6em;
+}
+
+.new-layer a {
+    text-decoration: none;
+    font-weight: 600;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
index dfd99c72c..19d953a03 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -5,7 +5,7 @@
     Style.Require("WidgetsAdmin");
 }
 <h1>@Html.TitleForPage(T("Manage Widgets").ToString())</h1>
-<div class="manage">@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })</div>
+
 
 @using(Html.BeginFormAntiForgeryPost()) {
     Html.ValidationSummary();
@@ -13,31 +13,7 @@
 
     <div id="widgets">
 
-        <div class="widgets-availableWidgets">
-            <h2>Available Widgets</h2>
 
-            <fieldset>
-                <table class="items" summary="@T("This is a table of the widgets currently available for use in your application.")">
-                    <colgroup>
-                        <col id="Col1" />
-                        <col id="Col2" />
-                    </colgroup>
-                    <thead>
-                        <tr>
-                            <th scope="col">@T("Name")</th>
-                            <th scope="col"></th>
-                        </tr>
-                    </thead>
-                    @foreach (string widget in Model.WidgetTypes) {
-                        <tr>
-                            <td>@widget</td>
-                            <td>@Html.ActionLink(T("Add").ToString(), "AddWidget", new { layerId = Model.CurrentLayer.Id, widgetType = widget })</td>
-                        </tr>
-                    }
-                </table>
-
-            </fieldset>
-        </div>
 
         <div class="widgets-availableLayers">
             <h2>Widget Zones</h2>
@@ -92,9 +68,39 @@
                                 </li>
                             }
                         }
-                    <ul>
+                    </ul>
+                    <div class="new-layer">
+                    @Html.ActionLink(T("+ Add a layer").ToString(), "AddLayer", new { })
+                   </div>
                 </div>
             </fieldset>
         </div>
+
+
+                <div class="widgets-availableWidgets">
+            <h2>Available Widgets</h2>
+
+            <fieldset>
+                <table class="items" summary="@T("This is a table of the widgets currently available for use in your application.")">
+                    <colgroup>
+                        <col id="Col1" />
+                        <col id="Col2" />
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th scope="col">@T("Name")</th>
+                            <th scope="col"></th>
+                        </tr>
+                    </thead>
+                    @foreach (string widget in Model.WidgetTypes) {
+                        <tr>
+                            <td>@widget</td>
+                            <td>@Html.ActionLink(T("Add").ToString(), "AddWidget", new { layerId = Model.CurrentLayer.Id, widgetType = widget })</td>
+                        </tr>
+                    }
+                </table>
+
+            </fieldset>
+        </div>
     </div>
 }
\ No newline at end of file