From 0eafbb92d53c2711779a0dc448b15ffb3721f548 Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 11 Mar 2015 11:53:42 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 14 ++++++------ config/locales/commons/en.yml | 12 ++++++++++ config/locales/commons/zh.yml | 12 ++++++++++ config/locales/en.yml | 6 ++--- config/locales/zh.yml | 28 ----------------------- 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 2444af68c..3095b05ce 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -107,7 +107,7 @@ $(function(){ $("#button1").click(function(){ - myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success"); + myTips("<%= l(:label_feedback_success) %>","success"); }); }) @@ -153,7 +153,7 @@ function cookieget(n) -意见反馈 +<%= l(:label_feedback) %> @@ -161,15 +161,15 @@ function cookieget(n)
-
<%= l(:label_feedback) %>
+
<%= l(:label_feedback) %>
<% get_memo %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> - <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> + <%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %> + <%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %> <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - 提  交 + <%= l(:label_submit)%> <% end %>
@@ -180,7 +180,7 @@ function cookieget(n)
-
提交
+
<%= l(:label_submit)%>
<%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> @@ -179,12 +190,14 @@
+
-

<%= l(:label_project_overview)%>

<%= @project.description %> -
- <%= l(:label_expend_information)%> +
+

<%= l(:label_project_overview) %>：

<%= @project.description %>
-
+
<%= l(:label_expend_information) %>
+
+

<%= l(:label_tag)%>:

diff --git a/public/images/jiantou.jpg b/public/images/jiantou.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cd28409886d0f4f3d97e76ce5e6f920a4458da3e GIT binary patch literal 7528 zcmeGhTX0jyb+6u*Wn*C*3}L7cHYT*TUX~4N9AiEF=pZnX%xl_VquQuU>36DVAOxxknXF4H3(k7Xe;=zvTU5B z4b!iBXYTIVbIzVU=j_?lu1@}Z{*rbuG@KqlsJC|kG9iSFXey;e6hQc!N$E+O0QjK- zybj>`1s)B+E=q%DK`X-N2Dk>=Z^D;;Tt~(p1o#i|ZThDfRW**bos5uRZG9<07NnGr zwFRPH+sZW02tyKbJ6&F%)9rJ%*j!Fui__=wfCSL%X+^hu9wE)sihK*E6kr3uN--d9 zK}U>J?U)Tlsdmf*xYQ0xqsVIpyruvz#s)&^fe-sbZS&{z*N}x+ur?4zn*85UCFvn% z6K2i-5p6>jlgU(OvXqrstmWo%YwZ+^WlC*bb#-lZb)D5hN}*9Y<7=v-yu6~aqN=j8 zs;08CvIbX`HOdg{e(^9ciqT)=K67guu%Di&O__si#N*g>eDTYIJ&o z(NtzGr^XX0q|vIxDn#ihtwyKO8x1DC*5U!8RjZpb)ur!T9u-0gutK1%j_71G z=)FXRIj*TX&|rhTTJPSxy#{M=GIHj+r#^8>+_EDOt)-=w8x01mfN`Gp)LBsCz;q_m z-zu}0iz>>@xjG!9bS5E z@3YUp@!Z{)J+6Bvy3gd%3vd0lxBhVcLjIchiP6aSG&|8ke{Wc)BMUKQ7PSUxA8P2H z1<|M3b4Z~z5L(sLkvqS-{-Xo;e!OXji!e&yFV>sJmyvA zW5uQM3>yoriUA6<6a7Aq8K|RBjp{eGM89QOIW6!K(5GU~Kvw2ev7kdjEOsJEDO~IX zL_RRu;pNfJk_0CeDNB>`V6hX*aKT~+%p4W%r`IQ!CDzd}zv4jEGg_=tgt6HeA(vPz z{26yi=@$9>aDMK7KEKGs`gyr)ZiK@tQ7nFru}y@JNSsXYeZ$=1NRiz<$kMVP2IF!Z zTR@cTOZG|XqG1>_LrWHP2|J*O88>YV&f1BljnbTg?-S|8tCeZ->S?bLxT^wrNRJd{7v8k};6$FPPdN$#lF}AP0Mfzo=hKeGQ(um^&A+x#!NJBJupJ02CV_*O% z9MsA|PZcoxp4wByxPg~KYoJznyadxUiXk#Tgg!!9gz^&>?Nv;kkd%KA8u5h*%U1V- zW-;t?_zHfTjUhOsp%C7g7}DYuRqVlC1;#&oMzjv4Q5^9|MgqzKrVzZCsaQ&JcvPt* z!c@wjjvC#nh|h6&kK-RhLqf>$j5Kbi(6S3?L}?seoWLhlF*poM`+ix-6#7JsNHV3; ziE0v;rdeqPw*&_>HD(??p#d775=PSL4VK6@CPg8a9fL9mVmg`T3wy*8iel-@2o7Xa z#B;LH&GM`mmsti7D7G=Ho`PnD8DlV|H_9w6j{40f7_566abK`Tp)A0fwNZ0*`%NCJR~k;gVQ2Ffh%`K_K0SwIl=? z0_r||IV^E%JUiJ>^RY05Lrv3hoxsXIvl5t6&LJJX#3});C!;Vw(tHsryj4h`LR$~t zd9r)!;8HbtC!D+!KER!j#MvB(D1`dqgGhwS7V1O{9PA0iA{**MDS+`oFA)fSyioNg zaM(})MUnCoNM=yZej_=oVUGMI%juLXXMGL_FEz*Uo2;1@GLGSR*5PV)I?y8>!`V2! zo|SD07EaQ3`+Luwu-np1yM3iM>UyyP2hw-ez$fHB%(w-FY3eY>5!oNTMYeYSugvNmtCvx#=LI&H14W|ya>t*z~I zHh2&^9Zt8yLPOLJ8TK~|#0G`Wk~utd0L<>YodXsVcy$ri;<=qr_xp^JQ3IL^uB z4DDb!HpB9=1b%g4^NG-``u;5r86&z#CX1mC0@sGa6Aw_=Et4ruA<3aZFyrG^S;9xN zBf?5TPNdn;AgDPPPnPusL>7J<;nK;r+wrTs$?0x#dSb3tpL3zl?fxv(PN%{e7MS$F z#&N7IG4%mIh7}@!fs5=XGBdPqKoB!=&_A7tCt1h3ESt33if-|d-w&7>)bkKE!eL)8 zFUfJ9W_yF}cCev2oo0OAE|)v#3beXfI|HE>m&@O|DA?5&@^pD!3q#Hpw>mZ`&^f$H z>R9H#7^~bX;@qc_f%gnvR$otAf@}W9LR3fD4F!lx+sI1#;xv9OwcDlmAj{Yb$n>YO zSrIstVnJMSb?;v?g-sF$aHDq#g_bkqbfzG;(U^Yqrzc#fE5nBsT6}8 z<839hk`1V`!>-0)@i=)@-S(61qz5KFFzJCw4@`Ps(gXiT9vFR)usmEXhTyqTl74|F zQ6c?e(CKt~ok6cRlo{YFHyI43a*NqqZZ=!0lw3=pQ99#m%4jrJSSsqOs_Gs%{Q~)l z(e#T3(l7f#O=D^H1?lu!je$ai^ovHLEv3SYt-`wf2nbA-)F2<(jS*R(-PO~#Vt1)0xi)U`;XGnDQ~cG=YeCb(_@T$`s`)Xysc&C zx*6Mcg}M$NUvaK~{>+2)Q*|@uwT5OkGID?0 z%>&0y&wu#bm0R0(9Xvi(<*t&{QEBFAjLsjU^0*AoLI1nnre|*KeY0!9kylp-!(X~k zR+~EU%4cr Date: Thu, 12 Mar 2015 08:42:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?JS=E5=86=B2=E7=AA=81=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BD=99=E6=A0=87=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 934b4c955..d336e26fc 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -63,10 +63,9 @@ }) function show_more_msg() - {$("#course_description").toggleClass("course_description_none");} - - + {$("#course_description").toggleClass("course_description_none");} + <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> <%= hidden_field_tag 'project_type', params[:project_type] %> @@ -193,7 +192,7 @@
-

<%= l(:label_project_overview) %>：

<%= @project.description %> +

<%= l(:label_project_overview) %>

<%= @project.description %>
<%= l(:label_expend_information) %>