Merge pull request #539 from lepdou/modify_app_info

optimize namespace more operation button UI
apolloconfig · Feb 10, 2017 · f5373b1 · f5373b1
2 parents d5a9c5f + 9e18241
commit f5373b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/apollo-portal/src/main/resources/static/config.html b/apollo-portal/src/main/resources/static/config.html
@@ -282,7 +282,7 @@ <h4 class="text-center" ng-show="viewMode == 2">
                              '</b> 个实例正在使用Namespace(' + deleteNamespaceContext.namespace.baseInfo.namespaceName +
                              ')，删除Namespace将导致实例获取不到配置。<br>
                              请到 <ins>“实例列表”</ins> 确认实例信息，如已确认删除Namespace将不会导致实例异常，
-                             请发送邮件至<ins> <a href=\'mailto:rdkjapollo@ctrip.com\'>Apollo团队(rdkjapollo@ctrip.com)</a></ins> 删除Namespace。'"
+                             请联系Apollo相关负责人删除Namespace'"
                              apollo-confirm="continueDeleteNamespace">
         </apolloconfirmdialog>
 
@@ -292,7 +292,7 @@ <h4 class="text-center" ng-show="viewMode == 2">
                              + '</b> 个实例正在使用Namespace(' + deleteNamespaceContext.namespace.baseInfo.namespaceName +
                              ')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br>
                              请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如已确认删除Namespace将不会导致实例异常，
-                             请发送邮件至<ins> <a href=\'mailto:rdkjapollo@ctrip.com\'>Apollo团队(rdkjapollo@ctrip.com)</a></ins> 删除Namespace。'"
+                             请联系Apollo相关负责人删除Namespace'"
                              apollo-confirm="continueDeleteNamespace">
         </apolloconfirmdialog>
 

diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css
@@ -790,7 +790,3 @@ table th {
     background: #fff;
 }
 
-.dropdown:hover .dropdown-menu {
-    display: block;
-    margin-top: 0;
-}
diff --git a/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html b/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
@@ -74,8 +74,10 @@
                     申请配置权限
                 </a>
 
-                <div class="btn-group dropdown">
+                <div class="btn-group"
+                ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission">
                     <button type="button" class="btn btn-default btn-sm dropdown-toggle"
+                            data-toggle="dropdown"
                             aria-haspopup="true" aria-expanded="false">
                         <img src="img/operate.png"> <span class="caret"></span>
                     </button>