Skip to content

J
jumpserver
Commit f4970039 authored by ibuler's avatar ibuler
Browse files
Options

修改content

parent ba5757e3
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 166 deletions
jumpserver/urls.py
View file @ f4970039
...@@ -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')),
) )
jumpserver/views.py
View file @ f4970039
...@@ -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')
juser/urls.py
View file @ f4970039
...@@ -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'),
) )
static/js/inspinia.js
View file @ f4970039
...@@ -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 () {
......
templates/nav.html
View file @ f4970039
<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"> <li><a href="index.html">Dashboard v.1</a></li>
<li><a href="index.html">Dashboard v.1</a></li> <li ><a href="dashboard_2.html">Dashboard v.2</a></li>
<li ><a href="dashboard_2.html">Dashboard v.2</a></li> <li ><a href="dashboard_3.html">Dashboard v.3</a></li>
<li ><a href="dashboard_3.html">Dashboard v.3</a></li> </ul>-->
</ul>--> </li>
</li> <li>
<li> <a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
<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">
<ul class="nav nav-second-level"> <li><a href="/user/showlist/">查看用户</a></li>
<li><a href="/user/showlist/">查看用户</a></li> <li><a href="/user/add/">添加用户</a></li>
<li><a href="/user/add/">添加用户</a></li> <li><a href="/group/showlist/">查看属组</a></li>
<li><a href="/group/showlist/">查看属组</a></li> <li><a href="/group/add/">添加属组</a></li>
<li><a href="/group/add/">添加属组</a></li> </ul>
</ul> </li>
</li> <li>
<li> <a href="mailbox.html"><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
<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">
<ul class="nav nav-second-level"> <li><a href="/asset/showlist/">查看资产</a></li>
<li><a href="/asset/showlist/">查看资产</a></li> <li><a href="/jasset/jadd/">添加资产</a></li>
<li><a href="/jasset/jadd/">添加资产</a></li> <li><a href="/idc/showlist/">查看机房</a></li>
<li><a href="/idc/showlist/">查看机房</a></li> <li><a href="/idc/add/">添加机房</a></li>
<li><a href="/idc/add/">添加机房</a></li> </ul>
</ul> </li>
</li> <li>
<li> <a href="#"><i class="fa fa-edit"></i> <span class="nav-label">授权管理</span><span class="fa arrow"></span></a>
<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">
<ul class="nav nav-second-level"> <li><a href="/perm/showlist/">查看授权</a></li>
<li><a href="/perm/showlist/">查看授权</a></li> <li><a href="/perm/add/">添加授权</a></li>
<li><a href="/perm/add/">添加授权</a></li> <li><a href="/sudo/showlist/">查看sudo</a></li>
<li><a href="/sudo/showlist/">查看sudo</a></li> <li><a href="/sudo/add/">添加sudo</a></li>
<li><a href="/sudo/add/">添加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>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">上传下载</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/file/upload/">文件上传</a></li>
<li><a href="/file/download/">文件下载</a></li>
</ul>
</li>
<li class="special_link">
<a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">访问官网</span></a>
</li>
</ul> </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>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">上传下载</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/file/upload/">文件上传</a></li>
<li><a href="/file/download/">文件下载</a></li>
</ul>
</li>
<li class="special_link">
<a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">访问官网</span></a>
</li>
</ul>
</div> </div>
</nav> </nav>
\ No newline at end of file \ No newline at end of file
templates/nav_bar_header.html
View file @ f4970039
...@@ -7,110 +7,110 @@ ...@@ -7,110 +7,110 @@
</div> </div>
</form> </form>
</div> </div>
<ul class="nav navbar-top-links navbar-right"> <ul class="nav navbar-top-links navbar-right">
<li> <li>
<span class="m-r-sm text-muted welcome-message">欢迎使用Jumpserver开源跳板机系统</span> <span class="m-r-sm text-muted welcome-message">欢迎使用Jumpserver开源跳板机系统</span>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#"> <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
<i class="fa fa-envelope"></i> <span class="label label-warning">16</span> <i class="fa fa-envelope"></i> <span class="label label-warning">16</span>
</a> </a>
<ul class="dropdown-menu dropdown-messages"> <ul class="dropdown-menu dropdown-messages">
<li> <li>
<div class="dropdown-messages-box"> <div class="dropdown-messages-box">
<a href="profile.html" class="pull-left"> <a href="profile.html" class="pull-left">
<img alt="image" class="img-circle" src="/static/img/a7.jpg"> <img alt="image" class="img-circle" src="/static/img/a7.jpg">
</a> </a>
<div class="media-body"> <div class="media-body">
<small class="pull-right">46h ago</small> <small class="pull-right">46h ago</small>
<strong>Mike Loreipsum</strong> started following <strong>Monica Smith</strong>. <br> <strong>Mike Loreipsum</strong> started following <strong>Monica Smith</strong>. <br>
<small class="text-muted">3 days ago at 7:58 pm - 10.06.2014</small> <small class="text-muted">3 days ago at 7:58 pm - 10.06.2014</small>
</div>
</div>
</li>
<li class="divider"></li>
<li>
<div class="dropdown-messages-box">
<a href="profile.html" class="pull-left">
<img alt="image" class="img-circle" src="/static/img/a4.jpg">
</a>
<div class="media-body ">
<small class="pull-right text-navy">5h ago</small>
<strong>Chris Johnatan Overtunk</strong> started following <strong>Monica Smith</strong>. <br>
<small class="text-muted">Yesterday 1:21 pm - 11.06.2014</small>
</div>
</div> </div>
</li> </div>
<li class="divider"></li> </li>
<li> <li class="divider"></li>
<div class="dropdown-messages-box"> <li>
<a href="profile.html" class="pull-left"> <div class="dropdown-messages-box">
<img alt="image" class="img-circle" src="/static/img/profile.jpg"> <a href="profile.html" class="pull-left">
</a> <img alt="image" class="img-circle" src="/static/img/a4.jpg">
<div class="media-body "> </a>
<small class="pull-right">23h ago</small> <div class="media-body ">
<strong>Monica Smith</strong> love <strong>Kim Smith</strong>. <br> <small class="pull-right text-navy">5h ago</small>
<small class="text-muted">2 days ago at 2:30 am - 11.06.2014</small> <strong>Chris Johnatan Overtunk</strong> started following <strong>Monica Smith</strong>. <br>
</div> <small class="text-muted">Yesterday 1:21 pm - 11.06.2014</small>
</div> </div>
</li> </div>
<li class="divider"></li> </li>
<li> <li class="divider"></li>
<div class="text-center link-block"> <li>
<a href="mailbox.html"> <div class="dropdown-messages-box">
<i class="fa fa-envelope"></i> <strong>Read All Messages</strong> <a href="profile.html" class="pull-left">
</a> <img alt="image" class="img-circle" src="/static/img/profile.jpg">
</a>
<div class="media-body ">
<small class="pull-right">23h ago</small>
<strong>Monica Smith</strong> love <strong>Kim Smith</strong>. <br>
<small class="text-muted">2 days ago at 2:30 am - 11.06.2014</small>
</div> </div>
</li> </div>
</ul> </li>
</li> <li class="divider"></li>
<li class="dropdown"> <li>
<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#"> <div class="text-center link-block">
<i class="fa fa-bell"></i> <span class="label label-primary">8</span>
</a>
<ul class="dropdown-menu dropdown-alerts">
<li>
<a href="mailbox.html"> <a href="mailbox.html">
<div> <i class="fa fa-envelope"></i> <strong>Read All Messages</strong>
<i class="fa fa-envelope fa-fw"></i> You have 16 messages
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="profile.html">
<div>
<i class="fa fa-twitter fa-fw"></i> 3 New Followers
<span class="pull-right text-muted small">12 minutes ago</span>
</div>
</a> </a>
</li> </div>
<li class="divider"></li> </li>
<li> </ul>
<a href="grid_options.html"> </li>
<div> <li class="dropdown">
<i class="fa fa-upload fa-fw"></i> Server Rebooted <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
<span class="pull-right text-muted small">4 minutes ago</span> <i class="fa fa-bell"></i> <span class="label label-primary">8</span>
</div> </a>
</a> <ul class="dropdown-menu dropdown-alerts">
</li> <li>
<li class="divider"></li> <a href="mailbox.html">
<li> <div>
<div class="text-center link-block"> <i class="fa fa-envelope fa-fw"></i> You have 16 messages
<a href="notifications.html"> <span class="pull-right text-muted small">4 minutes ago</span>
<strong>See All Alerts</strong> </div>
<i class="fa fa-angle-right"></i> </a>
</a> </li>
<li class="divider"></li>
<li>
<a href="profile.html">
<div>
<i class="fa fa-twitter fa-fw"></i> 3 New Followers
<span class="pull-right text-muted small">12 minutes ago</span>
</div> </div>
</li> </a>
</ul> </li>
</li> <li class="divider"></li>
<li>
<a href="grid_options.html">
<div>
<i class="fa fa-upload fa-fw"></i> Server Rebooted
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<div class="text-center link-block">
<a href="notifications.html">
<strong>See All Alerts</strong>
<i class="fa fa-angle-right"></i>
</a>
</div>
</li>
</ul>
</li>
<li> <li>
<a href="login.html"> <a href="login.html">
<i class="fa fa-sign-out"></i> Log out <i class="fa fa-sign-out"></i> Log out
</a> </a>
</li> </li>
</ul> </ul>
</nav> </nav>
\ No newline at end of file
templates/user_add.html
View file @ f4970039
...@@ -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">
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
</div> </div>
</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