mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-13 19:45:40 +00:00
d5451a482a
* [Update] 添加org * [Update] 修改url * [Update] 完成基本框架 * [Update] 修改一些逻辑 * [Update] 修改用户view * [Update] 修改资产 * [Update] 修改asset api * [Update] 修改协议小问题 * [Update] stash it * [Update] 修改约束 * [Update] 修改外键为org_id * [Update] 删掉Premiddleware * [Update] 修改Node * [Update] 修改get_current_org 为 proxy对象 current_org * [Bugfix] 解决Node.root() 死循环，移动AdminRequired到permission中 (#1571) * [Update] 修改permission (#1574) * Tmp org (#1579) * [Update] 添加org api, 升级到django 2.0 * [Update] fix some bug * [Update] 修改一些bug * [Update] 添加授权规则org (#1580) * [Update] 修复创建授权规则，显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则，解决QuerySet与Manager问题；修复创建用户，显示org_name不是有效UUID之bug； * Tmp org (#1583) * [Update] 修改一些内容 * [Update] 修改datatable 支持process * [Bugfix] 修复asset queryset 没有valid方法的bug * [Update] 在线/历史/命令model添加org；修复命令记录保存org失败bug (#1584) * [Update] 修复创建授权规则，显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则，解决QuerySet与Manager问题；修复创建用户，显示org_name不是有效UUID之bug； * [Update] 在线/历史/命令model添加org * [Bugfix] 修复命令记录，保存org不成功bug * [Update] Org功能修改 * [Bugfix] 修复merge带来的问题 * [Update] org admin显示资产详情右侧选项卡；修复资产授权添加用户，会显示其他org用户的bug (#1594) * [Bugfix] 修复资产授权添加用户，显示其他org的用户bug * [Update] org admin 显示资产详情右侧选项卡 * Tmp org (#1596) * [Update] 修改index view * [Update] 修改nav * [Update] 修改profile * [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug * [Update] 修改get_all_assets * [Bugfix] 修复节点前面有个空目录 * [Bugfix] 修复merge引起的bug * [Update] Add init * [Update] Node get_all_assets 过滤游离资产，条件nodes_key=None -> nodes=None * [Update] 恢复原来的api地址 * [Update] 修改api * [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug * [Bugfix] Fix perm name unique * [Bugfix] 修复校验失败api * [Update] Merge with org * [Merge] 修改一下bug * [Update] 暂时修改一些url * [Update] 修改url 为django 2.0 path * [Update] 优化datatable 和显示组织优化 * [Update] 升级url * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新，测试连接，str 没有 decode(… (#1613) * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新，测试连接，str 没有 decode() method的bug * [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug * [Bugfix] 修复一些bug * [Bugfix] 修复一些bug * [Update] 更新org下普通用户的资产详情 (#1619) * [Update] 更新org下普通用户查看资产详情，只显示数据 * [Update] 优化org下普通用户查看资产详情前端代码 * [Update] 创建/更新用户的role选项；密码强度提示信息中英文； (#1623) * [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题 * [Update] 用户密码强度提示信息支持中英文 * [Update] 修改token返回 * [Update] Asset返回org name * [Update] 修改支持xpack * [Update] 修改url * [Bugfix] 修复不登录就能查看资产的bug * [Update] 用户修改 * [Bugfix] ... * [Bugfix] 修复跳转错误的问题 * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644) * [Update] 更新xpack下orgs的翻译信息 * [Update] 更新model Label，继承OrgModelMixin; * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; * [Bugfix] 修复小bug * [Update] 优化一些api * [Update] 优化用户资产页面 * [Update] 更新 xpack/orgs 删除功能：限制在当前org下删除当前org (#1645) * [Update] 修改版本号
442 lines
6.9 KiB
CSS
442 lines
6.9 KiB
CSS
.red-fonts {
|
|
color: #ed5565;
|
|
}
|
|
|
|
.form-group.required .control-label:after {
|
|
content: " *";
|
|
color: red;
|
|
}
|
|
|
|
.n-invalid {
|
|
border: 1px solid #f00;
|
|
}
|
|
|
|
.primary-panel .ibox-title {
|
|
color: #ffffff;
|
|
background-color: #1AB394;
|
|
}
|
|
|
|
.primary-panel .ibox-content {
|
|
border: 1px solid #1AB394;
|
|
}
|
|
|
|
.info-panel .ibox-title {
|
|
color: #ffffff;
|
|
background-color: #23c6c8;
|
|
}
|
|
|
|
.info-panel .ibox-content {
|
|
border: 1px solid #23c6c8;;
|
|
}
|
|
|
|
th a {
|
|
color: #676a6c;
|
|
}
|
|
|
|
.select2-container--default .select2-results__option--highlighted[aria-selected] {
|
|
background-color: #d2d2d2 !important;
|
|
color: #333 !important;
|
|
}
|
|
|
|
.select2-selection--single,
|
|
.select2-selection--multiple {
|
|
border: 1px solid #e5e6e7 !important;
|
|
cursor: text !important;
|
|
}
|
|
|
|
.select2-container--forcus {
|
|
border: 1px solid #1AB394 !important;
|
|
}
|
|
|
|
.select2-selection__choice,
|
|
.chosen-container-multi .chosen-choices li.search-choice {
|
|
background: #f1f1f1 !important;
|
|
border: 1px solid #e5e6e7 !important;
|
|
/*border: 1px solid #ededed;*/
|
|
border-radius: 2px !important;
|
|
box-shadow: none !important;
|
|
color: #333333 !important;
|
|
cursor: default !important;
|
|
line-height: 13px !important;
|
|
/*margin: 3px 0 3px 5px !important;*/
|
|
padding: 3px 20px 3px 5px !important;
|
|
position: relative !important;
|
|
}
|
|
|
|
.select2-container--default.select2-container--focus .select2-selection--multiple {
|
|
border: 1px solid #1ab394 !important;
|
|
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3) !important;
|
|
}
|
|
|
|
.passwordBox2 {
|
|
max-width: 660px;
|
|
margin: 0 auto;
|
|
padding: 100px 20px 20px 20px;
|
|
}
|
|
|
|
.no-borders-tr td {
|
|
border-top: none !important;
|
|
}
|
|
|
|
table.dataTable tbody > tr.selected, table.dataTable tbody > tr > .selected {
|
|
background-color: #1ab394 !important;
|
|
}
|
|
|
|
table.dataTable tbody tr.selected a,
|
|
table.dataTable tbody th.selected a,
|
|
table.dataTable tbody td.selected a,
|
|
table.dataTable tbody tr.selected td i.text-navy,
|
|
table.dataTable tbody th.selected td i.text-navy,
|
|
table.dataTable tbody td.selected td i.text-navy {
|
|
color: white !important;
|
|
}
|
|
|
|
.m-0 {
|
|
margin: 0px !important;
|
|
}
|
|
|
|
.m-t-0 {
|
|
margin-top: 0px !important;
|
|
}
|
|
|
|
.m-b-0 {
|
|
margin-bottom: 0px !important;
|
|
}
|
|
|
|
.m-l-0 {
|
|
margin-left: 0px !important;
|
|
}
|
|
|
|
.m-r-0 {
|
|
margin-right: 0px !important;
|
|
}
|
|
|
|
.m-5 {
|
|
margin: 5px !important;
|
|
}
|
|
|
|
.m-t-5 {
|
|
margin-top: 5px !important;
|
|
}
|
|
|
|
.m-b-5 {
|
|
margin-bottom: 5px !important;
|
|
}
|
|
|
|
.m-l-5 {
|
|
margin-left: 5px !important;
|
|
}
|
|
|
|
.m-r-5 {
|
|
margin-right: 5px !important;
|
|
}
|
|
|
|
.m-10 {
|
|
margin: 10px !important;
|
|
}
|
|
|
|
.m-t-10 {
|
|
margin-top: 10px !important;
|
|
}
|
|
|
|
.m-b-10 {
|
|
margin-bottom: 10px !important;
|
|
}
|
|
|
|
.m-l-10 {
|
|
margin-left: 10px !important;
|
|
}
|
|
|
|
.m-r-10 {
|
|
margin-right: 10px !important;
|
|
}
|
|
|
|
.m-15 {
|
|
margin: 15px !important;
|
|
}
|
|
|
|
.m-t-15 {
|
|
margin-top: 15px !important;
|
|
}
|
|
|
|
.m-b-15 {
|
|
margin-bottom: 15px !important;
|
|
}
|
|
|
|
.m-l-15 {
|
|
margin-left: 15px !important;
|
|
}
|
|
|
|
.m-r-15 {
|
|
margin-right: 15px !important;
|
|
}
|
|
|
|
.m-20 {
|
|
margin: 20px !important;
|
|
}
|
|
|
|
.m-t-20 {
|
|
margin-top: 20px !important;
|
|
}
|
|
|
|
.m-b-20 {
|
|
margin-bottom: 20px !important;
|
|
}
|
|
|
|
.m-l-20 {
|
|
margin-left: 20px !important;
|
|
}
|
|
|
|
.m-r-20 {
|
|
margin-right: 20px !important;
|
|
}
|
|
|
|
.m-25 {
|
|
margin: 25px !important;
|
|
}
|
|
|
|
.m-t-25 {
|
|
margin-top: 25px !important;
|
|
}
|
|
|
|
.m-b-25 {
|
|
margin-bottom: 25px !important;
|
|
}
|
|
|
|
.m-l-25 {
|
|
margin-left: 25px !important;
|
|
}
|
|
|
|
.m-r-25 {
|
|
margin-right: 25px !important;
|
|
}
|
|
|
|
.m-30 {
|
|
margin: 30px !important;
|
|
}
|
|
|
|
.m-t-30 {
|
|
margin-top: 30px !important;
|
|
}
|
|
|
|
.m-b-30 {
|
|
margin-bottom: 30px !important;
|
|
}
|
|
|
|
.m-l-30 {
|
|
margin-left: 30px !important;
|
|
}
|
|
|
|
.m-r-30 {
|
|
margin-right: 30px !important;
|
|
}
|
|
|
|
.ydxbd {
|
|
font-size: 12px;
|
|
width: 100%;
|
|
overflow: hidden;
|
|
padding-top: 15px;
|
|
margin-bottom: 15px;
|
|
display: block;
|
|
background: #f4f4f4;
|
|
padding-left: 10px;
|
|
padding-bottom: 15px;
|
|
}
|
|
|
|
.mar {
|
|
margin-left: 2px;
|
|
line-height: 0px;
|
|
}
|
|
|
|
.mar-j {
|
|
margin-left: 3px;
|
|
margin-right: 3px;
|
|
}
|
|
|
|
.form-asset-on p {
|
|
margin-bottom: 0px;
|
|
}
|
|
|
|
.form-asset-on button {
|
|
background: #f1f1f1;
|
|
margin-right: 2px;
|
|
}
|
|
|
|
.form-asset-on {
|
|
border: 1px solid #e5e6e7;
|
|
padding-top: 5px;
|
|
padding-bottom: 0px;
|
|
padding-left: 5px;
|
|
padding-right: 5px;
|
|
min-height: 34px;
|
|
height: 100%;
|
|
}
|
|
|
|
.mgl-5 {
|
|
margin-left: 5px;
|
|
font-size: 12px;
|
|
}
|
|
|
|
.c02 {
|
|
color: #999;
|
|
}
|
|
|
|
.tagBtnList {
|
|
font-size: 12px;
|
|
line-height: 32px;
|
|
margin: -5px 0 0 0;
|
|
padding-left: 0px;
|
|
}
|
|
|
|
.tagBtn2 {
|
|
margin: 0 5px 5px 0;
|
|
font-size: 12px;
|
|
vertical-align: middle;
|
|
}
|
|
|
|
div.dataTables_wrapper div.dataTables_filter,
|
|
.dataTables_length {
|
|
float: right !important;
|
|
}
|
|
|
|
div.dataTables_wrapper div.dataTables_filter {
|
|
margin-left: 15px;
|
|
}
|
|
|
|
.simple-tag {
|
|
background-color: #f3f3f4;
|
|
border: 1px solid #e7eaec;
|
|
border-radius: 2px;
|
|
color: inherit;
|
|
display: inline-block;
|
|
font-size: 10px;
|
|
margin-right: 5px;
|
|
margin-top: 5px;
|
|
padding: 5px 12px;
|
|
}
|
|
|
|
#op.col-md-6 {
|
|
padding-left: 0;
|
|
}
|
|
|
|
.help-message {
|
|
padding-left: 10px;
|
|
font-size: 12px;
|
|
line-height: 18px;
|
|
margin-bottom: 0;
|
|
margin-left: 10px;
|
|
margin-right: 10px
|
|
}
|
|
|
|
.navbar-default {
|
|
background-color: #2f4050;
|
|
border-color: #2f4050;
|
|
}
|
|
|
|
.nav-header, body.mini-navbar .nav-header {
|
|
padding: 0;
|
|
/*background: #202c37;*/
|
|
}
|
|
|
|
.profile-element div:first-child {
|
|
line-height: 60px;
|
|
/*width: 70px;*/
|
|
/*float: left;*/
|
|
text-align: center;
|
|
}
|
|
|
|
.profile-element div:last-child a {
|
|
line-height: 60px;
|
|
width: 150px;
|
|
float: left;
|
|
font-size: 22px;
|
|
color: #1ab394;
|
|
}
|
|
|
|
.logo-element {
|
|
padding: 10px 0;
|
|
}
|
|
|
|
.welcome-message img {
|
|
margin: -11px 0;
|
|
}
|
|
|
|
.nav.nav-tabs li.active {
|
|
background-color: #FFF;
|
|
}
|
|
|
|
.ibox-title {
|
|
border-top: none;
|
|
}
|
|
|
|
.nav.nav-tabs li > a {
|
|
max-height: 38px;
|
|
}
|
|
|
|
.nav.nav-tabs li.active a {
|
|
border: none;
|
|
}
|
|
|
|
.popover-title {
|
|
padding: 8px 14px;
|
|
margin: 0;
|
|
font-size: 14px;
|
|
background-color: #f7f7f7;
|
|
border-bottom: 1px solid #ebebeb;
|
|
border-radius: 5px 5px 0 0;
|
|
}
|
|
|
|
.popover {
|
|
padding: 9px 14px;
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
z-index: 1060;
|
|
display: none;
|
|
max-width: 276px;
|
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
|
font-size: 14px;
|
|
font-style: normal;
|
|
font-weight: 400;
|
|
line-height: 1.42857143;
|
|
text-decoration: none;
|
|
text-shadow: none;
|
|
text-transform: none;
|
|
letter-spacing: normal;
|
|
word-break: normal;
|
|
word-spacing: normal;
|
|
word-wrap: normal;
|
|
white-space: normal;
|
|
background-color: #fff;
|
|
background-clip: padding-box;
|
|
border: 1px solid #ccc;
|
|
border-radius: 6px;
|
|
box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
|
|
line-break: auto;
|
|
}
|
|
|
|
.tree-toggle {
|
|
position: absolute;
|
|
left: 0;
|
|
top: 1px;
|
|
height: 100%;
|
|
}
|
|
|
|
.tree-toggle-btn {
|
|
width: 12px;
|
|
text-align: center;
|
|
padding: 5px 0;
|
|
}
|
|
|
|
.profile-dropdown li a {
|
|
font-size: 12px !important;
|
|
}
|
|
|
|
.ellipsis {
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
|