Skip to content

Commit

Permalink
feat(console): 合并industry-cloud到master (#2273)
Browse files Browse the repository at this point in the history 
* feat(console): 新建vm新增blockMultiQueue和cache参数 (#2269)

* feat(console): 新建vm新增blockMultiQueue和cache参数

* feat(console): change writethrough to writeback

* feat(console): 添加自定义配置

* feat(console): 修改auth logo 配置

* fix:  alarm vm_cpu_usage_rate can over 100 (#2190)

* feat(console): 添加差异化配置

* feat(console): support virtual monitor and alarm (#1918)

* feat(console): add vm monitor panel

* fix(console): fix create notify template error

* feat(console): support create vm alarm

* feat(console): change create vm network mode to virtio (#1920)

* feat(console): change network bridge model to virtio

* feat(console): support query vm by vm name

* fix(console): fix useFetch polling can't clear

* fix(console): fix log tabel type not right

* feat(console): change vm monitor expr

* feat(console): rewirite vm monitor chart

* feat(console): fix

* feat(console): 重新生成package-lock

* feat(console): 修复依赖错误

* feat(console): 处理webtty html

* feat(console): 全部default viisble设置为true
  • Loading branch information
@jo-hnny
jo-hnny committed Apr 27, 2023
1 parent 7750874 commit b84b7ab
Show file tree
Hide file tree
Showing 75 changed files with 3,061 additions and 1,709 deletions.
62 changes: 62 additions & 0 deletions pkg/auth/web/static/default/favicon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 web/console/public/static/icon/logo.svg → pkg/auth/web/static/default/logo.svg
View file
File renamed without changes
17 changes: 17 additions & 0 deletions pkg/auth/web/static/tkeanywhere/favicon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions pkg/auth/web/static/tkeanywhere/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 52 additions & 71 deletions pkg/auth/web/templates/approval.tmpl.html
View file
Original file line number Diff line number Diff line change
@@ -1,107 +1,88 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>{%.Title%} - Approval</title>
<title>{%.Title%} - Approval</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/oidc/static/style.css" rel="stylesheet" data-role="global">
<link rel="apple-touch-icon" sizes="57x57" href="/oidc/static/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/oidc/static/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/oidc/static/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/oidc/static/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/oidc/static/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/oidc/static/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/oidc/static/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/oidc/static/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/oidc/static/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/oidc/static/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/oidc/static/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/oidc/static/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/oidc/static/favicon-16x16.png">
<link rel="icon" type="image/svg" href="/oidc/static/{%.LogoDir%}/favicon.svg">
<link rel="manifest" href="/oidc/static/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/oidc/static/ms-icon-144x144.png">
<meta name="theme-color" content="#262626">
</head>

<body>
<div class="clg-head">
<div class="clg-head-inner">
<div class="clg-logo ">
<a href="/">{%.Title%} </a>
<div class="clg-head">
<div class="clg-head-inner">
<div class="clg-logo " style="background-image: url(/oidc/static/{%.LogoDir%}/logo.svg);">
<a href="/">{%.Title%} </a>
</div>
</div>
</div>
</div>
<div class="clg-wrap">
<div class="clg-wrap-inner">
<div class="clg-wrap-con clg-onpage" id="loginBox">
<div class="clg-mod J-commonLoginContent ">
<div class="clg-mod-tab J-loginContentBox J-qcloginBox">
<div class="clg-mod-tit J-txtLoginTitle">授权信息</div>
<div class="clg-form J-loginForm">
<div>【{%.Title%} 控制台】将获得以下权限:</div>
<ul class="clg-form-list">
{{ range $scope := .Scopes }}
<div class="clg-wrap">
<div class="clg-wrap-inner">
<div class="clg-wrap-con clg-onpage" id="loginBox">
<div class="clg-mod J-commonLoginContent ">
<div class="clg-mod-tab J-loginContentBox J-qcloginBox">
<div class="clg-mod-tit J-txtLoginTitle">授权信息</div>
<div class="clg-form J-loginForm">
<div>【{%.Title%} 控制台】将获得以下权限:</div>
<ul class="clg-form-list">
{{ range $scope := .Scopes }}
<li>
<div class="clg-form-input">
<div class="clg-form-unit">
<p class="clg-form-unit-txt"
style="margin-top:5px">
<p class="clg-form-unit-txt" style="margin-top:5px">
>{{ $scope }}</p>
</div>
</div>
</li>
{{ end }}
</ul>
<form method="post" id="grantForm"
style="margin-top:30px">
<input type="hidden" name="req"
value="{{ .AuthReqID }}"/>
<input type="hidden" name="approval"
value="approve">
<div class="clg-form-btn">
<a onclick="subgrantForm();"
class="clg-btn J-loginBtn">确认</a>
</div>
</form>
<form method="post" id="cancelForm"
style="margin-top:10px">
<input type="hidden" name="req"
value="{{ .AuthReqID }}"/>
<input type="hidden" name="approval"
value="rejected">
<div class="clg-form-btn">
<a onclick="subgcancelForm();"
class="clg-btn J-loginBtn"
style="background-color:#fff;color: black;border: 1px solid #ddd">取消</a>
</div>
</form>
{{ end }}
</ul>
<form method="post" id="grantForm" style="margin-top:30px">
<input type="hidden" name="req" value="{{ .AuthReqID }}" />
<input type="hidden" name="approval" value="approve">
<div class="clg-form-btn">
<a onclick="subgrantForm();" class="clg-btn J-loginBtn">确认</a>
</div>
</form>
<form method="post" id="cancelForm" style="margin-top:10px">
<input type="hidden" name="req" value="{{ .AuthReqID }}" />
<input type="hidden" name="approval" value="rejected">
<div class="clg-form-btn">
<a onclick="subgcancelForm();" class="clg-btn J-loginBtn"
style="background-color:#fff;color: black;border: 1px solid #ddd">取消</a>
</div>
</form>

</div>
</div>
</div>
</div>
<div class="clg-wrap-aside">
<div class="clg-wrap-aside-inner">
<div class="clg-wrap-aside-tit">{%.Title%} </div>
<div class="clg-wrap-aside-list">
<ul>
<li><span>登录成功，需要您再次确认 【{%.Title%} 控制台】 可以获取权限</span></li>
</ul>
<div class="clg-wrap-aside">
<div class="clg-wrap-aside-inner">
<div class="clg-wrap-aside-tit">{%.Title%} </div>
<div class="clg-wrap-aside-list">
<ul>
<li><span>登录成功，需要您再次确认 【{%.Title%} 控制台】 可以获取权限</span></li>
</ul>
</div>
<div class="clg-wrap-aside-btn"></div>
</div>
<div class="clg-wrap-aside-btn"></div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
function subgrantForm(){
<script type="text/javascript">
function subgrantForm() {
document.getElementById("grantForm").submit();
}
function subgcancelForm(){
function subgcancelForm() {
document.getElementById("grantForm").submit();
}
</script>
</script>
</body>
</html>

</html>
Loading

0 comments on commit b84b7ab

Please sign in to comment.