From a48fb9de8d3531d0825e08e0603c2919261e4fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Thu, 26 Jul 2018 05:27:09 -0500
Subject: [PATCH] Tmp org (#1596)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修改index view

* [Update] 修改nav

* [Update] 修改profile
---
 apps/jumpserver/views.py           |   4 ++--
 apps/static/css/jumpserver.css     |   4 ++--
 apps/static/img/header-profile.png | Bin 0 -> 5877 bytes
 apps/templates/_nav.html           |  16 -------------
 apps/templates/_user_profile.html  |  35 ++++++++++++++++++++++++-----
 5 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100755 apps/static/img/header-profile.png

diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py
index c2915ae0d..474eaf829 100644
--- a/apps/jumpserver/views.py
+++ b/apps/jumpserver/views.py
@@ -21,10 +21,10 @@ class IndexView(AdminUserRequiredMixin, TemplateView):
     session_month_dates = []
     session_month_dates_archive = []
 
-    def get(self, request, *args, **kwargs):
+    def dispatch(self, request, *args, **kwargs):
         if not request.user.is_org_admin:
             return redirect('assets:user-asset-list')
-        return super(IndexView, self).get(request, *args, **kwargs)
+        return super(IndexView, self).dispatch(request, *args, **kwargs)
 
     @staticmethod
     def get_user_count():
diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css
index cf570c4ad..13b58ac25 100644
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -335,13 +335,13 @@ div.dataTables_wrapper div.dataTables_filter {
 
 .nav-header, body.mini-navbar .nav-header {
     padding: 0;
-    background: #202c37;
+    /*background: #202c37;*/
 }
 
 .profile-element div:first-child {
     line-height: 60px;
     /*width: 70px;*/
-    float: left;
+    /*float: left;*/
     text-align: center;
 }
 
diff --git a/apps/static/img/header-profile.png b/apps/static/img/header-profile.png
new file mode 100755
index 0000000000000000000000000000000000000000..7dea7f2c76294013243f4956526a0409e82da9d2
GIT binary patch
literal 5877
zcmV<R77FQ!P)<h;3K|Lk000e1NJLTq007(o005i_0ssI2n_yD900009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000aiNkl<Zc-ripS+d+95=BW$d+9~=5_<o;vAF%ADm@7#=9wgHN7$~XlHhQ2fJF44
z|Nc)b)d2TL3VfIRd^&l20PXL>`oEjtR)I(<d!SKtfTK@a4@x4-*pwJFk|c;0m&Tw@
zmX$lm%Yc^d#1}-05J^NNo8hPw22scBpl>BE+LB98O(Ft7<%m4)pNQ&fBme=?D~dk%
zwMF*$)d*S*VuJ~H+>eU}62%7Y*BeB24fmmn9ZMs8#x4L#?NP6P?X4H=Vti6UL?vw7
zg~&=W**%N71D%N;RevI)f_h0rH6m^R!;BGp1_cmA+bS&9dB)#0OXq+F%I`#^M7CE?
zahaA)Eb9>2Uy3JJd~-hFri&-HL|3v<R&q=heTlq3+QuNJishvPi)1B7#<5JG!(4`V
zr8&dx>0)YzvM`rVtdNv>4EJ2pi15y2DD#Bv8M2anuf!COZy3rLv9x9<lCqMMTI%TM
z*|e)r@)h3(`@AL%+|AFu61i7$VXx5*C34X1KWShE*PI^h#nQ@6R914Nm6)<J`P2y;
zynFxZK>dAKbEG_WLU=v~LI9%dT>5oI=$4DwR$_7+?k|*T|96b3?x$P)cKdD&?O)9O
zMCXMQ2-Y4RFNzz_rO$4Spat&r(v8vX(02GW;-(EZ_0iz`{?$L!GzkvcVPwV@u5X6R
zwawL}PamwuV*1l=&au;A1#Tap%Wsp^49R4t5=Zgsb6a+?bY>+NvDDd#6oDxrdcKL@
z@4F-RC%36un`{nDUg0UCFF7DvR&rr8jZA}8E>B6lXziP)`_!T2jKoiwWE=}<WN9eN
zYi$a$FN~V@-8ABQR&vIbnBqiQXK&9dI#F8tPOw)WUFf7IBYx9J&VJ|C$o`>>(po*m
z2)koIW}fwW*?Y;v*Og=z6Nz+n-SlhUB%V+eLaVU7)A^#VL<FT6#L{iq4H@*1!Fm46
zE#k(|Yxg}^Z4V10xpRH{QmK94kHKKeEs7B-gxIK-_d0<rKq*B+%Fj(oiNs>^iIPOx
z%r`NkkI~PrAnuv-BkVb|R7_+VkpVs>6}{u3ERNcD`T1yp(f5-?5Vwsc#6*T?Dl+?&
z^z>`KQBX?hTmH-)Prt1$Se(c{qi+g-a_VF(@gDa4`zN<e+qxot%ldzRUSs(I<rC>+
z5uVWPF8V&j)s$PRJfg1N#J&go$Yp0VMo`d(w>M0lGJ;EO=PyDBg&czeU_boJM=meN
zyXk0N=<F?iHw#x#Y*r5sWxCryLEZxHGvM8hL+$k0Z2La7Q2jLS_tSFFg3i92r4^tI
z0{33V3Exd@LO?-@-Bvz!je#`Pd^+_L<|jQ!h3kIl9l>&kbjCGa(J_Z7d>@ul%DyJ<
zJi+zxNA7#qVc1i=yQh|aDK3i1TUGcl0&oA`YR93JvX|RF7Jqt=@hP9E16Cs(FG@L4
zUNMcwwA6=EDsEK#Nj2niJ|cw>Pt{NK{%b{r^az*Ei|o6jBEqca)RLN^baujM)_ag)
z#=rtAjZP#)4lY#$m+6CApU(3s3ViQIL>UT9Jh{a9M7n};A%s%<=M(6x=Q`Lsutq-V
zD~ip5&E3Z(5-|NB8~x~(AB1>Fs=p0z(bt+h=1N;zXaDHCgRN?z3pMFeiEg27RxY9T
z{bN6k&2qj?X`j!N(MH~?6yJ&zcsq}+{YQFQAlGgxpwCfiA_2-=9B*L_y?jv3M{F8D
zZLx#kV~GpC`_S#wQY|I0EcO6u-{t0d+reSPo4hZk%Qwf#e74Y3GrRP*ZB*wp3xw(=
zw-d?+FI%;xLlaDL6C$m%?7Il*>|y58P)gBXrt!^fq_jZkdyH<)K+U~4&Mm>G?1$7K
zE|4?0ao*k2<+1P3Dtov&m2&F-s_V$Ue2;svXZd!Ru(h_XHAjNE4D~6eCo<?D-(p;9
zm5|&FA4@Lz)aALfC)NM`V=gUT{|(BC-AVv{MLSive5{0A+mBq%e80PK&A2=&Ay*?0
z_VS?L+NKWWd}8SeESlQ!Ws;ZV1oSdYlh^3@g}Q}z?omQz&%6V(Z1jz&nOxV7uesP`
zHOO++*~nbBwBU9w<rBm-1(C=JPI)dlsXo0@B0o5Vxm;nfhx`nge6jdri)Gs2Hsz9a
za!REfKyR#Ea;zhn$Od9*`37KLUN0pR*&&yUFG9))b)C|Y?21d@%AV0<olq!;i*(Se
z4@;@OS7i^IZw_v1Vh^R}(@P{mIZR@xERih>f}xbcREs^72<6&_yY4_)^m1Qrv1fQF
zYYkY_3W~)ldn6Ot3zxJQm!ZpyL%5X_ipNr1PPn3jR;O7u)ytVGA)}SDSFxPh!*U%j
zIK6i%=bB?vIF~LiCtrlrN^Ci}86p@5un)Ua9UdQ$!y!3FR8rb~ow$O+Qz`p#D?4+i
zn(F0@T;j3rn+^9s*iXo17?iEWvR5LBxy<aFkvEjYM0VOYBUM7e8XMr-mn4UoK)qX8
zYKZ*=i#_-rBt&EQlw9EF#iiOY{6l<O0F+H)a4ymJ9a0QX2?@JBq;M$NaCh!pioTB*
zv^bPM>7fCj98e^w@#V*@IJ?+k8Tf-#aoP`RxZCH>#^Msjdmv@MH#%`tQux~F`8ZZ{
zWG~)izff{;lYz@&lIrHWWh0<0Y{6$Cl9)?h-86`jopttNf>xf(P9`}*{zrB;Z@^sU
zy?kGbJ%AD7h&)ghiow~HEY$j4gajVFLCIq_y;wHq5`i}_yO}d!F3aj=XO)mhsb*v%
zCt<#MC8RdW4=*N6gEFIAxdxHc374HzLZauFJF!Mq=CYSc$d?c&6-pvbS%y;6M~~G_
zs>86|FxC}2Qc9M|Rz5-pi#=Vw25(g&srhz|_FTG#z7>?Lk$rGkSQ_w@190A95|q(y
zCEM*z8tNp~uU`T8ylJ46>`HdEt)=E-k2A!{1ZALDGLbd747_&5N=W$JoUHlyOk}5e
zS*8*a=IHy4e?{}nMD`4Pxk|{tafjz!$%?a)Th~UscqODa0hOR+!#xD^87m?29OAfd
zh$zQdLhi&66FEpEF0xlbo<k4#5-DX3rDP<>YS|ZiJniH`WH$3{5lc4QgL#%Exb#R*
zo<tV+DVfM|nNO*NyzUIr&Ixi7Sr$qra$L{yXnU^39_z!A)ZIu~4oL=Wf{CJ3ESG*E
zj+9cSA4cHiR<cNT=vl^H9^b`rL<Ov{zN}nIN!3bhnaG)pxDY}qbt)f%M*m$U<>&Jj
zA7_P<h*fe<=6}gc{78e}Pdz5giRknB*c3GLBQuecisiA`L*AbjLcHz2ASvyXWH#T7
z<g8pCigVqxVb{ywo*>dRQd%|gXj=?(h8)t*a1#-m?@SD!An>u*29#3dw-AVjSlDj`
zaZ6(8$x~%6r=BY$l!5@s&lNo~Y_}HTkROpqG~aY5l0jUjDW!0U$FHggA%vkyK15!f
z0T~4&*>?u<IR(9YmX!F@q|QZ16V2mb{a@ToFUiOgL;y%Ri2n^nym*=1ri{eDKJO`(
z-&p$r1}UXwtBx?<3lRV%S=I5)a5I<5nT*~&qVJC2`(oaYvzK`2oyCCYJB2OcBvF2u
zM7GQ4xRO%4Jc6F<(g_(v+Cz>zV_R9jkciXit!+BWa)}F<zd=vjJTBj?weKytm}4W}
z0mSC7r~iz`5<;o{l*9CLhAjmk-)-(}#D|bua*Yz+#}`ohE@f1K&D+*B3Q@=OZ{;=}
z<8*{CS=2{H<A^XUnaloz{nYVBrq@X&nE$}<W-eEu8wfaIFykiQxY@v1jw+Mkd?;g`
zrixOscgfJYBB?koWz;kPW68}EV}wg)gF{o9${A!Z{FI`CP-ckwSuDqemg2VwKS*Yl
z!m(WbFh}CU$Ry%z9Ny48aeNUt8A`igE*ESRbK0fte5vE@rRhqUeW{SS9K)L=5%)1T
z1ulb9@_rvCGVdJ#T3JOHl!Z!gSS-6Y+ey#`pqUbVGnXrQk?<5*_`Qq7hNe=d8@hS2
z%%ilD?Y3rpP|D2z?ON|*R<c-jM`TUERX63*mtW>`6_Xu<6J-sKWe-F$mp$Q_Rr;bb
ziL$T0VJ;ikZYp{4m?n9Yn8;jWo9k+_x1gKFvaZ!GD0tCs<^Kl&vgl>DMwzen00000
LNkvXXu0mjf-K0Pr

literal 0
HcmV?d00001

diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index a792beb48..772c9db78 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -1,20 +1,4 @@
 {% load i18n %}
-{% if ADMIN_ORGS and ADMIN_ORGS|length > 1 %}
-<li id="org">
-    <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-        <i class="fa fa-star" style="width: 14px"></i> <span class="nav-label">{{ CURRENT_ORG.name }}</span>
-        <span class="fa fa-caret-down arrow"></span>
-    </a>
-    <ul class="dropdown-menu">
-        {% for org in ADMIN_ORGS %}
-            {% if org.id != CURRENT_ORG.id %}
-            <li><a class="org-dropdown" href="{% url 'orgs:org-switch' pk=org.id %}" data-id="{{ org.id }}">{{ org.name }}</a></li>
-            {% endif %}
-        {% endfor %}
-    </ul>
-</li>
-<hr>
-{% endif %}
 <li id="index">
     <a href="{% url 'index' %}">
         <i class="fa fa-dashboard" style="width: 14px"></i> <span class="nav-label">{% trans 'Dashboard' %}</span>
diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html
index d7525958b..6717fa771 100644
--- a/apps/templates/_user_profile.html
+++ b/apps/templates/_user_profile.html
@@ -1,15 +1,40 @@
 {% load static %}
 {% load i18n %}
 <li class="nav-header">
-    <div class="dropdown profile-element">
-        <div href="http://www.jumpserver.org" target="_blank">
-            <img alt="logo" height="55" width="185" src="/static/img/logo-text.png" style="margin-left: 20px"/>
+    <div class="profile-element" style="height: 65px">
+        <div href="http://www.jumpserver.org" target="_blank" style="width: 100%; background-image: url({% static 'img/header-profile.png' %})">
+            <img alt="logo" height="55" width="185" src="/static/img/logo-text.png"/>
         </div>
     </div>
-    <div class="clearfix"></div>
+{#    <div class="clearfix"></div>#}
     <div class="logo-element">
-        <img alt="image" height="40" src="/static/img/logo.png"/>
+        <img alt="image" height="40px" src="/static/img/logo.png"/>
     </div>
+    {% if ADMIN_ORGS and ADMIN_ORGS|length != 1 %}
+    <div style="height: 55px;">
+        <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" style="display: block; background-color: transparent; color: #8095a8; padding: 14px 20px 14px 25px">
+            <i class="fa fa-bookmark" style="width: 14px; "></i>
+            <span class="nav-label" style="padding-left: 7px">
+                {% trans 'Org' %} - {{ CURRENT_ORG.name }}
+            </span>
+            <span class="fa fa-sort-desc pull-right"></span>
+        </a>
+        <ul class="dropdown-menu" style="width: 219px;">
+            {% for org in ADMIN_ORGS %}
+                <li>
+                    <a class="org-dropdown"
+                       href="{% url 'orgs:org-switch' pk=org.id %}"
+                       data-id="{{ org.id }}">
+                        {{ org.name }}
+                        {% if org.id == CURRENT_ORG.id %}
+                            <span class="fa fa-circle pull-right" style="padding-top: 5px; color: #1ab394"></span>
+                        {% endif %}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    </div>
+    {% endif %}
 </li>
 <script>
 $(document).ready(function () {