From 62bf136beaa6577cedf5f0cbac267bf8b60c2d7c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 11:42:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=86=85=E5=AE=B9=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8D=A2=E8=A1=8C=EF=BC=8C=E9=82=A3=E4=B9=88?= =?UTF-8?q?=E5=B0=B1=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_forum_list.html.erb | 8 ++++---- app/views/layouts/base_forums.html.erb | 2 +- app/views/memos/show.html.erb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index 286219356..7934a80fe 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -2,15 +2,15 @@ <% if forums.any? %> <% forums.each do |forum| %>
-
+
<%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
- - <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %> + <%=forum.name.gsub(/(\r\n)/,'
').html_safe %> + <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'
'), forum_path(forum),:class=>"f16 linkBlue" %>
-
<%= textAreailizable forum.description%>
+
<%= textAreailizable forum.description%>
创建者：<%= forum.creator.name %>
创建时间：<%= format_date(forum.created_at) %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 366291691..ec19b5b97 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -149,7 +149,7 @@
-
<%= @forum.name%>
+
<%= @forum.name%>
吧主：<%= @forum.creator.name%>
回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 133a90547..8aeb0120b 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -49,14 +49,14 @@
<%end%> -
主题: <%= @memo.subject%>
+
主题: <%= @memo.subject%>
<%= @memo.author.name%>
<%= format_date( @memo.created_at)%>
<%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-
+
<%= @memo.content.html_safe%>
From 0b5b643a8ebcdc66ecb8253943719d4c74e32f1d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 11:48:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8E=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=B7=9D=E7=A6=BB=E5=A4=AA=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 8aeb0120b..ce36656a9 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -60,7 +60,7 @@ <%= @memo.content.html_safe%>
-
+
<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> From 5174e6eeb8ed4f3d37295af7df0315ed73b2ad39 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 12:02:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index ce36656a9..1e2f0f25b 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -30,6 +30,14 @@ $(function() { init_activity_KindEditor_data(<%= @memo.id%>,null,"87%"); }); + + function del_confirm(){ + if(confirm('确认删除么?')){ + $("#del_link").click(); + }else{ + + } + }
@@ -43,7 +51,8 @@