Skip to content

Commit dd561bd

Browse files
committed
Minor fixes
1 parent 31e6e01 commit dd561bd

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/Libraries/SmartStore.Services/Cms/WidgetExtentions.cs renamed to src/Libraries/SmartStore.Services/Cms/WidgetExtensions.cs

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

44
namespace SmartStore.Services.Cms
55
{
6-
public static class WidgetExtentions
6+
public static class WidgetExtensions
77
{
88
public static bool IsWidgetActive(this IWidgetPlugin widget, WidgetSettings widgetSettings)
99
{

src/Libraries/SmartStore.Services/SmartStore.Services.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
<Compile Include="Catalog\ProductAttributeParser.cs" />
207207
<Compile Include="Cms\IWidget.cs" />
208208
<Compile Include="Cms\IWidgetService.cs" />
209-
<Compile Include="Cms\WidgetExtentions.cs" />
209+
<Compile Include="Cms\WidgetExtensions.cs" />
210210
<Compile Include="Cms\WidgetService.cs" />
211211
<Compile Include="Cms\IWidgetPlugin.cs" />
212212
<Compile Include="CommonServices.cs" />

src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
using SmartStore.Core.IO.Media;
7272
using SmartStore.Core.IO.VirtualPath;
7373
using SmartStore.Core.IO.WebSite;
74+
using SmartStore.Utilities;
7475

7576
namespace SmartStore.Web.Framework
7677
{
@@ -849,7 +850,8 @@ private int GetDisplayOrder(Type type, PluginDescriptor descriptor)
849850
}
850851
else
851852
{
852-
throw Error.Application("The 'FriendlyNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-"));
853+
name = Inflector.Titleize(type.Name);
854+
//throw Error.Application("The 'FriendlyNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-"));
853855
}
854856

855857
return new Tuple<string, string>(name, description);

src/Presentation/SmartStore.Web/Administration/Views/Plugin/EditProviderPopup.cshtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}
66

77
@{
8-
ViewBag.Title = T("Admin.Configuration.Plugins.EditDetails").Text;
8+
ViewBag.Title = T("Common.Edit") + ": " + Model.FriendlyName.Truncate(30, "...");
99
}
1010

1111
@if (ViewBag.RefreshPage == true)
@@ -21,7 +21,8 @@
2121
{
2222
<div class="section-header">
2323
<div class="title">
24-
@T("Admin.Configuration.Plugins.EditDetails")
24+
<img src="@Url.Content(Model.IconUrl)" class="img-responsive" style="max-height: 32px; margin-right: 3px" alt="@Model.FriendlyName" />
25+
@ViewBag.Title
2526
</div>
2627
<div class="options">
2728
<button type="submit" name="save" value="save" class="btn btn-primary">

src/Presentation/SmartStore.Web/Administration/sitemap.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
<siteMapNode id="scheduled tasks" iconClass="clock-o" title="Schedule tasks" resKey="Admin.System.ScheduleTasks" permissionNames="ManageScheduleTasks" controller="ScheduleTask" action="List" area="Admin" />
143143
<siteMapNode id="seo-names" iconClass="search" title="Search engine friendly names" resKey="Admin.System.SeNames" permissionNames="ManageMaintenance" controller="Common" action="SeNames" area="Admin" />
144144
<siteMapNode id="warnings" iconClass="exclamation-triangle" title="Warnings" resKey="Admin.System.Warnings" controller="Common" action="Warnings" area="Admin" />
145-
<siteMapNode isGroupHeader="true" title="[SKIP]" />
146145
<siteMapNode id="system-info" iconClass="info-circle" title="System information" resKey="Admin.System.SystemInfo" controller="Common" action="SystemInfo" area="Admin" />
147146
<siteMapNode isGroupHeader="true" title="[SKIP]" />
148147
<siteMapNode id="plugins" iconClass="puzzle-piece" title="Plugins" resKey="Admin.Configuration.Plugins" permissionNames="ManagePlugins" controller="Plugin" action="List" area="Admin"/>

0 commit comments

Comments
 (0)