fix

farzindev · farzindev · commit 3403597dc9b5 · 2017-11-28T13:03:53.000+03:30
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Packages/Themes.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Packages/Themes.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Themes";
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";
 }
-<div class="bf-settings bf-settings-boxed bf-settings-about" data-page-title="Themes">
+<div class="bf-settings">
 
     <!-- Toolbar -->
     <div class="bf-toolbar d-flex">
@@ -36,4 +36,4 @@
             No themes found!
         </div>
     }
-</div>
+</div>
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Packages/Widgets.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Packages/Widgets.cshtml
@@ -5,7 +5,7 @@
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";
 }
 
-<div class="bf-settings bf-settings-boxed bf-settings-about" data-page-title="Widgets">
+<div class="bf-settings">
 
     <!-- Toolbar -->
     <div class="bf-toolbar d-flex">
@@ -58,4 +58,4 @@
 
 @section Scripts{
     <script src="~/admin/js/app/packagesController.js"></script>
-}
+}
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Posts/Editor.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Posts/Editor.cshtml
@@ -64,7 +64,12 @@
       </div>
       <div class="modal-body bf-editor-category">
         <form id="frmCategory">
-            <input type="text" id="txtCategory" title="Type and Enter" autocomplete="off" onkeypress="editorController.categoryKeyPress(event)" class="form-control" placeholder="Category Name..." autofocus />
+            <div class="input-group">
+              <input type="text" id="txtCategory" autocomplete="off" onkeypress="editorController.categoryKeyPress(event)" class="form-control" placeholder="Category name..." autofocus />
+              <span class="input-group-btn">
+                <button class="btn btn-secondary" type="button" onclick="editorController.categoryAddButton(event)">Add</button>
+              </span>
+            </div>
         </form>
         <ul id="edit-categories">
           @foreach (var category in Model.CategoryList)
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/About.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/About.cshtml
@@ -6,7 +6,7 @@
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
 }
 
-<div class="bf-settings bf-settings-boxed bf-settings-about mx-auto" data-page-title="@ViewData["Title"]">
+<div class="bf-settings bf-settings-boxed bf-settings-about mx-auto">
 
     <div class="text-center pt-5">
         <p class="mb-3">
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/Advanced.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/Advanced.cshtml
@@ -4,10 +4,8 @@
     ViewData["Title"] = "Avanced Settings";
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
 }
-<div class="bf-settings bf-settings-boxed" data-page-title="@ViewData["Title"]">
-    <div class="bf-title">
-        <span>Import & Export</span>
-    </div>
+<div class="bf-settings bf-settings-boxed">
+    <div class="bf-title"><span>Import & Export</span></div>
     <div class="btn-group d-flex" role="group">
         <button type="button" class="btn btn-outline-primary w-100" data-toggle="modal" data-target="#importRss">Import RSS</button>
         <button type="button" class="btn btn-outline-primary w-100" disabled>Export</button>
@@ -28,7 +26,7 @@
                 <form id="frmImport" name="frmImport">
                     <div class="form-group">
                         <label class="form-group-label">RSS URL</label>
-                        <input type="text" id="txtFeedUrl" class="form-control" />
+                        <input type="text" id="txtFeedUrl" class="form-control" autofocus />
                     </div>
                     <div class="form-group">
                         <label class="form-group-label">Domain URL</label>
@@ -62,4 +60,4 @@
         <script>toastr.success('@ViewBag.Message')</script>
     }
     <script src="~/admin/js/app/toolsController.js"></script>
-}
+}
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/General.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/General.cshtml
@@ -5,10 +5,8 @@
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
 }
 <form method="post" asp-controller="Settings" asp-action="General" asp-antiforgery="true">
-
-    <div class="bf-settings bf-settings-boxed bf-settings-appsettings" data-page-title="@ViewData["Title"]">
-        <div class="bf-title"><span>@ViewData["Title"]</span></div>
-
+    <div class="bf-settings bf-settings-boxed bf-settings-appsettings">
+        <div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
         <div class="form-group">
             <label class="form-group-label">Title</label>
             <input type="text" asp-for="Title" class="form-control" />
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/Posts.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/Posts.cshtml
@@ -4,8 +4,8 @@
     ViewData["Title"] = "Posts Settings";
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
 }
-<div class="bf-settings bf-settings-boxed bf-settings-import" data-page-title="@ViewData["Title"]">
-    <div class="bf-title"><span>@ViewData["Title"]</span></div>
+<div class="bf-settings bf-settings-boxed bf-settings-import">
+    <div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
     <form method="post" asp-controller="Settings" asp-action="Posts" asp-antiforgery="true">
         <div class="form-group">
             <label class="form-group-label">Items per page</label>
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/Profile.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/Profile.cshtml
@@ -5,8 +5,8 @@
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
     if (!Model.CustomFields.ContainsKey("SendGridApiKey")) { Model.CustomFields.Add("SendGridApiKey", ""); }
 }
-<div class="bf-settings bf-settings-boxed bf-settings-profile" data-page-title="@ViewData["Title"]">
-    <div class="bf-title"><span>@ViewData["Title"]</span></div>
+<div class="bf-settings bf-settings-boxed bf-settings-profile">
+    <div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
     <form method="post" asp-controller="Settings" asp-action="Profile" asp-antiforgery="true">
         <div class="form-group">
             <label class="form-group-label">Author Name</label>
diff --git a/Blogifier.Web/Views/Blogifier/Admin/Settings/Users.cshtml b/Blogifier.Web/Views/Blogifier/Admin/Settings/Users.cshtml
@@ -10,7 +10,7 @@
     var cntFrom = pgr.CurrentPage == 1 ? 1 : (pgr.CurrentPage - 1) * pgr.ItemsPerPage + 1;
     var cntTo = pgr.CurrentPage * pgr.ItemsPerPage < pgr.Total ? pgr.CurrentPage * pgr.ItemsPerPage : pgr.Total;
 }
-<div class="bf-settings bf-settings-users" data-page-title="@ViewData["Title"]">
+<div class="bf-settings bf-settings-users">
 
   <div class="bf-toolbar d-flex">
       <label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
diff --git a/Blogifier.Web/Views/Blogifier/Admin/_Layout/_Settings.cshtml b/Blogifier.Web/Views/Blogifier/Admin/_Layout/_Settings.cshtml
@@ -2,7 +2,7 @@
 @{
     Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Layout.cshtml";
 }
-<div class="bf-header d-flex d-lg-none">Settings / <span></span> <i class="fa fa-chevron-down"></i></div>
+<div class="bf-header d-flex d-lg-none">@ViewData["Title"] <i class="fa fa-chevron-down"></i></div>
 <div class="bf-body">
     <div class="bf-sidebar d-lg-block">
         <div class="bf-settings-sidebar">
@@ -50,4 +50,4 @@
 </div>
 @section Scripts{
     @RenderSection("Scripts", false)
-}
+}
diff --git a/Blogifier.Web/wwwroot/admin/js/app/app.js b/Blogifier.Web/wwwroot/admin/js/app/app.js
@@ -109,20 +109,17 @@ $(".bf-header").on("click", function() {
   $(".bf-sidebar").stop(true, true).slideToggle();
 });
 
-//
-var settingPageTitle = $(".bf-settings").data("page-title");
-$(".bf-header span").text(settingPageTitle);
-
 // Tooltips
 $("[data-tooltip]").tooltip({
   container: 'body'
 });
 
+
+// autofocus for modals that has "autofocus" attribute
 $('.modal').on('shown.bs.modal', function() {
-  $(this).find('[autofocus]').trigger('focus')
+  $(this).find('[autofocus]').trigger('focus');
 })
 
-
 // dropdown
 $('.dropdown-custom .dropdown-item').on('click', function() {
   var thisValue = $(this).text();
diff --git a/Blogifier.Web/wwwroot/admin/js/app/editorController.js b/Blogifier.Web/wwwroot/admin/js/app/editorController.js
@@ -76,10 +76,21 @@
         }
         return false;
     }
+    function categoryAddButton(e) {
+        e.preventDefault();
+        saveCategory();
+        return false;
+    }
 
     function saveCategory() {
-        var obj = { Title: $("#txtCategory").val() }
-        dataService.post("blogifier/api/categories/addcategory", obj, saveCategoryCallback, fail);
+        var categoryName = $("#txtCategory").val();
+        if (categoryName.length > 0) {
+          var obj = { Title: categoryName }
+          dataService.post("blogifier/api/categories/addcategory", obj, saveCategoryCallback, fail);
+        } else {
+          toastr.error('Enter the category name!');
+        }
+
     }
 
     function saveCategoryCallback(data) {
@@ -90,14 +101,16 @@
         li += '   <span class="custom-control-indicator"></span>';
         li += '   <span class="custom-control-description">' + obj.title + '</span>';
         li += '	</label>';
-        li += '<i class="fa fa-times" onclick="editorController.removeCategory(\'' + obj.id + '\')"></i>';
+        li += '<i class="fa fa-times" data-tooltip data-placement="right" title="Delete ' + obj.title + '" onclick="editorController.removeCategory(\'' + obj.id + '\')"></i>';
         li += '</li>';
         $("#edit-categories").prepend(li);
         $("#txtCategory").val('');
         $("#txtCategory").focus();
+        $(".bf-editor-category .fa").tooltip('update');
     }
 
     function removeCategory(id) {
+        $(".bf-editor-category .fa").tooltip('hide');
         dataService.remove("blogifier/api/categories/" + id, removeCategoryCallback(id), fail);
     }
 
@@ -205,6 +218,7 @@
         saveCategory: saveCategory,
         removeCategory: removeCategory,
         categoryKeyPress: categoryKeyPress,
+        categoryAddButton: categoryAddButton,
         loadPostImage: loadPostImage,
         resetPostImage: resetPostImage,
         loadActionButtons: loadActionButtons,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`ViewData["Title"] = "Themes";`
`5`	`5`	`Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";`
`6`	`6`	`}`
`7`		`-<div class="bf-settings bf-settings-boxed bf-settings-about" data-page-title="Themes">`
	`7`	`+<div class="bf-settings">`
`8`	`8`
`9`	`9`	`<!-- Toolbar -->`
`10`	`10`	`<div class="bf-toolbar d-flex">`
`@@ -36,4 +36,4 @@`
`36`	`36`	`No themes found!`
`37`	`37`	`</div>`
`38`	`38`	`}`
`39`		`-</div>`
	`39`	`+</div>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";`
`7`	`7`	`}`
`8`	`8`
`9`		`-<div class="bf-settings bf-settings-boxed bf-settings-about mx-auto" data-page-title="@ViewData["Title"]">`
	`9`	`+<div class="bf-settings bf-settings-boxed bf-settings-about mx-auto">`
`10`	`10`
`11`	`11`	`<div class="text-center pt-5">`
`12`	`12`	`<p class="mb-3">`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`var cntFrom = pgr.CurrentPage == 1 ? 1 : (pgr.CurrentPage - 1) * pgr.ItemsPerPage + 1;`
`11`	`11`	`var cntTo = pgr.CurrentPage * pgr.ItemsPerPage < pgr.Total ? pgr.CurrentPage * pgr.ItemsPerPage : pgr.Total;`
`12`	`12`	`}`
`13`		`-<div class="bf-settings bf-settings-users" data-page-title="@ViewData["Title"]">`
	`13`	`+<div class="bf-settings bf-settings-users">`
`14`	`14`
`15`	`15`	`<div class="bf-toolbar d-flex">`
`16`	`16`	`<label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>`