From 821c7cb16038ad3bda75c107361c3c475bc31701 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Tue, 19 Oct 2010 19:30:27 -0700 Subject: [PATCH 1/2] Site settings not updated anymore Adding "Prefix" to all the editor template calls --HG-- branch : dev --- .../Core/Settings/Drivers/SiteSettingsPartDriver.cs | 4 ++-- .../Orchard.Search/Drivers/SearchSettingsPartDriver.cs | 2 +- .../Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs | 2 +- .../Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs | 2 +- .../Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs b/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs index f5ede406f..2fabd1803 100644 --- a/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs +++ b/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs @@ -28,7 +28,7 @@ namespace Orchard.Core.Settings.Drivers { }; return ContentShape("Parts_Settings_SiteSettingsPart", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model, Prefix: Prefix)); } protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { @@ -38,7 +38,7 @@ namespace Orchard.Core.Settings.Drivers { updater.TryUpdateModel(model, Prefix, null, null); return ContentShape("Parts_Settings_SiteSettingsPart", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model, Prefix: Prefix)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs index 638905e61..54e214495 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs @@ -35,7 +35,7 @@ namespace Orchard.Search.Drivers { } return ContentShape("Parts_Search_SiteSettings", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Search.SiteSettings", Model: model)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Search.SiteSettings", Model: model, Prefix: Prefix)); } protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs index dfa200634..a37cfd2f6 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs @@ -10,7 +10,7 @@ namespace Orchard.Widgets.Drivers { protected override DriverResult Editor(LayerPart layerPart, dynamic shapeHelper) { return ContentShape("Parts_Widgets_LayerPart", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.LayerPart", Model: layerPart)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.LayerPart", Model: layerPart, Prefix: Prefix)); } protected override DriverResult Editor(LayerPart layerPart, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs index 8f6faf7bd..d4072c7a8 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs @@ -7,7 +7,7 @@ namespace Orchard.Widgets.Drivers { public class WidgetBagPartDriver : ContentPartDriver { protected override DriverResult Editor(WidgetBagPart part, dynamic shapeHelper) { return ContentShape("Parts_Widgets_WidegetBagPart", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.WidgetBagPart", Model: part)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.WidgetBagPart", Model: part, Prefix: Prefix)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs index 3559a1a8c..889595ee2 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs @@ -20,7 +20,7 @@ namespace Orchard.Widgets.Drivers { widgetPart.AvailableLayers = _widgetsService.GetLayers(); return ContentShape("Parts_Widgets_WidgetPart", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.WidgetPart", Model: widgetPart)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix)); } protected override DriverResult Editor(WidgetPart widgetPart, IUpdateModel updater, dynamic shapeHelper) { From 719d50789c7f3ca7bd80f45e30c919be6c3d6c47 Mon Sep 17 00:00:00 2001 From: Jonathan Wall Date: Tue, 19 Oct 2010 19:52:40 -0700 Subject: [PATCH 2/2] Updated the up and down icons in manage widgets UI. --HG-- branch : dev --- .../Content/Admin/images/movedown.gif | Bin 963 -> 875 bytes .../Content/Admin/images/moveup.gif | Bin 958 -> 879 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/movedown.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/movedown.gif index 7c177d8fb3ac1714fcb63c263ff4b64eb1f3b151..b988d55ee73acfecd11e2af64edea39399e63ba0 100644 GIT binary patch literal 875 zcmZ?wbhEHb6krfw_|5+Yc%HKuuJl3e{*p3$#Qdn$V06^gvH^ zq6^&^zzB@QAcinJ|Aqrjn6Th^nc5M^00Ww}D2NhKG76(8ilZWGM9rv-s;G{JXb~-= zF`A+|I-*DPjLzta?ih#>F){{YD2BrbM>xX_D?Iy{V@DzrOlY>11z93XW?>d(aaLrF zteKTrmDSmhEwW`cW>Yq2NA}2`*_mD0odY={N9JG-A* z%96bigz3gaGW(jv8HECua7h=s$i=R34cBy~t6c2{w{S~0y2;J%a1Zx%r@P$k0gv!V z4|>RBLu>|Zx;>H4xi`f(Q@^?0at1dRwl95k=KQhmf4KJh`ja1>f8+XVr$65J_353< z*SB6;T|fE4cc=dOlNXlWedgk^wf&bLSp4znFIKMV_=7i&{QB5?Yi}+5@$l!rT>NnD zF!wC(-|_A7D+jh7Sa|i>CzkiVa@(!%9JzAt;BTM&yyc~nAM9MY`tsU;?;rhZ@$BxK z|6VGC(veR+6g_3Y8RetPqvr#`!T>Ap|Tox1n-L$B}B`kl)cw(ouZ@%wjR&;Rhj B(D48O diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/moveup.gif b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Admin/images/moveup.gif index 3a7220c25f85b2eefc044d99716b8c6c305323bc..8f222e0fd755cd0847d171366b02e74be980f268 100644 GIT binary patch literal 879 zcmZ?wbhEHb6krfw_|5=;cIPn6%m?$n@Aux`eJ?)!%*u9b$J@uS z^WQBCz%e|Ixi;QD+&CZr0s;~+3Qz)tC_+gTqXIQhi7M1YH5$+Yjc7tkG@}DO(1|Ye zL^lR70)rUBNDR-v;eZJXPIz9Xb_5tuAZINKqC^x%QIw40sE8U-8C6j;s-q!VL}N5X z%V>^{=n{|1PfWjk}PHgYp{}4 ztjTINumv00#FlJk2YaxSUF^wj4sZkqImD41ra=cyT6EGA!6Y661qnHcs6ZuDs3MhA zu_{zUm8w!rRjWZQ)Tk!4RI@tNL!IhUPjzcRBQ&TXjnuFVIb_O`Q=asv*^yvEiJWF+ zL6*qEEXtBuoE2FkE3+zVW_31Xi)_rMY?;m3kv+0AyRv6?=Rl6g!5qqwIh;m1(o8Fz zX>SB!x-pT=zGiVop}-|v=pvVNu`67|m9BD4SG&P2+~_8^bhA6$!=3JOPj`F3BRuFK zkM!6On?ajyPvmp%P4UgtZ*KRT$3KfpFJ1oP`;{y2?poq24?lZi{pi{s_2B7i$L~9| zw)>rJpI<$)c=rBpu5Y{j)QQDCHy`}@;-}Z%TR(8;tF0FgET8=E$$X t3#Wd+aOCc*X_V{qVt^_isJ&(chO=Ru>kq`+r_S%K88R