修改content

pull/6/head
ibuler 2015-01-05 22:35:25 +08:00
parent ba5757e377
commit f497003948
7 changed files with 171 additions and 165 deletions

View File

@ -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')),
)

View File

@ -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')

View File

@ -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'),
)

View File

@ -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 () {

View File

@ -1,9 +1,8 @@
<nav class="navbar-default navbar-static-side" role="navigation">
<nav class="navbar-default navbar-static-side" role="navigation">
<div class="sidebar-collapse">
<ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %}
<li>
<a href="css_animation.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
<!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@ -60,4 +59,4 @@
</ul>
</div>
</nav>
</nav>

View File

@ -2,6 +2,7 @@
{% block content %}
{% include 'nav_cat_bar.html' %}
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row">
<div class="col-lg-10">
<div class="ibox float-e-margins">
@ -58,4 +59,5 @@
</div>
</div>
</div>
</div>
{% endblock %}