Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
6cee6269
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6cee6269
编写于
12月 15, 2017
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Feature] 翻译,并增加设置导航
上级
11fa3e08
变更
5
展开全部
隐藏空白更改
内联
并排
Showing
5 changed file
with
1099 addition
and
1002 deletion
+1099
-1002
apps/locale/zh/LC_MESSAGES/django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
apps/locale/zh/LC_MESSAGES/django.po
apps/locale/zh/LC_MESSAGES/django.po
+1079
-982
apps/ops/templates/ops/task_detail.html
apps/ops/templates/ops/task_detail.html
+2
-2
apps/templates/_nav.html
apps/templates/_nav.html
+14
-14
apps/terminal/models.py
apps/terminal/models.py
+4
-4
未找到文件。
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
6cee6269
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
6cee6269
此差异已折叠。
点击以展开。
apps/ops/templates/ops/task_detail.html
浏览文件 @
6cee6269
...
...
@@ -65,7 +65,7 @@
<td><b>
{{ object.adhoc.all |length }}
</b></td>
</tr>
<tr>
<td>
{% trans 'Last version' %}
</td>
<td>
{% trans 'La
te
st version' %}
</td>
<td><b>
{{ object.get_latest_adhoc.short_id }}
</b></td>
</tr>
<tr>
...
...
@@ -85,7 +85,7 @@
<td><b>
{{ object.get_latest_history.is_success|yesno:"Yes,No,Unkown" }}
</b></td>
</tr>
<tr>
<td>
{% trans 'Conents' %}:
</td>
<td>
{% trans 'Con
t
ents' %}:
</td>
<td>
<b>
{% for task in object.get_latest_adhoc.tasks %}
...
...
apps/templates/_nav.html
浏览文件 @
6cee6269
...
...
@@ -35,24 +35,24 @@
</ul>
</li>
<li
id=
"
terminal
"
>
<li
id=
"
ops
"
>
<a>
<i
class=
"fa fa-
rocket"
></i>
<span
class=
"nav-label"
>
{% trans 'Terminal
' %}
</span><span
class=
"fa arrow"
></span>
<i
class=
"fa fa-
coffee"
></i>
<span
class=
"nav-label"
>
{% trans 'Job Center
' %}
</span><span
class=
"fa arrow"
></span>
</a>
<ul
class=
"nav nav-second-level"
>
<li
id=
"terminal"
><a
href=
"{% url 'terminal:terminal-list' %}"
>
{% trans 'Terminal' %}
</a></li>
<li
id=
"session-online"
><a
href=
"{% url 'terminal:session-online-list' %}"
>
{% trans 'Session online' %}
</a></li>
<li
id=
"session-offline"
><a
href=
"{% url 'terminal:session-offline-list' %}"
>
{% trans 'Session offline' %}
</a></li>
<li
id=
"command"
><a
href=
"{% url 'terminal:command-list' %}"
>
{% trans 'Command' %}
</a></li>
<li
id=
"task"
><a
href=
"{% url 'ops:task-list' %}"
>
{% trans 'Tasks' %}
</a></li>
</ul>
</li>
<li
id=
"
ops
"
>
<li
id=
"
terminal
"
>
<a>
<i
class=
"fa fa-
coffee"
></i>
<span
class=
"nav-label"
>
{% trans 'Job Center
' %}
</span><span
class=
"fa arrow"
></span>
<i
class=
"fa fa-
rocket"
></i>
<span
class=
"nav-label"
>
{% trans 'Terminal
' %}
</span><span
class=
"fa arrow"
></span>
</a>
<ul
class=
"nav nav-second-level"
>
<li
id=
"task"
><a
href=
"{% url 'ops:task-list' %}"
>
{% trans 'Tasks' %}
</a></li>
<li
id=
"terminal"
><a
href=
"{% url 'terminal:terminal-list' %}"
>
{% trans 'Terminal' %}
</a></li>
<li
id=
"session-online"
><a
href=
"{% url 'terminal:session-online-list' %}"
>
{% trans 'Session online' %}
</a></li>
<li
id=
"session-offline"
><a
href=
"{% url 'terminal:session-offline-list' %}"
>
{% trans 'Session offline' %}
</a></li>
<li
id=
"command"
><a
href=
"{% url 'terminal:command-list' %}"
>
{% trans 'Command' %}
</a></li>
</ul>
</li>
...
...
@@ -65,11 +65,11 @@
{#
<li
id=
"download"
><a
href=
""
>
{% trans 'File download' %}
</a></li>
#}
{#
</ul>
#}
{#
</li>
#}
{#
<li
id=
""
>
#}
{#
<a
href=
""
>
#}
{#
<i
class=
"fa fa-gears"
></i>
<span
class=
"nav-label"
>
{% trans 'Settings' %}
</span><span
class=
"label label-info pull-right"
></span>
#}
{#
</a>
#}
{#
</li>
#}
<li
id=
""
>
<a
href=
""
>
<i
class=
"fa fa-gears"
></i>
<span
class=
"nav-label"
>
{% trans 'Settings' %}
</span><span
class=
"label label-info pull-right"
></span>
</a>
</li>
<li
class=
"special_link"
>
<a
href=
"http://www.jumpserver.org"
target=
"_blank"
><i
class=
"fa fa-database"
></i>
<span
class=
"nav-label"
>
{% trans 'Visit us' %}
</span>
...
...
apps/terminal/models.py
浏览文件 @
6cee6269
...
...
@@ -89,14 +89,14 @@ class Session(models.Model):
id
=
models
.
UUIDField
(
default
=
uuid
.
uuid4
,
primary_key
=
True
)
user
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
"User"
))
asset
=
models
.
CharField
(
max_length
=
1024
,
verbose_name
=
_
(
"Asset"
))
system_user
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
"System
U
ser"
))
system_user
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
"System
u
ser"
))
login_from
=
models
.
CharField
(
max_length
=
2
,
choices
=
LOGIN_FROM_CHOICES
,
default
=
"ST"
)
is_finished
=
models
.
BooleanField
(
default
=
False
)
has_replay
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
"Replay"
))
has_command
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
"Command"
))
terminal
=
models
.
ForeignKey
(
Terminal
,
null
=
True
,
on_delete
=
models
.
CASCADE
)
date_start
=
models
.
DateTimeField
(
verbose_name
=
_
(
"Date
S
tart"
))
date_end
=
models
.
DateTimeField
(
verbose_name
=
_
(
"Date
E
nd"
),
null
=
True
)
date_start
=
models
.
DateTimeField
(
verbose_name
=
_
(
"Date
s
tart"
))
date_end
=
models
.
DateTimeField
(
verbose_name
=
_
(
"Date
e
nd"
),
null
=
True
)
class
Meta
:
db_table
=
"terminal_session"
...
...
@@ -113,7 +113,7 @@ class Task(models.Model):
id
=
models
.
UUIDField
(
default
=
uuid
.
uuid4
,
primary_key
=
True
)
name
=
models
.
CharField
(
max_length
=
128
,
choices
=
NAME_CHOICES
,
verbose_name
=
_
(
"Name"
))
args
=
models
.
CharField
(
max_length
=
1024
,
verbose_name
=
_
(
"
Playbook
Args"
))
args
=
models
.
CharField
(
max_length
=
1024
,
verbose_name
=
_
(
"Args"
))
terminal
=
models
.
ForeignKey
(
Terminal
,
null
=
True
,
on_delete
=
models
.
CASCADE
)
is_finished
=
models
.
BooleanField
(
default
=
False
)
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录