From d536c81a8a8db9b201118258b4c0dc24f382ba4e Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 17:11:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index c0492c85b..07bfcfdef 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -866,14 +866,14 @@ a:hover.BlueCirBtn{ background:#15bccf; color:#fff;} .W120{ width:110px;} .W700{ width:700px;max-width: 700px;min-width: 700px;} .w708{width: 708px;} -a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#15bccf;} -a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#15bccf;} +a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} +a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#15bccf;} +a.FilesBtn{ background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} +a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#15bccf;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #15bccf; color:#15bccf; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#15bccf; color:#fff;} -a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat; width:85px; height:20px; display:block; color:#888888; font-size:14px;} -a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;} +a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; width:85px; height:20px; display:block; color:#888888; font-size:14px;} +a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;} .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;} /*20150820编程作业 LB*/ .W320{ width:320px;} @@ -894,8 +894,8 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} .W200{ width:200px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} -.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; } -.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; } +.SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } +.SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; } a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;} From 49972ca476de22aed0c16cb8ad6774192e68392e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 17:11:34 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E8=B5=84=E6=BA=90=E5=BA=93=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_attachment.html.erb | 2 +- app/views/users/_user_homework_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index 4f47cd7f2..1613b144e 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -47,7 +47,7 @@
上传附件 - <%= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%> + <%#= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
<% content_for :header_tags do %> diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index e6cd1483d..8340306e0 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -27,7 +27,7 @@
- <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox w708 SearchIcon"} %> + <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox w708"} %>
From e448d2c05f51a45c56579dd6f9856e058ac762cc Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 28 Aug 2015 17:25:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 ++ app/helpers/poll_helper.rb | 10 -- app/views/users/_course_homework.html.erb | 21 ++-- app/views/users/_course_message.html.erb | 112 ++++++++++++--------- app/views/users/_course_news.html.erb | 104 ++++++++++--------- app/views/users/_course_poll.html.erb | 20 ++-- app/views/users/_project_issue.html.erb | 92 +++++++++-------- app/views/users/_project_message.html.erb | 115 +++++++++++++--------- app/views/users/_user_activities.html.erb | 59 +++++++++++ 9 files changed, 336 insertions(+), 207 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 709426d41..7f93345b4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2493,4 +2493,14 @@ int main(int argc, char** argv){ return 0; }".html_safe end + + #判断用户是否已经提交了问卷 + def has_commit_poll?(poll_id,user_id) + pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) + if pu.nil? + false + else + true + end + end end diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb index 22ee21936..170e1b92c 100644 --- a/app/helpers/poll_helper.rb +++ b/app/helpers/poll_helper.rb @@ -37,16 +37,6 @@ module PollHelper pv.vote_text end end - - #判断用户是否已经提交了问卷 - def has_commit_poll?(poll_id,user_id) - pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) - if pu.nil? - false - else - true - end - end #统计答题百分比，统计结果保留两位小数 def statistics_result_percentage(e, t) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 0cb3aa25e..88a00e8ab 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,16 +4,16 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
- <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %> +
+ <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
@@ -21,7 +21,16 @@
截止时间：<%= format_date(activity.end_time) %>
-
（作业描述）<%= activity.description.html_safe %>
+
+ 作业描述：<%= activity.description.html_safe %> +
+
- <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
-
时间：<%= format_date(activity.created_on) %>
+
发帖时间：<%= format_date(activity.created_on) %>
-
（描述） + + +
帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> @@ -44,20 +47,26 @@
-
-
+ + <% activity= activity.parent_id.nil? ? activity:activity.parent%> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
+
    + <% activity.children.reorder("created_on desc").each do |reply|%> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
    +
    <%= reply.content.html_safe %>
    +
    +
    +
    • + <% end %> +
-
<%#= reply.content.html_safe %>
-
-
-
- <%# end %> - <%# end %> -
--> + <% end %> + diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index ce85e0cad..aaa8fa672 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -1,5 +1,5 @@
-
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -9,17 +9,18 @@ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
-
- <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %> +
+ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
发布时间：<%= format_date(activity.created_on) %>
-
（通知描述）<%= activity.description.html_safe %>
- -
<%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%> -
- <%#= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %> - -
- 取消 + + <% replies_all_i = 0 %> + <% unless activity.comments.empty? %> +
+
    + <% activity.comments.reorder("created_on desc").each do |comment| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if comment.try(:author).try(:realname) == ' ' %> + <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(comment.created_on) %> + <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> + +
    +
    <%= comment.comments.html_safe %>
    +
    +
    +
    • + <% end %> +
-
- 发送 -
-
- <%# end %> + <% end %>
- <%# activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%> -
-
- <%#= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> -
-
-
- <%# if comment.try(:author).try(:realname) == ' ' %> - <%#= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#=format_date(comment.created_on)%> - <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> - <!–删除–> -
-
<%#= comment.comments.html_safe %>
-
-
-
- <%# end %> - <%# end %> -
-->
\ No newline at end of file diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 0c93e7627..bc0fee3a8 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,4 +1,4 @@ -<%# has_commit = has_commit_poll?(activity.id ,User.current)%> +<% has_commit = has_commit_poll?(activity.id ,User.current)%> <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
@@ -14,21 +14,21 @@ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
- <%#= link_to activity.polls_name.to_s+"(问卷名称)", %> - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(activity.id), :class => "polls_title polls_title_w fl c_dblue"%> - <%# else %> - <%= link_to poll_name+"(问卷名称)", poll_path(activity.id), :class => "postGrey"%> - <%# end %> + <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> + <% if has_commit %> + <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> + <% else %> + <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> + <% end %>
-
时间：<%= format_date(activity.created_at) %>
+
发布时间：<%= format_date(activity.published_at) %>
-
（问卷描述）<%=activity.polls_description.to_s%>
+
问卷描述：<%=activity.polls_description.to_s%>
- <%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> - <%=activity.status.name %> + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> + <%= get_issue_priority(activity.priority_id)[1] %>
指派给   @@ -28,7 +28,7 @@
时间：<%=format_date(activity.created_on) %>
-
（缺陷描述）<%=activity.description.html_safe %>
+
缺陷描述：<%= activity.description.html_safe %>
<% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> @@ -70,15 +70,21 @@
-
-
+ + <% replies_all_i = 0 %> + <% unless activity.journals.empty? %> +
+
    + <% activity.journals.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:user).try(:realname) == ' ' %> + <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <%# else %> + <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> - <%# activity.journals.reorder("created_on desc").each do |reply| unless activity.journals.nil?%> -
    -
    - <%#= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> -
    -
    -
    - <%# if reply.try(:user).try(:realname) == ' ' %> - <%#= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#= format_date(reply.created_on) %> - - #<!–删除–> -
    - <%# if reply.details.any? %> - <%# details_to_strings(reply.details).each do |string| %> -
    <%#=string %>
    - <%# end %> - <%# else %> -
    <%#=reply.notes.html_safe %>
    - <%# end %> -
    -
    -
    - <%# end %> - <%# end %> -
    --> + +
    + <% if reply.details.any? %> + <% details_to_strings(reply.details).each do |string| %> +
    <%= string %>
    + <% end %> + <% else %> +
    <%= reply.notes.html_safe %>
    + <% end %> +
+
+ + <% end %> + +
+ <% end %> + \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 57b021467..d46823211 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,20 +11,26 @@ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
<% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
时间：<%= format_date(activity.created_on) %>
-
（描述）<%= activity.content.html_safe %>
+
帖子描述： + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
- -
+ + <% activity= activity.parent_id.nil? ? activity : activity.parent %> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
+
    + <% activity.children.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
    +
    <%= reply.content.html_safe %>
    +
    +
    +
    • + <% end %> +
-
-
- <%# if reply.try(:author).try(:realname) == ' ' %> - <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#= format_date(reply.created_on) %> - <%#= link_to( - l(:button_delete), - {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => 'replyGrey fr ml10' - ) if reply.course_destroyable_by?(User.current) %> - # <!–删除–> -
-
<%#= reply.content.html_safe %>
-
-
-
- <%# end %> - <%# end %> - --> - + <% end %> + + \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 97f7b4c6f..1cfeb7ed8 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -1,5 +1,64 @@ <% user_activities.each do |user_activity| unless user_activities.nil? %> + <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %> <% case user_activity.container_type.to_s %> <% when 'Course' %> From 3f61a908d12a2aa0adc4a6cc1823311c2367bb16 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 17:27:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- app/views/my/account.html.erb | 2 +- app/views/users/user_fanslist.html.erb | 2 +- app/views/users/user_newfeedback.html.erb | 16 ++++++++++------ public/javascripts/new_user.js | 4 ++-- public/stylesheets/new_user.css | 1 + public/stylesheets/users.css | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 9c4bde60d..9ab29ba8b 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -137,7 +137,7 @@ -
+
<%= yield %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index c25363323..688d7e2ac 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,5 +1,5 @@
-
+
  • 基本资料
    • diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index 350875f8b..63b03e5dd 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -7,7 +7,7 @@ } -
    +
    <% if @action == 'fans' %>

    粉丝

    diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index b8c5b106d..556069a1f 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -24,11 +24,15 @@ -
    -
    -
    留言
    -
    -
    +
    +
    +
    +
    留言
    +
    +
    +
    + +
    <%= form_for('new_form',:url => leave_user_message_path(@user.id),:method => "post") do |f|%> @@ -40,7 +44,7 @@
    -
    +
    <%if @jour%> <% @jour.each do |jour|%> <%= render :partial => 'user_jours_new', :locals => {:jour => jour} %> diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index 42c8a9ddf..100dcb46a 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -1,7 +1,7 @@ $(function(){ //右侧最小高度 = 左侧高度 - 15px 保证两边高度基本一样，页面美观 - $("#RSide").css("min-height",$("#LSide").height()-15); - $("#users_setting").css("min-height",$("#LSide").height()-35); + $("#RSide").css("min-height",$("#LSide").height()-35); + $("#users_setting").css("min-height",$("#LSide").height()-100); //头像相关 $("#homepage_portrait_image").live("mouseover",function(){ diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 07bfcfdef..5e5c9517b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -12,6 +12,7 @@ a:hover,a:active{color:#000;} /*常用*/ /*#RSide{ background:#fff;}*/ #users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} +#RSide{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} /*上传图片处理*/ .upload_img img{max-width: 100%;} blockquote img{max-width: 100%;} diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css index eb9309eab..48d73f86a 100644 --- a/public/stylesheets/users.css +++ b/public/stylesheets/users.css @@ -24,7 +24,7 @@ a.icon_face{background:url(../images/public_icon.png) 0px -671px no-repeat; dis a:hover.icon_face{background:url(../images/public_icon.png) -79px -671px no-repeat; } .inputUsers_message{ border:1px solid #d2d2d2; width:718px; height:48px; color:#666; padding:5px; margin-bottom:5px;} .inputUsers_message02{ border:1px solid #d2d2d2; width:618px; height:26px; color:#666; padding:5px; margin-bottom:5px; } -.message_list_box{ background:#f5f5f5; padding:10px;margin-top: 10px;} +.message_list_box{ background:#f5f5f5; margin-top: 10px;} .users_pic{ width:46px; height:46px; border:1px solid #e3e3e3;} .users_pic:hover{ border:1px solid #a5a5a5;} .users_pic_sub{width:32px; height:32px; border:1px solid #e3e3e3;} From 46ac491b5bcf5c329d308774ed42a809ac3e48a2 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 17:29:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/homepage_icon2.png | Bin 0 -> 10889 bytes public/images/resource_icon_list.png | Bin 0 -> 2654 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/homepage_icon2.png create mode 100644 public/images/resource_icon_list.png diff --git a/public/images/homepage_icon2.png b/public/images/homepage_icon2.png new file mode 100644 index 0000000000000000000000000000000000000000..6cbde8f6235a780dc9116f7507f433dcf4f6cec8 GIT binary patch literal 10889 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 Date: Fri, 28 Aug 2015 17:36:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_poll.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index bc0fee3a8..f0a2a8aba 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -28,7 +28,7 @@
    发布时间：<%= format_date(activity.published_at) %>
    -
    问卷描述：<%=activity.polls_description.to_s%>
    +
    问卷描述：<%=activity.polls_description.html_safe.to_s%>