From daeab7ef64b47de0e7674e637a59d31d4f8ef487 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 14 Aug 2014 15:15:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=90=A7=E6=97=B6=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=202.=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6=E9=99=90=E5=AE=9A=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=203.=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_form.html.erb | 13 ++++++++----- app/views/forums/show.html.erb | 3 ++- app/views/memos/_topic_form.html.erb | 5 +++-- app/views/memos/show.html.erb | 2 +- config/locales/zh.yml | 3 +++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/views/forums/_form.html.erb b/app/views/forums/_form.html.erb index f67aa1181..993563954 100644 --- a/app/views/forums/_form.html.erb +++ b/app/views/forums/_form.html.erb @@ -13,16 +13,19 @@ --> <% end %> -
+
<%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share' %>
-
- <%= f.text_area :description, :required => true, :rows => 4, :style => 'width: 100%;resize: none;', :class => 'create-share' %> +
+ + <%= f.text_area :description, :required => true, :id => 'editor01' %> + +

(<%= l(:lable_forums_max_length) %>)

- <%= f.submit :value=>(l :button_submit) ,:class => 'nyan-clean-gray', :style => 'font-size: 14px; padding: 0px 3px' %> - <%= link_to l(:button_back), forums_path,:class => 'nyan-clean-gray',:style => 'font-size: 14px; padding: 0px 3px; color: #000' %> + <%= submit_tag l(:button_submit) %> + <%= link_to l(:button_back), forums_path ,:style => 'font-size: 14px; padding: 0px 3px;' %>
<% end %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index d558abe3f..48913a38d 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -18,8 +18,9 @@

<%= f.text_field :subject, :required => true%>

<%= f.text_area :content, :required => true, :id => 'editor02' %>

-
+

(<%= l(:lable_memos_max_length) %>)

+ <%= l(:label_attachment_plural) %>
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>

diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb index fa291a7f9..3f5642733 100644 --- a/app/views/memos/_topic_form.html.erb +++ b/app/views/memos/_topic_form.html.erb @@ -10,12 +10,13 @@
<% end %> -
+

<%= f.text_field :subject, :required => true, :size => 95 %>

<%= f.text_area :content, :required => true, :id => 'editor01' %>


-

+ +

<%= l(:label_attachment_plural) %>
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 2c3248d06..75030797b 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -48,7 +48,7 @@
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
- <%=h sanitize(@memo.content.html_safe) %> + <%= textAreailizable(@memo,:content) %>

<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1d66874ee..62c9b860f 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2109,4 +2109,7 @@ zh: lable_file_not_found: 对不起，该文件现在不能下载! lable_goto_homepage: 返回主页 lable_trustie_team: Trustie开发团队 + + lable_memos_max_length: 帖子内容最大长度为65535个字符 + lable_forums_max_length: 贴吧描述最大长度为65535个字符 \ No newline at end of file