From 055439abc888951a8e0f8167544b7ef206cdadb4 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 19 Oct 2010 18:23:05 -0700
Subject: [PATCH] More updates to the manage widgets UI.

--HG--
branch : dev
---
 .../Content/Admin/images/edit.gif             | Bin 123 -> 0 bytes
 .../Content/Admin/images/edit.png             | Bin 0 -> 714 bytes
 .../Modules/Orchard.Widgets/Styles/admin.css  |  23 +++++++++++++++---
 .../Orchard.Widgets/Views/Admin/Index.cshtml  |  12 ++++-----
 4 files changed, 26 insertions(+), 9 deletions(-)
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.gif
 create mode 100644 src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.png

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.gif
deleted file mode 100644
index 498aabfd6760a46f209d7b44c9e79997f87b378d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 123
zcmZ?wbhEHblwgoxSj51vbH|QVt5&^z{d(rinP0ztWq<+2pDbXe4u}M)Wngyj*mdWh
z!70gRRi)Q^V;PtYdr~5+l$Wm4$!3*MPnXk}RdI`@>h=G%;W@`vwia22aGc0-YH^wQ
RvCZaf)wwm_rZX^D0{|R>EpY$<

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.png b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..af486c940c60b746d56e757686d51801bf18ae72
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShR5;6}
zlkZDYQ5eVXztG$0RWBlt>MscT0g(~ZNI{bH#Y_Utm11j?0+FF&hK-qRX-TePYY3~f
zgtoM;)~2M+AJew!(sr+7^KN&$cgxoJcJAGZGzzQ(AD(j#=leYm&p8hTfchUO*=18r
zr!~koJq|$qh+zB()q@3G>7PU6y;(H$c~Nhe#3lU)C~l9VR_BJ=;N(S}WT3GGbJ~$L
zY!^k>SWYq!Z~hmmJ4PWHsEvN4)9Gy^Z?)wOR0E3;1OdDR51!|xxx?Z3jR~6$3lGcS
zw`wrecMQ|rMHQ4-uw*icvKH@8Qe-U(ejNgB1!Gqt;e8II!iak<aNRh*Mv2u<a2&V<
zflCx3x5+@DhrrG^V`KFxn9&ZTX9n>t<iyPV>I@}570bpEkH@7b5obwc$sUX75)sc{
zLoV$^I#`Q!&qeqK<Z$cd@MvXwsD|EY#9}c-3yAYrG$v)>v2}x;Q6ZOcK?qbLvr>-a
zyc(hY)2O@Nn=hiGX9AH(WK#{q_3OcQFyqRCxB{6^XTi-jVaae3jL(UZMoZqHPUiu`
zFod;2WZ-*e#Qe)flJ*;9mgV@eat;ZSNkD%BUpZPjbEd(ZH>lOVM>tFq!k`K6p&rZ)
zt1<ne3!mMk5SGiaK6MrTyQi?aI0>2-&(V<8oA9F-Oc!oCq@PvQW{0``D3A<c!B7Ib
zdMDoADaLT~A=Ie!B<&~UW)p};#3UJP?XH&dMcECP4jb-UaBB|3T(v7TqS}ApkKMR+
wqx9g8Ol#%dtgWp$`>ONE*fZt6-G6K6?>+q?gw;DtTL1t607*qoM6N<$g3ymi=>Px#

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
index 68a6de158..2c44a98d0 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
@@ -1,11 +1,20 @@
-#main #widgets h2 
-{
+#main #widgets h2 {
     border-bottom:none;
 }
 
+h4.widgets-layer-header, h4.widgets-zone-header {
+    font-weight:600;
+}
+
+h4.widgets-layer-header {
+    float:left;
+    width:40%;
+}
+
+
 .widgetsbag-editor h5 {
     color:#4c4c4c;
-    font-weight:bold;
+    font-weight:600;
 }
 
 .widgets-availableWidgets {
@@ -15,6 +24,13 @@
     margin: 0 0 0 2em;
 }
 
+.widgets-availableWidgets table.items th
+{
+    background: #f1f1f1;
+    font-size:1.6em;
+    padding:.5em 0 .3em .2em;
+}
+
 .widgets-availableLayers {
     float: left;
     margin: 0 0 0 2em;
@@ -50,6 +66,7 @@
 .widgets-availableLayers fieldset 
 {
     border: 1px solid #eaeaea;
+    background: #f1f1f1;
     background: -moz-linear-gradient(center top, #f1f1f1, #fcfcfc);
     padding: .6em;
 }
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 c1c176b29..3ed6f7c84 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -13,12 +13,12 @@
 
     <div id="widgets">
 
-
-
         <div class="widgets-availableLayers">
-            <h2>Widget Zones</h2>
+            <h2>Widgets</h2>
 
             <fieldset>
+            <h4 class="widgets-layer-header">Layers</h4>
+            <h4 class="widgets-zone-header">Zones</h4>
                 <div>
                     <ul class="widgets-layerZones">
                         @foreach (string zone in Model.Zones) {
@@ -55,14 +55,14 @@
                             if (layer.Id == Model.CurrentLayer.Id) {
                                 <li class="widgets-currentLayer widgets-editLayer">
                                  <a href="@Url.Action("EditLayer", new { @layer.Id })">
-                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
+                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.png")" />
                                     </a>
                                     @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
                                 </li>
                             } else {
                                 <li class="widgets-editLayer">
                                 <a href="@Url.Action("EditLayer", new { @layer.Id })">
-                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
+                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.png")" />
                                     </a>
                                     @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
                                 </li>
@@ -95,7 +95,7 @@
                     @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>
+                            <td>@Html.ActionLink(T("Add to zone").ToString(), "AddWidget", new { layerId = Model.CurrentLayer.Id, widgetType = widget })</td>
                         </tr>
                     }
                 </table>