Social buttons widget in Standard theme

rxtur · rxtur · commit 7aadb2004b2e · 2018-11-01T11:03:33.000-05:00
diff --git a/plugins/Common/Views/Widgets/HtmlBlock/Edit.cshtml b/plugins/Common/Views/Widgets/HtmlBlock/Edit.cshtml
@@ -4,7 +4,6 @@
     var existing = _db.HtmlWidgets.Single(w => w.Name == Model.Widget.Title && w.Theme == Model.Theme && w.Author == "0");
     var content = existing == null ? "" : existing.Content;
 }
-<h4>@Model.Widget.Title</h4>
 <form id="usrform" method="post" action="~/widgets/api/htmlblock/edit">
     <div class="form-group">
         <input type="hidden" id="txtWidget" name="txtWidget" value="@Model.Widget.Title" />
diff --git a/plugins/Common/Views/Widgets/PostList/Edit.cshtml b/plugins/Common/Views/Widgets/PostList/Edit.cshtml
@@ -1,2 +1 @@
-﻿@model Core.Data.Widget
-<h4>Post List</h4>
+﻿@model Core.Data.ThemeWidget
diff --git a/src/App/Pages/Admin/Settings/Themes.cshtml b/src/App/Pages/Admin/Settings/Themes.cshtml
@@ -68,11 +68,11 @@
                         foreach (var widget in Model.Widgets)
                         {
                             var path = $"~/Views/Widgets/{widget.Widget}/Edit.cshtml";
-                            await Html.RenderPartialAsync(path,
-                                new ThemeWidget {
-                                    Theme = Model.BlogItem.Theme,
-                                    Widget = widget
-                                });
+                            <h6>@widget.Title</h6>
+                            await Html.RenderPartialAsync(path, new ThemeWidget {
+                                Theme = Model.BlogItem.Theme,
+                                Widget = widget
+                            });
                         }
                     }
                 </div>
diff --git a/src/App/Views/Themes/Standard/Standard.json b/src/App/Views/Themes/Standard/Standard.json
@@ -0,0 +1,6 @@
+[
+  {
+    "Widget": "HtmlBlock",
+    "Title": "Social Buttons"
+  }
+]
diff --git a/src/App/Views/Themes/Standard/_Shared/_Header.cshtml b/src/App/Views/Themes/Standard/_Shared/_Header.cshtml
@@ -7,11 +7,8 @@
                 <span class="my-auto">@Model.Blog.Title</span>
             }
         </a>
-        @*@await Component.InvokeAsync("HtmlBlock", new { id = "social-btns", theme = "Standard", author = "" })*@
         <ul class="blog-social nav ml-auto my-auto">
-            <li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-twitter"></i></a></li>
-            <li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-google-plus"></i></a></li>
-            <li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-facebook-official"></i></a></li>
+            @await Component.InvokeAsync("HtmlBlock", new { theme = "Standard", widget = "Social Buttons" })
         </ul>
         <button class="blog-search-toggle btn-unstyled" type="button" data-toggle="modal" data-target="#blog-search">
             <i class="fa fa-search"></i>
diff --git a/src/App/app.db b/src/App/app.db
diff --git a/src/App/wwwroot/admin/js/app/fileManagerController.js b/src/App/wwwroot/admin/js/app/fileManagerController.js
@@ -179,8 +179,8 @@
 }(DataService);
 
 $('#asset-search').keypress(function (event) {
-    var keycode = (event.keyCode ? event.keyCode : event.which);
-    if (keycode ==='13') {
+    var keycode = event.keyCode ? event.keyCode : event.which;
+    if (keycode === 13) {
         fileManagerController.load(1);
         return false;
     }
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.0.7</Version>
+    <Version>2.1.0.8</Version>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`var existing = _db.HtmlWidgets.Single(w => w.Name == Model.Widget.Title && w.Theme == Model.Theme && w.Author == "0");`
`5`	`5`	`var content = existing == null ? "" : existing.Content;`
`6`	`6`	`}`
`7`		`-<h4>@Model.Widget.Title</h4>`
`8`	`7`	`<form id="usrform" method="post" action="~/widgets/api/htmlblock/edit">`
`9`	`8`	`<div class="form-group">`
`10`	`9`	`<input type="hidden" id="txtWidget" name="txtWidget" value="@Model.Widget.Title" />`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-@model Core.Data.Widget`
`2`		`-<h4>Post List</h4>`
	`1`	`+@model Core.Data.ThemeWidget`
Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@`
`68`	`68`	`foreach (var widget in Model.Widgets)`
`69`	`69`	`{`
`70`	`70`	`var path = $"~/Views/Widgets/{widget.Widget}/Edit.cshtml";`
`71`		`- await Html.RenderPartialAsync(path,`
`72`		`- new ThemeWidget {`
`73`		`- Theme = Model.BlogItem.Theme,`
`74`		`- Widget = widget`
`75`		`- });`
	`71`	`+ <h6>@widget.Title</h6>`
	`72`	`+ await Html.RenderPartialAsync(path, new ThemeWidget {`
	`73`	`+ Theme = Model.BlogItem.Theme,`
	`74`	`+ Widget = widget`
	`75`	`+ });`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`</div>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +[
 +  {
 +    "Widget": "HtmlBlock",
 +    "Title": "Social Buttons"
 +  }
 +]