From ad9f9bbf5c6fb57dcecdab1a3ed6838b7a92d552 Mon Sep 17 00:00:00 2001 From: chris2tof Date: Sat, 19 Nov 2011 21:47:18 +0800 Subject: [PATCH] Final Ray's modifications --- app/assets/images/Thumbs.db | Bin 61440 -> 62976 bytes app/assets/images/icon.png | Bin 5317 -> 6608 bytes app/assets/images/orbitbar.png | Bin 198 -> 1010 bytes app/assets/images/switch.png | Bin 0 -> 2182 bytes app/assets/stylesheets/member.css.erb | 67 +++++++++++++++++- app/models/user/user.rb | 2 +- app/models/user/user_attribute_model.rb | 2 +- .../_attribute_model.html.erb | 18 ++--- .../user_attribute_models/_form.html.erb | 4 +- .../admin/user_attribute_models/edit.html.erb | 19 ++--- .../user_attribute_models/index.html.erb | 56 ++++----------- .../admin/user_attribute_models/new.html.erb | 19 ++--- .../toggle_enable.js.erb | 3 +- app/views/admin/users/_form.html.erb | 2 +- app/views/admin/users/edit.html.erb | 17 ++--- app/views/admin/users/index.html.erb | 12 ---- app/views/admin/users/new.html.erb | 17 ++--- app/views/admin/users/show.html.erb | 10 --- app/views/layouts/member.html.erb | 9 ++- 19 files changed, 122 insertions(+), 135 deletions(-) create mode 100644 app/assets/images/switch.png diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db index 964d8da85783f56f9ecc8eb37c507b9a78a62bf2..f9d32b5f625bf17a3cde65784f73ba03f1ea1bdd 100644 GIT binary patch delta 1721 zcmYk(c{JNu6bJBMgou6XprTZ*r`9BDUt*X+L+!;(wG3))s9l^&Y(?zSqSYZ^$_+m4Tr^ zr1-zsI2{H-Ss?hgFwhCe0y+nwL5~2pNXQb*R{zbGkQrn~)uQTC-NcL##bE1+7(=jl z91%hRa|uuilmX>H1yBi80o4E%xB^@SYJggx4!8zf2kLD@r>)ODH zR7)Vyo&UZER3X0ickHl1Te0^kR~bn)Nf61nySey+ZUE>Y5#Zdl%TT6vTOTC_ySq5~ z2f0qv&U>i`9D34^9Wn{YUw%T_n~D9d9Tj`BsJO4SxLD#bA^PBQo2f-plN>wWwL!x3 z($P49Y27h7LcTfL!T1+ri&%47Gz#Z-GST_LI8S!bI(V;|A7u8XdlXjkc+V0lL^TJ<#LyM5LTM|^A z1HD8q9Ko3*>Yhar$XT9w8DUyu}2dlO1^Uk z{;L{U-Z(f_gBG;SO1XI&S{);&Nf;=T_x!jO;sf*e7-Dh}PRfK9MmojaKn=aOgLfU3 zcVJ2xO#fC;GC~mv8qG6uBa>iKpCAA1Ay9)iJXz)N7MD53E@~m`=+KZ+W`jGg<51ps z|CYdRZg+m)6wO-f?)Dc|t?a1#OQa^di{ASpfxC%UQq71`m6=F{X-C-0R2m0P630vG zgjTE0y8Sm03!NGy*=nahC!~X>pvFD;-j{t=4!%)H!M;<>Fj<2o?Xj~y1pZ0dzR#aI( z2B)OE)aGAV(26M^@tmUC#+l7@8A%hD6x#036w2)rhv}pN=2MkUb@kvOtk5Tt9w?`) z9PldRCsjGmk6Ay6wV3)>d}#t82SukAG+|YIEwht0t_qDl}$ItQ| zeO@<8Xhyy|4Qq?2?|Q0~Syl4BLG!JUw#1PeEzlGUCi6A2aC4k3zWr1~Ly^O@vG1FE z#hc2thqD-*NdR6SUpR$UI;e#*Gz-)qI=m0H2v09CG zvE0gN>g0g?%|3TzMnbhH_e$4Zt__UC-?8XPg8vA zOQVk~k&M>Xn96h6HSedFb~RU4%u+twG_|WuUkdKF?iA;{KU-g?lwp{z=cIG}DfSel z@^5r8E11KnwyC@KdJyj(?dJ+olz%FzkDrc}y?4AKi8J*6n8oM%e1@Bg*TJow7!v(_ zcbvRgi&s>b1r?*;VOsOR5qaiZ_y~rxwd{IYqza=na^1^Im08osuLc(=DfvxiHkIW+c1?(q3q8Wr=+++M}@yjLq@>_#rGJxiJ9cPQ`3mcAn_}=6Wt0MP{zJj! zi!3UeOST4Z@CX4#S)npu(Jy=bRVO>M8nTu%GB8w6PL%cLf$0L#KmmhEoE)1up2)Cm V3|YfCF~MNd8waM%3SSN|0svT+J{$l5 diff --git a/app/assets/images/icon.png b/app/assets/images/icon.png index 597e8dbe2af67fdfcaa8c7e087349d558b977828..a3fc685b1225d5d403ba543798749d631c6f410a 100644 GIT binary patch delta 3910 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 delta 2609 zcmV-13eNS=GsP*877GAc2nGNE0N#O$MzJBD3V#XkNkl#naq%AOtf*=cZ;;~d6Qm0i!UMDKS zMCn*WAlV+9fCR)Zg+kfdNS)M%g(={8l<{LWE%?2&KWd{FW5>TuLhe_(%FBDt@4frE z=YO7a-#yL^BO=5@jInrJrosDjF8~lxOxKN9-4Z3;Bzl%5O-)T!0I=Kb4;vteQUKTi zWh-8ga6~Uo1(|(*PC#KyGesZEI_5Q24WF&)%|c-@fH~y?){S`}c?I z>+84NxpT)B<-Pm;et$7pm1dK`?KG5@mVa)%aN)w+k|cc-KpTK|&iM|N+pz#>^nIYM zt?jvE$BvDiJ$v@QFTC)=(^XYf+3oG^pQ^68AHcinx&?baNs`6^;GDDRV)+eCO-FKd@&VM9H(h1J_Nk2eF04vn{mM&dt@H zeU+T^6Kac7S!{mk)sAxOqd`B4IcO;>{{ZXFtV#467Kt2m#U14G28jHo^ zE-fv+tI=rw4FHOwC8CeGad3kvqU0q#2Eh{Vg$(b`} z=I`0FhjY%i0vHVUW;UCxwxpzFL8x9~x7+t(8c5>>Z>g@X-rd#JRcRrluw<=YRZj0PVqi{B#2U(CwH^rcVH@@$I~I>sAiuTzBNik-Gp= z0U#wMAR_nO-h0FJE9bo1f>L|NL=PHc%{joI_2G&jkQj zLqskBC@Lz-OG`_8T~U;E02}}uilVGbOG|sbsHiB<`#>(nSPkd=oqtd_DK9U-0iZoA zE9>_V3OL&N6JzW$fVVR40muO60XPrfX8dW6lcy?oLEoDKhp>JCYP!1C4?nQ8ecyBH;d5QI!7?5si+H-kUXR)>fCxRYOGAiRik^<*J!A zYu47$(b0QEMBa11ACAv=j5!Z_ExstkP&J{JKY!WZa0`g2kBDe+aPUledU_{-%>Xv0 zr>A!g4i292K4YKv+(<_|5b#64;g)#kQws2P0^OHJ{0v`z{rX~{alQ|nA$tys7QXuP z>Ni{;7{(Y2XM4)L;fgfk6OcxX#pS3qk>!UQSVbC9q!E*2`9e>&H7qqAeA^ZK32^{;tJ~7Z2d;1?hyMQ50!J zEdYCCV7yM0JJ6QyDd+0iS(}#^*Wty--Znv*7}zBs;{p{etv$rFyqJ-3H&s@ zUf;cW^JZRNKA!cmWy|^n%Gi9q5x{ZpPk(>SOiN4q>-O#29{~?wBj@~=0%i2@jRu3^ zbZ2MhO9q4CoL>Vxlb)V_%4)SPHAQWxk!h27h?) z;DKl7&Yec1(WnORVT`TioF9sD)Fj{&5sn@`nlH=pX{}Z}SKR=LqQGD56sT)8oMN#f)G@5G8`RO>lFNlEa+u)pE)oQg%Wm&!!0Q_x@ zMpGFKyigpb7Xmeaq9`{t8qEsM`F}ZqD?x5YEuRZwjA^{!|CxYk3IRXZYEIsN7@*~x zUrEp$k$@lTQd$CjjPQjfLBJJCuHv@dj_5(jxBLo$@bSRkRZ&qf0Fg#as=Lqvug($Z1isnlzC?)*zH#Bgg;$RsKTi4i`J;Xf@JvQV#-)LQfpNqYMUjc< zRdwtTB?|b3g@xyahlh!XXk=tW-2jHHtgKHz{P4p-;4S`vTa+l^yIijGYPh}zm^W|U z$k5QxIPkJ8KOmyoK%*v6qJLZLDBt7poYv`d53^WTuU>^L%gE2qS0`1z(r7fR7-J%h z7|&TvA~JeBo^$F3P)nBOds?lwnlUEQi1B{IWsF_b>2ymy9?!J^;BRZS+R9+yh2k*1 z5U2rUS-z>&YF9AEL>e&}$rPUpVvK3L;6)lSS@3-g06@za6KTXm!WtKPJo^6t5&`nN T2ReRV00000NkvXXu0mjfaySi2 diff --git a/app/assets/images/orbitbar.png b/app/assets/images/orbitbar.png index 6cb3d6bb03a5b2277cfb0eb34f424387822c2935..4f27a0a274441b22f1d002bcc52b6b3ededdd6bc 100644 GIT binary patch literal 1010 zcmaJ=PiWIn9L|_bH<{axD#$bQrcGYDc5TA4t!wtDxQx*iR$<7}kzeqo!(|IzUC384W%9@Lqgn@Giq%5s~(nvE_Zhb&Q4Aah< znJmew(~^!YP75%cZ#k6BFhe80qv<6?Kn@j5TV}t$-C%)f$n1Png{qT8MRTg+qPfaU zMz54~(O^f0!H_Re0Sgfg_|}r`Nxsb1bS1hDj(HZ;AfzO-$ELFCEJ$J(fhY$hJzKo|;;7s5P@g#;)?V-gfV{bOk~*T_q0WuhL7?qs$|h$HcQxm@PT0~~e> zyda7q55s&o9HNMjw_+2`57}OSLqS2F?wSrUu?+%6Er*wh%u=VvDOgTZ*7oXUq6Oo9 z&EW+O1}Qaws``JZWi`D6y-3-P{jVjI- zF~MFDJ0Lk1g4bZlWbOXa&omkrm{cw~;a7Vhhw#mdw^(VlDORT%)y@ zcuOu%&G5m+{&mrfBicQ|ve~wD(`03WI{pfH~+f*;#y!iU@_OpeB z{q5(&t3Nlls@2`TY1rO*sdw`nn;kvX|A1+qfStXIOxumsgPpVAo(8WlH9n)f99z8m E2d&yi=l}o! delta 41 vcmeywevEN~2NOfa9h&142*0HT=DgP*1Ru2$^ZnOu6{1-oD!M<8N&^H diff --git a/app/assets/images/switch.png b/app/assets/images/switch.png new file mode 100644 index 0000000000000000000000000000000000000000..e4b1930a89b9b450ffb6a9e496b458cb1e4e7a66 GIT binary patch literal 2182 zcmaJ@YgiL!8cn%hRbq;G0mdLokz6JONMce@2oSlL0z#^Ygk%B%l8MP+B0MaJRYYxp zg%zWS4}yXMqGDw!C|wn4gB80!mYwIB`EKW&_kF+j{FoeW zXn?iFItvU2W6cTl3qwa2^xb4;f_~?jDqD0|i?De}I4nYxd^v>KE`;MCfFt3@LtzkK zc<8|Q5EFwj#ET<%2rndGAS1c~f}tW@#-n$Qa)srWJyNF*g_74)GCK9s$G2OSi~PfDu@c0LuX1 za1SB~M2V$BSgCl24+&v#qzZ&D6+j$679Ld~ip4?(Z99$T=}QJd(3cK^Y>-BF2k9Pk zvKJlnq=KFvOI$x#kRpMk$P!ohCzrA;chL$G85-FSl8X;QLVr0d0p69&5HFX@4uAh; z_1<%Z%jbd?vP>N$G#S!jWB;qsOIxUW7N;L57+GzCn?LGV)K0pD#BcFo2mV;;Oj<4j#-BnFpfueIDC;; zbX~HL{nR?*Do&pOaLm(fBuA-DKH8C;wk2Ki1B2R0&;^5))9d1*t3Zn+DrQPPe4_Y=_>P~$` zsPQ>YTzlEHayMqZ(*@HB3!e%zTr!}v`uBptoI;V~aCQ^-8SadJU-UO|Km2nqU~FE0 z$-qUEVMY)+B`|Xo!a@7gqbN6Cece<4Y0HC^Nn763q_8zX6;&?7 zT_dWu?SbXIW+<#Fn`XAMqMdh#q3C+rb78o$Qa?1R&%*}KIA<5$>f}WSlpA*>1am~L zlj^-Lao6qcx;=3cO*SPzw-ZN(yMO)_yM$UI9tbL+#OLg6v+BZ2Z+pdREkiljnI7-L zd%6{AjxSR-U&tTd&bg;Q*tBp-+W@UrAHjVT+WRf_D)vbF$F)cH4Ed?&7L1SnR^YlH ziN@OZm(1@V*R?YsDZdbZC#A@-3?oWt(oo3A>2h`lzQ*V5p-@09<{j$%ZskWh`T49~QSQrlp+JqgqxPIe?jcWK+L!`CPso~EHR{gdoFRQMUn{cPV<^Fb*8hcyEfT2ARvIoWVYK{ z9HnPPR~nC{VGZi^dc98`*{aNHOU+|hk6rmF4WLc_`YVNdcgsfZ-eYspjErV>=7vsc z$Lh?EFs`xijg9Ha;;-xKoMtwakNn7Un`x@Ae`1z>e>ZyEwTo@SbF*zYaa$sQ;VwFj zX4h+;c(tOUHI{o7^bt?CMeHA_tJu}{LP`2=Hmzd7J4ckq3m2uOHMTg+)B&$cs;|XO zz38~vJU3x;Ev7LtCHLOg&nGo^BQITKM$L~W<8&LnD>JZr`b()FM;pxlYfHVe=FJti z2ewbt#a||eX;NG3sBx>)u&3EQeTV1a7vd|TI|A;-?@pb5_!N0m?EE^8HEmcsZaOq= zm=9f^S$BhQE}|v8kkDJmKE_BYjuc6QgGUZ9_WcOMa8Y`H=|JL}RLCFPQq;!k^A8BH z$!*oG9t@V)GYJKzCMJ)@T{kp3j6K=fmuO#}G<&+J2%f(3RbuGh%gO}#nboP8wSub! znPVh~qW)f^*$rxb(dnKU9X#KY>Up87tM~qA=5q{NOABDQAWv?2w@TgF8Hy;CxvN$U z7jz$pHcrM>o~6YYOtH-E!?$kTy1T8W+1L*A)2sMe_b@hn@y~$64)wdXBR1) repeat left top; margin-bottom:20px; @@ -173,6 +181,9 @@ h1 { .main_list li.list_item:hover { border:1px solid #3699dd; } +.main_list li.disable { + opacity:0.6; +} .main_list li.list_item:hover span { line-height:38px; } @@ -206,6 +217,13 @@ h1 { #main .action a.delete{ background-position:-38px top; } +#main a.switch{ + background:url(<%= asset_path 'switch.png' %>) no-repeat left 3px; + width:40px; +} +#main .disable a.switch{ + background:url(<%= asset_path 'switch.png' %>) no-repeat left bottom; +} #main .action a.show:hover{ background-position:left -19px; } @@ -238,19 +256,37 @@ h1 { #add_new a:hover { background-position: -54px 3px; } +.buttom { + float:right; +} #confirm a{ background-position:4px -70px; } #confirm a:hover{ background-position: 4px -51px; } +#create a{ + background-image: none; + padding: 0 10px; +} +#update a{ + background-position:4px -112px; +} +#update a:hover{ + background-position:4px -89px; +} +#back a{ + background-position:4px -156px; +} +#back a:hover{ + background-position:4px -133px; +} .buttom a { - margin-bottom: 20px; + margin:0 0 20px 10px; background-image:url(<%= asset_path 'icon.png' %>); background-repeat:no-repeat; font-size:12px; color:#FFF; - float:right; display:inline-block; padding:0 10px 0 25px; background-color: rgba(0, 0, 0, 0.75); @@ -279,6 +315,21 @@ h1 { position:absolute; top:-30px; } +#porfile .user_mail { + text-align: center; + background:url(<%= asset_path 'upload_but.png' %>) repeat-x left top; + border:none; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + padding:3px 10px 1px; + margin-top:10px; + width:110px; + height: 21px; + font-size: 12px; + color:#666666; + text-shadow: 0 1px 0 #FFFFFF; +} #porfile label { display:block; text-shadow: 0 1px 0 #FFFFFF; @@ -326,6 +377,7 @@ h1 { margin-left:180px; } #person { + text-align:center; left: 265px; position: fixed; top: 75px; @@ -340,7 +392,16 @@ h1 { -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ } +#person .mail { + color: #FFFFFF; + font-size: 12px; + text-shadow:0px 1px 0px #333; + font-weight:bold; + background:url(<%= asset_path 'line.png' %>) repeat-x left top; + padding-top:10px; +} #upload, #edit{ + margin: 0 auto; display:block; text-shadow: 0 1px 0 #FFFFFF; background:url(<%= asset_path 'upload_but.png' %>) repeat-x left top; diff --git a/app/models/user/user.rb b/app/models/user/user.rb index f582dc04e..31e182acb 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -52,7 +52,7 @@ class User infos = self.user_infos.detect {|info| info.key.to_s.eql?('profile') } if infos first_name = infos.attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil - last_name = infos.attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil + last_name = infos.attribute_values.detect {|value| value.key.to_s.eql?('family_name') }[I18n.locale.to_s] rescue nil return "#{first_name} #{last_name}" else return nil diff --git a/app/models/user/user_attribute_model.rb b/app/models/user/user_attribute_model.rb index a70c9f852..c8aea4b2e 100644 --- a/app/models/user/user_attribute_model.rb +++ b/app/models/user/user_attribute_model.rb @@ -53,7 +53,7 @@ class UserAttributeModel end def is_disabled? - self.disabled + self.disabled.blank? ? false : self.disabled end def get_enabled_attribute_models diff --git a/app/views/admin/user_attribute_models/_attribute_model.html.erb b/app/views/admin/user_attribute_models/_attribute_model.html.erb index 10dac715a..819f584bf 100644 --- a/app/views/admin/user_attribute_models/_attribute_model.html.erb +++ b/app/views/admin/user_attribute_models/_attribute_model.html.erb @@ -20,17 +20,13 @@ <% if attribute_model.new_record? %> <%= t(:delete) %> <% else %> - - <% if attribute_model.is_built_in? %> - - <%= t(:disable) %> - <%= t(:enable) %> - - <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][disabled]", attribute_model.is_disabled? , :class => 'built_in_state' %> - <% else %> - <%= t(:delete) %> - <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %> - <% end %> + <% if attribute_model.is_built_in? %> + + <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][disabled]", attribute_model.is_disabled? , :class => 'built_in_state' %> + <% else %> + <%= t(:delete) %> + <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %> + <% end %> <%= f.hidden_field :id %> <%= f.hidden_field :key %> <% end %> diff --git a/app/views/admin/user_attribute_models/_form.html.erb b/app/views/admin/user_attribute_models/_form.html.erb index f7325ec2f..beb9c5df3 100644 --- a/app/views/admin/user_attribute_models/_form.html.erb +++ b/app/views/admin/user_attribute_models/_form.html.erb @@ -1,5 +1,5 @@
-

User Role

+

<%= t("admin.user_#{@attribute}") %>

@@ -68,7 +68,7 @@ }); $('#attributes_block a.change_built_in').click(function(){ - $(this).children().toggle(); + $(this).parent().toggleClass('disable'); var $am = $(this).next('.built_in_state') $am.attr('value', ($am.attr('value') == "false") ? "true" : "false"); }); diff --git a/app/views/admin/user_attribute_models/edit.html.erb b/app/views/admin/user_attribute_models/edit.html.erb index f3dedbec3..810da7729 100644 --- a/app/views/admin/user_attribute_models/edit.html.erb +++ b/app/views/admin/user_attribute_models/edit.html.erb @@ -1,21 +1,14 @@ -<% content_for :body_id do %>roles_list<% end -%> - -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> +<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_model_path(@user_role_model)") do |f| %> <%= f.error_messages %> <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => false } %> -
- <%= f.submit t('update') %> <%= link_back %> +
+ <%= link_to t('update'), "#", :onclick=>"$('#edit_user_role_model_#{@user_attribute_model.id}').submit()" %> +
+
+ <%= link_back %>
<% end -%>
\ No newline at end of file diff --git a/app/views/admin/user_attribute_models/index.html.erb b/app/views/admin/user_attribute_models/index.html.erb index f50885a9e..58ab9bc71 100644 --- a/app/views/admin/user_attribute_models/index.html.erb +++ b/app/views/admin/user_attribute_models/index.html.erb @@ -1,60 +1,32 @@ -<% content_for :body_id do %>roles_list<% end -%> - -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> - - +<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
- <%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %> + <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
  • - Roles + <%= t("admin.#{@attribute}") %> Action
    • <% @user_attribute_models.each do |user_attribute_model| %> -
  • - <%= user_attribute_model.i18n_variable[I18n.locale] %> +
  • clear"> + <%= user_attribute_model.i18n_variable[I18n.locale] %> + <%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'edit' %> - <%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete unless user_attribute_model.is_built_in? %> + <% if user_attribute_model.is_built_in? %> + <%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %> + <%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %> + <% else %> + <%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %> + <% end %> +
    • <% end %>
- <%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %> + <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
diff --git a/app/views/admin/user_attribute_models/new.html.erb b/app/views/admin/user_attribute_models/new.html.erb index 1bd58d00b..aaa6a0329 100644 --- a/app/views/admin/user_attribute_models/new.html.erb +++ b/app/views/admin/user_attribute_models/new.html.erb @@ -1,21 +1,14 @@ -<% content_for :body_id do %>roles_list<% end -%> - -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> +<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %> <%= f.error_messages %> <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => true } %> -
- <%= f.submit t('create') %> <%= link_back %> +
+ <%= link_to t('create'), "#", :onclick=>"$('#new_user_attribute_model').submit()" %> +
+
+ <%= link_back %>
<% end -%>
diff --git a/app/views/admin/user_attribute_models/toggle_enable.js.erb b/app/views/admin/user_attribute_models/toggle_enable.js.erb index a78a00db6..153c24a85 100644 --- a/app/views/admin/user_attribute_models/toggle_enable.js.erb +++ b/app/views/admin/user_attribute_models/toggle_enable.js.erb @@ -1,2 +1,3 @@ $("#enable_<%= @user_attribute_model.id %>").toggle(); -$("#disable_<%= @user_attribute_model.id %>").toggle(); \ No newline at end of file +$("#disable_<%= @user_attribute_model.id %>").toggle(); +$("#attribute_<%= @user_attribute_model.id %>").toggleClass('disable'); \ No newline at end of file diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb index ff2224380..684313497 100644 --- a/app/views/admin/users/_form.html.erb +++ b/app/views/admin/users/_form.html.erb @@ -7,7 +7,7 @@ <%#= file_field_tag 'file' %> <%#= hidden_field_tag :avatar_cache %> Choose a file... - <%= f.text_field :email %> + <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value='E-Mail';}", :value => "E-Mail", :class => 'user_mail' %> diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index 43053c4f5..2e114f210 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -1,21 +1,14 @@ <% content_for :body_id do %>user_list<% end -%> -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> -
<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> <%= f.error_messages %> <%= render :partial => 'form', :locals => { :f => f } %> -
- <%= f.submit t('update') %> <%= link_back %> +
+ <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %> +
+
+ <%= link_back %>
<% end -%>
\ No newline at end of file diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 72c8179da..7ac2ddf71 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -1,17 +1,5 @@ <% content_for :body_id do %>user_list<% end -%> -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> - - -
<%= flash_messages %>
diff --git a/app/views/admin/users/new.html.erb b/app/views/admin/users/new.html.erb index 9a3a866f7..a38640467 100644 --- a/app/views/admin/users/new.html.erb +++ b/app/views/admin/users/new.html.erb @@ -1,21 +1,14 @@ <% content_for :body_id do %>user_list<% end -%> -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> -
<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %> <%= f.error_messages %> <%= render :partial => 'form', :locals => { :f => f } %> -
- <%= f.submit t('create') %> <%= link_back %> +
+ <%= link_to t('create'), "#", :onclick=>"$('#new_user').submit()" %> +
+
+ <%= link_back %>
<% end -%>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 7e4b5ab6f..cc6fafffb 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -1,15 +1,5 @@ <% content_for :body_id do %>user_list<% end -%> -<% content_for :secondary do %> -
-

Member Setup

-
    -
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • -
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • -
-
-<% end -%> -
diff --git a/app/views/layouts/member.html.erb b/app/views/layouts/member.html.erb index 5cffe7b4e..91615d716 100644 --- a/app/views/layouts/member.html.erb +++ b/app/views/layouts/member.html.erb @@ -31,7 +31,14 @@ - <%= yield :secondary %> +
+

Member Setup

+
    +
  • <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
    • +
  • <%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %>
    • +
  • <%= link_to content_tag(:span, t('admin.list_user_infos')), admin_user_info_models_path %>
    • +
+