diff --git a/jumpserver/views.py b/jumpserver/views.py index 79da6075f..338ecea17 100644 --- 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') diff --git a/templates/base.html b/templates/base.html index 80a002abc..42a223e36 100644 --- a/templates/base.html +++ b/templates/base.html @@ -8,40 +8,242 @@ Jumpserver | 开源跳板机系统 - {% include "link_css.html" %} + + + + + +
-
+
-
- {% include "nav_cat_bar.html" %} -
-
- {{ content }} -
- - {% include "footer.html" %} + {{ content }}
- {% include "script.html" %} + + + + + + + + + + + + + + + diff --git a/templates/base1.html b/templates/base1.html deleted file mode 100644 index 6acee4f29..000000000 --- a/templates/base1.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - Jumpserver | 开源跳板机系统 - - - - - - - - - - - - -
- - - -
-
- -
- {{ content }} - - -
-
- - - - - - - - - - - - - - - - - - - - - diff --git a/templates/base2.html b/templates/base2.html new file mode 100644 index 000000000..d49866177 --- /dev/null +++ b/templates/base2.html @@ -0,0 +1,44 @@ + + + + + + + + Jumpserver | 开源跳板机系统 + + {% include "link_css.html" %} + + + + +
+ +
+
+ +
+
+ {% include "nav_cat_bar.html" %} +
+
+ {{ content }} +
+ + {% include "footer.html" %} + +
+
+ + + + {% include "script.html" %} + + + diff --git a/templates/nav_li_profile.html b/templates/nav_li_profile.html index 626468cd5..79c6207f3 100644 --- a/templates/nav_li_profile.html +++ b/templates/nav_li_profile.html @@ -14,6 +14,6 @@
- IN+ + JS+
diff --git a/templates/useradd.html b/templates/useradd.html index 1d4afdae6..9ce94cf6f 100644 --- a/templates/useradd.html +++ b/templates/useradd.html @@ -1,4 +1,4 @@ -{% extends 'base1.html' %} +{% extends 'base.html' %} {% block content %} {% include 'nav_bar_header.html' %}