Skip to content

Commit 3ad9634

Browse files
muratcakirmuratcakir
committed
Moved SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage-> SmartStore.Web.Framework.Theming.WebViewPage
1 parent b25e3d3 commit 3ad9634

13 files changed

Lines changed: 23 additions & 222 deletions

File tree

‎src/Plugins/SmartStore.AmazonPay/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<system.web.webPages.razor>
1616
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
17-
<pages pageBaseType="SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage">
17+
<pages pageBaseType="SmartStore.Web.Framework.Theming.WebViewPage">
1818
<namespaces>
1919
<add namespace="System.Collections.Generic"/>
2020
<add namespace="System.Linq"/>

‎src/Presentation/SmartStore.Web.Framework/Controllers/CookieTempDataProvider.cs‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎src/Presentation/SmartStore.Web.Framework/Controllers/SmartAsyncController.cs‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using SmartStore.Core.Localization;
77
using SmartStore.Core.Logging;
88
using SmartStore.Services;
9+
using SmartStore.Web.Framework.Localization;
910

1011
namespace SmartStore.Web.Framework.Controllers
1112
{

‎src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@
217217
<Link>Properties\AssemblyVersionInfo.cs</Link>
218218
</Compile>
219219
<Compile Include="Controllers\AdminControllerBase.cs" />
220+
<Compile Include="Localization\SetWorkingCultureAttribute.cs" />
220221
<Compile Include="Theming\AdminThemedAttribute.cs" />
221222
<Compile Include="Controllers\HandleExceptionFilter.cs" />
222223
<Compile Include="Controllers\NotifyAttribute.cs" />
223224
<Compile Include="Controllers\PublicControllerBase.cs" />
224-
<Compile Include="Controllers\SetWorkingCultureAttribute.cs" />
225225
<Compile Include="Controllers\PluginControllerBase.cs" />
226226
<Compile Include="Controllers\CheckAffiliateAttribute.cs" />
227227
<Compile Include="Controllers\ContollerExtensions.cs" />
@@ -259,6 +259,7 @@
259259
<Compile Include="Theming\ThemeFileResolver.cs" />
260260
<Compile Include="Theming\InheritedVirtualThemeFile.cs" />
261261
<Compile Include="Theming\TwoLevelViewLocationCache.cs" />
262+
<Compile Include="Theming\WebViewPage.cs" />
262263
<Compile Include="UI\Components\Menu\AdminMenuProvider.cs" />
263264
<Compile Include="UI\Components\Menu\MenuPublisher.cs" />
264265
<Compile Include="UI\HtmlAttribute.cs" />
@@ -381,7 +382,6 @@
381382
<Compile Include="Extensions\UrlHelperExtensions.cs" />
382383
<Compile Include="Validators\ValidatorExtensions .cs" />
383384
<Compile Include="Validators\CreditCardPropertyValidator.cs" />
384-
<Compile Include="ViewEngines\Razor\WebViewPage.cs" />
385385
<Compile Include="WebApi\AutofacWebApiDependencyResolver.cs" />
386386
<Compile Include="WebApi\AutofacWebApiDependencyScope.cs" />
387387
<Compile Include="WebApi\Configuration\IWebApiConfigurationProvider.cs" />

src/Presentation/SmartStore.Web.Framework/ViewEngines/Razor/WebViewPage.cs renamed to src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
using SmartStore.Core.Themes;
1414
using SmartStore.Web.Framework.Controllers;
1515
using SmartStore.Web.Framework.Localization;
16-
using SmartStore.Web.Framework.Theming;
1716

18-
namespace SmartStore.Web.Framework.ViewEngines.Razor
17+
namespace SmartStore.Web.Framework.Theming
1918
{
2019
public abstract class WebViewPage<TModel> : System.Web.Mvc.WebViewPage<TModel>
2120
{
22-
2321
private IText _text;
2422
private IWorkContext _workContext;
2523

@@ -39,7 +37,7 @@ protected int CurrentCategoryId
3937
if (!_currentCategoryId.HasValue)
4038
{
4139
int id = 0;
42-
var routeValues = Url.RequestContext.RouteData.Values;
40+
var routeValues = this.Url.RequestContext.RouteData.Values;
4341
if (routeValues["controller"].ToString().IsCaseInsensitiveEqual("catalog") && routeValues["action"].ToString().IsCaseInsensitiveEqual("category"))
4442
{
4543
id = Convert.ToInt32(routeValues["categoryId"].ToString());
@@ -57,7 +55,7 @@ protected int CurrentManufacturerId
5755
{
5856
if (!_currentManufacturerId.HasValue)
5957
{
60-
var routeValues = Url.RequestContext.RouteData.Values;
58+
var routeValues = this.Url.RequestContext.RouteData.Values;
6159
int id = 0;
6260
if (routeValues["controller"].ToString().IsCaseInsensitiveEqual("catalog") && routeValues["action"].ToString().IsCaseInsensitiveEqual("manufacturer"))
6361
{
@@ -76,7 +74,7 @@ protected int CurrentProductId
7674
{
7775
if (!_currentProductId.HasValue)
7876
{
79-
var routeValues = Url.RequestContext.RouteData.Values;
77+
var routeValues = this.Url.RequestContext.RouteData.Values;
8078
int id = 0;
8179
if (routeValues["controller"].ToString().IsCaseInsensitiveEqual("product") && routeValues["action"].ToString().IsCaseInsensitiveEqual("productdetails"))
8280
{
@@ -95,7 +93,7 @@ protected bool IsHomePage
9593
{
9694
if (!_isHomePage.HasValue)
9795
{
98-
var routeData = Url.RequestContext.RouteData;
96+
var routeData = this.Url.RequestContext.RouteData;
9997
_isHomePage = routeData.GetRequiredString("controller").IsCaseInsensitiveEqual("Home") &&
10098
routeData.GetRequiredString("action").IsCaseInsensitiveEqual("Index");
10199
}
@@ -127,18 +125,18 @@ private IEnumerable<LocalizedString> ResolveNotifications(NotifyType? type)
127125
string key = NotifyAttribute.NotificationsKey;
128126
IList<NotifyEntry> entries;
129127

130-
if (TempData.ContainsKey(key))
128+
if (this.TempData.ContainsKey(key))
131129
{
132-
entries = TempData[key] as IList<NotifyEntry>;
130+
entries = this.TempData[key] as IList<NotifyEntry>;
133131
if (entries != null)
134132
{
135133
result = result.Concat(entries);
136134
}
137135
}
138136

139-
if (ViewData.ContainsKey(key))
137+
if (this.ViewData.ContainsKey(key))
140138
{
141-
entries = ViewData[key] as IList<NotifyEntry>;
139+
entries = this.ViewData[key] as IList<NotifyEntry>;
142140
if (entries != null)
143141
{
144142
result = result.Concat(entries);
@@ -194,7 +192,7 @@ public HelperResult RenderWrappedSection(string name, object wrapperHtmlAttribut
194192
var tagBuilder = new TagBuilder("div");
195193
tagBuilder.MergeAttributes(htmlAttributes);
196194

197-
var section = RenderSection(name, false);
195+
var section = this.RenderSection(name, false);
198196
if (section != null)
199197
{
200198
tw.Write(tagBuilder.ToString(TagRenderMode.StartTag));
@@ -207,7 +205,7 @@ public HelperResult RenderWrappedSection(string name, object wrapperHtmlAttribut
207205

208206
public HelperResult RenderSection(string sectionName, Func<object, HelperResult> defaultContent)
209207
{
210-
return IsSectionDefined(sectionName) ? RenderSection(sectionName) : defaultContent(new object());
208+
return this.IsSectionDefined(sectionName) ? this.RenderSection(sectionName) : defaultContent(new object());
211209
}
212210

213211
public override string Layout
@@ -219,7 +217,7 @@ public override string Layout
219217
if (!string.IsNullOrEmpty(layout))
220218
{
221219
var filename = System.IO.Path.GetFileNameWithoutExtension(layout);
222-
ViewEngineResult viewResult = System.Web.Mvc.ViewEngines.Engines.FindView(ViewContext.Controller.ControllerContext, filename, "");
220+
ViewEngineResult viewResult = System.Web.Mvc.ViewEngines.Engines.FindView(this.ViewContext.Controller.ControllerContext, filename, "");
223221

224222
if (viewResult.View != null && viewResult.View is RazorView)
225223
{

‎src/Presentation/SmartStore.Web/Administration/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<system.web.webPages.razor>
1212
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13-
<pages pageBaseType="SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage">
13+
<pages pageBaseType="SmartStore.Web.Framework.Theming.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Linq.Expressions" />
1616
<add namespace="System.Web.Mvc" />

‎src/Presentation/SmartStore.Web/Themes/Alpha/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<system.web.webPages.razor>
1212
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13-
<pages pageBaseType="SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage">
13+
<pages pageBaseType="SmartStore.Web.Framework.Theming.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
1616
<add namespace="System.Web.Mvc.Ajax" />

‎src/Presentation/SmartStore.Web/Themes/AlphaBlack/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<system.web.webPages.razor>
1212
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13-
<pages pageBaseType="SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage">
13+
<pages pageBaseType="SmartStore.Web.Framework.Theming.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
1616
<add namespace="System.Web.Mvc.Ajax" />

‎src/Presentation/SmartStore.Web/Themes/AlphaBlue/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<system.web.webPages.razor>
1212
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13-
<pages pageBaseType="SmartStore.Web.Framework.ViewEngines.Razor.WebViewPage">
13+
<pages pageBaseType="SmartStore.Web.Framework.Theming.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
1616
<add namespace="System.Web.Mvc.Ajax" />

0 commit comments

Comments
 (0)