diff --git a/apollo-portal/src/main/resources/static/img/close.png b/apollo-portal/src/main/resources/static/img/close.png
deleted file mode 100644
index 66485ccfd4b25696614a44d200206ee08e090b81..0000000000000000000000000000000000000000
Binary files a/apollo-portal/src/main/resources/static/img/close.png and /dev/null differ
diff --git a/apollo-portal/src/main/resources/static/img/dolphin.jpg b/apollo-portal/src/main/resources/static/img/dolphin.jpg
deleted file mode 100644
index 1118e5b17fbe0a4c15a91036b67ca116dbff7773..0000000000000000000000000000000000000000
Binary files a/apollo-portal/src/main/resources/static/img/dolphin.jpg and /dev/null differ
diff --git a/apollo-portal/src/main/resources/static/img/open.png b/apollo-portal/src/main/resources/static/img/open.png
deleted file mode 100644
index ff423c16e8e9b787988a2e7078f34d4393f7bf56..0000000000000000000000000000000000000000
Binary files a/apollo-portal/src/main/resources/static/img/open.png and /dev/null differ
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js
index 0cb12d6e2a67069747d205ae533c9f56406be2ce..31db7147e563f757b84aec5748be68180ecce9bb 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js
@@ -4,7 +4,6 @@ application_module.controller("AppConfigController",
var appId = AppUtil.parseParams($location.$$url).appid;
- var currentUser = 'test_user';
var pageContext = {
appId: appId,
env: '',
@@ -140,8 +139,7 @@ application_module.controller("AppConfigController",
itemCnt ++;
});
- itemCnt > 30 ? 30 : itemCnt;
- itemCnt < 9 ? 8 : itemCnt;
+ itemCnt = itemCnt > 30 ? 30 : itemCnt;
namespace.itemCnt = itemCnt + 3;
return result;
}
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js
index 85fd57077d87b552c8b3f730bc9249dbe2b9e4d5..d517812b8eaa5d174fc7e5a96158bd0f5c2b3877 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js
@@ -61,8 +61,15 @@ sync_item_module.controller("SyncItemController",
};
$scope.diff = function () {
+ $scope.hasDiff = false;
ConfigService.diff($scope.pageContext.namespaceName, parseSyncSourceData()).then(function (result) {
+
$scope.diffs = result;
+ result.forEach(function (diff) {
+ if (!$scope.hasDiff) {
+ $scope.hasDiff = diff.diffs.createItems.length + diff.diffs.updateItems.length > 0;
+ }
+ });
$scope.syncItemNextStep(1);
}, function (result) {
toastr.error(AppUtil.errorMsg(result));
diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css
index b422dbf5b8f18e18a4c7574bf6508bb1029bb12f..69d59b71464e5b0b926af6ae937b90bd633850ce 100644
--- a/apollo-portal/src/main/resources/static/styles/common-style.css
+++ b/apollo-portal/src/main/resources/static/styles/common-style.css
@@ -43,7 +43,6 @@ a {
.footer {
width: 100%;
height: 75px;
- margin-top: -75px;
padding-top: 25px;
}
diff --git a/apollo-portal/src/main/resources/static/views/app.html b/apollo-portal/src/main/resources/static/views/app.html
index 94b50d6c01a3b95941cc5cd8e353e55bb3ca65b7..1b7d8b0746cbf9921a7a585b92c755f026fe0a50 100644
--- a/apollo-portal/src/main/resources/static/views/app.html
+++ b/apollo-portal/src/main/resources/static/views/app.html
@@ -75,24 +75,24 @@
-
-