基于文平修改

8682d7c6 · ibuler · dde0b75d · 8682d7c6 · 8682d7c6 · dde0b75d
Commit 8682d7c6 authored Jan 03, 2015 by ibuler
6 changed files
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -5,4 +5,4 @@ from django.shortcuts import render_to_response


 def base(request):
-    return render_to_response('base1.html')
+    return render_to_response('base.html')
--- a/templates/base.html
+++ b/templates/base.html
--- a/templates/base1.html
+++ b/templates/base1.html
--- a/templates/base2.html
+++ b/templates/base2.html
+<!DOCTYPE html>
+<html>
+
+<head>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Jumpserver | 开源跳板机系统</title>
+    <link rel="shortcut icon" href="/static/img/facio.ico" type="image/x-icon">
+	{% include "link_css.html" %}
+
+</head>
+
+<body class="skin-1">
+    <div id="wrapper">
+	<nav class="navbar-default navbar-static-side" role="navigation">
+        <div class="sidebar-collapse">
+		{% include "nav.html" %}
+	    </div>
+	</nav>
+    <div id="page-wrapper" class="gray-bg">
+    <div class="row border-bottom">
+    <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
+        {% include "nav_bar_header.html" %}
+    </nav>
+    </div>
+        <div class="row wrapper border-bottom white-bg page-heading">
+    {% include "nav_cat_bar.html" %}
+        </div>
+    <div class="wrapper wrapper-content">
+    {{ content }}
+    </div>
+
+	{% include "footer.html" %}
+
+    </div>
+        </div>
+
+
+
+     {% include "script.html" %}
+</body>
+
+</html>
--- a/templates/nav_li_profile.html
+++ b/templates/nav_li_profile.html
@@ -14,6 +14,6 @@
        </ul>
    </div>
    <div class="logo-element">
-        IN+
+        JS+
    </div>
 </li>
--- a/templates/useradd.html
+++ b/templates/useradd.html
-{% extends 'base1.html' %}
+{% extends 'base.html' %}

 {% block content %}
    {% include 'nav_bar_header.html' %}