From f49700394882afcfaa0cf29a1274672a2f7cd4c2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 5 Jan 2015 22:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9content?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jumpserver/urls.py | 3 +- jumpserver/views.py | 4 + juser/urls.py | 2 +- static/js/inspinia.js | 6 +- templates/nav.html | 121 +++++++++++---------- templates/nav_bar_header.html | 198 +++++++++++++++++----------------- templates/user_add.html | 2 + 7 files changed, 171 insertions(+), 165 deletions(-) diff --git a/jumpserver/urls.py b/jumpserver/urls.py index 5ee408303..7c82e3750 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -6,6 +6,7 @@ urlpatterns = patterns('', # url(r'^$', 'jumpserver.views.home', name='home'), # url(r'^blog/', include('blog.urls')), - (r'^user/', include('juser.urls')), + (r'^skin_config/$', 'jumpserver.views.skin_config'), + (r'^juser/', include('juser.urls')), url(r'^jasset/', include('jasset.urls')), ) diff --git a/jumpserver/views.py b/jumpserver/views.py index 338ecea17..baeebf2d5 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -6,3 +6,7 @@ from django.shortcuts import render_to_response def base(request): return render_to_response('base.html') + + +def skin_config(request): + return render_to_response('skin_config.html') diff --git a/juser/urls.py b/juser/urls.py index 634cacf49..a7c504005 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -6,5 +6,5 @@ urlpatterns = patterns('juser.views', # url(r'^$', 'jumpserver.views.home', name='home'), # url(r'^blog/', include('blog.urls')), - (r'^useradd/$', 'user_add'), + (r'^user_add/$', 'user_add'), ) diff --git a/static/js/inspinia.js b/static/js/inspinia.js index ca4bf4950..239e7f2b4 100644 --- a/static/js/inspinia.js +++ b/static/js/inspinia.js @@ -34,9 +34,9 @@ $(document).ready(function () { }); // Append config box / Only for demo purpose -// $.get("/skin_config/", function (data) { -// $('body').append(data); -// }); + $.get("/skin_config/", function (data) { + $('body').append(data); + }); // minimalize menu $('.navbar-minimalize').click(function () { diff --git a/templates/nav.html b/templates/nav.html index 2a84fd274..424b85b46 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,63 +1,62 @@ - \ No newline at end of file diff --git a/templates/nav_bar_header.html b/templates/nav_bar_header.html index 4dbddde90..50276b70f 100644 --- a/templates/nav_bar_header.html +++ b/templates/nav_bar_header.html @@ -7,110 +7,110 @@ - + -
  • - - Log out - -
    • - +
  • + + Log out + +
    • + \ No newline at end of file diff --git a/templates/user_add.html b/templates/user_add.html index 2cc3b0915..d96a13415 100644 --- a/templates/user_add.html +++ b/templates/user_add.html @@ -2,6 +2,7 @@ {% block content %} {% include 'nav_cat_bar.html' %} +
    @@ -56,6 +57,7 @@
    +
    {% endblock %} \ No newline at end of file