Merge pull request #1723 from lepdou/namespace_view

hidden namespace's body when namespace's size bigger than 2

apollo-portal/src/main/resources/static/config.html

@@ -214,6 +214,7 @@
                        pre-delete-item="preDeleteItem"
                        show-text="showText"
                        show-no-modify-permission-dialog="showNoModifyPermissionDialog"
+                       show-body="namespaces.length == 1"
                        pre-create-branch="preCreateBranch"
                        pre-delete-branch="preDeleteBranch">
         </apollonspanel>

apollo-portal/src/main/resources/static/login.html

@@ -7,7 +7,6 @@
     <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="vendor/font-awesome.min.css">
     <style type="text/css">
-        @import url(https://fonts.googleapis.com/css?family=Roboto:400,300,100,700,500);
 
         body {
             padding-top: 90px;

apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js

@@ -129,6 +129,7 @@ function controller($rootScope, $scope, toastr, AppUtil, EventManager, ConfigSer
                 $scope.namespaces.forEach(function (namespace, index) {
                     if (namespace.baseInfo.namespaceName == result.baseInfo.namespaceName) {
                         $scope.namespaces[index] = result;
+                        $scope.namespaces[index].showNamespaceBody = true;
                     }
                 });
 

apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js

@@ -21,7 +21,8 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
             showNoModifyPermissionDialog: '=',
             preCreateBranch: '=',
             preDeleteBranch: '=',
-            showMergeAndPublishGrayTips: '='
+            showMergeAndPublishGrayTips: '=',
+            showBody: "=?"
         },
         link: function (scope) {
 
@@ -89,8 +90,9 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
                 namespace.displayControl = {
                     currentOperateBranch: 'master',
                     showSearchInput: false,
-                    show: true
+                    show: scope.showBody
                 };
+                scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
                 namespace.viewItems = namespace.items;
                 namespace.isPropertiesFormat = namespace.format == 'properties';
                 namespace.isTextEditing = false;
@@ -380,10 +382,8 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
 
             function switchBranch(branchName) {
                 if (branchName != 'master') {
-                    scope.namespace.branch.displayControl.show = true;
                     initRules(scope.namespace.branch);
-                } else {
-                    scope.namespace.displayControl.show = true;
+                    scope.showNamespaceBody = true;
                 }
                 scope.namespace.displayControl.currentOperateBranch = branchName;
 

apollo-portal/src/main/resources/static/styles/common-style.css

@@ -407,9 +407,7 @@ table th {
 }
 
 .namespace-panel .namespace-attribute-public {
-    background: #31708f;
-    width: 40px;
-    cursor: pointer;
+    margin-right:5px;
 }
 
 .namespace-panel .second-panel-heading .nav-tabs {

apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html

@@ -8,14 +8,8 @@
                 <span class="cursor-pointer"
                       data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false"
                       ng-click="namespace.branch.displayControl.show = !namespace.branch.displayControl.show">
-                    <span class="glyphicon glyphicon-triangle-bottom small"
-                          ng-show="namespace.branch.displayControl.show"></span>
-                    <span class="glyphicon glyphicon-triangle-top small"
-                          ng-show="!namespace.branch.displayControl.show"></span>
-                    <b class="namespace-name" ng-bind="namespace.viewName"
-                       data-tooltip="tooltip" data-placement="bottom" title="点击展开/收缩Namespace"></b>
                     </span>
-                <span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
+                <b class="namespace-name" ng-bind="namespace.viewName"></b>
                 <span class="label label-warning no-radius namespace-label"
                       ng-show="namespace.branch.itemModifiedCnt > 0">有修改
                     <span class="badge label badge-white namespace-label"
@@ -52,7 +46,7 @@
 
     </header>
 
-    <div id="BODY{{namespace.branch.id}}" class="collapse in">
+    <div id="BODY{{namespace.branch.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
         <div class="J_namespace-release-tip well well-sm no-radius text-center"
              ng-show="namespace.isConfigHidden">
             <span style="color: red">您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。</span>

apollo-portal/src/main/resources/static/views/component/namespace-panel-header.html

 <header class="row namespace-attribute-panel">
-    <div class="text-center namespace-attribute-public">
+    <div class="row">
+        <div class="col-md-6" style="padding-bottom:5px;">
+            <span class="text-center namespace-attribute-public label label-primary no-radius">
                 <span data-tooltip="tooltip" data-placement="bottom"
                       title="私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到"
                       ng-show="!namespace.isPublic">私有</span>
@@ -12,6 +14,21 @@
                           title="namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到"
                           ng-show="namespace.isPublic && namespace.isLinkedNamespace"
                           ng-click="goToParentAppConfigPage(namespace)">关联</span>
+            </span>
+            <span class="text-center namespace-attribute-public label label-info no-radius">
+                <span ng-bind="namespace.format" style="width:30px;"></span>
+            </span>
+        </div>
+        <div class="col-md-6 text-right" style="padding-right:23px;">
+            <span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
+                <span
+                        class="label no-radius cursor-pointer"
+                        data-toggle="collapse" data-target="#BODY{{namespace.id}}" aria-expanded="false"
+                        ng-click="showNamespaceBody = !showNamespaceBody">
+                    <a ><small>[展开/收缩]</small></a>
+                </span>
+            </span>
+        </div>
     </div>
 </header>
 

apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html

@@ -7,18 +7,7 @@
     <header class="panel-heading">
         <div class="row">
             <div class="col-md-6 col-sm-6 header-namespace">
-                <span class="cursor-pointer"
-                      data-toggle="collapse" data-target="#BODY{{namespace.id}}" aria-expanded="false"
-                      ng-click="namespace.displayControl.show = !namespace.displayControl.show">
-                    <span class="glyphicon glyphicon-triangle-bottom small"
-                          ng-show="namespace.displayControl.show"></span>
-                    <span class="glyphicon glyphicon-triangle-top small"
-                          ng-show="!namespace.displayControl.show"></span>
-                    <b class="namespace-name" ng-bind="namespace.viewName"
-                       data-tooltip="tooltip" data-placement="bottom" title="点击展开/收缩Namespace"></b>
-
-                </span>
-                <span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
+                <b class="namespace-name" ng-bind="namespace.viewName"></b>
                 <span class="label label-warning no-radius namespace-label modify-tip"
                       ng-show="namespace.itemModifiedCnt > 0">
                     有修改
@@ -94,7 +83,7 @@
 
 
 
-    <div id="BODY{{namespace.id}}" class="collapse in">
+    <div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
         <div class="J_namespace-release-tip well well-sm no-radius text-center"
              ng-show="namespace.isConfigHidden">
             <span style="color: red">您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。</span>