From 245e0a858cac278938925242e6137cd637c1b8f4 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 17 Sep 2014 12:06:07 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=BF=9E=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/index.html.erb | 2 +- app/views/welcome/contest.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb index c166f73ab..2086bfe70 100644 --- a/app/views/contests/index.html.erb +++ b/app/views/contests/index.html.erb @@ -7,7 +7,7 @@
- <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject" %> -
- <% else %> -- <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject", :readonly => true %> -
- <% end %> -- <% unless replying %> - <% if @message.safe_attribute? 'sticky' %> + + <% unless replying %> +
+ <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %>
+
+ <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+
+ <% unless replying %> + <% if @message.safe_attribute? 'sticky' %> <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %> - <% end %> - <% if @message.safe_attribute? 'locked' %> + <% end %> + <% if @message.safe_attribute? 'locked' %> <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %> - <% end %> + <% end %> <% end %> -
--
++ -
- <%= text_area :quote,:quote,:style => 'display:none' %> - -- <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> - <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %> -
+ + <%= text_area :quote,:quote,:style => 'display:none' %> + ++ <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> + <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %> +
- + -
- <%= l(:label_attachment_plural) %>
-
- <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
-
+ <%= l(:label_attachment_plural) %>
+
+ <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+
<%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb index 5df6ecca8..47ea32b91 100644 --- a/app/views/stores/index.html.erb +++ b/app/views/stores/index.html.erb @@ -1,71 +1,68 @@ <% content_for :top_field do%> - <%= render 'search_bar' %> + <%= render 'search_bar' %> <% end %> -
- <%= @str_arr.shift %> -
++ <%= @str_arr.shift %> +
-6N^Vf7U>6pK!i%GHm876D^V`YZP_rXg4E?r=TDg5?X-Z;}b
z{U x
z0>r>k5#z`?HnCuat#C<=ViW_87t0KgmYWUgj
zrg?VhlG3e_ejrftnyu!xxq`K7Ot1=G+EHS2*lNF0^Frc%4?53`=pV~%{wf!mb7e(B
zNX^qvlC@&eTFt7`4x}apS>7*#o*GP@$~&_pBj-@T^5$#yBCB^~Wm5}{>_6+m`9ecu
zUldsyn+C*fO0dfVWEGq2g!}wn+grgWb*rehI9B5OMN&Z
z4^QLN5secAsl{9$V(Wy&ZCgsJP=MDkVO?#dC#{GCmc=~UStIrhwF^Mck%T0ga+>OY
z3o-6PZa3bexnN)+6=}Sw8!`85${nJ1g(DZ?<#Rq2fjP1vw#Kpl?9R
8(831LS2@5ms!)JzMYQ^SGd;X(5<58%r`fmUr