Pull widget title from the model

AlexanderKovachev · Feb 8, 2016 · 4dcef22 · 4dcef22
1 parent e44a1b3
commit 4dcef22
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/BlogEngine/BlogEngine.NET/AppCode/Controls/WidgetZone.cs b/BlogEngine/BlogEngine.NET/AppCode/Controls/WidgetZone.cs
@@ -83,7 +83,7 @@ protected override void OnLoad(EventArgs e)
                     widget.InnerText);
                 try
                 {
-                    var model = new { Id = widget.Attributes["id"].Value, Title = widget.Attributes["title"].Value };
+                    var model = new { Id = widget.Attributes["id"].Value, Name = widget.InnerText, Title = widget.Attributes["title"].Value };
                     var lit = new Literal { Text = RazorHelpers.ParseRazor(fileName, model) };
                     Controls.Add(lit);
                 }

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Administration/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Administration/widget.cshtml
@@ -1,6 +1,6 @@
 @using BlogEngine.Core
 @{
-    var title = "Administration";
+    var title = Model.Title;
     var dashboardUrl = Utils.RelativeWebRoot + "admin/index.cshtml";
     var contentUrl = Utils.RelativeWebRoot + "admin/#/content/posts";
     var customUrl = Utils.RelativeWebRoot + "admin/#/custom/themes";

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/AuthorList/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/AuthorList/widget.cshtml
@@ -1,7 +1,7 @@
 @using BlogEngine.Core
 @using BlogEngine.Core.Data.Services
 @{
-    var title = "Author List";
+    var title = Model.Title;
     var authorUrl = Utils.RelativeWebRoot + "author";
     var authorRss = Utils.RelativeWebRoot + "syndication.axd";
 

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Blog List/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Blog List/widget.cshtml
@@ -1,6 +1,6 @@
 @using BlogEngine.Core
 @{
-    var title = "Blog List";
+    var title = Model.Title;
     var blogs = Blog.Blogs.Where(b => b.IsActive).ToList();
 }
 <div class="widget bloglist">

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Category list/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Category list/widget.cshtml
@@ -1,6 +1,6 @@
 @using BlogEngine.Core
 @{
-    var title = "Category list";
+    var title = Model.Title;
     var dic = BlogEngine.Core.Helpers.CategoryHelper.SortCategories();
 }
 <div class="widget categorylist">

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Page List/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Page List/widget.cshtml
@@ -1,6 +1,6 @@
 @using BlogEngine.Core
 @{
-    var title = "Page List";
+    var title = Model.Title;
 }
 <div class="widget pagelist">
     <h4 class="widget-header">@title</h4>

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Post List/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Post List/widget.cshtml
@@ -1,7 +1,7 @@
 @using BlogEngine.Core.Helpers
 @using BlogEngine.Core
 @{
-    var title = "Post List";
+    var title = Model.Title;
     var id = Model.Id;
     var settings = WidgetHelper.GetSettings(id);
 

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/RecentComments/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/RecentComments/widget.cshtml
@@ -2,6 +2,7 @@
 @using BlogEngine.Core.Helpers
 @using System.Text.RegularExpressions
 @{
+    var title = Model.Title;
     var numberOfComments = 10;
     var settings = WidgetHelper.GetSettings(Model.Id);
     if (settings != null && settings.Count > 0)
@@ -24,7 +25,7 @@
     }
 </style>
 <div class="widget recentcomments">
-    <h4 class="widget-header">Recent comments</h4>
+    <h4 class="widget-header">@title</h4>
     <div class="widget-content">
         <ul id="recentComments" class="recentcomments">
             @if (list.Count > 0)

diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Tag cloud/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/Tag cloud/widget.cshtml
@@ -1,5 +1,5 @@
 @{
-    var title = "Tag cloud";
+    var title = Model.Title;
     var cloud = new BlogEngine.Core.Data.Services.TagCloud();
     var tags = cloud.Links();
 }

diff --git a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js
@@ -37,6 +37,7 @@
         var customSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml";
         $scope.editId = id;
         $scope.editTitle = title;
+        $("#txtWidgetTitle").val(title);
         $.ajax({
             type: 'HEAD',
             url: customSrc,