Skip to content

A
apollo
Commit 86371916 by Jason Song Committed by GitHub
Options

Merge pull request #422 from lepdou/ConfigPage404

config page show tips when app not created
parents 4434416c 27e29e67
Showing with 72 additions and 57 deletions
apollo-portal/src/main/resources/static/config.html
...@@ -20,61 +20,71 @@ ...@@ -20,61 +20,71 @@
<!--具体配置信息--> <!--具体配置信息-->
<div class="row config-info-container"> <div class="row config-info-container">
<!--tag导航--> <div ng-controller="ConfigBaseInfoController">
<div class="col-md-3 col-xs-3 col-sm-3" ng-controller="ConfigBaseInfoController">
<div id="treeview"></div> <div class="J_appNotFound hidden row text-center app-not-found" ng-show="notFoundApp">
<!--app info--> <img src="img/404.png">
<section class="panel"> <br>
<header class="panel-heading"> <p>
<img src="img/info.png" class="i-25-20"/> 应用信息 <span ng-bind="pageContext.appId"></span> 不存在，<a href="/app.html">点击创建</a>
</p>
</div>
<div class="J_appFound hidden col-md-3 col-xs-3 col-sm-3" ng-show="!notFoundApp">
<div id="treeview"></div>
<!--app info-->
<section class="panel">
<header class="panel-heading">
<img src="img/info.png" class="i-25-20"/> 应用信息
<span class="tools pull-right"> <span class="tools pull-right">
<a href="javascript:;" class="icon-chevron-down"></a> <a href="javascript:;" class="icon-chevron-down"></a>
</span> </span>
</header> </header>
<div class="panel-body"> <div class="panel-body">
<table class="project-info"> <table class="project-info">
<tbody class="text-left"> <tbody class="text-left">
<tr> <tr>
<th>AppId:</th> <th>AppId:</th>
<td ng-bind="appBaseInfo.appId"></td> <td ng-bind="appBaseInfo.appId"></td>
</tr> </tr>
<tr> <tr>
<th>应用名:</th> <th>应用名:</th>
<td ng-bind="appBaseInfo.name"></td> <td ng-bind="appBaseInfo.name"></td>
</tr> </tr>
<tr> <tr>
<th>部门:</th> <th>部门:</th>
<td ng-bind="appBaseInfo.orgInfo"></td> <td ng-bind="appBaseInfo.orgInfo"></td>
</tr> </tr>
<tr> <tr>
<th>负责人:</th> <th>负责人:</th>
<td ng-bind="appBaseInfo.ownerName"></td> <td ng-bind="appBaseInfo.ownerName"></td>
</tr> </tr>
<tr> <tr>
<th>负责人Email:</th> <th>负责人Email:</th>
<td ng-bind="appBaseInfo.ownerEmail"></td> <td ng-bind="appBaseInfo.ownerEmail"></td>
</tr> </tr>
<tr ng-show="missEnvs.length > 0"> <tr ng-show="missEnvs.length > 0">
<th>缺失的环境:</th> <th>缺失的环境:</th>
<td> <td>
<span ng-repeat="env in missEnvs" ng-bind="env"> <span ng-repeat="env in missEnvs" ng-bind="env">
</span> </span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</section> </section>
<a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
<div class="row icon-text icon-plus-orange"> <a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
<p class="btn-title ng-binding">补缺环境</p> <div class="row icon-text icon-plus-orange">
</div> <p class="btn-title ng-binding">补缺环境</p>
</a> </div>
</a>
<apolloentrance apollo-title="'添加集群'" apollo-img-src="'plus-orange'" <apolloentrance apollo-title="'添加集群'" apollo-img-src="'plus-orange'"
apollo-href="'cluster.html?#/appid=' + pageContext.appId" apollo-href="'cluster.html?#/appid=' + pageContext.appId"
ng-show="hasCreateClusterPermission"></apolloentrance> ng-show="hasCreateClusterPermission"></apolloentrance>
<span class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()" <span class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateClusterPermission"> ng-show="!hasCreateClusterPermission">
<div class="row icon-text icon-plus-orange"> <div class="row icon-text icon-plus-orange">
...@@ -82,9 +92,9 @@ ...@@ -82,9 +92,9 @@
</div> </div>
</span> </span>
<apolloentrance apollo-title="'添加Namespace'" apollo-img-src="'plus-orange'" <apolloentrance apollo-title="'添加Namespace'" apollo-img-src="'plus-orange'"
apollo-href="'namespace.html?#/appid=' + pageContext.appId" apollo-href="'namespace.html?#/appid=' + pageContext.appId"
ng-show="hasCreateNamespacePermission"></apolloentrance> ng-show="hasCreateNamespacePermission"></apolloentrance>
<span class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()" <span class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateNamespacePermission"> ng-show="!hasCreateNamespacePermission">
<div class="row icon-text icon-plus-orange"> <div class="row icon-text icon-plus-orange">
...@@ -92,15 +102,15 @@ ...@@ -92,15 +102,15 @@
</div> </div>
</span> </span>
<apolloentrance apollo-title="'项目权限'" apollo-img-src="'user-manage'" <apolloentrance apollo-title="'项目权限'" apollo-img-src="'user-manage'"
apollo-href="'/app/role.html?#/appid=' + pageContext.appId" apollo-href="'/app/role.html?#/appid=' + pageContext.appId"
ng-show="hasAssignUserPermission"></apolloentrance> ng-show="hasAssignUserPermission"></apolloentrance>
</section> </section>
</div>
</div> </div>
<!--namespaces--> <!--namespaces-->
<div class="col-md-9 col-xs-9 col-sm-9 config-item-container hide" ng-controller="ConfigNamespaceController"> <div class="col-md-9 col-xs-9 col-sm-9 config-item-container hide" ng-controller="ConfigNamespaceController">
<div class="alert alert-warning alert-dismissible" role="alert" <div class="alert alert-warning alert-dismissible" role="alert"
......
apollo-portal/src/main/resources/static/styles/common-style.css
...@@ -541,3 +541,8 @@ table th { ...@@ -541,3 +541,8 @@ table th {
border-color: #a94442; border-color: #a94442;
} }
.app-not-found {
padding-top: 50px;
font-size: 18px;
}
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<img src="img/sync.png"> <img src="img/sync.png">
同步配置 同步配置
</a> </a>
<a type="button" class="btn btn-danger btn-sm J_tableview_btn" <a type="button" class="btn btn-default btn-sm J_tableview_btn"
data-tooltip="tooltip" data-placement="bottom" title="您没有任何配置权限,请申请" data-tooltip="tooltip" data-placement="bottom" title="您没有任何配置权限,请申请"
ng-click="showNoModifyPermissionDialog()" ng-click="showNoModifyPermissionDialog()"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment