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

apps/static/css/jumpserver.css

@@ -308,7 +308,7 @@ div.dataTables_wrapper div.dataTables_filter {
     text-align: center;
 }
 
-.profile-element div:last-child {
+.profile-element div:last-child a {
     line-height: 60px;
     width: 150px;
     float: left;

apps/templates/_nav.html

@@ -68,8 +68,3 @@
 {#        <i class="fa fa-gears"></i> <span class="nav-label">{% trans 'Settings' %}</span><span class="label label-info pull-right"></span>#}
 {#    </a>#}
 {#</li>#}
\ No newline at end of file
-<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

apps/templates/_nav_user.html

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

@@ -6,7 +6,7 @@
             <img alt="image" height="40" src="/static/img/logo.png"/>
         </div>
         <div>
-            <span>Jumpserver</span>
+            <a href="http://www.jumpserver.org" target="_blank">Jumpserver</a>
         </div>
     </div>
     <div class="clearfix"></div>