From 64c6fa1f37ce082e41ce140255bc4b6978087f78 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 28 Dec 2016 09:55:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=8C=97=E4=BA=AC=EF=BC=8C=E6=8D=A2=E6=88=90=E7=81=B0=E5=BA=A6?= =?UTF-8?q?=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 4 ++-- public/images/user/user_bg_info2.jpg | Bin 0 -> 17602 bytes public/stylesheets/css/user.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 public/images/user/user_bg_info2.jpg diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index fdbf2f3db..42912fcd5 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -101,10 +101,10 @@
-
+
<% if User.current.logged? && User.current == @user%>
- <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id => 'nh_source_tx'), + <%= link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id => 'nh_source_tx'), my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true %>
<%=link_to '', my_clear_user_avatar_temp_path, :class => 'homepageEditProfileIcon', :remote => true, :title => '点击编辑Logo' %> diff --git a/public/images/user/user_bg_info2.jpg b/public/images/user/user_bg_info2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f2f676ee73eb3bf50566124cfd75d4c369451af8 GIT binary patch literal 17602 zcmeHtcUV)+)96Wo&^w4C5SldU9R;Kb0Rl+3At4D6N`gt~Vi&~%Qba{Xr57tISSSi8 zDkvf#C>DwhLgF`Djiv-Z z5FQVyK@h|RVGtq^3P1?(gAmIg4mJ!y{s^fBI2fVwiw6mKbRdvJ^59QL=(1rk0H^P# zKy@upBov?zuu1d4{H zI=ZI1dRQHOQyl|SeO(AbokRSV?;LWWkD+s@1=tz%2PaMh>K8BPVqFmOzjZ;VE!G8z zm~R82i(F_M&6;ZtvIkFKmANOYgY^~SV{5U+8V?~@gOC8b1d(>ae5_7rFT}^i#l_9V z$IZ$qeqLUF0e&F?0UX z{7FPWNYp%02tuF{C?p!mf#KxhK=J7TqA&_AC!)h)xsD(zzjc=`r&!AQt5yn%;%@i+ z_4Mhxo2@ZQsqRDF!$gLGM0V+(6*g%eB-@%Crs0z3o;~F6*Y?)7MD&iVRZh>{cl}sh z>-!&hH}1E681)K>OvuPDd+_4pn30`#VATHO1?BbapT>nDBoauAX3K=(vRfgayE?FsOMBgveP!vh_4%l6w|J z_}@#Q{96RpD~J!p?o$}DfWD>T6w`D2()OmGBbe_^Jn?OL4Mj#y?)=D*s%qL9SA`aV z&`0hrRj7ZYOEKGp!+-qXf8BB8^{h3a;=W(@HNBBqBlPkEZ}jqlXSsR7 zJd7SuoD9L@)b{u3*%1P=`pMvb{nJQXGP)wUb~@E9@jVMt6s*)R9(e0EG%0(}Fy*rJ z%wvZwlXmY#gL{sjs(L?l7MpquyS13=_ADk(Rn--UlBbx8Q)M;JiE}-1b#!`TobQ_& z;ySZus4s0VP{f^MP0h;V)v2kcRH)><=g<9#*R4+9-0hc8x2Jd3E1533Z*coZgK1{- zE5XMiZnSU*yLiFWL$3kv5}HMVu{CjZQ+xq*tx**i=s`>-hONsiD`dycfL#o!)r6>^reH zo2l#_cdiyk(_UNs(w%Z;hsnnMcU@+k-=|-_v76Md-&KT?w<;ObeC7P4e*H6s>Eo;J zuVy8=_@61}Q{-X?URxeTB)*r=Enq$Ww)wW%)jQXR&NW>R(J?EJWpi|{KK}{v=Kv>@3&Y`epM(=$-=>q*(p48R#5Th##M4tM@K~2kQ&D=Bk9M{N#l%s~X=qsk4&8wXKdALunKI;Ro zdHrN(;N1>}DRZ#_+I z$k+;pN5df>f&`Z%Hb5vTCA;O|)d0U8*fb?JP3TF}RD5B56*otC~ zav|`CgDeE`hSMojrb`4fJc0>|@S6y7WiZ|SX|zx_2ad`llc^D5Fad_y&#*u&cnY%X zx>KTI4l4>1t^u@G@UTnxZ)Stdka0_JM7Yf#Ns`c*zmHE5i@GUcCw>W|Aw;){X3r(o#f$3 zWv*3l3x!8>Az6izu>XX2V}vrN?_1p0`EKl$hN=_&koerIT?N}K#=oK_RLwq zrV0G&6g(_;&doQ}cQ%d(f>`YIYZmgevG6?Iz^=b^p)AAhYlL0qX6GP7uzeRS+u+3W zYq9`0X7i4+vG$NwKmeeGf*dTgKtlY&oIjblfB|bafZqV}c^(5c2A&VUFzhxbKpBF< z=cS&L{dbP~43mGC7eoIiG`20c;I`*yCvpu?6a0VKO$LV8%fq?ZybLa)@F1I$9xg%< zy!0Fbe?BMzVnAew4sC(_p+JyRASx69(E#n&!~)Rov=|51pI^c*a4cq+N5X^h3r~#* zh2t9>YdQUC5mXZ6FSD4))B!Yhc!phn!M_0VFa8Nx{q|$F7;eAa6c&w>5lSJF8D61I z@I*uW(GLfk2GAnlk6{;ZHjDbg1kz~{;eVhwX>>{;Wg&*zy2GuzuyLRbenJG3W=E!y z=>#U31Q3u%O!$1z=b2-MF)#%;7yAES>yL_{hyL;EfMDbQiNP}h|9ri05<;0Cgup+z z1c+o%j~va!G3-6?PV?c6YaaavGj|Y;9%~s&37of-;GFXI^JriI42c{-h+v0T?npA7 z`48+~^XNa>dHn;eX`wXwBI63rwQps&K!9!ROryfK=4R5u!HbzeUL3!8LP4PW8vjyyMAhGfAwsOve+0h3Lb3hzYAcH5tIq=s9U>5`t zb^YK!P_0x^Wl#QKxL8o*5c+ns88EQMqy?`?qB#)n&zgDCc~ zbh3M_vj;IYglIyNw=l=9jy8=B3lAeR3E1ecP%6VT+Dx9^xG8{Pw3a-U&B6>ZlV=~v zVSVtfSZf-cj5W|S)F5gb8exr0G<6J&jP#9GvX33LwDq*~v^8|~O!c+FIV1L0k_Wxf zNdcyAHfw+N1xjY}zm$rKiqeeI)1=V@wRB8OOtiFhwRCkg0EY%6hRP&FYfu>q^DWqr z8ALjTy~D%8ErQ)k1k+3&NIIuNSolJ-|7fduMiOy>FB~jH*qxJzTI5i27@5js0K4kI z>a!aSpFdn(sPaeC3uN|S%vS=Y#pD0E!u+^}g)MZ!VA@6kHU6tnX26RIEjKcQ7C|SH zZ6kr03UFuPrg$2O5)cEna%3}k_^?+)M;DBM$NXWhy0)>Yw)PyWHJwZV+ddDl<(nVV z-=`0MJ33xehy0JtgX3h~#m(b^*O0)L@*kPugXei>645k(Mh_zZohf02K(bbFI5|)r zyI@LF_G$?z22|2pjK^79gL8oZN+=*Oz@8e5v$ZzVF)=jM(ACso%ZtaG;;0NJfl4If zY|P|=fix);lBu?_E31?{DBgU*CpCjDXz$ zu0J;;NHij7-%e%80rLoBGJeI$YpGz69BtD+nY@7DGV@pF~260 zJ9+CbD3pR_JCG@X2p@d_%Mc>TB>7)R%0F1+KkD~a{V1?q|C?j!o9gS#59VCo3|as) zia;k@1_I0dN6s}@j~GOt29iOn(vsKuAM5johVcq5*%oUfv-{U^4Mqn1}x?&IMC(>=j-6;nm}ZP1#oB-GaSal z=a6FlAux=D57EWwKtKRX!f@amypqi`2d{x)QWzB+StDVY!%1Nz7_I~GfyfB>C>!Mj z;DksDISRn709Fi*2%`WP{sJNvMkavcb@myjB9lxE0#F7zmov8LkD1 z{B3{2M$cvcC2NigD95~p9)So8Y-@@JwYcqE!kA=OO z2oBjJ=vW3g^&n$4{_4d4V^^YCs zq89##)fTk?gL8fj0MXo^kk}SYNT^8+LVaz7(4xE$YEu@VAQr~WiQ5YtL_v_Z?58=u z2QZ+s^FK0VGAJS$lt3(uws!Nt5+mr5Fbw7doN<6}l!A~Lv=owo6d)By0~}HrL93uO zkS*i@xj-J!ddL?df}^f5@NF&%+6L`{5}-rSQRo6%m2h zhS-BRgh)kXBF-a<5LXem5cd#|5Y32}h;Bq5;yYpri9+%r#gNj-6-X_lG13z0i1a{i zMg}6cB4d$zkx9rC$ZX^VWEt`vvH{tK>_UD)j)MDayeJ8j97+RajIu_#pf;caP;}IG z)In4RDjRhPbsJTWYC(0O22hh|PP8Z*i`GD|LffM~(M0rC^mg=NbSAnGU52hhx1hVx zL+GCz{2a?U)HzH!a2!4yfgDjB2^<+5`5ZSm?sK$peBc=4jQWbRz<+uTjuAGoJ^gn5*C%y>L_f_ZlF zoZz{{bD!rm&j>FsuRN~_?>b%z?@rzmyjOT1@^=N@mce2;)~!*;w#|0%lDFR zgrA>(1^*iU4g5_0B>p1)TK>2E69S?FngTchlE4muQvziI&jkhrxdoL3Ed_lAV+At= zuL(8@4hV4ztq`&nA_#34Iwf>Vs9k7OSX5X?*hM%@_^@!X@FU^RA{dbsBDNwVk-Z{0 zBDEsDq9{=XQEO46=pNBr(fgtw#5l#2#c*Q5Vu!>oiaiw@5*HEI7xxm67C$9kDc&W4 zl2{>ulL(bamME2YAu+W?dWq!{@{+_QmzF$VGA=14xki#Kc~J7QWSivFQtVROr6EgG zmXiYRqZs#NOLa^!Ng9m8~k-Dy^!Vs>Z4zs%KQ6sUg)2)PmGbsWqu1)eY4t z>SxrOS8}X0SxH@)y|P_{Ps36pQlmtpTT?>QNprVmx#pmjqSgkj6s>x#pV|i6q1w6H zojM{q4m!JaZtHy4RnsNvp3-gAprr%a+tO{9Gyz296<<;cX zxvP849e1*Pg@P(LTk#9Vd+=;)-xX z4n_{~4t0)vj_!_`jy+ClPIRZ+cqHBdpN4Q@z}->n+!H3YAK8qYO8yjJ7LXe7InXRHEwC@hA}AwhfMQL_ zqznh!2cHcd4{-@82w{bKhh7fj3iAuQMHQijQ0r(iv}js$xO#X(c-L0bt;eUv)ZR3FT3I?a{b2f!V_S|r%Fxd^dz|NZ#PO~ZPA6`jR6Kd~ zJ9OYccdAsvv*(5o7DqdckT!Ji#DCxVf>B6&%HWzPR(ztZ~vc%;> zSD-5qSNgB|U42pNSXy(<_}ZoGO4m={5WR7*3{e(SHdG!|-gR^R&E{JUw`y*$x_#r0 z=AD8Hxr$Sj;+4r&JXL$ESk-KXZ;)dKYR)QGCh#+Rru@a zL6yPl-`0F<9P%0ZFian2eLp<1bfn;i{*Rhb*U`6QVPn(d2Pc+J6iymX)=zm)eVUG% z!OWbPRh_;4)A8qPRv5Sm^!p0-8n70ayMjG;!5Pkx@E^`VK9^8P6i6UL!wJQ~PT-w} z!GL?)ztS&$G+@GTpg9&%<~jbGCyRXr+Zh@{A;6vG-&e3@z!hw;tc5s{;2QBl!fz^K>rIwKtf@VTnKK6hgS#!*Pl7Sm26H<4h{s0lZF7WFbAic2!zqG z6y;hcPY?swuv56tD-7MUx+>l*(LL;@w?xrj(pq0>H_uYK`wC*JjX}0Y=`x04&2wd2 zqqRNX_oU@qBYCRSwx}BSj@a3Ik=0C0aSq;Kp%%c5*t;(bgTgq9Ny`{hXR2a{St@M4%f_f}sK9#g}1Pl{tBHRE6ZC(s5;ok{kK7W{!B_ldG*Bg)(?PN7*T-JQnmQ zzdfKen7`_bN&l!~KC(FLk@BnY-jFkbX1@70snPFoMrVfCA5eVfJTn@bReYk!o^<5M zU6H)XiqY6x-E_UX4L9FN-FWz{Ut@Bltv|TVNNHQwRjJq7G7^TLN?Jc1v}Zvp1x89P z)8iOz{bQm#)B*z(;t=P}(m^roK;>ovy)JRn!*gKI4W}%|Cz? z+G3j(^XjggUQx~8IA}{+_r&$1L9~PJpgcCu9^3a#bhth1vYWaAvs$l9Uot^QDZ(sL zYK_x#9)`S=91D_ZM{nA)?oN-{>CxETDT)biC+`GdfM`1VC3JB+_^V}NE7z~jY}XYr zUp^XpleS}6wgU7yHqL^Cr@||x_cs4pY$2qpreb}Ev z$zb&DLzh`mSn|3g%20wI&q+)5uN4=|Ct&`B8UC1I;Lq#uC zS@A!ZrYZ`Or(uckxfIE`;B7vzynT7T4Mj3bz5*kQKl;`^3CQEXp5XERY}odc88CTv zu$uoInJe6t6<`8HdL$<|gL+8`KNWx)JL{sPj^i==VU*D+t|hvH1ir9$j`2YJTN=`~ zULVgVZ0P0ESSP&_uX=dH)PPrKK{==v^v*L?FF^X#%O>xl7faoWcy5mG9B&^>0#-wrAr`A0qPK5O{t%BwT1a2JTahdX$~xu*Qu4-d^TE}wx}%yTEje;iYb zf3!0B#}Nw}P=i=(x$9}c+awlr*39?9&3kXGEx#IC{0Nx_YWdfldYqS?w~jG*6qD3U z>j9{U4Ymei`b8ze0Sez}jlfmBnUAl#E=#nl7+V!5yR)SZ^cv!sSsdvXwfc5O+0Gq- zz`+V4gM!X+$7PKvQi(u^OE?+pD(k{&Y_y;skSW77AY6L({?HZ?bMt#m-o-W-`LO)R zq{kLHS(n{I(^j3j{JFh54z&9blHOMZwDzr>4gnU-dH_#Xcpjw2-s9f6gC&#~b9E65SQcFDlXLUPLnAj$gYxY&qp^AZ6CW`dLH+8(%Wf9t zuppIwLrlt7Kjaagth+$46+RcP_S{TRNW719GYEa|c|jQAw{%eK>&#Ch5Xqj}q!^=P z7%OsmXMtz9pQaw$I*=ZAGcey%q2Eo||U zxZQGO6^+&b>|H3eDb;6F)&L$DoFRN?n>lz-dF(vY`z=~1F8(#}dMVz>mW`1>n4~XV z)xZHS!BauGb4%_H5Ei$vTK*hPP@@t^SvjE9163x280v3pDs6Tau)6gXm#B6NHTQ^% zrSMDeY&dxgv;U=4F))KoVL>K^@A<<~ciyvx=ij_^9DDGtxf{6T zeNw_jEBia7L8B-PC>JYUX>h(*9XT$-uQ5;bc?KSj%wNqaz)_IZ`nR#TgH7rM8gakLUeh3)el3P<7tViww!jw%=-P86?17Ts z5@yJy+k@rXduw6UEj`yQ&m-^5?hsGaqu1Y(_)3G{QE7GuPdd`}b*qOdqBb7tbZG)J zx~QeG;Pm>W7p6O3$-?n}ebJeS+93wn#2xE!|+l%|sS- zKIM=stngkDiacTLEyAhV@liKyrQsCuiq`R*0v2SOb2w6$pL;oYKW9v8H(KB~Tf}`S zotm8iew52C%3ZSjda87dP7&-W-noTYbT6gSv6r&fI(Fm$wLP-^s`CkwEQqIbVhnWj z?ko;c+uvxGxS2Kz^sft%u_Z{p>}CLW@e;wwzfbG%{RG;%P=93#b`iSD3sX4GN(m0j zW&<;Nhe8UkR%OLjZU!_HIf zJlNok+u!8AHc`JhOzjxQv6Vimibt57K(9R$!>jA@iT4mC2TND3J*W6N<)p%1Zo~Dw zvP|vqgvvW#n!F30HYBViRCGv-9f8+2c{6ox#r5vev-_yPv0|{;$?J^Qg4e4I$7H_( zt^1@`ggC}J+<2xl-~s}%#IZNrGMhss)bJOzQ6pe&*OsB|>UrFLeB0xq*1Xx5OMs%0 zs$x2W9imZ{1K1SC&=PozsBX)2ZuCfrZr^S2tq81;0Pb^bN2Yy)PSw<-)$wH@0$m`h zW-Aq(Xp$Qgz3~%{4V(6D8sK@}@>S-UCOjVAoC(=<)UE2N`tnxTIFhlKE=}9FyTC#| zwBd3)o~@?{>HW^7dvlE_K&KY z2b{T!ldJw#)hV6(g;oHEn3Cqo$2v(DsWu=g512v4sXa2AfoX=>sx2;SBhg(JsE z&xEU|{4F0L$?JqycW0~ss%Gm2Ez1!j^)Z(;1;JeYb6dVBgKqT>b<<^AJQ}pe%$m1% z!#*FDL|_hIn@k^8Tyv))FDVP|yhJSKU_xOU{$PtS^>I@9RJky~9dlN8;jKC5IsE(v z{)y?s{_|twR|mohz&j%ULTstSO0^9SgAdy-(^exQH>w+R-u+Ai&3lAi-h9Ac?3(8b zk8O>sGE|oO3rlw+Qm5l~K4^#6m=4GMYTp>a;RM}rX4|2IUagt^x4Fp0K?)_gMu)9= z2I331w8jBw*=bg0!Drx>T zuD1W_Ct}~Z1_BuZZ&2{o%2jZM4B=`Z>IMtAmxpuU+~Shsd1nVx}H zylLH?Ab7R5pH?U46xEUwOyutu)jHz5TqT|GgQhyfZ_;tmTRMPq>S%_S(XSoJbuq5E?28!-iheg`=6hZ~b9rrIo`DncEMHCDcwR zx3_>JBuf=K6TEi&9bSd{7Ey>vIfDBt zPWYz_`Q#tI*ZO+XJ3M%)=50rvkgs6Nw-PV-lrLBJGMrpT< zjD%Q5MA?Ob?<&hC;()fC+Rt3QT=Z}Fw3+ideP7CJ2q^}J8uptR2Ci-)BJn;kz zdKbj`wiD>fIG2%9lx-ZLYrFrN(W488zlltLy%U(ZrZWyi5BE+!>qqn_I_Zb7=e}25 z?R5VT4Z8_(-_^F=LyD>E6I~-?@+$25PVmO926zRvt1Er<4{>fz`E-kGG(zm&wk8oP z6SGM`DPcjEzDAyIJP=o(fc}0LEJ>7-KLN|Ad=kCGv+u&h^>;ec@CrKIC9C@L5&WP* z@<**numdV|xhtULX#dqmT}MZw;>0JP9-oVh^MyzCM0-I@2d~FZ!PR}q7PDgDSf&Vs zkP5ZeDR+2J3Lbft&VsmO`bV9T@b3aJhohf-oK(8ML(YiwBM>t(PPP>ap9KX^$l zVde$a=bB?8UKhGOz*F%0N_*XFct?VFXjE)8BnTxAfElfErabaRrwi!S?R}`>x+$Nl zJhX^Q{$XFrAB-(2?+5JGN&7kCt2K_a)&7(odR+U{$vL)i9dVm=ybVs=-Mx5UL2>c- zC0n8XN4GNTdw~1p_m4e3BDUoPxi+Wh4%ZXE0@LV?Z&$nnJ80KcHii@Sup=YaX8WaNlz-=3U%%uyg#3Lb%J0H@@I4u)4sI q=-^=7SJ?NlhBrNF{W5X+Pw)JQ{&mSj*go8SW9@yi@N1Lx@_zvjP^54G literal 0 HcmV?d00001 diff --git a/public/stylesheets/css/user.css b/public/stylesheets/css/user.css index abff72629..575379f87 100644 --- a/public/stylesheets/css/user.css +++ b/public/stylesheets/css/user.css @@ -87,6 +87,7 @@ a:hover.pro_new_topbtn_left{background-image: linear-gradient(#ededed, #dddddd); /* 个人主页左侧信息 */ .user_leftinfo{ width:238px;border:1px solid #e5e5e5; background:#fff url(/images/user/user_bg_info.jpg) 0 0 no-repeat; position:relative; } +.user_leftdata_background{ width:238px;border:1px solid #e5e5e5; background:#fff url(/images/user/user_bg_info2.jpg) 0 0 no-repeat; position:relative; } a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;} .user_leftinfo_img img{ width:74px; height:74px;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px; border:3px solid #dcdcdc; } .user_leftinfo_female{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) 5px -378px no-repeat; position:absolute; top:80px; left:160px;} From fc439e562d6640ea84078f5ac27d5ece5c13f794 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 28 Dec 2016 13:46:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E2=80=9C=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5=E2=80=9D=E4=B8=80?= =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E6=9C=AA=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E9=9A=90=E8=97=8F=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 + app/models/user.rb | 10 +- app/views/my/account.html.erb | 1103 +++++++++++++++-------------- app/views/users/_form.html.erb | 10 +- 4 files changed, 576 insertions(+), 557 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a2e69c846..a69442297 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -227,6 +227,16 @@ module ApplicationHelper xls_report.string end + # 用户资料是否完善 + def user_data_complete user + user_extension = UserExtensions.where(:user_id => user.id).first + data = true + if user_extension.gender.nil? || user_extension.school_id.nil? || user.lastname.blank? || (user_extension.identity == 3 && user_extension.school_id.nil?) + data = false + end + return data + end + # 获取用户单位 # 优先获取高校信息，如果改信息不存在则获取occupation def get_occupation_from_user user diff --git a/app/models/user.rb b/app/models/user.rb index d6722274c..8d9751a38 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -80,12 +80,12 @@ class User < Principal #每日一报、一事一报、不报 - MAIL_NOTIFICATION_OPTIONS = [ + # MAIL_NOTIFICATION_OPTIONS = [ #['week', :label_user_mail_option_week], # ['day', :label_user_mail_option_day], - ['all', :label_user_mail_option_all], - ['none', :label_user_mail_option_none] - ] + # ['all', :label_user_mail_option_all], + # ['none', :label_user_mail_option_none] + # ] has_many :homework_users has_many :homework_attaches, :through => :homework_users @@ -244,7 +244,7 @@ class User < Principal validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true validates_confirmation_of :password, :allow_nil => true - validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true + # validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true validate :validate_password_length # validates_email_realness_of :mail before_create :set_mail_notification diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 166a95ccb..0b6e51f6b 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,73 +1,73 @@ - <% if @force %> - <% message = AppliedMessage.where(:status => 3, :user_id => User.current.id, :viewed => 0).first %> - <% unless message.nil? %> -
+<% if @force %> + <% message = AppliedMessage.where(:status => 3, :user_id => User.current.id, :viewed => 0).first %> + <% unless message.nil? %> +
  消息：  您添加新的单位“<%= message.name %>”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！
<% message.update_attribute(:viewed, true)%> -
- <% end %> -
-
  提示：  您尚未完善您的基本资料，完善后可使用更多功能
-
- <% end %> -
-
-
    -
  • 基本资料
    • -
  • 密码管理
    • -
-
-
-
- <%= labelled_form_for :user, @user, :url => {:action => "account"}, :html => {:id => 'my_account_form', :method => :post} do |f| %> -
- <% if( @act.nil? || @act != 'password') %> +
+ <% end %> +
+
  提示：  您尚未完善您的基本资料，完善后可使用更多功能
+
+<% end %> +
+
+
    +
  • 基本资料
    • +
  • 密码管理
    • +
+
+
+
+<%= labelled_form_for :user, @user, :url => {:action => "account"}, :html => {:id => 'my_account_form', :method => :post} do |f| %> +
+ <% if( @act.nil? || @act != 'password') %> <%= render_flash_messages %> <%= error_messages_for 'user',@user.user_extensions %> + <% end %> +
    +
  • *  登录名 : 
    • +
  • *  邮箱 : 
    • +
  • *  职业 : 
    • +
  • *  姓名 : 
    • +
  • 组织名 : *
    • +
  • *  性别 : 
    • +
  • *  单位名称 : 
    • +
  • 地区 : 
    • + + +
  • 个人主页 : 
    • +
  •   
    • +
+
    +
  • <%= f.text_field :login,:no_label=>true, :required => true, :style => "color:grey", :nh_required => "1", :name => "login", :class => "w210" %>
    • + <% if @force %> +
  • <%= f.text_field :mail,:no_label=>true, :required => true,:nh_required => "1",:class=>"w210",:disabled=>'disabled'%>
    • + <% else %> +
  • <%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%>
    • <% end %> -
      -
    • *  登录名 : 
      • -
    • *  邮箱 : 
      • -
    • *  职业 : 
      • -
    • *  姓名 : 
      • -
    • 组织名 : *
      • -
    • *  性别 : 
      • -
    • *  单位名称 : 
      • -
    • 地区 : 
      • -
    • 邮件通知 : 
      • - -
    • 个人主页 : 
      • -
    •   
      • -
    -
      -
    • <%= f.text_field :login,:no_label=>true, :required => true, :style => "color:grey", :nh_required => "1", :name => "login", :class => "w210" %>
      • - <% if @force %> -
    • <%= f.text_field :mail,:no_label=>true, :required => true,:nh_required => "1",:class=>"w210",:disabled=>'disabled'%>
      • - <% else %> -
    • <%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%>
      • - <% end %> -
    • - + + + - - - + + + <% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %> <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style => "width:127px;" %> @@ -76,159 +76,168 @@ <% end %> -
      • + -
    • <%= text_field_tag :lastname, @user.lastname+@user.firstname, :no_label => true, :required => true, :nh_required => "1",:class => "w210" %>姓名不能为空 +
    • <%= text_field_tag :lastname, @user.lastname+@user.firstname, :no_label => true, :required => true, :nh_required => "1",:class => "w210" %>姓名不能为空 -
    • - <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %> - - <% else %> - - <% end %> - -
      • +
    • + <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %> + + <% else %> + + <% end %> + +
      • -
    • - - <% if User.current.user_extensions.nil? %> - - -

      - - -

      - - - <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %> - <% if User.current.user_extensions.school_id.nil? %> - - - <% else %> - - +
    • + + <% if User.current.user_extensions.nil? %> + + +

      + + +

      + + + <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %> + <% if User.current.user_extensions.school_id.nil? %> + + + <% else %> + + + <% end %> +

      + + +

      + + <% elsif User.current.user_extensions.school.nil? %> + + +

      + + +

      + + <% else %> + + +

      + + +

      + + <% end %> +
      • + +
    • + + +
      • + + + +
    • + <% if @user.homepage && !@user.homepage.article_homepages.empty? %> + <% if @user.base_homepage %> + <%=link_to '查看', homepage_user_path(@user.login), :class => 'linkBlue',:target => '_blank' %> + <% else %> + <%=link_to '查看', user_homepages_path(:user_id => @user.id),:target => '_blank', :class => 'linkBlue' %> + <% end %> + <% else %> +

      您还没有创建属于自己的个人主页。 + <% if user_data_complete @user %> + <%= link_to '新建', new_user_homepage_article_homepage_path(:user_id => @user.id, + :homepage_id => @user.homepage.id), + :onclick=>"my_account_form_submit();", + :target => "_blank", + :class => 'linkBlue' %> <% end %> -

      - - -

      - - <% elsif User.current.user_extensions.school.nil? %> - - -

      - - -

      - - <% else %> - - -

      - - -

      - - <% end %> -
      • +

      -
    • - - -
      • + <% end %> + + +
    • <%= f.select :language, :Chinese => :zh, :English => :en %>
      • +
    • + 确定 + + +
      • +
    +
    +
+<% end %> -
  • - <%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %> - -
    • - -
  • - <% if @user.homepage && !@user.homepage.article_homepages.empty? %> - <% if @user.base_homepage %> - <%=link_to '查看', homepage_user_path(@user.login), :class => 'linkBlue',:target => '_blank' %> - <% else %> - <%=link_to '查看', user_homepages_path(:user_id => @user.id),:target => '_blank', :class => 'linkBlue' %> - <% end %> - <% else %> -

    您还没有创建属于自己的个人主页。<%=link_to '新建', new_user_homepage_article_homepage_path(:user_id=> @user.id, :homepage_id => @user.homepage.id),:onclick=>"my_account_form_submit();", :target => "_blank", :class => 'linkBlue' %>

    - <% end %> - -
    • -
  • <%= f.select :language, :Chinese => :zh, :English => :en %>
    • -
  • - 确定 - - -
    • - -
    -
    - <% end %> - - <%= form_tag({:action => "password"},:id => 'my_password_form') do %> -
    - <% if( !@act.nil? && @act == 'password') %> +<%= form_tag({:action => "password"},:id => 'my_password_form') do %> +
    + <% if( !@act.nil? && @act == 'password') %> <%= render_flash_messages %> <%= error_messages_for 'user' %> - <% end %> -
      -
    • 原始密码 : 
      • -
    • 新密码 : 
      • -
    • 确认密码 : 
      • -
    -
      - -
      • -
    • 请输入8-12个字符
      • -
      • -
    • - 确认 - - -
      • -
    -
    -
    -
    <% end %> -
    +
      +
    • 原始密码 : 
      • +
    • 新密码 : 
      • +
    • 确认密码 : 
      • +
    +
      + +
      • +
    • 请输入8-12个字符
      • +
      • +
    • + 确认 + + +
      • +
    +
    +
    +
    +<% end %> +
    @@ -243,10 +252,10 @@
    @@ -262,322 +271,322 @@ <%= stylesheet_link_tag 'nyan' %> <%= javascript_include_tag '/javascripts/jquery.leanModal.min.js' %> <% if !User.current.user_extensions.nil? %> - <% province = User.current.user_extensions.location %> - <% city = User.current.user_extensions.location_city %> - <% identity = User.current.user_extensions.identity %> - <% occupation1 = User.current.user_extensions.occupation %> - <% occupation = User.current.user_extensions.occupation %> - <% title = User.current.user_extensions.technical_title %> - <% gender = User.current.user_extensions.gender %> - <% language = User.current.language %> + <% province = User.current.user_extensions.location %> + <% city = User.current.user_extensions.location_city %> + <% identity = User.current.user_extensions.identity %> + <% occupation1 = User.current.user_extensions.occupation %> + <% occupation = User.current.user_extensions.occupation %> + <% title = User.current.user_extensions.technical_title %> + <% gender = User.current.user_extensions.gender %> + <% language = User.current.language %> <% else %> - <% province = "湖南省" %> - <% city = "长沙"%> - <% identity = ""%> - <% occupation1 = ""%> - <% title = "" %> - <% language = ""%> + <% province = "湖南省" %> + <% city = "长沙"%> + <% identity = ""%> + <% occupation1 = ""%> + <% title = "" %> + <% language = ""%> <% end %> \ No newline at end of file diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 287c5f202..afbd6f360 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -42,13 +42,13 @@
    -
    - <%=l(:field_mail_notification)%> - <%= render :partial => 'users/mail_notifications' %> -
    +
    - <%=l(:label_preferences)%> + <%= l(:label_preferences) %> <%= render :partial => 'users/preferences' %>
    From 880c66c659550bf4d3fa725fccd4c6ecd17a1f95 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 28 Dec 2016 14:40:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=A2=AB=E6=B8=85=E6=A5=9A=E5=90=8E=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 0b6e51f6b..560c10d8f 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -665,6 +665,12 @@ $('#my_account_form').submit(); } + $("#province").blur(function(){ + if($(this).val() == ""){ + $(this).attr("placeholder","--请搜索您所在的高校（单位）--"); + } + }) +