Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

apps/static/css/jumpserver.css

@@ -289,4 +289,37 @@ div.dataTables_wrapper div.dataTables_filter {
     margin-bottom:0;
     margin-left: 10px;
     margin-right: 10px
+}
+
+.navbar-default {
+    background-color: #2f4050;
+    border-color: #2f4050;
+}
+
+.nav-header, body.mini-navbar .nav-header {
+    padding: 0;
+    background: #202c37;
+}
+
+.profile-element div:first-child {
+    line-height: 60px;
+    width: 70px;
+    float: left;
+    text-align: center;
+}
+
+.profile-element div:last-child a {
+    line-height: 60px;
+    width: 150px;
+    float: left;
+    font-size: 22px;
+    color: #1ab394;
+}
+
+.logo-element {
+    padding: 10px 0;
+}
+
+.welcome-message img {
+    margin: -11px 0;
 }
\ No newline at end of file

apps/templates/_header_bar.html

@@ -18,11 +18,30 @@
                      <span class="m-r-sm text-muted welcome-message">{% trans 'Help' %}</span>
                 </a>
             </li>
-            <li>
+            <li class="dropdown">
                 {% if user.is_authenticated %}
-                <a href="{% url 'users:logout' %}">
-                    <i class="fa fa-sign-out"></i>{% trans 'Logout' %}
+                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                    <span class="m-r-sm text-muted welcome-message">
+                        <img alt="image" class="img-circle" width="40" height="40" src="{{ request.user.avatar_url }}"/>
+                        <strong class="font-bold"> {{ request.user.name }}
+                            <span style="color: #8095a8"></span>
+                            <b class="caret"></b>
+                        </strong>
+                    </span>
                 </a>
+                <ul class="dropdown-menu animated fadeInRight m-t-xs">
+                    <li><a href="{% url 'users:user-profile' %}">{% trans 'Profile' %}</a></li>
+                    <li><a href="{% url 'users:user-profile-update' %}">{% trans 'Profile settings' %}</a></li>
+                    <li class="divider"></li>
+                    {% if request.user.is_superuser %}
+                    {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
+                    <li><a id="switch_admin">{% trans 'Admin page' %}</a></li>
+                    {% else %}
+                    <li><a id="switch_user">{% trans 'User page' %}</a></li>
+                    {% endif %}
+                    {% endif %}
+                    <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
+                </ul>
                 {% else %}
                 <a href="{% url 'users:login' %}">
                     <i class="fa fa-sign-in"></i>{% trans 'Login' %}

apps/templates/_nav.html

@@ -67,9 +67,4 @@
 {#    <a href="">#}
 {#        <i class="fa fa-gears"></i> <span class="nav-label">{% trans 'Settings' %}</span><span class="label label-info pull-right"></span>#}
 {#    </a>#}
-{#</li>#}
-<li class="special_link">
-    <a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i>
-        <span class="nav-label">{% trans 'Visit us' %}</span>
-    </a>
-</li>
\ No newline at end of file
+{#</li>#}
\ No newline at end of file

apps/templates/_nav_user.html

@@ -8,9 +8,4 @@
     <a href="{% url 'users:user-profile' %}">
         <i class="fa fa-user" ></i> <span class="nav-label">{% trans 'Profile' %}</span><span class="label label-info pull-right"></span>
     </a>
-</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>
\ No newline at end of file

apps/templates/_user_profile.html

@@ -2,35 +2,16 @@
 {% load i18n %}
 <li class="nav-header">
     <div class="dropdown profile-element">
-        <span>
-            <img alt="image" class="img-circle" width="48" height="48" src="{{ request.user.avatar_url }}"/>
-        </span>
-        <a data-toggle="dropdown" class="dropdown-toggle" href="#">
-            <span class="clear">
-                <span class="block m-t-xs">
-                    <strong class="font-bold"> {{ request.user.name }}<span style="color: #8095a8"></span></strong>
-                </span>
-                <span class="text-muted text-xs block">
-                     {{ request.user.get_role_display | default:_('User') }}<b class="caret"></b>
-                </span>
-            </span>
-        </a>
-        <ul class="dropdown-menu animated fadeInRight m-t-xs">
-            <li><a href="{% url 'users:user-profile' %}">{% trans 'Profile' %}</a></li>
-            <li><a href="{% url 'users:user-profile-update' %}">{% trans 'Profile settings' %}</a></li>
-            <li class="divider"></li>
-            {% if request.user.is_superuser %}
-                {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
-                <li><a id="switch_admin">{% trans 'Admin page' %}</a></li>
-                {% else %}
-                <li><a id="switch_user">{% trans 'User page' %}</a></li>
-                {% endif %}
-            {% endif %}
-            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
-        </ul>
+        <div>
+            <img alt="image" height="40" src="/static/img/logo.png"/>
+        </div>
+        <div>
+            <a href="http://www.jumpserver.org" target="_blank">Jumpserver</a>
+        </div>
     </div>
+    <div class="clearfix"></div>
     <div class="logo-element">
-        JMS
+        <img alt="image" height="40" src="/static/img/logo.png"/>
     </div>
 </li>
 <script>