diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/site.css b/src/admin/Bootstrap.Admin/wwwroot/css/site.css
index 15f1c2cc..84672652 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/site.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/site.css
@@ -350,6 +350,10 @@ body.trans-mute * {
}
.dd3-content .menuType {
+ right: 100px;
+ }
+
+ .dd3-content .menuApp {
right: 45px;
}
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
index 56c11cde..c797f52a 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
@@ -1,4 +1,4 @@
-(function ($) {
+(function ($) {
$.fn.extend({
autoScrollSidebar: function (options) {
var option = $.extend({ target: null, offsetTop: 0 }, options);
@@ -127,14 +127,18 @@
return ret;
};
+ var formatApplicationName = function (app) {
+ return app;
+ }
+
var cascadeMenu = function (menus) {
var html = "";
$.each(menus, function (index, menu) {
if (menu.Menus.length === 0) {
- html += $.format('
', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, formatCategoryName(menu), menu.IsResource);
+ html += $.format('', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, formatCategoryName(menu), menu.IsResource, formatApplicationName(menu.Application));
}
else {
- html += $.format('{4}
', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeMenu(menu.Menus), menu.Order, formatCategoryName(menu), menu.IsResource);
+ html += $.format('{4}
', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeMenu(menu.Menus), menu.Order, formatCategoryName(menu), menu.IsResource, formatApplicationName(menu.Application));
}
});
return html;
diff --git a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
index 4a0d01ae..3c7811c2 100644
--- a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
+++ b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
@@ -5,8 +5,9 @@
-
+
+
diff --git a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
index 07a21b14..2d7267c9 100644
--- a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
+++ b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
@@ -5,7 +5,7 @@
-
+