lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge - potentially bad merges in a place or two

Browse Source 
--HG--
branch : composition
This commit is contained in:
Louis DeJardin
2010-10-12 17:43:49 -07:00
parent d57c44bcf2 1e18168dbe
commit 9e00c20a6e
60 changed files with 863 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
View File

@@ -1,4 +1,4 @@
@model WidgetsIndexViewModel;
@model WidgetsIndexViewModel
@using Orchard.Widgets.Models;
@using Orchard.Widgets.ViewModels;
@{ Style.Require("WidgetsAdmin"); }
@@ -48,7 +48,7 @@
<li>
<div class="widgets-zone">@zone</div>
<ul>
@foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position)) {
@foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position, new Orchard.UI.FlatPositionComparer())) {
<li class="widgets-zoneWidget">
@if (widget.Position != "1") {
<input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" />