jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复火狐不兼容自动换行的问题

This commit is contained in:
sw 2014-08-28 17:30:08 +08:00
parent 2f1b6386f6
commit fbb19480f5
20 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/attachments/autocomplete.js.erb
View File

@ -4,5 +4,5 @@ $('#relation_file').html('<%=render_attachments_for_new_project(@project, nil)%>
<% elsif @course%> <% elsif @course%>
$('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>'); $('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>');
<% end%> <% 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");

2
app/views/boards/_project_show.html.erb
View File

@ -53,7 +53,7 @@
</span> </span>
<% end %> <% end %>
</div> </div>
<div style="width: 100%;word-break: break-all;"> <div style="width: 100%;word-break: break-all;word-wrap: break-word;">
<% if @topics.any? %> <% if @topics.any? %>
<!-- <table class="list messages"> <!-- <table class="list messages">
<thead><tr> <thead><tr>

2
app/views/contests/show_contest.html.erb
View File

@ -6,7 +6,7 @@
<p> <p>
<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong>
</p> </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 %> <%= @contest.description %>
<!-- <%# if @contest.attachments.any?%> <!-- <%# if @contest.attachments.any?%>
<%# options = {:author => true} %> <%# options = {:author => true} %>

2
app/views/courses/show.html.erb
View File

@ -29,7 +29,7 @@
<%= l(:label_new_activity) %> </span> <%= 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> </td>
</tr> </tr>
<tr> <tr>

2
app/views/issues/_list.html.erb
View File

@ -37,7 +37,7 @@
</ul> </ul>
<% end -%> <% end -%>
<ul class="list-group-item-meta"> <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 %> <%= textilizable issue, :description %>
</div> </div>
</ul> </ul>

2
app/views/journals/diff.html.erb
View File

@ -1,7 +1,7 @@
<h3><%=h @issue.tracker %> #<%= @issue.id %></h3> <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p> <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 %> <%= simple_format_without_paragraph @diff.to_html %>
</div> </div>

2
app/views/layouts/base_courses.html.erb
View File

@ -191,7 +191,7 @@
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<% if @course.description && @course.description.size>0 %> <% 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 %> <%= textilizable @course.description %>
</div> </div>

2
app/views/layouts/base_projects.html.erb
View File

@ -112,7 +112,7 @@
</div> </div>
<div style="padding-bottom: 8px"> <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 %> <%= textilizable @project.description %>
</div> </div>
<div class="created_on_project"> <div class="created_on_project">

2
app/views/layouts/base_users.html.erb
View File

@ -116,7 +116,7 @@
</p> </p>
<% end %> <% end %>
<% unless @user.user_extensions.nil? %> <% 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 %> <%= @user.user_extensions.brief_introduction %>
</p> </p>
<% end %> <% end %>

2
app/views/memos/show.html.erb
View File

@ -46,7 +46,7 @@
</div> </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"> <div class="memo-content">
<%= textAreailizable(@memo,:content) %> <%= textAreailizable(@memo,:content) %>
<p> <p>

2
app/views/messages/_course_show.html.erb
View File

@ -156,7 +156,7 @@
<tr> <tr>
<td class="comments"> <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 %> <%= textAreailizable message,:content,:attachments => message.attachments %>
<%#= message.content.html_safe %> <%#= message.content.html_safe %>
</div> </div>

2
app/views/messages/_form.html.erb
View File

@ -32,7 +32,7 @@
<%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p> <%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p>
<% end %> <% end %>
<% 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' %> <%= text_area :quote,:quote,:style => 'display:none' %>
<p> <p>

5
app/views/messages/_project_show.html.erb
View File

@ -37,6 +37,7 @@
background-color: #F6F6F6; background-color: #F6F6F6;
white-space: normal; white-space: normal;
word-break: break-all; word-break: break-all;
word-wrap: break-word;
/*word-wrap: break-word;*/ /*word-wrap: break-word;*/
} }
.memo-timestamp { .memo-timestamp {
@ -94,7 +95,7 @@
<%= link_to @topic.author, user_path(@topic.author) %> <%= link_to @topic.author, user_path(@topic.author) %>
</p> </p>
</div> </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;"> <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
<% if @project %> <% if @project %>
<%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %> <%= 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>
<tr> <tr>
<td class="comments"> <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 %> <%= textAreailizable message,:content,:attachments => message.attachments %>
<%#= message.content.html_safe %> <%#= message.content.html_safe %>
</div> </div>

2
app/views/messages/edit.html.erb
View File

@ -4,7 +4,7 @@
<%= course_board_breadcrumb(@message) %> <%= course_board_breadcrumb(@message) %>
<% end %> <% 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, { <%= form_for @message, {
:as => :message, :as => :message,

4
app/views/projects/show.html.erb
View File

@ -7,7 +7,7 @@
<% @events_by_day.keys.sort.reverse.each do |day| %> <% @events_by_day.keys.sort.reverse.each do |day| %>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> <% 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%;"> <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %> <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
</div> </div>
@ -24,7 +24,7 @@
</span> </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 %> <%= 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 %> <%= textAreailizable e,:event_description %>
<%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %> <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
</div> </div>

2
app/views/users/_course_form.html.erb
View File

@ -30,7 +30,7 @@
</span></td> </span></td>
</tr> </tr>
<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"> <p class="font_description">
<%= textilizable membership.course.short_description %> <%= textilizable membership.course.short_description %>
</p> </p>

2
app/views/users/user_projects.html.erb
View File

@ -28,7 +28,7 @@
<span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td> <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
</tr> </tr>
<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"> <p class="font_description">
<%= membership.project.short_description%> <%= membership.project.short_description%>
</p></td> </p></td>

4
app/views/welcome/contest.html.erb
View File

@ -158,7 +158,7 @@
<div class="d-p-projectlist"> <div class="d-p-projectlist">
<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %> <% 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"> <div class="avatar-4" style="float: left; margin-top: 7px">
<%= image_tag('/images/contest1.png')%> <%= image_tag('/images/contest1.png')%>
</div> </div>
@ -197,7 +197,7 @@
<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span> <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;"> <div style="height: 167px; padding-top:6px;">
<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;"> <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 class="underline-contests_four"></div>
<div id="up_zzjs"> <div id="up_zzjs">
<div id="marqueebox"> <div id="marqueebox">

2
app/views/welcome/index.html.erb
View File

@ -66,7 +66,7 @@
<% #projects = find_miracle_project(10, 3) %> <% #projects = find_miracle_project(10, 3) %>
<% @projects.map do |project| %> <% @projects.map do |project| %>
<!--<%# cache cache_key_for_project(project) do %> --> <!--<%# 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;"> <div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %> <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
</div> </div>

2
app/views/wiki/diff.html.erb
View File

@ -22,6 +22,6 @@
%>, <%= format_time(@diff.content_to.updated_on) %>)</em> %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
</p> </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 %> <%= simple_format_without_paragraph @diff.to_html %>
</div> </div>