Skip to content

Commit b84b7ab

Browse files
jo-hnnyjo-hnny
authored
feat(console): 合并industry-cloud到master (#2273)
* 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
1 parent 7750874 commit b84b7ab

File tree

75 files changed

+3061
-1709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+3061
-1709
lines changed

Diff for: ‎pkg/auth/web/static/default/favicon.svg

+62
Loading

Diff for: ‎web/console/public/static/icon/logo.svg renamed to ‎pkg/auth/web/static/default/logo.svg

File renamed without changes.

Diff for: ‎pkg/auth/web/static/tkeanywhere/favicon.svg

+17
Loading

Diff for: ‎pkg/auth/web/static/tkeanywhere/logo.svg

+24
Loading

Diff for: ‎pkg/auth/web/templates/approval.tmpl.html

+52-71
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,88 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<meta charset="utf-8">
56
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6-
<title>{%.Title%} - Approval</title>
7+
<title>{%.Title%} - Approval</title>
78
<meta name="viewport" content="width=device-width, initial-scale=1.0">
89
<link href="/oidc/static/style.css" rel="stylesheet" data-role="global">
9-
<link rel="apple-touch-icon" sizes="57x57" href="/oidc/static/apple-icon-57x57.png">
10-
<link rel="apple-touch-icon" sizes="60x60" href="/oidc/static/apple-icon-60x60.png">
11-
<link rel="apple-touch-icon" sizes="72x72" href="/oidc/static/apple-icon-72x72.png">
12-
<link rel="apple-touch-icon" sizes="76x76" href="/oidc/static/apple-icon-76x76.png">
13-
<link rel="apple-touch-icon" sizes="114x114" href="/oidc/static/apple-icon-114x114.png">
14-
<link rel="apple-touch-icon" sizes="120x120" href="/oidc/static/apple-icon-120x120.png">
15-
<link rel="apple-touch-icon" sizes="144x144" href="/oidc/static/apple-icon-144x144.png">
16-
<link rel="apple-touch-icon" sizes="152x152" href="/oidc/static/apple-icon-152x152.png">
17-
<link rel="apple-touch-icon" sizes="180x180" href="/oidc/static/apple-icon-180x180.png">
18-
<link rel="icon" type="image/png" sizes="192x192" href="/oidc/static/android-icon-192x192.png">
19-
<link rel="icon" type="image/png" sizes="32x32" href="/oidc/static/favicon-32x32.png">
20-
<link rel="icon" type="image/png" sizes="96x96" href="/oidc/static/favicon-96x96.png">
21-
<link rel="icon" type="image/png" sizes="16x16" href="/oidc/static/favicon-16x16.png">
10+
<link rel="icon" type="image/svg" href="/oidc/static/{%.LogoDir%}/favicon.svg">
2211
<link rel="manifest" href="/oidc/static/manifest.json">
2312
<meta name="msapplication-TileColor" content="#ffffff">
2413
<meta name="msapplication-TileImage" content="/oidc/static/ms-icon-144x144.png">
2514
<meta name="theme-color" content="#262626">
2615
</head>
2716

2817
<body>
29-
<div class="clg-head">
30-
<div class="clg-head-inner">
31-
<div class="clg-logo ">
32-
<a href="/">{%.Title%} </a>
18+
<div class="clg-head">
19+
<div class="clg-head-inner">
20+
<div class="clg-logo " style="background-image: url(/oidc/static/{%.LogoDir%}/logo.svg);">
21+
<a href="/">{%.Title%} </a>
22+
</div>
3323
</div>
3424
</div>
35-
</div>
36-
<div class="clg-wrap">
37-
<div class="clg-wrap-inner">
38-
<div class="clg-wrap-con clg-onpage" id="loginBox">
39-
<div class="clg-mod J-commonLoginContent ">
40-
<div class="clg-mod-tab J-loginContentBox J-qcloginBox">
41-
<div class="clg-mod-tit J-txtLoginTitle">授权信息</div>
42-
<div class="clg-form J-loginForm">
43-
<div>【{%.Title%} 控制台】将获得以下权限:</div>
44-
<ul class="clg-form-list">
45-
{{ range $scope := .Scopes }}
25+
<div class="clg-wrap">
26+
<div class="clg-wrap-inner">
27+
<div class="clg-wrap-con clg-onpage" id="loginBox">
28+
<div class="clg-mod J-commonLoginContent ">
29+
<div class="clg-mod-tab J-loginContentBox J-qcloginBox">
30+
<div class="clg-mod-tit J-txtLoginTitle">授权信息</div>
31+
<div class="clg-form J-loginForm">
32+
<div>【{%.Title%} 控制台】将获得以下权限:</div>
33+
<ul class="clg-form-list">
34+
{{ range $scope := .Scopes }}
4635
<li>
4736
<div class="clg-form-input">
4837
<div class="clg-form-unit">
49-
<p class="clg-form-unit-txt"
50-
style="margin-top:5px">
38+
<p class="clg-form-unit-txt" style="margin-top:5px">
5139
>{{ $scope }}</p>
5240
</div>
5341
</div>
5442
</li>
55-
{{ end }}
56-
</ul>
57-
<form method="post" id="grantForm"
58-
style="margin-top:30px">
59-
<input type="hidden" name="req"
60-
value="{{ .AuthReqID }}"/>
61-
<input type="hidden" name="approval"
62-
value="approve">
63-
<div class="clg-form-btn">
64-
<a onclick="subgrantForm();"
65-
class="clg-btn J-loginBtn">确认</a>
66-
</div>
67-
</form>
68-
<form method="post" id="cancelForm"
69-
style="margin-top:10px">
70-
<input type="hidden" name="req"
71-
value="{{ .AuthReqID }}"/>
72-
<input type="hidden" name="approval"
73-
value="rejected">
74-
<div class="clg-form-btn">
75-
<a onclick="subgcancelForm();"
76-
class="clg-btn J-loginBtn"
77-
style="background-color:#fff;color: black;border: 1px solid #ddd">取消</a>
78-
</div>
79-
</form>
43+
{{ end }}
44+
</ul>
45+
<form method="post" id="grantForm" style="margin-top:30px">
46+
<input type="hidden" name="req" value="{{ .AuthReqID }}" />
47+
<input type="hidden" name="approval" value="approve">
48+
<div class="clg-form-btn">
49+
<a onclick="subgrantForm();" class="clg-btn J-loginBtn">确认</a>
50+
</div>
51+
</form>
52+
<form method="post" id="cancelForm" style="margin-top:10px">
53+
<input type="hidden" name="req" value="{{ .AuthReqID }}" />
54+
<input type="hidden" name="approval" value="rejected">
55+
<div class="clg-form-btn">
56+
<a onclick="subgcancelForm();" class="clg-btn J-loginBtn"
57+
style="background-color:#fff;color: black;border: 1px solid #ddd">取消</a>
58+
</div>
59+
</form>
8060

61+
</div>
8162
</div>
8263
</div>
83-
</div>
84-
<div class="clg-wrap-aside">
85-
<div class="clg-wrap-aside-inner">
86-
<div class="clg-wrap-aside-tit">{%.Title%} </div>
87-
<div class="clg-wrap-aside-list">
88-
<ul>
89-
<li><span>登录成功，需要您再次确认 【{%.Title%} 控制台】 可以获取权限</span></li>
90-
</ul>
64+
<div class="clg-wrap-aside">
65+
<div class="clg-wrap-aside-inner">
66+
<div class="clg-wrap-aside-tit">{%.Title%} </div>
67+
<div class="clg-wrap-aside-list">
68+
<ul>
69+
<li><span>登录成功，需要您再次确认 【{%.Title%} 控制台】 可以获取权限</span></li>
70+
</ul>
71+
</div>
72+
<div class="clg-wrap-aside-btn"></div>
9173
</div>
92-
<div class="clg-wrap-aside-btn"></div>
9374
</div>
9475
</div>
9576
</div>
9677
</div>
97-
</div>
98-
<script type="text/javascript">
99-
function subgrantForm(){
78+
<script type="text/javascript">
79+
function subgrantForm() {
10080
document.getElementById("grantForm").submit();
10181
}
102-
function subgcancelForm(){
82+
function subgcancelForm() {
10383
document.getElementById("grantForm").submit();
10484
}
105-
</script>
85+
</script>
10686
</body>
107-
</html>
87+
88+
</html>

0 commit comments

Comments
 (0)