From fbb19480f5802848cb02aa73a5ae915445148286 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 17:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=8B=90=E4=B8=8D?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/autocomplete.js.erb | 2 +-
 app/views/boards/_project_show.html.erb   | 2 +-
 app/views/contests/show_contest.html.erb  | 2 +-
 app/views/courses/show.html.erb           | 2 +-
 app/views/issues/_list.html.erb           | 2 +-
 app/views/journals/diff.html.erb          | 2 +-
 app/views/layouts/base_courses.html.erb   | 2 +-
 app/views/layouts/base_projects.html.erb  | 2 +-
 app/views/layouts/base_users.html.erb     | 2 +-
 app/views/memos/show.html.erb             | 2 +-
 app/views/messages/_course_show.html.erb  | 2 +-
 app/views/messages/_form.html.erb         | 2 +-
 app/views/messages/_project_show.html.erb | 5 +++--
 app/views/messages/edit.html.erb          | 2 +-
 app/views/projects/show.html.erb          | 4 ++--
 app/views/users/_course_form.html.erb     | 2 +-
 app/views/users/user_projects.html.erb    | 2 +-
 app/views/welcome/contest.html.erb        | 4 ++--
 app/views/welcome/index.html.erb          | 2 +-
 app/views/wiki/diff.html.erb              | 2 +-
 20 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/views/attachments/autocomplete.js.erb b/app/views/attachments/autocomplete.js.erb
index abe2c3757..691454feb 100644
--- a/app/views/attachments/autocomplete.js.erb
+++ b/app/views/attachments/autocomplete.js.erb
@@ -4,5 +4,5 @@ $('#relation_file').html('<%=render_attachments_for_new_project(@project, nil)%>
 <% elsif @course%>
 $('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>');
 <% end%>
-$('#attachments').children().css("width","100%").css("word-break","break-all");
+$('#attachments').children().css("width","100%").css("word-break","break-all").css("word-wrap", "break-word");
 
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 8cd46c35b..a14e32d6d 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -53,7 +53,7 @@
     </span>
   <% end %>
 </div>
-<div style="width: 100%;word-break: break-all;">
+<div style="width: 100%;word-break: break-all;word-wrap: break-word;">
   <% if @topics.any? %>
       <!-- <table class="list messages">
   <thead><tr>
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index 91279b7bb..121f5e690 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -6,7 +6,7 @@
 		<p>		
 			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong>
 		</p>		
-		<div class="bid_description" style="width: 100%;word-break:break-all;">
+		<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
 			<%= @contest.description %>
 			<!-- <%# if @contest.attachments.any?%>
 				<%# options = {:author => true} %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 366ec0c39..ff0a3e6e1 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -29,7 +29,7 @@
                                           <%= l(:label_new_activity) %> </span>
 
 
-                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;" %>
+                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;word-wrap: break-word;" %>
                             </td>
                           </tr>
                           <tr>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 90a51d031..d65a93c6c 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -37,7 +37,7 @@
 				</ul>
 				<% end -%>
 				<ul class="list-group-item-meta">
-                  <div class="wiki" style="width: 100%;word-break: break-all;">
+                  <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                     <%= textilizable issue, :description %>
                   </div>
 				</ul>
diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index 6e67f0544..237cfea4f 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -1,7 +1,7 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
 <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
 
-<div class="text-diff" style="word-break: break-all;width: 100%;">
+<div class="text-diff" style="word-break: break-all;width: 100%;word-wrap: break-word;">
 <%= simple_format_without_paragraph @diff.to_html %>
 </div>
 
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 01510865b..4554b0466 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -191,7 +191,7 @@
 
       <div style="padding-bottom: 8px">
         <% if @course.description && @course.description.size>0 %>
-            <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-all;">
+            <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-word;">
 
               <%= textilizable @course.description %>
             </div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index c3ad0fe08..a3b8e267c 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -112,7 +112,7 @@
 									</div>
 
 									<div style="padding-bottom: 8px">
-										<div class="font_lighter_sidebar" style="word-break:break-all">
+										<div class="font_lighter_sidebar" style="word-break:break-all;word-wrap: break-word;">
 											<%= textilizable @project.description %>
 										</div>
 										<div class="created_on_project">
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index de10036de..380481fe2 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -116,7 +116,7 @@
 											</p>
 											<% end %>
 											<% unless @user.user_extensions.nil? %>
-											<p style="width: 100%;word-break: break-all">
+											<p style="width: 100%;word-break: break-all;word-wrap: break-word;">
 												<%= @user.user_extensions.brief_introduction %>
 											</p>
 											<% end %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 76e4990a5..9b68e80fc 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -46,7 +46,7 @@
 				
 		</div>
 
-		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
+		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
 		<%= textAreailizable(@memo,:content) %>
 			<p>							
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index c543601d3..aba16d620 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -156,7 +156,7 @@
             <tr>
 
               <td class="comments">
-                <div class="wiki" style="width: 100%;word-break: break-all;">
+                <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
                   <%#= message.content.html_safe  %>
                 </div>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index a8def56f5..55aa829c8 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -32,7 +32,7 @@
         <%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p>
     <% end %>
 <% end %>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all"></div>
+  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
 
   <%= text_area :quote,:quote,:style => 'display:none' %>
 <p>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 7f88816f5..ddb23fc95 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -37,6 +37,7 @@
         background-color: #F6F6F6;
         white-space: normal;
         word-break: break-all;
+        word-wrap: break-word;
         /*word-wrap: break-word;*/
     }
     .memo-timestamp {
@@ -94,7 +95,7 @@
       <%= link_to @topic.author, user_path(@topic.author) %>
     </p>
   </div>
-  <div class="memo-section" style="width: 100%;word-break: break-all;">
+  <div class="memo-section" style="width: 100%;word-break: break-all;word-wrap: break-word;">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
       <% if @project %>
           <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
@@ -161,7 +162,7 @@
             </tr>
             <tr>
               <td class="comments">
-                <div class="wiki" style="width: 100%;word-break: break-all;">
+                <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
                   <%#= message.content.html_safe  %>
                 </div>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 62d29ebd8..3d4b6a4d2 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -4,7 +4,7 @@
     <%= course_board_breadcrumb(@message) %>
 <% end %>
 
-<h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;"><%=h @topic.subject %></span></h3>
+<h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%=h @topic.subject %></span></h3>
 
 <%= form_for @message, {
                :as => :message,
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 47e3e8419..a08577c80 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -7,7 +7,7 @@
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>
           <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-break: break-all;">
+              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
                 <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
                   <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
                 </div>
@@ -24,7 +24,7 @@
                     </span>
                   <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
 
-                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;">
+                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
                     <%= textAreailizable e,:event_description %>
                     <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
                   </div>
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index 055dd7d6b..892c2775e 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -30,7 +30,7 @@
                       </span></td>
                   </tr>
                   <tr>
-                    <td colspan="2" width="580"  style="word-break:break-all">
+                    <td colspan="2" width="580"  style="word-break:break-all;word-wrap: break-word;">
                       <p class="font_description">
                       <%= textilizable membership.course.short_description %>
                      </p>        
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index a1597e270..b312ed0d4 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -28,7 +28,7 @@
 													 <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
 					</tr>
 					<tr>
-						<td colspan="2" width="580" style="word-break:break-all">
+						<td colspan="2" width="580" style="word-break:break-all;word-wrap: break-word;">
 						<p class="font_description">
 							<%= membership.project.short_description%>
 						</p></td>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 30395aa6f..69b272002 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -158,7 +158,7 @@
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
 
-			<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'>
+			<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
 				<div class="avatar-4" style="float: left; margin-top: 7px">
 					<%= image_tag('/images/contest1.png')%>
 				</div>
@@ -197,7 +197,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
 	<div style="height: 167px; padding-top:6px;">
 		<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
-			<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
+			<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all;word-wrap: break-word; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
 			<div class="underline-contests_four"></div>
           <div id="up_zzjs">
             <div id="marqueebox">
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 997b583c3..d91019e53 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -66,7 +66,7 @@
 			<% #projects = find_miracle_project(10, 3) %>
 			<% @projects.map do |project| %>
 			<!--<%# cache cache_key_for_project(project) do %> -->
-			<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'>
+			<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
 				</div>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index ef26c570c..c50051d20 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -22,6 +22,6 @@
       %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
 </p>
 
-<div class="text-diff" style=" width: 100%;word-break: break-all;">
+<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
 <%= simple_format_without_paragraph @diff.to_html %>
 </div>