From 1976aa9c728c05eae9d88c7587c52744e950af94 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 17 Sep 2014 14:55:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7--=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=B8=96=E5=AD=90=EF=BC=8C=E2=80=9C=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E2=80=9D=E4=B8=8E=E2=80=9C=E5=BC=95=E7=94=A8=E2=80=9D=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=8F=A0=E5=8F=8A=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=B7=B7=E6=8E=92=E9=97=AE=E9=A2=98=20#1258?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/edit.html.erb | 3 +- app/views/memos/show.html.erb | 9 ++- app/views/stores/index.html.erb | 117 ++++++++++++++--------------- config/locales/zh.yml | 2 +- public/stylesheets/application.css | 16 ++++ 5 files changed, 81 insertions(+), 66 deletions(-) diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index cf8770c8c..35543398f 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -27,8 +27,7 @@

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


- <%= f.submit :value => l(:button_change) %> + <%= f.submit :value => l(:button_change) %>  <%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%> <% end %> -<%= link_to l(:button_back), back_url %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 577c3ff7f..5da3c5d63 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -43,11 +43,14 @@ :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete) ) if @memo.destroyable_by?(User.current) %> - - -
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
+
 
+ +
+ <%= label_tag l(:field_subject) %>: <%=h @memo.subject %> +
<%= textAreailizable(@memo,:content) %>

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 %> -

-<% @attach_array.each do |k|%> -
-

- <%= @str_arr.shift %> -

+
+ <% @attach_array.each do |k|%> +
+

+ <%= @str_arr.shift %> +

-
-
-
<%=l(:label_attachment)%>
-
<%=l(:field_downloads)%>
-
<%=l(:button_download)%>
-
-
+
+
+
<%=l(:label_attachment)%>
+
<%=l(:field_downloads)%>
+
<%=l(:button_download)%>
+
+
-
- <% k.each do |c1|%> -
-
- <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %> -
-
- <%= c1.downloads %> -
-
- <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%> -
-
- <% end -%> -
+
+ <% k.each do |c1|%> +
+
+ <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %> +
+
+ <%= c1.downloads %> +
+
+ <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%> +
+
+ <% end -%> +
-
-<% end; reset_cycle %> +
+ <% end; reset_cycle %>
\ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f71241223..fa8cf91f9 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1936,7 +1936,7 @@ zh: label_forum_edit: 编辑讨论区 label_memo_create: 发布 label_memo_new: 新建主题 - label_memo_edit: 修改主题label_board_new + label_memo_edit: 修改主题 label_memo_new_from_forum: 发布帖子 label_forum: 公共贴吧 label_forum_new: 新建贴吧 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 72b379585..1fda63f93 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2794,3 +2794,19 @@ div.repos_explain{ padding-top: 20px; padding-bottom: 20px; } + +.button-canel{ + padding-bottom: 5px; + width: auto; + height: 25px; + font-family: '微软雅黑',Arial,Helvetica,sans-serif; + font-size: 12px; + color: #ffffff; + padding: 3px 9px; + background: #15bccf; + border-radius: 4px; + border: 1px solid #15bccf; + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; + text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); + cursor: pointer; +}