From fcb9978a05cc470952e119f5c8ccc23f710acef3 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 16:21:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E7=BB=8F=E8=BF=87=E6=97=B6=E6=98=BE=E7=A4=BAhtml=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 30 ++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index d965c92e7..33c51760c 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -52,7 +52,11 @@
  • <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :title => "#{ma.course_message.comments.html_safe}" %>
    • + :onmouseover =>"message_titile_show($(this),event)", + :onmouseout => "message_titile_hide($(this))" %> +
    + <%= ma.course_message.comments.html_safe %> +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -180,7 +184,9 @@ ">评论了新闻：
  • <%= link_to "#{ma.forge_message.comments.html_safe}", - {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%>
    • + {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + :title => "#{ma.forge_message.comments.html_safe}" %> +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -197,7 +203,7 @@ " ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
  • - <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %> + <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • @@ -215,8 +221,13 @@ "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.journals_for_message.notes}" %> + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + :onmouseover =>"message_titile_show($(this),event)", + :onmouseout => "message_titile_hide($(this))" %>
    • +
    + <%= ma.journals_for_message.notes.html_safe %> +
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -236,6 +247,17 @@ + From 273e1ea6b1c05b22500e9c904e0d0715a1a53fe4 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 17:08:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=BC=95=E7=94=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index a22831b2c..a4eaa7f0a 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -391,16 +391,17 @@ blockquote { border-right: 1px solid #e0e0e0; border-top: 1px solid #e0e0e0; border-bottom: 1px solid #e0e0e0; - padding-left: .6em; - padding-top: .6em; - padding-right: .6em; - padding-bottom: .6em; + padding-left: 0.6em; + padding-top: 0.6em; + padding-right: 0.6em; + padding-bottom: 0.6em; margin-left: 1.4em; - margin-right: .4em; + margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; - background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg); + /*background: url('../images/requirements/reference.jpg');*/ background-size: 100% 100%; + margin-top:5px; } /*上传项目图片*/ .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}