• 老广's avatar
    Merge to dev (#1051) · c2abd58d
    老广 authored
    * [Update] 修改 success message, 添加资产组时可以添加资产
    
    * [Update] system user form add label
    
    * [Update] set default cluster
    
    * [Update] 修改一些翻译
    
    * [Bugfix] 修复重置密码bug
    
    * [Bugfix] 默认default cluster
    
    * [Bugfix] 用户添加报错
    
    * 修改tab样式
    
    * [Bugfix] 修复了一些显示上的bug
    
    * 修复全选按钮在搜索后仍然选择全部的问题
    
    * [Bugfix] 修复以下bug
    1. 查看执行历史异常
    2. 用户授权资产页显示message
    
    * [Update] api 返回platform, 并增加web terminal nav
    
    * [Feature] 添加setting页面
    
    * [Feature] 添加basic settings
    
    * [Update] 修改翻译
    
    * [Update] 修改config
    
    * [Update] 启动加载common setting
    
    * [Bugfix] 修复cluster创建的bug
    
    * [Bugfix] 修复title显示Jumpserver
    
    * [Bugfix] setting tables not found
    
    * [Bugfix] settings add option
    
    * [Feature] 添加后端paging
    
    * [Bugfix] 资产列表选择别的页会报错
    
    * [Update] check all 只选择当前页面
    
    * [Bugfix] user login ip
    
    * [Bugfix] for login ip
    
    * [Bugfix] 修复资产列表显示bug
    
    * [Remove] labels
    
    * [Bugfix] task运行失败,因为tasks没有设置
    
    * [Feature] 增加标签
    
    * [Bugfix] 读取不到prefix
    
    * For storage
    
    * [Change] 修改部分翻译
    
    * [Update] 启用ldap移动位置
    
    * [Update] 修改翻译
    
    * [Feature] 支持es存储命令
    
    * Update README.md
    
    * [Feature] 添加es支持
    
    * [update] 修改用户创建时 姓名和用户名的位置
    
    * [Update] 修改install.md
    
    * [Update] remote default PAGE_SIZE stting
    
    * [Feature] terminal config load
    
    * [Feature] es support
    
    * [Update] 修改requirement
    
    * [Update] 修改requirements
    
    * [Update] 修改dictfiled
    
    * [Fix] 修改Logger
    
    * [Bugfix] 倒序显示
    
    * [Update] 修改默认头像和logo
    
    * [Update] 修改django-celery-beat的版本
    
    * [Feature] 添加修改用户密码api
    
    * add logo test
    
    * [Bugfix] 修复一些bug
    
    * [Update] 修改copyrite
    
    * [Update] 修改copyright
    
    * Update ISSUE_TEMPLATE.md
    
    * [Update] 修改禁止排序的颜色
    
    * [Feature] 标签管理功能
    
    * [Bugfix] git status
    
    * [Model] 修改create_by字段
    
    * [Update] 修改位置
    
    * [Update] 修改签名md5算法
    
    * [Feature] 资产列表标签搜索
    
    * [Feature] 添加资产详情标签
    
    * [Bugfix] 修复资产搜索bug
    
    * [Update] ansible disk bug
    
    * [Update] ansible disk bug
    
    * [Bugfix] 修复获取kvmcpu的bug
    
    * [Bugfix] 修复bsd获取cpu数量bug
    
    * [Bugfix] 修改翻译
    
    * [Bugfix] 资产model 太长
    
    * [Bugfix] 修改项目结构描述
    
    修正"项目多语言目录"
    
    * Update project_structure.md
    
    * [Update] add debug log
    
    * refactor: rename folder i18n
    
    * [Feature] 添加链接token
    
    * [Feature] Label 删除修改
    
    * [Update] 修改部分翻译
    
    * [Update] 修改小bug
    
    * [Update] 修复获取资产信息异常bug
    
    * [Bugfix] 修复系统用户上传秘钥的bug
    
    * [Update] 修改获取资产信息产生的异常
    
    * [Update] 删除部分资产属性
    
    * [Bugfix] 资产批量便捷
    
    * [Update] 修改认证
    
    * [Feature] 支持popover
    
    * [Feature] tree
    
    * [Feature] 添加资产树
    
    * [Feature] 使用ztree
    
    * [Feature] tree增删功能
    
    * [Bugfix] 修复组详情bug
    
    * [Bugfix] 修复组详情bug
    
    * [Bugfix] 修改创建label时报错的bug
    
    * [Bugfix] 修改label api bug
    
    * [Update] 去掉资产组添加
    
    * [Update] 修改ztrr
    
    * Update README.md
    
    * [Update] 修改资产创建
    
    * [Bugfix] 修复ldap认证bug
    
    * [Update] 修改一处翻译
    
    * [Update] 更改授权规则前commit
    
    * [Abandon] ...
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * [Feature] 完成资产授权和资产添加
    
    * [Update] 修改授权
    
    * [Bugfix] 修改创建系统用户的bug
    
    * feat: rdp support
    
    * [Update] 拆分asset api module
    
    * [Update] 资产列表选中和移除资产
    
    * [Feature] 更改perms api
    
    * [Update] 使用资产树,去掉集群和资产组
    
    * [Update] 修改系统用户推送,拆分assets的部分模块
    
    * [Update] 完成树形改造
    
    * [Update] 完成资产书
    
    * [Update] 修改资产model
    
    * ubuntu16.04 deb_requirements.txt update (#1007)
    
    * Update run server.py (#915)
    
    Fix  for not callable error when  config.py not exists
    
    * [Update]一些修改
    
    * [Update] 修改初始
    
    * feat: replay setting page and api
    
    * 增加隐藏树功能
    
    * [Update] 修改翻译
    
    * 对齐菜单文字。修改英文
    
    * feat: update app setting
    
    * fix: app get replay storage
    
    * [Update] 修改文案
    
    * [Docs] 初始化doc
    
    * [Bugfix] 用户csv导入编码问题
    
    * [Update] 修改设置的一些require
    
    * [Bugfix] 修复管理用户无法查看的bug
    
    * [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
    
    * [Update] terminal可以更改名称
    
    * [Update] 统一copyright
    
    * [Update] 修改文档
    
    * [Bugfix] 修复资产禁用还可以登录
    
    * [Update] 修改文案
    
    * [Update] 支持拖拽更新
    
    * [Bugfix] 修复bug,修改celery beat版本依赖
    
    * [Update] 修改一些小问题
    
    * 添加普通用户使用内容
    
    * [Update] 修改一些文案
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * 用户列表
    
    * [Update] 修改一些bug和文案
    
    * [Delete] 删除build 页面
    
    * [Update] 修改conf
    
    * [Update] bugfix
    
    * [Update] 更新文档地址
    
    * [Update] 修改部分翻译和文档
    
    * [Update] 修改一些bug
    
    * [Update] 修改链接
    
    * [Update] 增加批量终端session api
    
    * [Update] 修改Node value唯一
    
    * [Bugfix] 修复首页无法显示数据的bug
    
    * feat: s3 replay file get
    
    * feat: update
    
    * [Update] 修改bug
    Unverified
    c2abd58d
awesome.css 8.24 KB
/*-------------------------------------
zTree Style using fontawesome instead of images

version:    1.1
author:     Mike King
email:      mikkelking @ hotmail . com
website:    http://code.google.com/p/jquerytree/

-------------------------------------*/
/* Definitions ----------------------*/
/* End of Definitions ---------------*/
/* Imports  -------------------------*/
/* End of Imports  ------------------*/
.ztree * {
  padding: 0;
  margin: 0;
  font-size: 12px;
  font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
  background-color: #f3f3f3;
}
.ztree {
  margin: 0;
  padding: 5px;
  color: #676a6c;
  background-color: #f3f3f3;
}
.ztree li {
  padding: 0;
  margin: 0;
  list-style: none;
  line-height: 17px;
  text-align: left;
  white-space: nowrap;
  outline: 0;
}
.ztree li ul {
  margin: 0px;
  padding: 0 0 0 18px;
}
.ztree li a {
  padding-right: 3px;
  margin: 0;
  cursor: pointer;
  height: 20px;
  color: #676a6c;
  background-color: transparent;
  text-decoration: none;
  vertical-align: top;
  display: inline-block;
}
.ztree li a input.rename {
  height: 14px;
  width: 80px;
  padding: 0;
  margin: 0;
  color: #f3f3f3;
  background-color: #676a6c;
  font-size: 12px;
  border: 1px #585956 solid;
  *border: 0px;
}
.ztree li a:hover {
  background: #e7f4f9;
  border-radius: 2px;
  box-shadow: inset 0 0 1px #cccccc;
}
.ztree li a.curSelectedNode {
  padding-top: 0px;
  background-color: #beebff;
  color: #676a6c;
  height: 20px;
  opacity: 0.8;
}
.ztree li a.curSelectedNode_Edit {
  padding-top: 0px;
  background-color: #f3f3f3;
  color: red;
  height: 20px;
  border: 1px #676a6c solid;
  opacity: 0.8;
}
.ztree li a.tmpTargetNode_inner {
  padding-top: 0px;
  background-color: #f3f3f3;
  color: #676a6c;
  height: 20px;
  border: 1px #666 solid;
  opacity: 0.8;
  filter: alpha(opacity=80);
}
.ztree li span {
  line-height: 20px;
  margin-right: 2px;
  background-color: transparent;
}
.ztree li span.button {
  line-height: 0;
  margin: 0;
  padding: 0;
  width: 18px;
  height: 20px;
  display: inline-block;
  vertical-align: top;
  border: 0px solid;
  cursor: pointer;
  outline: none;
  background-color: transparent;
  background-repeat: no-repeat;
  background-attachment: scroll;
}
.ztree li span.button::before {
  color: #676a6c;
  font-family: FontAwesome;
  padding-top: 10px;
}
.ztree li span.button.chk {
  margin: 0px;
  cursor: auto;
  width: 12px;
  display: inline-block;
  padding-top: 10px;
  padding-left: 2px;
}
.ztree li span.button.chk.checkbox_false_full::before {
  content: "\f096";
}
.ztree li span.button.chk.checkbox_false_full_focus::before {
  content: "\f096";
  color: #676a6c;
}
.ztree li span.button.chk.checkbox_false_part::before {
  content: "\f096";
  color: #aaaaaa;
}
.ztree li span.button.chk.checkbox_false_part_focus::before {
  content: "\f096";
  color: #cad96c;
}
.ztree li span.button.chk.checkbox_false_disable::before {
  content: "\f096";
  color: #808080;
}
.ztree li span.button.chk.checkbox_true_full::before {
  content: "\f046";
}
.ztree li span.button.chk.checkbox_true_full_focus::before {
  content: "\f046";
}
.ztree li span.button.chk.checkbox_true_part::before {
  content: "\f14a";
}
.ztree li span.button.chk.checkbox_true_part_focus::before {
  content: "\f14a";
  color: #676a6c;
}
.ztree li span.button.chk.checkbox_true_full_focus::before {
  content: "\f046";
  color: #676a6c;
}
.ztree li span.button.chk.checkbox_true_part::before {
  content: "\f046";
  color: #aaaaaa;
}
.ztree li span.button.chk.checkbox_true_part_focus::before {
  content: "\f046";
  color: #cad96c;
}
.ztree li span.button.chk.checkbox_true_disable::before {
  content: "\f046";
  color: #808080;
}
.ztree li span.button.chk.radio_false_full::before {
  content: "\f10c";
}
.ztree li span.button.chk.radio_false_full_focus::before {
  content: "\f10c";
  color: #676a6c;
}
.ztree li span.button.chk.radio_false_part::before {
  content: "\f10c";
  color: #aaaaaa;
}
.ztree li span.button.chk.radio_false_part_focus::before {
  content: "\f10c";
  color: #676a6c;
}
.ztree li span.button.chk.radio_false_disable::before {
  content: "\f1db";
  color: #808080;
}
.ztree li span.button.chk.radio_true_full::before {
  content: "\f192";
}
.ztree li span.button.chk.radio_true_full_focus::before {
  content: "\f192";
  color: #676a6c;
}
.ztree li span.button.chk.radio_true_part::before {
  content: "\f192";
  color: #aaaaaa;
}
.ztree li span.button.chk.radio_true_part_focus::before {
  content: "\f192";
  color: #aaaaaa;
}
.ztree li span.button.chk.radio_true_disable::before {
  content: "\f1db";
  color: #808080;
}
.ztree li span.button.switch {
  width: 18px;
  height: 20px;
}
.ztree li span.button.root_open::before {
  content: "\f078";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.root_close::before {
  content: "\f054";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.roots_open::before {
  content: "\f078";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.roots_close::before {
  content: "\f054";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.center_open::before {
  content: "\f078";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.center_close::before {
  content: "\f054";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.bottom_open::before {
  content: "\f078";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.bottom_close::before {
  content: "\f054";
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
}
.ztree li span.button.root_docu {
  background: none;
}
.ztree li span.button.roots_docu::before {
  content: "\f114";
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.center_docu::before {
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.bottom_docu::before {
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.noline_docu {
  background: none;
}
.ztree li span.button.ico_open::before {
  content: "\f07c";
  font-family: FontAwesome;
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.ico_close::before {
  content: "\f07b";
  font-family: FontAwesome;
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.ico_docu::before {
  content: "\f114";
  font-family: FontAwesome;
  padding-top: 10px;
  padding-left: 2px;
  display: inline-block;
  color: #676a6c;
}
.ztree li span.button.edit {
  margin-left: 4px;
  margin-right: -1px;
  vertical-align: top;
  *vertical-align: middle;
  padding-top: 10px;
}
.ztree li span.button.edit::before {
  content: "\f044";
  font-family: FontAwesome;
}
.ztree li span.button.remove {
  margin-left: 4px;
  margin-right: -1px;
  vertical-align: top;
  *vertical-align: middle;
  padding-top: 10px;
}
.ztree li span.button.remove::before {
  content: "\f1f8";
  font-family: FontAwesome;
}
.ztree li span.button.add {
  margin-left: 4px;
  margin-right: -1px;
  vertical-align: top;
  *vertical-align: middle;
  padding-top: 10px;
}
.ztree li span.button.add::before {
  content: "\f067";
  font-family: FontAwesome;
}
.ztree li span.button.ico_loading {
  margin-right: 2px;
  background: url(img/loading.gif) no-repeat scroll 0 0 transparent;
  vertical-align: top;
  *vertical-align: middle;
}
ul.tmpTargetzTree {
  background-color: #FFE6B0;
  opacity: 0.8;
  filter: alpha(opacity=80);
}
span.tmpzTreeMove_arrow {
  width: 16px;
  height: 20px;
  display: inline-block;
  padding: 0;
  margin: 2px 0 0 1px;
  border: 0 none;
  position: absolute;
  background-color: transparent;
  background-attachment: scroll;
}
span.tmpzTreeMove_arrow::before {
  content: "\f04b";
  font-family: FontAwesome;
  color: #676a6c;
}
ul.ztree.zTreeDragUL {
  margin: 0;
  padding: 0;
  position: absolute;
  width: auto;
  height: auto;
  overflow: hidden;
  background-color: #cfcfcf;
  border: 1px #676a6c dotted;
  opacity: 0.8;
  filter: alpha(opacity=80);
}
.ztreeMask {
  z-index: 10000;
  background-color: #cfcfcf;
  opacity: 0.0;
  filter: alpha(opacity=0);
  position: absolute;
}