Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
7241f750
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,发现更多精彩内容 >>
提交
7241f750
编写于
9月 05, 2016
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update nav
上级
8827fd2d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
69 addition
and
53 deletion
+69
-53
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
+54
-38
apps/templates/_foot_js.html
apps/templates/_foot_js.html
+1
-1
apps/templates/_nav.html
apps/templates/_nav.html
+13
-13
apps/users/forms.py
apps/users/forms.py
+1
-1
未找到文件。
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
7241f750
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
7241f750
...
...
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To:
ibuler@qq.com
\n"
"POT-Creation-Date: 2016-09-05
12:13
+0800\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-05
20:18
+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n"
...
...
@@ -82,7 +82,7 @@ msgid "VALUE"
msgstr "VALUE"
#: assets/models.py:55 assets/models.py:77 users/forms.py:12
#: users/models.py:106 users/templates/users/login.html:5
8
#: users/models.py:106 users/templates/users/login.html:5
4
#: users/templates/users/user_detail.html:73
#: users/templates/users/user_edit.html:5
#: users/templates/users/user_list.html:13
...
...
@@ -90,7 +90,7 @@ msgid "Username"
msgstr "用户名"
#: assets/models.py:56 assets/models.py:78 users/forms.py:13
#: users/templates/users/login.html:
61
#: users/templates/users/login.html:
57
#: users/templates/users/reset_password.html:52
#: users/templates/users/user_add.html:8 users/templates/users/user_add.html:10
#: users/templates/users/user_edit.html:12
...
...
@@ -162,7 +162,7 @@ msgstr "端口"
msgid "Asset groups"
msgstr "用户组"
#: assets/models.py:107
#: assets/models.py:107
assets/models.py:109 templates/_nav.html:24
msgid "Admin user"
msgstr "管理用户"
...
...
@@ -170,10 +170,6 @@ msgstr "管理用户"
msgid "Admin password"
msgstr "管理员密码"
#: assets/models.py:110
msgid "Sys User"
msgstr "系统用户"
#: assets/models.py:111 templates/_nav.html:23
msgid "IDC"
msgstr "机房"
...
...
@@ -318,8 +314,8 @@ msgstr "欢迎使用Jumpserver开源跳板机系统"
msgid "Help"
msgstr "帮助"
#: templates/_nav.html:9 users/views.py:10
2 users/views.py:115
#: users/views.py:15
9 users/views.py:176 users/views.py:201 users/views.py:214
#: templates/_nav.html:9 users/views.py:10
0 users/views.py:113
#: users/views.py:15
3 users/views.py:170 users/views.py:195 users/views.py:208
msgid "Users"
msgstr "用户管理"
...
...
@@ -327,12 +323,18 @@ msgstr "用户管理"
msgid "User"
msgstr "用户"
#: templates/_nav.html:13 users/models.py:109
#: users/templates/users/user_detail.html:181
#: users/templates/users/user_list.html:15
msgid "Usergroup"
#: templates/_nav.html:13
msgid "User group"
msgstr "用户组"
#: templates/_nav.html:22
msgid "Asset group"
msgstr "资产组"
#: templates/_nav.html:25
msgid "System user"
msgstr "系统"
#: templates/_nav.html:26
msgid "Label"
msgstr "标签"
...
...
@@ -385,8 +387,12 @@ msgstr "注销登录"
msgid "Play CAPTCHA as audio file"
msgstr ""
#: templates/captcha/text_field.html:4
msgid "Captcha"
msgstr "验证码"
#: users/forms.py:31 users/forms.py:50
msgid "Join usergroups"
msgid "Join user
groups"
msgstr "添加到用户组"
#: users/models.py:102 users/models.py:225
...
...
@@ -397,6 +403,11 @@ msgstr "管理员"
msgid "Email"
msgstr "邮件"
#: users/models.py:109 users/templates/users/user_detail.html:181
#: users/templates/users/user_list.html:15
msgid "Usergroup"
msgstr "用户组"
#: users/models.py:110 users/templates/users/user_detail.html:93
#: users/templates/users/user_list.html:14
msgid "Role"
...
...
@@ -434,16 +445,16 @@ msgstr "Administrator是初始的超级管理员"
msgid "System"
msgstr "系统"
#: users/templates/users/_user.html:1
8
users/templates/users/user_list.html:5
#: users/views.py:11
5
#: users/templates/users/_user.html:1
7
users/templates/users/user_list.html:5
#: users/views.py:11
3
msgid "Create user"
msgstr "创建用户"
#: users/templates/users/_user.html:3
4
#: users/templates/users/_user.html:3
3
msgid "Account"
msgstr "账户"
#: users/templates/users/_user.html:4
4
#: users/templates/users/_user.html:4
3
msgid "Security and Role"
msgstr "角色安全"
...
...
@@ -455,11 +466,11 @@ msgstr "忘记密码"
msgid "Input your email, that will send a mail to your"
msgstr "输入您的邮箱, 将会发一封重置短信邮件到您的邮箱中"
#: users/templates/users/login.html:4
6 users/templates/users/login.html:66
#: users/templates/users/login.html:4
2 users/templates/users/login.html:62
msgid "Login"
msgstr "登录"
#: users/templates/users/login.html:
51
#: users/templates/users/login.html:
47
msgid "Captcha invalid"
msgstr "验证码错误"
...
...
@@ -484,7 +495,7 @@ msgstr "生成重置密码连接,通过邮件发送给用户"
msgid "Confirm delete"
msgstr "确认删除"
#: users/templates/users/user_detail.html:18 users/views.py:17
6
#: users/templates/users/user_detail.html:18 users/views.py:17
0
msgid "User detail"
msgstr "用户详情"
...
...
@@ -625,64 +636,69 @@ msgstr ""
" </br>\n"
" "
#: users/views.py:5
5
#: users/views.py:5
3
msgid "Username or password invalid"
msgstr "用户名或密码错误"
#: users/views.py:7
2
#: users/views.py:7
0
msgid "Logout success"
msgstr "退出登录成功"
#: users/views.py:7
3
#: users/views.py:7
1
msgid "Logout success, return login page"
msgstr "退出登录成功,返回到登录页面"
#: users/views.py:10
2
#: users/views.py:10
0
msgid "User list"
msgstr "用户列表"
#: users/views.py:1
11
#: users/views.py:1
09
#, python-format
msgid "Create user<a href=\"%s\">%s</a> success."
msgstr "创建用户<a href=\"%s\">%s</a> 成功"
#: users/views.py:15
9
#: users/views.py:15
3
msgid "Edit user"
msgstr "编辑用户"
#: users/views.py:
201
#: users/views.py:
195
msgid "Usergroup list"
msgstr "用户组列表"
#: users/views.py:2
14
#: users/views.py:2
08
msgid "Create usergroup"
msgstr "创建用户组"
#: users/views.py:24
6
#: users/views.py:24
0
msgid "Email address invalid, input again"
msgstr "邮箱地址错误,重新输入"
#: users/views.py:25
7
#: users/views.py:25
1
msgid "Send reset password message"
msgstr "发送重置密码邮件"
#: users/views.py:25
8
#: users/views.py:25
2
msgid "Send reset password mail success, login your mail box and follow it "
msgstr ""
"发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"
#: users/views.py:2
70
#: users/views.py:2
64
msgid "Reset password success"
msgstr "重置密码成功"
#: users/views.py:2
71
#: users/views.py:2
65
msgid "Reset password success, return to login page"
msgstr "重置密码成功,返回到登录页面"
#: users/views.py:28
7 users/views.py:300
#: users/views.py:28
1 users/views.py:294
msgid "Token invalid or expired"
msgstr "Token错误或失效"
#: users/views.py:29
6
#: users/views.py:29
0
msgid "Password not same"
msgstr "密码不一致"
#, fuzzy
#~| msgid "Asset groups"
#~ msgid "Assetgroup"
#~ msgstr "用户组"
apps/templates/_foot_js.html
浏览文件 @
7241f750
...
...
@@ -15,7 +15,7 @@
$
(
'
#index
'
).
addClass
(
'
active
'
)
}
else
{
$
(
"
#
"
+
s1
).
addClass
(
'
active
'
);
$
(
'
#
'
+
s1
+
'
.
'
+
s2
).
addClass
(
'
active
'
);
$
(
'
#
'
+
s1
+
'
#
'
+
s2
).
addClass
(
'
active
'
);
}
function
getCookie
(
name
)
{
...
...
apps/templates/_nav.html
浏览文件 @
7241f750
...
...
@@ -9,30 +9,30 @@
<i
class=
"fa fa-group"
></i>
<span
class=
"nav-label"
>
{% trans 'Users' %}
</span><span
class=
"fa arrow"
></span>
</a>
<ul
class=
"nav nav-second-level active"
>
<li
class
=
"user"
><a
href=
"{% url 'users:user-list' %}"
>
{% trans 'User' %}
</a></li>
<li
class=
"usergroup"
><a
href=
"{% url 'users:usergroup-list' %}"
>
{% trans 'User
group' %}
</a></li>
<li
id
=
"user"
><a
href=
"{% url 'users:user-list' %}"
>
{% trans 'User' %}
</a></li>
<li
id=
"usergroup"
><a
href=
"{% url 'users:usergroup-list' %}"
>
{% trans 'User
group' %}
</a></li>
</ul>
</li>
<li
id=
""
>
<li
id=
"
assets
"
>
<a>
<i
class=
"fa fa-inbox"
></i>
<span
class=
"nav-label"
>
{% trans 'Assets' %}
</span><span
class=
"fa arrow"
></span>
</a>
<ul
class=
"nav nav-second-level"
>
<li
class=
"{% url 'assets:asset-list' %}"
><a
href=
"
"
>
{% trans 'Asset' %}
</a></li>
<li
class=
""
><a
href=
"{% url 'assets:assetgroup-list' %}"
>
{% trans 'Asset
group' %}
</a></li>
<li
class=
"
"
><a
href=
""
>
{% trans 'IDC' %}
</a></li>
<li
class=
"
"
><a
href=
""
>
{% trans 'Admin user' %}
</a></li>
<li
class=
"
"
><a
href=
""
>
{% trans 'System user' %}
</a></li>
<li
class
=
""
><a
href=
""
>
{% trans 'Label' %}
</a></li>
<li
id=
"asset"
><a
href=
"{% url 'assets:asset-list' %}
"
>
{% trans 'Asset' %}
</a></li>
<li
id=
"assetgroup"
><a
href=
"{% url 'assets:assetgroup-list' %}"
>
{% trans 'Asset
group' %}
</a></li>
<li
id=
"idc
"
><a
href=
""
>
{% trans 'IDC' %}
</a></li>
<li
id=
"admin-user
"
><a
href=
""
>
{% trans 'Admin user' %}
</a></li>
<li
id=
"system-user
"
><a
href=
""
>
{% trans 'System user' %}
</a></li>
<li
id
=
""
><a
href=
""
>
{% trans 'Label' %}
</a></li>
</ul>
</li>
<li
id=
""
>
<a
href=
"#"
><i
class=
"fa fa-edit"
></i>
<span
class=
"nav-label"
>
{% trans 'Perms' %}
</span><span
class=
"fa arrow"
></span></a>
<ul
class=
"nav nav-second-level"
>
<li
class
=
"sudo"
>
<li
id
=
"sudo"
>
<a
class=
"sudo"
href=
""
>
{% trans 'Perm' %}
</a>
</li>
<li
class
=
"role"
>
<li
id
=
"role"
>
<a
href=
""
>
{% trans 'Create perm' %}
</a>
</li>
</ul>
...
...
@@ -47,8 +47,8 @@
<i
class=
"fa fa-download"
></i>
<span
class=
"nav-label"
>
{% trans 'File' %}
</span><span
class=
"fa arrow"
></span>
</a>
<ul
class=
"nav nav-second-level"
>
<li
class
=
"upload"
><a
href=
""
>
{% trans 'File upload' %}
</a></li>
<li
class
=
"download"
><a
href=
""
>
{% trans 'File download' %}
</a></li>
<li
id
=
"upload"
><a
href=
""
>
{% trans 'File upload' %}
</a></li>
<li
id
=
"download"
><a
href=
""
>
{% trans 'File download' %}
</a></li>
</ul>
</li>
<li
id=
""
>
...
...
apps/users/forms.py
浏览文件 @
7241f750
...
...
@@ -28,7 +28,7 @@ class UserAddForm(ModelForm):
}
widgets
=
{
'groups'
:
forms
.
SelectMultiple
(
attrs
=
{
'class'
:
'select2'
,
'data-placeholder'
:
_
(
'Join usergroups'
)}),
'groups'
:
forms
.
SelectMultiple
(
attrs
=
{
'class'
:
'select2'
,
'data-placeholder'
:
_
(
'Join user
groups'
)}),
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录