From 9186978551f99e457720796786763af3cf4a6c85 Mon Sep 17 00:00:00 2001 From: Spen Date: Thu, 26 Sep 2013 20:02:41 +0800 Subject: [PATCH] new ui member plugin sort fix and user show avatar fix --- app/assets/images/person.png | Bin 2036 -> 6989 bytes app/assets/images/thumb_person.png | Bin 0 -> 2036 bytes app/controllers/admin/plugins_controller.rb | 18 ++++++------- .../admin/users_new_interface_controller.rb | 9 +++++++ app/helpers/application_helper.rb | 6 +---- app/uploaders/avatar_uploader.rb | 3 +++ app/views/admin/plugins/_plugin_list.html.erb | 4 +-- .../_user_for_summary.html.erb | 2 +- .../_user_for_thumbnail.html.erb | 2 +- .../admin/users_new_interface/show.html.erb | 6 ++--- lib/orbit_app/plugin/registration.rb | 5 ++++ .../front_end/member_lists_controller.rb | 7 +++++ .../front_end/member_lists/index.html.erb | 23 +++++++++++++++-- .../front_end/member_lists/show.html.erb | 24 +++++++++--------- vendor/built_in_modules/personal_book/init.rb | 2 +- .../personal_conference/init.rb | 2 +- .../built_in_modules/personal_diploma/init.rb | 2 +- .../personal_experience/init.rb | 2 +- .../built_in_modules/personal_honor/init.rb | 2 +- .../personal_journal/config/locales/zh_tw.yml | 2 +- .../built_in_modules/personal_journal/init.rb | 2 +- vendor/built_in_modules/personal_lab/init.rb | 2 +- .../built_in_modules/personal_patent/init.rb | 2 +- .../built_in_modules/personal_project/init.rb | 2 +- .../personal_research/init.rb | 2 +- 25 files changed, 85 insertions(+), 46 deletions(-) create mode 100644 app/assets/images/thumb_person.png diff --git a/app/assets/images/person.png b/app/assets/images/person.png index f0493974cc8e8e49e1048eef058ec50949e90a6c..db1d7d2460f9f21a1b2350879baefb2c0b06f383 100644 GIT binary patch literal 6989 zcmcI|c{r8b_xC=>DJO-aL5AdTG^or|rW`{e8In1X;TSR;4w;8TDv1ou5-LRzO)?cK zP3DY6W<@eYM8@B`^*qn_`^WEjuj_rU>veJ6_rC4D_S$QG)>@yn&lnl(V`t-ILkO|! z>S!4wgojr=B4UqVKF#~^;Pu^W;d_Yg4o>tW|iGp5-&2714zsUXB6 z;%Z{yYoUKY$${=6Zimeg5Ag7U)d;Dm1$fyxxY2yc_B3Z#PgUWuk}_ektD~y0xtzYF zzLzG=#Z@PWK|2&=VB!$u=Ah^(thR@&5}*VEJZQdl09V(vnir5|Z#MFD50cBqy&V ztw8?kM;LZvI65gAYia+r7mQSeU3`7Llq4kl{r$!LWyI+WX9+1qMMX@8w6qw^5c3K2 z^tB5R^Yo$oEkTRs)ScFdSV|$msjZPE9rXr_}Y0o&~&v_g+Ye6tE;1u zjP`ELy$ae|QhPPQ?t5j_)up8O%E@bLDC}03)R5Wx_gXEw!*LIqr|;iu9sjd-@4v3a zz~JEpJ8RJxu6{H}Z3f+gynJXS*MHYV<6q_dwbt?9be78m^%C|b>cD}N93`tGH@_8Z{1XlQ5fXwg8%aC^bnR`l}xF+9Q{ zDncZL2<6}cL z3SB8n^drT-u8nu}v(4@w*w4`UR6tMLpu<6<(Im>|Cwg9;&bA$tur0N2UGm}OENsC9hhqlihc7K2De=3$+xzCTXDVz<;S3+2vBJJ{5@F+K^{>fK4U$oU&Oq(; z_D3{5>(nQzL6batLIMm7&arafm~Fd5XD4Ge?7U|?+c#(UuBwV($=79iv_mzSh(aQh zl9E7ELA5ZI_lrkhnbshd)BSPA!Tk|Qss}xkOtgOsfy8N}jKX#Miqr(NBn|%pP zFH;i}ld?~0zJo?rmga4q2Zc_TbWO=p5%K%+vckfd>Z>w$viz#V3aV2SWn^R;*Avlu z_u3Ridg<>w0(-zH`4YAha<1Nw9Aq)Ie1W6#K_6%>&?Aq zhhgr)(;Na;MU2}5Lk0z&9UvF`D5N&~A-*%{yO?rQ{Dz%oJUCo>#Pi7pz3;7g1)2-j z)WSRSy`Tv!QAD@Kl5i`7$iMTa+Ql*y>6 zdc5!L#$6UiPZw5IR$3K$-4Gz5T=Rnm6ZM{MiHnVm-J*BtBM#TSZn&dl`pmY}2bvRL zCS8EW+~l{$d^dA{UQINUCFSsjM`%+~QPD_yL7u_O0kx$-H!|u`3Y>8C_I@a!aVa^u zEywb)Vfbw0!rb)O$A`Dn2~2X1#lzkoJ+J(_DSQf^)*UBU1w-oBJz<7>?|XI4*ZQ`6?+1b*2-AtKUt|5z^cY+;)b(wTzHiIh9&XrgTtR5Ym*S)8<{#4 z2Lj(Eer-0yUOx5dOytz}R+yJXAFbC~zez3ZGaTu;QuyLCE`%d~0H?-LwZPe}Kv|+( zz|SCL==~Gd##pLv%5LwMFk7|At0$5x`rN&HJ3zy!9`NdUu4q1gBFua>)SMkhZ7P(` zLfw7x5wmk$OP&N=x~E4+aWhfNh(^23MPL?BUF({EL)2>gQgs=Q)FkvaJUV9}HMkap zAMyUpdea@U3AS$~U?!I8_@(Osfx}Z4P=R!=h=XJk_ntB7?z*rS2-^h(ai0LgpwA;hS&kZNwzs1dseV zjgu4KvZdC(_}0usgvwAe9FBP5{7#VH1bJau{yfi>L7xr=tiO2iBIZbqey0Q=)Cf{wboMe0WjAcZLN-e? zUTv|ED;mn;e(WHFQ?0fN_(VC+&%2lHH8C*}6T_wq03Vp){Gi}BYyqFo47|Nm@ltSU zW*;{2?SIEbA+63f&yxq_>r`EqP{4bSSIg94Xp23;%E=eO^XZ|(X$Zawi~M63xuP#a zEPs;}4)a8R8;U_l88O8;D;fwCSxdL&IrAhZDe0y$0wsVc67q;e?5Fs12$pWoAE z@PvhxEX3opYAmnisTHJ12dHvZvK-F(Kz#t`?^=!S-dYxo0HpMhF!vSQ&*D6cYsfq~2Jfw~0W9GBsi_5N1UkheM(pS65) z$Kc@q#oD^>T$7fTUKVXt;ORktC~wNMRilvnN8N=`(;H{CIZGHoRhEoIMh-RC6u`{p zR#wNBBj?sW&Sig%c9eiunWQ2>AB132R97V6EDISekVe&3x+xp^3=H|?-5Jg z)DiUkJ`53*c5lNi_L;ipx5993y8l?GHrZw+$0jUo;YxpAALEG#D4H8Bfv^|p<(fDI z=VlI8)zv|XN|3ajZMYmuwT|VJs|1Z+uGy^ekyvrk7E89m3OGoE63WW$M6IrhGwZPR zA0t<+j-^iKd$hMe{vl-kNm@f%K#XFUb$7uvz>i|77k;m_0CR{}k)c_R zg&jdySWK+ubvS_;G*dfSQf|70DOG8Oazl(|%&*1NTqT;0r!#be(G1 z+y)?E57zKVmOnN?_2^~8J=5%=ZSCpmCk`aa8e<9lq=;nr;{3X81|K7e6E0o)>Mn>Q z4*^MyIeS)5PfuU{=B~p}t9!z5WGBDT&qZ+9i3!FbBV|st`3K4&tI$LL#rfaBe3p7R z!vmHUrtiPl#wU4{>9ByOKH`;eisdSl&)g98%96@7566+C3`0gmPnm}k$Oq#173A?t z%}}Z_qso|%ekrT0t@Z4DRwO`RI{Lj8@aKt$Km6cm1O%bTfHpqF8jBbLv;Q)dW%t;3 zJ_`h2leH`@EwShBwArT2<&?v=dNoL-Mgy&fXVlC12rRSuEY8HY+&>K9BO)ITx)CkT^%@RZpdpm|jrZYKTH^4H;*+NK9%GpH_EU z0i8}Dkc|pDgR;3afOJVx$S8ur%Pg0pcYY=kA%u{f7aIvw9qK44;37emdY4FvW1`(0 zfao4wJv|u>=IrD*2aw{6)l3cMrX_V$csD)0oOt8?yLXa!e7QagD~GIx3$z0E1OoHg z#Lu5`r1h)|B(zwDMYzx=NHuaWZ)xTQXV}pwDl{l>VQ)cc`wAjOzEDNKW2mx;TWi(t+O9oAq{f!pLll6rUs8b)J)=)J9a^N36?$@ zLNhd~v}^M{)4Ehu=vcgtK+o_g>mWs0njhu`78H*q7RYieIj z!fTOQ-JBd2u-MxM#_T zJO#R;?bGYxADP{^f{*FBg=qm7fRl%6QvsnXR;++$mS*mHc04t`bpDG3KaRj8b%f20 zXfrcrE$H~%5isD{jS^u4*ZmK0Spu^wgFMjK*r=}_hjrO?Y#|kilzm~pt86b_x|A$@ zDZE)!6o3!?L|(22w5IALwCBZ#Tl=8LNGpY7-qG2A_wHTjk&707wX01R)zP2;5OCe$ z)mNnYAmsdr6#xooV;opRR#le;OmS91`@0&TG+zZhRU9eV;q5s%N%x&ro8TJa4a+Ak ziGaX*k57+Y6YX~F+zDBU^yL2G0zRPwoT`%v5IJ4~ii`>(1f0w7i7(njOK79uE9tt@ z@k(Muc1{k)?r(m2?93k_xcK8V#Kz0sB+iiTi7!>yyR>(&7Uf5T=%G7MwTXlJwx*^R z1!kzax@SO$QLLa^Cvl$Mm}v+Jn?#^5{f_=QPzSNB69#(9;RUDr&l^HT*I{71x4ZAJ z2I76Sgj&(5KgC|hz&zJ_yvi`Qr~ZZ}?3mP8=-n4vo?mla8R$Osk?78yJ`sVMl^8HlWIj_U%q_7mYiN4ZcM4=UWbw@o_e&$QsaOI7u)2Zgf-Bhx)6>X zdl|I~=JnQG47-~T2>_U0w3PYm?G{Kp&IBAe7g{+7f@cNRQ9x@2s1A-TXD^11f_`EJ zbH=j7?><+dcPTqJvVRl!S)?9vH8$@R%(I?4Pf!Z@k6Ez}H!EWGlEccucF}RyJz=Y@vao zQ?AN5^F_?|1aAcjB$CP?BKFKjj~dd1`Iv~{3^cj6`j#F4gX7=Llq<|DOGD>!ND{%n zh6886WiGT_CO%I*p#OZVbZ++7h#MP(g1Bv|3a#?O&{A?_bX9eA&Z47{k7l-?n6Xseb~hLv}dzJ*?wdT$lu$cX*P%yC6I}=JrPS2 z`!6IhT95d%^Ga8&$0tNVG25!2Yyt$9tUe<8B~CdZsxqEZ=9qK$#i`k?sJ0 zek5ig){h4U773)cK$kL5b8SEmkBg3b9z4BgykeanlfWnIQqRP(43p6ZIWPvaq@Qp@ zI&kR%6?24)xQxxrzKZi2g-aYR-OkP29`O6i<+QL_S7qvnAA27n+1Q5;Z_P|hKH~VG zpv}HKxjK6ZjF;szdII-B*8Ssyu!Y%A>S*m4gkj&?_yQI!Yv72WzauM7C-&~4%u%_b|*#gWuk7fvqX-M}xjstE!DZixDo#V@$y zygWIL%q1?1ib7s7f}<12RzT99Fuv?JG)mtrQWNK5FUU+=7PG zJvXnG`E;lzbmU&<;Kzm(W_U$BQTl-_@y0&~b)vL@aLjcEUE(#&tX>-_2kAG+2+sCXr z_^Vg1LIJ$Ln1`&Zz{*<>TS^}bQeUJkc4aDVruhmds=Zo4WDR44~<$=qGo3O!E9&#^e0PS--=*!Pu4(PWH zUpRgOUtw^Z1xyFs-Z5^Z){WQUgSx>7W%q5KCCjj^(&DpIB(_Kqx z!7WQW5o~zq&Vjp7VMx>lpsXcO|5(@XBs63i3i_a^nXBbM*bvYn@_%jw{x4tuKP{(b cEU4jDqV`l@$-_L1wFrK6_Zn#BY8;LHA9tNhEC2ui delta 1363 zcmZ{kYfzF26ox-PP>M)pRq~2xUedHMG)=7u0b9z*OQ|bLUO;rcQ9|Zzu+o&;w8C^t z$_+K|c}vNP4b!wxEVX8G(<051%3EMCn$5a1+fRR-_xyS0ojK<{b7VVJdR9Dt%D#qXAh>(?Zi+VIBD#o~oxQUD)kh`y zGPK+bp(CcHw1<%bT+3wTEPKb{Rzrl2g>K)(gz)vux8;>Nu1Ry*wQF!VoW34`PY}H> zEh)kLLAcl4-rj!mCO%dY6BEPd^P`T^0s^91LjCN5l9O+95jij&9ZXJu-)LgT;2`Bz z|FB$+K{-EBu!YMI1LLnFQYn1tQ{<+TbUHNqX+(JVUfUR?vGmK-lr4#--R}evw5=U& zXicT0$Sn_u63Y`#M*;J7Pzr@okkjRnDp9M|#0{E5_nU%ou!g`|R?2yf{Af|&bFICH z4;y-13VA#-nQR53pr;NN;~k_e)Ts*N#_sL5nsOuCBMYcfN#>nu`0p{7&S# zXOFH|ccz$juUckvCO$JWQ!ExEO;?A-j~NYToXpA+AUBt5WwF_JIyz9D7Fh5W9q{({ z9{9__QQq0vDU%&^N{EDW5!Rxm(6gAPd*RzuQQoZ9w{x3FLy=hQr7Dp~)b(hj#%o{g zz<^)92gQ35*&Tj8i oGyQ>j6coQ}AguA52!H@;^6WdL;<6F2Vf9gxNfhF3pUBhy0%baA9RL6T diff --git a/app/assets/images/thumb_person.png b/app/assets/images/thumb_person.png new file mode 100644 index 0000000000000000000000000000000000000000..f0493974cc8e8e49e1048eef058ec50949e90a6c GIT binary patch literal 2036 zcmaJ?X;c&E8XiI*Hl=8)P}VpN;6lm9Dv{Vi2HIGXvI$%^3CR$0A(=6mNZ5|Fih$mN z6^gaca%E9KEGUJDmTMFQ4T}ZsIdauDqNuSVAW%3^dhW!Ey+1B@&dhw@_n!B8-t9Rv z#bLq^-y%DZ0RVW5{}B{{uVJQV4FP|fso+I?vB!dAu}CBp%M>YLAW(v&z#v~PlEM+N zNRqYZIvfB1=B~1+SS(f$$`K=ShREc@(8y674FCb}YfzCm9mc>ESSnL+X_FT((LkAm zON;RlummU%PLq9Kog@V1yN&M8lLH&CCJg&vraGScD0($Kf+4Cj1O<7K zzTg&tNGwyB3|n6!1Og6Up~6H8G0ca!G@OGWlSw#%Y!)lXlLz_uu)NspV9%gnRuB~8 z=NA&f^V=5a&0fJmh*&L$71#<^@)tIERjf%2aukmY!AjX)SQ4T{J<~NAJg`=aPh-y>B9|x(NEgnz=PU9qKFZ*-m{kIy$=9$&!RKFo=}d_)hM?kt-r9OT zx28zS9i!;Kpa1soUG(0Oj>l7u4=!eK`f{^}CaY$a2JM>)3M_>DG5-Q1X@Rs*$zMLc z@7eFa=VoTkKYH}YU@$B$#?=nnecpTEz=5i&s`Ka1BNkRisHM`pyyZ7;Kc3+qC009H zS#~8M?Qy~3-j##Z=w|nka~rHIovr)E#%k_N{I;|_xzE0}^6Rh3WU}N9tH5;aonsXh z;6Hd5THD*(Pn-x$)rrO8va&MK?xgT=(b?G0O_2)4cUJi%OG_|6JajapV`xZtvVX*2 z0Bz~lj9AT*`Fgt-H}!h*;?v}JG!h9h?|NcF!Ut|*ik<%1__$kel10Aj|l6 zZ;nw*jYavQm;u^UPY;nYH9Lznki-vlt+2W?0lRnQ)~yZkI{Xt+H!(akWF4&8rCVq)AG+k0BMT>h1f_5A(8iHS3JCa4Y$WXt_u#Q*x_Nken9yL35;1$0DA71$#;T>lUb}U>a|+!UHR*}yu7^Pv[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} } + + @profile_data = [] @teacher_data = [] @student_data = [] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 425a85f9d..2963e6eb1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -271,11 +271,7 @@ module ApplicationHelper end def show_avatar(user) - if (user.avatar? rescue false) - image_tag(user.avatar.thumb.url) - else - image_tag "person.png" - end + image_tag(user.avatar.thumb.url) end # NTU link diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 2d55e6759..c2aa3d7be 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -21,6 +21,9 @@ class AvatarUploader < CarrierWave::Uploader::Base # def default_url # "/images/fallback/" + [version_name, "default.png"].compact.join('_') # end + def default_url + [version_name, (Site.first.default_image.file.url rescue "person.png")].compact.join('_') + end # Process files as they are uploaded: # process :scale => [200, 300] diff --git a/app/views/admin/plugins/_plugin_list.html.erb b/app/views/admin/plugins/_plugin_list.html.erb index f583f92ee..2a6255e3f 100644 --- a/app/views/admin/plugins/_plugin_list.html.erb +++ b/app/views/admin/plugins/_plugin_list.html.erb @@ -7,8 +7,8 @@ <%= link_to t(:all_plugin_summary)%> <% end -%> <% @plugins.each do |plugin| %> - <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> - <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.name) %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %> + <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.app_name) %> <% end -%> <% end -%> diff --git a/app/views/admin/users_new_interface/_user_for_summary.html.erb b/app/views/admin/users_new_interface/_user_for_summary.html.erb index 6ed3506d6..de5a88796 100644 --- a/app/views/admin/users_new_interface/_user_for_summary.html.erb +++ b/app/views/admin/users_new_interface/_user_for_summary.html.erb @@ -15,7 +15,7 @@ <%= link_to(content_tag(:i, nil, :class => 'icon-key'),'#',:class=>"key" ) if is_admin?%> <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_summary, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %> - <%= show_avatar(user_for_summary) %> + <%= image_tag(user_for_summary.avatar) %>

<%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%>

diff --git a/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb b/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb index 71cb2e8c2..e35571104 100644 --- a/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb +++ b/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb @@ -16,7 +16,7 @@ <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_thumbnail, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
- <%= show_avatar(user_for_thumbnail) %> + <%= image_tag(user_for_thumbnail.avatar) %>

<%= link_to user_for_thumbnail.name,admin_users_new_interface_path(user_for_thumbnail)%>

\ No newline at end of file diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb index 07be2bf1a..216177e27 100644 --- a/app/views/admin/users_new_interface/show.html.erb +++ b/app/views/admin/users_new_interface/show.html.erb @@ -50,9 +50,9 @@ Module List
    - <% @plugins.each do |plugin| %> - <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %> - <%= link_to plugin.name, :show_plugin_profile => plugin.app_name %> + <% @plugin_shows.each do |plugin| %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin["app_name"] ? "active" : nil) do %> + <%= link_to plugin["name"], :show_plugin_profile => plugin["app_name"] %> <% end -%> <% end -%> diff --git a/lib/orbit_app/plugin/registration.rb b/lib/orbit_app/plugin/registration.rb index 64b0d312b..e8be81368 100644 --- a/lib/orbit_app/plugin/registration.rb +++ b/lib/orbit_app/plugin/registration.rb @@ -53,6 +53,7 @@ module OrbitApp def initialize(name,partial=nil,*args ,&block) @base_path = args[0][:base_path] @name = partial[0][:i18n].nil? ? name : lambda{ I18n.t(partial[0][:i18n]) } + @sort_number = partial[0][:sort_number] @app_name = partial[0][:app_name] @intro_app_name = partial[0][:intro_app_name] @partial_path = '' @@ -68,6 +69,10 @@ module OrbitApp block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given? end + def sort_number + return @sort_number + end + def app_name return @app_name end diff --git a/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb b/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb index d02286e65..567542032 100644 --- a/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb +++ b/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb @@ -50,6 +50,13 @@ class Panel::Member::FrontEnd::MemberListsController < OrbitWidgetController @plugins = OrbitApp::Plugin::Registration.all + @ppname = Array.new + @plugins.each do |aa| + @ppname << [aa.sort_number.to_i, [aa.name, aa.app_name, aa.intro_app_name, aa.front_partial_path]] + end + @plugin_shows = @ppname.sort.collect {|v| {"name"=>v[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} } + + @profile_data = [] attribute_values = @member.attribute_values.asc("_id") diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb index 31f29064b..46c2fa52b 100644 --- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb +++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb @@ -18,6 +18,8 @@
    <% @member_status.each do |ms| %> + + <% if @member_lists.where(:role_status_ids=>ms.id).count > 0 %>

    <%= ms.title %>

      @@ -28,7 +30,14 @@
      <%= show_avatar(member) %>
      • <%= t("users.name")%><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %>
        • -
      • <%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) %>
        • + <% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) + if @job_title != 'NoData' and !@job_title.blank? + %> +
      • + <%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %> + <%= @job_title %> +
        • + <% end %>
      • <%= t("users.email")%><%= member.email %>
      • <%= t("users.office_tel")%><%= member.office_tel %>
      @@ -40,6 +49,8 @@ <% end %> + <% end %> +
    <% elsif @item.frontend_style == 'Two' or @item.frontend_style.blank? %> @@ -52,6 +63,8 @@ <% @member_status.each do |ms| %> + <% if @member_lists.where(:role_status_ids=>ms.id).count > 0 %> +

    <%= ms.title %>

      @@ -61,7 +74,11 @@
      <%= show_avatar(member) %>
      • <%= t("users.name")%><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %>
        • -
      • <%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) %>
        • + <% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) + if @job_title != 'NoData' and !@job_title.blank? + %> +
      • <%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %><%= @job_title %>
        • + <% end %>
      • <%= t("users.email")%> <%= member.email %>
      • <%= t("users.office_tel")%><%= member.office_tel %>
      @@ -73,6 +90,8 @@ <% end %> + <% end %> + <% end %> diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb index 3a77f0a6b..d21e192c4 100644 --- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb +++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb @@ -43,29 +43,29 @@
      - <%= show_avatar(@member) %> + <%= image_tag(@member.avatar) %>
        <% - @plugins.each do |plugin| + @plugin_shows.each do |plugin| - @data = plugin.app_name.classify.constantize.where(is_hidden: false, :create_user_id=>@member.id) - @intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first + @data = plugin["app_name"].classify.constantize.where(is_hidden: false, :create_user_id=>@member.id) + @intro_data = plugin["intro_app_name"].classify.constantize.where(:user_id=>@member.id).first %> <% if !@intro_data.blank? %> <% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %> -
      • <%= plugin.name %>
        • +
      • "><%= plugin["name"] %>
        • <% end %> <% else %> <% if !@data.blank? %> -
      • <%= plugin.name %>
        • +
      • "><%= plugin["name"] %>
        • <% end %> <% end %> @@ -75,18 +75,18 @@
      <% - @plugins.each do |plugin| + @plugin_shows.each do |plugin| - @plugin_partial = !plugin.front_partial_path.blank? ? OrbitApp::Plugin::Registration.find_by_key(plugin.name).front_partial_path : nil + @plugin_partial = !plugin["front_partial_path"].blank? ? OrbitApp::Plugin::Registration.find_by_key(plugin["name"]).front_partial_path : nil - @data = plugin.app_name.classify.constantize.where(:create_user_id=>@member.id) - @intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first + @data = plugin["app_name"].classify.constantize.where(:create_user_id=>@member.id) + @intro_data = plugin["intro_app_name"].classify.constantize.where(:user_id=>@member.id).first %> <% if !@intro_data.blank? %> <% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %> -
      +
      "> <%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
      <% end %> @@ -94,7 +94,7 @@ <% else %> <% if !@data.blank? %> -
      +
      "> <%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
      <% end %> diff --git a/vendor/built_in_modules/personal_book/init.rb b/vendor/built_in_modules/personal_book/init.rb index 1344198b3..19cc69d6c 100644 --- a/vendor/built_in_modules/personal_book/init.rb +++ b/vendor/built_in_modules/personal_book/init.rb @@ -2,7 +2,7 @@ module PersonalBook OrbitApp.registration "PersonalBook",:type=> 'ModuleApp' do module_label 'module_name.personal_book' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"WritingBook", :intro_app_name=>"PersonalBookIntro",:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book' + personal_plugin :enable => true, :sort_number => '25', :app_name=>"WritingBook", :intro_app_name=>"PersonalBookIntro",:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book' diff --git a/vendor/built_in_modules/personal_conference/init.rb b/vendor/built_in_modules/personal_conference/init.rb index 1bbf7c6de..881414a4b 100644 --- a/vendor/built_in_modules/personal_conference/init.rb +++ b/vendor/built_in_modules/personal_conference/init.rb @@ -2,7 +2,7 @@ module PersonalConference OrbitApp.registration "PersonalConference",:type=> 'ModuleApp' do module_label 'module_name.personal_conference' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"WritingConference", :intro_app_name=>"PersonalConferenceIntro",:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference' + personal_plugin :enable => true, :sort_number => '10', :app_name=>"WritingConference", :intro_app_name=>"PersonalConferenceIntro",:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference' diff --git a/vendor/built_in_modules/personal_diploma/init.rb b/vendor/built_in_modules/personal_diploma/init.rb index aef73f712..5d5cc28bf 100644 --- a/vendor/built_in_modules/personal_diploma/init.rb +++ b/vendor/built_in_modules/personal_diploma/init.rb @@ -2,7 +2,7 @@ module PersonalDiploma OrbitApp.registration "PersonalDiploma",:type=> 'ModuleApp' do module_label 'module_name.personal_diploma' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Diploma", :intro_app_name=>"PersonalDiplomaIntro",:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma' + personal_plugin :enable => true, :sort_number => '40', :app_name=>"Diploma", :intro_app_name=>"PersonalDiplomaIntro",:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma' diff --git a/vendor/built_in_modules/personal_experience/init.rb b/vendor/built_in_modules/personal_experience/init.rb index ad0a687df..517bceac1 100644 --- a/vendor/built_in_modules/personal_experience/init.rb +++ b/vendor/built_in_modules/personal_experience/init.rb @@ -2,7 +2,7 @@ module PersonalExperience OrbitApp.registration "PersonalExperience",:type=> 'ModuleApp' do module_label 'module_name.personal_experience' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience' + personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience' diff --git a/vendor/built_in_modules/personal_honor/init.rb b/vendor/built_in_modules/personal_honor/init.rb index 965d7156f..6c21dc65e 100644 --- a/vendor/built_in_modules/personal_honor/init.rb +++ b/vendor/built_in_modules/personal_honor/init.rb @@ -2,7 +2,7 @@ module PersonalHonor OrbitApp.registration "PersonalHonor",:type=> 'ModuleApp' do module_label 'module_name.personal_honor' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor' + personal_plugin :enable => true, :sort_number => '50', :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor' diff --git a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml index 25a3be94b..d035f05f5 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml @@ -1,6 +1,6 @@ zh_tw: module_name: - personal_journal: 期刊著作 + personal_journal: 期刊論文 personal_journal: paper_title : "論文名稱" journal_title : "期刊名稱" diff --git a/vendor/built_in_modules/personal_journal/init.rb b/vendor/built_in_modules/personal_journal/init.rb index 461f72578..1a8ef49dc 100644 --- a/vendor/built_in_modules/personal_journal/init.rb +++ b/vendor/built_in_modules/personal_journal/init.rb @@ -2,7 +2,7 @@ module PersonalJournal OrbitApp.registration "PersonalJournal",:type=> 'ModuleApp' do module_label 'module_name.personal_journal' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"WritingJournal", :intro_app_name=>"PersonalJournalIntro",:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal' + personal_plugin :enable => true, :sort_number => '5', :app_name=>"WritingJournal", :intro_app_name=>"PersonalJournalIntro",:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal' diff --git a/vendor/built_in_modules/personal_lab/init.rb b/vendor/built_in_modules/personal_lab/init.rb index 076f3c015..f5453024a 100644 --- a/vendor/built_in_modules/personal_lab/init.rb +++ b/vendor/built_in_modules/personal_lab/init.rb @@ -2,7 +2,7 @@ module PersonalLab OrbitApp.registration "PersonalLab",:type=> 'ModuleApp' do module_label 'module_name.personal_lab' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab' + personal_plugin :enable => true, :sort_number => '30', :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab' end diff --git a/vendor/built_in_modules/personal_patent/init.rb b/vendor/built_in_modules/personal_patent/init.rb index b06f389cf..f49d7fc3d 100644 --- a/vendor/built_in_modules/personal_patent/init.rb +++ b/vendor/built_in_modules/personal_patent/init.rb @@ -2,7 +2,7 @@ module PersonalPatent OrbitApp.registration "PersonalPatent",:type=> 'ModuleApp' do module_label 'module_name.personal_patent' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"WritingPatent", :intro_app_name=>"PersonalPatentIntro",:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent' + personal_plugin :enable => true, :sort_number => '35', :app_name=>"WritingPatent", :intro_app_name=>"PersonalPatentIntro",:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent' diff --git a/vendor/built_in_modules/personal_project/init.rb b/vendor/built_in_modules/personal_project/init.rb index 1bc478389..c6fed5f7e 100644 --- a/vendor/built_in_modules/personal_project/init.rb +++ b/vendor/built_in_modules/personal_project/init.rb @@ -2,7 +2,7 @@ module PersonalProject OrbitApp.registration "PersonalProject",:type=> 'ModuleApp' do module_label 'module_name.personal_project' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Project", :intro_app_name=>"PersonalProjectIntro",:path=>"panel/personal_project/plugin/profile",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project' + personal_plugin :enable => true, :sort_number => '15', :app_name=>"Project", :intro_app_name=>"PersonalProjectIntro",:path=>"panel/personal_project/plugin/profile",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project' diff --git a/vendor/built_in_modules/personal_research/init.rb b/vendor/built_in_modules/personal_research/init.rb index 85e371122..abe94a1f1 100644 --- a/vendor/built_in_modules/personal_research/init.rb +++ b/vendor/built_in_modules/personal_research/init.rb @@ -2,7 +2,7 @@ module PersonalResearch OrbitApp.registration "PersonalResearch",:type=> 'ModuleApp' do module_label 'module_name.personal_research' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research' + personal_plugin :enable => true, :sort_number => '20', :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research'