diff --git a/CREDITS.txt b/CREDITS.txt
index 269ca40b9..a401a6944 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -123,6 +123,12 @@ Website: http://code.google.com/p/jquery-utils/
Copyright: Copyright (c) Maxime Haineault (http://haineault.com)
License: MIT
+jQuery ScrollTo
+-----
+Website: http://flesler.blogspot.com
+Copyright: Copyright (c) 2007-2009 Ariel Flesler
+License: MIT
+
Log4Net
-----
Website: http://logging.apache.org/log4net/index.html
diff --git a/src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css b/src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css
index c037dd547..6fcbcf99c 100644
--- a/src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css
+++ b/src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css
@@ -3,4 +3,14 @@ background-image:url(images/menu.content.png) !important;
}
.navicon-content:hover {
background-position:0 -30px !important;
+}
+.section-new .menuItems a {
+background-image:url(images/menu.content.png);
+}
+/* subnav */
+#menu .menu-admin .selected .menuItems a {
+background-position:0 4px;
+}
+#menu .menu-admin .selected .menuItems a:hover, #menu .menu-admin .selected .menuItems .selected a {
+background-position:0 -28px;
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css b/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css
index 604530d9e..61ffb4fbd 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css
@@ -4,12 +4,4 @@ background-image:url(images/menu.list.png) !important;
}
.navicon-lists:hover {
background-position:0 -30px !important;
-}
-/* subnav */
-.section-new .subnavicon-list {
-background-position:0 6px !important;
-padding-left:20px !important;
-}
-.section-new .subnavicon-list:hover {
-background-position:0 -26px !important;
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css b/src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css
index 7a170c293..6aa9d4378 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css
@@ -4,12 +4,4 @@ background-image:url(images/menu.page.png) !important;
}
.navicon-page:hover {
background-position:0 -30px !important;
-}
-/* subnav */
-.section-new .subnavicon-page {
-background-position:0 6px !important;
-padding-left:20px !important;
-}
-.section-new .subnavicon-page:hover {
-background-position:0 -26px !important;
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index e6e53d16a..c66a256f5 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -81,9 +81,13 @@
+
+
+
+
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones-on.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones-on.gif
new file mode 100644
index 000000000..0befc0fd4
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones-on.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones.gif
new file mode 100644
index 000000000..89be2e735
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/all-zones.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones-on.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones-on.gif
new file mode 100644
index 000000000..d24e9f181
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones-on.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones.gif
new file mode 100644
index 000000000..01cafdb6c
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/images/widget-zones.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
index 887d6d1b6..a27c31a08 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
@@ -106,7 +106,7 @@ background-color:#e6f1c9;
/*#widgets-layer-visibility li.widgets-this-layer:hover {
border-color:#487328;
}*/
-.widgets-listed li li.widgets-this-layer:hover, #widgets-layer-visibility li:hover, #widgets-layer-visibility li.on {
+.widgets-listed li li.widgets-this-layer:hover, #widgets-layer-visibility li:hover {
/*border-color:#bfd3a7;*/
border-color:#487328;
}
@@ -216,6 +216,18 @@ background-position:5px -17px;
}
/* begin: switchable tweaks for admin/widgets */
+.orchard-widgets .switch-for-switchable .summary-view {
+ background: url("images/widget-zones.gif") no-repeat left top;
+}
+.orchard-widgets .switch-for-switchable.summary-switched .summary-view {
+ background:url("images/widget-zones-on.gif") no-repeat left top;
+}
+.orchard-widgets .switch-for-switchable .detail-view {
+ background:url("images/all-zones.gif") no-repeat left top;
+}
+.orchard-widgets .switch-for-switchable.detail-switched .detail-view {
+ background:url("images/all-zones-on.gif") no-repeat left top;
+}
#widgets-placement .switch-for-switchable {
margin:-32px 10px -2px 0;
}
diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
index fbf5dba3c..3e72673c0 100644
--- a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
+++ b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
@@ -84,10 +84,10 @@ namespace Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy {
placement.ShapeType = value;
break;
case "alternate":
- placement.Alternates = new[] {value};
+ placement.Alternates = placement.Alternates.Concat(new[] { value });
break;
case "wrapper":
- placement.Wrappers = new[] {value};
+ placement.Wrappers = placement.Wrappers.Concat(new[] { value });
break;
default:
// ignore unknown properties