diff --git a/templates/base.html b/templates/base.html index 42a223e36..e793c1d1c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,241 +9,24 @@ Jumpserver | 开源跳板机系统 - - - - - + {% include 'link_css.html' %}
- - - + {% include 'nav.html' %}
-
- -
+
+ {% include 'nav_bar_header.html' %} +
{{ content }} - -
+ {% include 'footer.html' %}
+ - - - - - - - - - - - - - - - - - + {% include 'script.html' %} diff --git a/templates/base2.html b/templates/base2.html deleted file mode 100644 index d49866177..000000000 --- a/templates/base2.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - Jumpserver | 开源跳板机系统 - - {% include "link_css.html" %} - - - - -
- -
-
- -
-
- {% include "nav_cat_bar.html" %} -
-
- {{ content }} -
- - {% include "footer.html" %} - -
-
- - - - {% include "script.html" %} - - - diff --git a/templates/nav.html b/templates/nav.html index b828d0c5d..c7b51cb9d 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,24 +1,9 @@ +