Commit f4970039 authored by ibuler's avatar ibuler

修改content

parent ba5757e3
...@@ -6,6 +6,7 @@ urlpatterns = patterns('', ...@@ -6,6 +6,7 @@ urlpatterns = patterns('',
# url(r'^$', 'jumpserver.views.home', name='home'), # url(r'^$', 'jumpserver.views.home', name='home'),
# url(r'^blog/', include('blog.urls')), # 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')), url(r'^jasset/', include('jasset.urls')),
) )
...@@ -6,3 +6,7 @@ from django.shortcuts import render_to_response ...@@ -6,3 +6,7 @@ from django.shortcuts import render_to_response
def base(request): def base(request):
return render_to_response('base.html') return render_to_response('base.html')
def skin_config(request):
return render_to_response('skin_config.html')
...@@ -6,5 +6,5 @@ urlpatterns = patterns('juser.views', ...@@ -6,5 +6,5 @@ urlpatterns = patterns('juser.views',
# url(r'^$', 'jumpserver.views.home', name='home'), # url(r'^$', 'jumpserver.views.home', name='home'),
# url(r'^blog/', include('blog.urls')), # url(r'^blog/', include('blog.urls')),
(r'^useradd/$', 'user_add'), (r'^user_add/$', 'user_add'),
) )
...@@ -34,9 +34,9 @@ $(document).ready(function () { ...@@ -34,9 +34,9 @@ $(document).ready(function () {
}); });
// Append config box / Only for demo purpose // Append config box / Only for demo purpose
// $.get("/skin_config/", function (data) { $.get("/skin_config/", function (data) {
// $('body').append(data); $('body').append(data);
// }); });
// minimalize menu // minimalize menu
$('.navbar-minimalize').click(function () { $('.navbar-minimalize').click(function () {
......
<nav class="navbar-default navbar-static-side" role="navigation"> <nav class="navbar-default navbar-static-side" role="navigation">
<div class="sidebar-collapse"> <div class="sidebar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %} {% include 'nav_li_profile.html' %}
<li> <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="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> <!--<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"> <ul class="nav nav-second-level">
...@@ -60,4 +59,4 @@ ...@@ -60,4 +59,4 @@
</ul> </ul>
</div> </div>
</nav> </nav>
\ No newline at end of file \ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% block content %} {% block content %}
{% include 'nav_cat_bar.html' %} {% include 'nav_cat_bar.html' %}
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row"> <div class="row">
<div class="col-lg-10"> <div class="col-lg-10">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
...@@ -58,4 +59,5 @@ ...@@ -58,4 +59,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment