Further changes - Redesign administration panel theme #392

Tall-Paul · Jun 13, 2019 · 61a7ea8 · 61a7ea8
1 parent 4d92294
commit 61a7ea8
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 19 deletions.
diff --git a/Grand.Web/App_Data/Localization/Upgrade/EN_440_450.nopres.xml b/Grand.Web/App_Data/Localization/Upgrade/EN_440_450.nopres.xml
@@ -546,4 +546,10 @@
   <LocaleResource Name="Admin.Catalog.Products.LinkedProducts">
     <Value>Linked products</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Promotions.Newsletter">
+    <Value>Newsletter</Value>
+  </LocaleResource>
+  <LocaleResource Name="admin.system.developertools">
+    <Value>Developer Tools</Value>
+  </LocaleResource>
 </Language>
diff --git a/Grand.Web/App_Data/Localization/defaultResources.grandres.xml b/Grand.Web/App_Data/Localization/defaultResources.grandres.xml
@@ -20110,10 +20110,16 @@
   <LocaleResource Name="products.similarproducts">
     <Value>Similar products</Value>
   </LocaleResource>
-<LocaleResource Name="admin.catalog.products.similarproducts.savebeforeedit">
-  <Value>You need to save the product before you can add similar products for this product page.</Value>
-</LocaleResource>
+  <LocaleResource Name="admin.catalog.products.similarproducts.savebeforeedit">
+    <Value>You need to save the product before you can add similar products for this product page.</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Catalog.Products.LinkedProducts">
     <Value>Linked products</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Promotions.Newsletter">
+    <Value>Newsletter</Value>
+  </LocaleResource>
+  <LocaleResource Name="admin.system.developertools">
+    <Value>Developer Tools</Value>
+  </LocaleResource>
 </Language>
diff --git a/Grand.Web/Areas/Admin/Views/Reports/LowStockReport.cshtml b/Grand.Web/Areas/Admin/Views/Reports/LowStockReport.cshtml
@@ -1,7 +1,7 @@
 @inject AdminAreaSettings adminAreaSettings
 @{
     //page title
-    ViewBag.Title = T("Admin.Catalog.LowStockReport").Text;
+    ViewBag.Title = T("Admin.Reports.LowStockReport").Text;
 }
 <antiforgery-token />
 <div class="row">
@@ -10,7 +10,7 @@
             <div class="x_title">
                 <div class="caption level-caption">
                     <i class="fa fa-cubes"></i>
-                    @T("Admin.Catalog.LowStockReport")
+                    @T("Admin.Reports.LowStockReport")
                 </div>
             </div>
             <div class="x_content form">

diff --git a/Grand.Web/Areas/Admin/sitemap.config b/Grand.Web/Areas/Admin/sitemap.config
@@ -34,23 +34,27 @@
       <siteMapNode SystemName="Online customers" grandResource="Admin.Customers.OnlineCustomers" PermissionNames="ManageCustomers" controller="OnlineCustomer" action="List" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="Vendors" grandResource="Admin.Vendors" PermissionNames="ManageVendors" controller="Vendor" action="List" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="Vendor reviews" grandResource="Admin.VendorReviews" PermissionNames="ManageVendorReviews" controller="VendorReview" action="List" IconClass="fa fa-dot-circle-o"/>
+      <siteMapNode SystemName="Affiliates" grandResource="Admin.Affiliates" PermissionNames="ManageAffiliates" controller="Affiliate" action="List" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="Activity Log" grandResource="Admin.Configuration.ActivityLog" PermissionNames="ManageActivityLog" IconClass="fa fa-arrow-circle-o-right">
         <siteMapNode SystemName="Activity Types" grandResource="Admin.Configuration.ActivityLog.ActivityLogType" controller="ActivityLog" action="ListTypes" IconClass="fa fa-dot-circle-o"/>
         <siteMapNode SystemName="Activity Log" grandResource="Admin.Configuration.ActivityLog.ActivityLog" controller="ActivityLog" action="ListLogs" IconClass="fa fa-dot-circle-o"/>
         <siteMapNode SystemName="Activity Stats" grandResource="Admin.Configuration.ActivityLog.ActivityStats" controller="ActivityLog" action="ListStats" IconClass="fa fa-dot-circle-o"/>
       </siteMapNode>
     </siteMapNode>
     <siteMapNode SystemName="Promotions" grandResource="Admin.Promotions" PermissionNames="ManageAffiliates, ManageNewsletterSubscribers, ManageCampaigns, ManageDiscounts, ManageActions, ManageReminders, ManagePushNotifications" IconClass="icon-bulb">
-      <siteMapNode SystemName="Campaigns" grandResource="Admin.Promotions.Campaigns" PermissionNames="ManageCampaigns" controller="Campaign" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Banners" grandResource="Admin.Promotions.Banners" PermissionNames="ManageBanners" controller="Banner" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="InteractiveForms" grandResource="Admin.Promotions.InteractiveForms" PermissionNames="ManageInteractiveForms" controller="InteractiveForm" action="List" IconClass="fa fa-dot-circle-o"/>
+      <siteMapNode SystemName="Newsletter" grandResource="Admin.Promotions.Newsletter" PermissionNames="ManageCampaigns" IconClass="fa fa-dot-circle-o">
+        <siteMapNode SystemName="Campaigns" grandResource="Admin.Promotions.Campaigns" PermissionNames="ManageCampaigns" controller="Campaign" action="List" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Newsletter categories" grandResource="Admin.Promotions.NewsletterCategory" PermissionNames="ManageNewsletterSubscribers" controller="NewsletterCategory" action="List" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Newsletter subscriptions" grandResource="Admin.Promotions.NewsletterSubscriptions" PermissionNames="ManageNewsletterSubscribers" controller="NewsLetterSubscription" action="List" IconClass="fa fa-dot-circle-o"/>
+      </siteMapNode>
       <siteMapNode SystemName="Discounts" grandResource="Admin.Promotions.Discounts" PermissionNames="ManageDiscounts" controller="Discount" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Customer action type" grandResource="Admin.Customers.Actiontype" PermissionNames="ManageActions" controller="CustomerActionType" action="ListTypes" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Customer actions" grandResource="Admin.Customers.CustomerActions" PermissionNames="ManageActions" controller="CustomerAction" action="List" IconClass="fa fa-dot-circle-o"/>
+      <siteMapNode SystemName="Customer actions" grandResource="Admin.Customers.CustomerActions" PermissionNames="ManageActions" IconClass="fa fa-dot-circle-o">
+        <siteMapNode SystemName="Customer actions" grandResource="Admin.Customers.CustomerActions" PermissionNames="ManageActions" controller="CustomerAction" action="List" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Customer action type" grandResource="Admin.Customers.Actiontype" PermissionNames="ManageActions" controller="CustomerActionType" action="ListTypes" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Banners" grandResource="Admin.Promotions.Banners" PermissionNames="ManageBanners" controller="Banner" action="List" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="InteractiveForms" grandResource="Admin.Promotions.InteractiveForms" PermissionNames="ManageInteractiveForms" controller="InteractiveForm" action="List" IconClass="fa fa-dot-circle-o"/>
+      </siteMapNode>
       <siteMapNode SystemName="Customer reminders" grandResource="Admin.Customers.CustomerReminders" PermissionNames="ManageReminders" controller="CustomerReminder" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Newsletter categories" grandResource="Admin.Promotions.NewsletterCategory" PermissionNames="ManageNewsletterSubscribers" controller="NewsletterCategory" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Newsletter subscriptions" grandResource="Admin.Promotions.NewsletterSubscriptions" PermissionNames="ManageNewsletterSubscribers" controller="NewsLetterSubscription" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Affiliates" grandResource="Admin.Affiliates" PermissionNames="ManageAffiliates" controller="Affiliate" action="List" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="PushNotifications" grandResource="Admin.PushNotifications" PermissionNames="ManagePushNotifications" controller="PushNotifications" IconClass="fa fa-dot-circle-o">
         <siteMapNode SystemName="PushNotifications" grandResource="Admin.PushNotifications.Send" PermissionNames="ManagePushNotifications" controller="PushNotifications" action="Send" IconClass="fa fa-dot-circle-o"/>
         <siteMapNode SystemName="PushNotifications" grandResource="Admin.PushNotifications.Messages" PermissionNames="ManagePushNotifications" controller="PushNotifications" action="Messages" IconClass="fa fa-dot-circle-o"/>
@@ -127,9 +131,11 @@
         <siteMapNode SystemName="PickupPoints" grandResource="Admin.Configuration.Shipping.PickupPoints" controller="Shipping" action="PickupPoints" IconClass="fa fa-dot-circle-o"/>
       </siteMapNode>
       <siteMapNode SystemName="Access control list" grandResource="Admin.Configuration.ACL" PermissionNames="ManageACL" controller="Security" action="Permissions" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="External authentication methods" grandResource="Admin.Configuration.ExternalAuthenticationMethods" PermissionNames="ManageExternalAuthenticationMethods" controller="ExternalAuthentication" action="Methods" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Widgets" grandResource="Admin.ContentManagement.Widgets" PermissionNames="ManageWidgets" controller="Widget" action="List" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Local plugins" grandResource="Admin.Configuration.Plugins.Local" PermissionNames="ManagePlugins" controller="Plugin" action="List" IconClass="fa fa-dot-circle-o"/>
+      <siteMapNode SystemName="Local plugins" grandResource="Admin.Configuration.Plugins" PermissionNames="ManagePlugins" IconClass="fa fa-dot-circle-o">
+        <siteMapNode SystemName="External authentication methods" grandResource="Admin.Configuration.ExternalAuthenticationMethods" PermissionNames="ManageExternalAuthenticationMethods" controller="ExternalAuthentication" action="Methods" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Widgets" grandResource="Admin.ContentManagement.Widgets" PermissionNames="ManageWidgets" controller="Widget" action="List" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Local plugins" grandResource="Admin.Configuration.Plugins.Local" PermissionNames="ManagePlugins" controller="Plugin" action="List" IconClass="fa fa-dot-circle-o"/>
+      </siteMapNode>
     </siteMapNode>
     <siteMapNode SystemName="System" grandResource="Admin.System" PermissionNames="ManageSystemLog,ManageMessageQueue,ManageMessageContactForm,ManageMaintenance,ManageScheduleTasks" IconClass="icon-settings">
       <siteMapNode SystemName="Log" grandResource="Admin.System.Log" PermissionNames="ManageSystemLog" controller="Log" action="List" IconClass="fa fa-dot-circle-o"/>
@@ -139,10 +145,12 @@
       <siteMapNode SystemName="Schedule tasks" grandResource="Admin.System.ScheduleTasks" PermissionNames="ManageScheduleTasks" controller="ScheduleTask" action="List" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="Warnings" grandResource="Admin.System.Warnings" PermissionNames="ManageMaintenance" controller="Common" action="Warnings" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="System information" grandResource="Admin.System.SystemInfo" PermissionNames="ManageMaintenance" controller="Common" action="SystemInfo" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Roslyn compiler" grandResource="Admin.System.Roslyn" PermissionNames="ManageMaintenance" controller="Common" action="Roslyn" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Query editor" grandResource="Admin.System.QueryEditor" PermissionNames="ManageMaintenance" controller="Common" action="QueryEditor" IconClass="fa fa-dot-circle-o"/>
       <siteMapNode SystemName="Search engine friendly names" grandResource="Admin.System.SeNames" PermissionNames="ManageMaintenance" controller="Common" action="SeNames" IconClass="fa fa-dot-circle-o"/>
-      <siteMapNode SystemName="Manage API Users" grandResource="Admin.System.APIUsers" PermissionNames="ManageMaintenance" controller="ApiUser" action="Index" IconClass="fa fa-dot-circle-o"/>
+      <siteMapNode SystemName="Developer tools" grandResource="Admin.System.DeveloperTools" PermissionNames="ManageMaintenance" IconClass="fa fa-dot-circle-o">
+        <siteMapNode SystemName="Manage API Users" grandResource="Admin.System.APIUsers" PermissionNames="ManageMaintenance" controller="ApiUser" action="Index" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Roslyn compiler" grandResource="Admin.System.Roslyn" PermissionNames="ManageMaintenance" controller="Common" action="Roslyn" IconClass="fa fa-dot-circle-o"/>
+        <siteMapNode SystemName="Query editor" grandResource="Admin.System.QueryEditor" PermissionNames="ManageMaintenance" controller="Common" action="QueryEditor" IconClass="fa fa-dot-circle-o"/>
+      </siteMapNode>
       <siteMapNode SystemName="Templates" grandResource="Admin.System.Templates" PermissionNames="ManageMaintenance" IconClass="fa fa-arrow-circle-o-right">
         <siteMapNode SystemName="Category templates" grandResource="Admin.System.Templates.Category" controller="Template" action="CategoryTemplates" IconClass="fa fa-dot-circle-o"/>
         <siteMapNode SystemName="Manufacturer templates" grandResource="Admin.System.Templates.Manufacturer" controller="Template" action="ManufacturerTemplates" IconClass="fa fa-dot-circle-o"/>