diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index c7d06b825..f411aa98e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -10,10 +10,10 @@ <% 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+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15"%>
- <%= 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"%>
@@ -21,7 +21,7 @@
截止时间:<%= format_date(activity.end_time) %>
-
+
作业描述:<%= activity.description.html_safe %>
- <%= 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" %> + <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %> <% 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"%> <% end %>
@@ -26,7 +26,7 @@
-
帖子描述: +
帖子描述: <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index b39a5bcb1..78478aee4 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -10,15 +10,15 @@ <% 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_news_index_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %> + <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
- <%= 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" %>
发布时间:<%= format_date(activity.created_on) %>
-
通知描述:<%= activity.description.html_safe %>
+
通知描述:<%= activity.description.html_safe %>
@@ -28,7 +28,7 @@
发布时间:<%= format_date(activity.published_at) %>
-
问卷描述:<%=activity.polls_description.html_safe.to_s%>
+
问卷描述:<%=activity.polls_description.html_safe.to_s%>
- <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> <%= get_issue_priority(activity.priority_id)[1] %>
@@ -28,7 +28,7 @@
时间:<%=format_date(activity.created_on) %>
-
缺陷描述: +
缺陷描述: <% if activity.description? %> <%= textAreailizable activity, :description, :attachments => activity.attachments %> <% end %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 24d26a5b0..af6233d82 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,20 +11,22 @@ <%= 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_boards_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
<% 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" + %> <% 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" + %> <% end %>
时间:<%= format_date(activity.created_on) %>
-
帖子描述: +
帖子描述: <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2adf15822..58c1e8ba8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -954,7 +954,6 @@ img.ui-datepicker-trigger { .is_public_checkbox{display: none !important;} .is_public{display: none !important;} .ui-corner-left{background: #64bdd9;} -.homepagePostIntro img{max-width: 100%;}