Merge

--HG--
branch : dev

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;
 }

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>