From a184ae98886e0646da0c44b8499fabd799e41662 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Jan 2015 21:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=20useradd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/urls.py                        |  3 +--
 juser/urls.py                             | 10 ++++++++
 juser/views.py                            |  3 ++-
 templates/nav.html                        | 28 +++++++++++------------
 templates/{useradd.html => user_add.html} |  0
 5 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 juser/urls.py
 rename templates/{useradd.html => user_add.html} (100%)

diff --git a/jumpserver/urls.py b/jumpserver/urls.py
index 4e0a10643..d570d92ff 100644
--- a/jumpserver/urls.py
+++ b/jumpserver/urls.py
@@ -7,6 +7,5 @@ urlpatterns = patterns('',
     # url(r'^$', 'jumpserver.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-    url(r'^admin/', include(admin.site.urls)),
-    (r'^base/$', views.base),
+    (r'^user/', include('juser.urls')),
 )
diff --git a/juser/urls.py b/juser/urls.py
new file mode 100644
index 000000000..634cacf49
--- /dev/null
+++ b/juser/urls.py
@@ -0,0 +1,10 @@
+from django.conf.urls import patterns, include, url
+
+
+urlpatterns = patterns('juser.views',
+    # Examples:
+    # url(r'^$', 'jumpserver.views.home', name='home'),
+    # url(r'^blog/', include('blog.urls')),
+
+    (r'^useradd/$', 'user_add'),
+)
diff --git a/juser/views.py b/juser/views.py
index 5029dd19d..a27f1668b 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -2,6 +2,7 @@ from django.shortcuts import render
 from django.shortcuts import render_to_response
 
 
-
+def user_add(request):
+    return render_to_response('user_add.html')
 
 
diff --git a/templates/nav.html b/templates/nav.html
index c7b51cb9d..46a3a55b8 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -15,35 +15,35 @@
                     <li>
                         <a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
                         <ul class="nav nav-second-level">
-                            <li><a href="/user/showlist/">查看用户</a></li>
-                            <li><a href="/user/add/">添加用户</a></li>
-                            <li><a href="/group/showlist/">查看属组</a></li>
-                            <li><a href="/group/add/">添加属组</a></li>
+                            <li><a href="/user/show_user/">查看用户</a></li>
+                            <li><a href="/user/add_user/">添加用户</a></li>
+                            <li><a href="/user/show_idc/">查看属组</a></li>
+                            <li><a href="/group/add_group/">添加属组</a></li>
                         </ul>
                     </li>
                     <li>
                         <a href="mailbox.html"><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
                         <ul class="nav nav-second-level">
-                            <li><a href="/asset/showlist/">查看资产</a></li>
-                            <li><a href="/asset/add/">添加资产</a></li>
-                            <li><a href="/idc/showlist/">查看机房</a></li>
-                            <li><a href="/idc/add/">添加机房</a></li>
+                            <li><a href="/asset/show_asset/">查看资产</a></li>
+                            <li><a href="/asset/add_asset/">添加资产</a></li>
+                            <li><a href="/asset/show_idc/">查看机房</a></li>
+                            <li><a href="/asset/add_idc/">添加机房</a></li>
                         </ul>
                     </li>
                     <li>
                         <a href="#"><i class="fa fa-edit"></i> <span class="nav-label">授权管理</span><span class="fa arrow"></span></a>
                         <ul class="nav nav-second-level">
-                            <li><a href="/perm/showlist/">查看授权</a></li>
-                            <li><a href="/perm/add/">添加授权</a></li>
-                            <li><a href="/sudo/showlist/">查看sudo</a></li>
-                            <li><a href="/sudo/add/">添加sudo</a></li>
+                            <li><a href="/perm/show_perm/">查看授权</a></li>
+                            <li><a href="/perm/add_perm/">添加授权</a></li>
+                            <li><a href="/perm/show_sudo/">查看sudo</a></li>
+                            <li><a href="/perm/add_sudo/">添加sudo</a></li>
                         </ul>
                     </li>
                     <li>
                         <a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">日志审计</span><span class="fa arrow"></span></a>
                         <ul class="nav nav-second-level">
-                            <li><a href="/log/showlist/">查看日志</a></li>
-                            <li><a href="/log/detail/">日志分析</a></li>
+                            <li><a href="/log/show_log/">查看日志</a></li>
+                            <li><a href="/log/show_stat/">日志分析</a></li>
                         </ul>
                     </li>
                     <li>
diff --git a/templates/useradd.html b/templates/user_add.html
similarity index 100%
rename from templates/useradd.html
rename to templates/user_add.html