diff --git a/jasset/views.py b/jasset/views.py index ca5e5f91a..7fce97d34 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -451,7 +451,7 @@ def asset_update(request): return HttpResponseRedirect(reverse('asset_detail')+'?id=%s' % asset_id) else: asset_ansible_update([asset], name) - return HttpResponseRedirect(reverse('asset_detail')+'/?id=%s' % asset_id) + return HttpResponseRedirect(reverse('asset_detail')+'?id=%s' % asset_id) @require_role('admin') diff --git a/jumpserver.conf b/jumpserver.conf index 254035c64..68f9561f0 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -1,9 +1,9 @@ #coding: utf8 [base] -url = http://yourIP -key = 16位字母数字 -log = debug | warning +url = http://j +key = 88aaaf7ffe3c6c04 +log = debug [db] host = 127.0.0.1 @@ -13,12 +13,12 @@ password = mysql234 database = jumpserver [websocket] -web_socket_host = yourIP|yourDomainName:3000 +web_socket_host = j:3000 [mail] mail_enable = 1 -email_host = yourSMTPHost -email_port = yourSMTPHost|25 -email_host_user = yourEmail -email_host_password = yourEmailPassword +email_host = smtp.exmail.qq.com +email_port = 25 +email_host_user = noreply@jumpserver.org +email_host_password = jumpserver1234 email_use_tls = True diff --git a/jumpserver/urls.py b/jumpserver/urls.py index 506476e3e..63e907f89 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -14,6 +14,7 @@ urlpatterns = patterns('jumpserver.views', url(r'^setting', 'setting', name='setting'), url(r'^terminal/$', 'web_terminal', name='terminal'), url(r'^install/$', 'install', name='install'), + url(r'^install/test/(\w+)/$', 'install_test', name='install_test'), url(r'^juser/', include('juser.urls')), url(r'^jasset/', include('jasset.urls')), url(r'^jlog/', include('jlog.urls')), diff --git a/jumpserver/views.py b/jumpserver/views.py index 5314243ce..3cd2424c8 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -357,4 +357,16 @@ def web_terminal(request): def install(request): - return render_to_response('test.html', locals()) + return render_to_response('install.html', locals()) + + +def install_test(request, offset): + if offset == 'db': + db_host = request.GET.get('db_host') + db_port = request.GET.get('db_port') + db_user = request.GET.get('db_user') + db_pass = request.GET.get('db_pass') + db = request.GET.get('db') + + + diff --git a/templates/install.html b/templates/install.html index 30662cba8..76ddba8a0 100644 --- a/templates/install.html +++ b/templates/install.html @@ -1,358 +1,31 @@ - - + + + - - - + Jumpserver Install + - - - + + + + + - - - + + -
- - -
-
- -
-
-
-

Wizard

-
    -
  1. - Home -
    2. -
  2. - Forms -
    3. -
  3. - Wizard -
    4. -
-
-
- -
-
-
-
-
-
-

Steps

-

Smart UI component which allows you to easily create wizard-like interfaces.

-

Learn more about jQuery Steps -

-
-
-
-
+
+
+
-
Basic Wizzard
+
向导
@@ -360,197 +33,157 @@ -
-
+
+

+ 安装向导 +

- This is basic example of Step + 请输入相关信息完成安装

-
-

First Step

-
-
-

Hello in Step 1

-

- This is the first content. -

-
-
-

Second Step

-
-
-

This is step 2

-

- This content is diferent than the first one. -

+
+

管理员账户

+
+

管理员账号是首次登陆的账号

+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+ +
+
+
-
-

Third Step

-
-
-

This is step 3

-

- This is last content. -

+ +

数据库

+
+

数据库连接信息

+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ 测试连接 +
+
-
-
+ +

邮件设置

+
+

邮件设置

+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ 测试邮件 +
+
+
+
+ +

完成

+
+

Terms and Conditions

+ +
+
-
-
-
-
-
-
-
Wizard with Validation
-
- - - - - - - - - - -
-
-
-

- Validation Wizard Form -

-

- This example show how to use Steps with jQuery Validation plugin. -

- -
-

Account

-
-

Account Information

-
-
-
- - -
-
- - -
-
- - -
-
-
-
-
- -
-
-
-
- -
-

Profile

-
-

Profile Information

-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- -

Warning

-
-
-

You did it Man :-)

-
-
- -

Finish

-
-

Terms and Conditions

- -
-
-
-
-
-
-
-
- 10GB of 250GB Free. -
-
- Copyright Example Company © 2014-2015 -
-
- -
+
- - - + + + + + + - + + - + - + - - - - - - - - - - - - - - - - - - - - -