Fix lists in rich text to display properly

Add a "richtext" class to anything which contains text rendered
by our rich text library, and move styles which were only being
applied to diary entries to apply to all rich text.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index db14033a5dd94b036942b8b42eef1d8634881dc3..d516e0b9a533b6198b4dd8aba41c0460a6c8d4c7 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1133,15 +1133,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   ul,
   ol {
   }
   ul,
   ol {

-    margin-bottom: 20px;

     font-style: italic;
     font-style: italic;

-    margin-left: 20px;
-  }
-  ul li {
-    list-style: disc;
-  }
-  ol li {
-    list-style: decimal;

   }
   ul.secondary-actions { display: inline-block;}
 }
   }
   ul.secondary-actions { display: inline-block;}
 }


@@ -1530,6 +1522,7 @@ a.button.submit {
     background-color: #9ed485;
   }
 }
     background-color: #9ed485;
   }
 }

+

 /* Rules for doing distinct colour of alternate table rows */
 
 .table0,
 /* Rules for doing distinct colour of alternate table rows */
 
 .table0,


@@ -1549,6 +1542,23 @@ a.button.submit {
   border: 0;
 }
 
   border: 0;
 }
 

+/* Rules for rich text */
+
+.richtext {
+  ul,
+  ol {
+    margin-bottom: 20px;
+    margin-left: 20px;
+  }
+  ul li {
+    list-style: disc;
+  }
+
+  ol li {
+    list-style: decimal;
+  }
+}
+

 /* Rules for rich text editors */
 
 .richtext_container {
 /* Rules for rich text editors */
 
 .richtext_container {

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f0c0ccbd5e27d18c7441cc9b6d3758ae6457c19f..49608c4a0d42a9df70e3f2c6b7bbac4bb05d38b3 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -77,7 +77,7 @@ module ApplicationHelper
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))

-        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
+        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")

       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do

diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb
index ccc1c744fc1dc42843a35c1663685f3e12e2130e..c7700b361bee5d0db6a1daf993727bf35b9acf95 100644 (file)
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -1,8 +1,8 @@
-<div class='clearfix diary-comment'>
+<div class="clearfix diary-comment">

   <%= user_thumbnail diary_comment.user %>
   <%= user_thumbnail diary_comment.user %>

-  <p class='deemphasize comment-heading' id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></p>
-  <%= diary_comment.body.to_html %>
+  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></p>
+  <div class="richtext"><%= diary_comment.body.to_html %></div>

   <%= if_administrator(:span) do %>
     <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>
   <% end %>
   <%= if_administrator(:span) do %>
     <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>
   <% end %>

-</div>
\ No newline at end of file
+</div>

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index c17cf05e6ee0e5c2dffec2aac052d289652d2295..a7d40c7920036bbfd3e8b7d1af4e0d2dfefdf77f 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -6,7 +6,8 @@
 
     <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
   </div>
 
     <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
   </div>

-  <div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+
+  <div class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">

     <%= diary_entry.body.to_html %>
   </div>
 
     <%= diary_entry.body.to_html %>
   </div>
 

diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb
index e486308ead7b0560717f05e163a86e04dceb85ef..b55eecf76576cdc80a64b102771a3246e5f93f00 100644 (file)
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -13,7 +13,7 @@
   <tr class="<%= cl %>">
     <td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
     <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
   <tr class="<%= cl %>">
     <td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
     <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>

-    <td width="50%"><%= comment.body.to_html %></td>
+    <td width="50%" class="richtext"><%= comment.body.to_html %></td>

   </tr>
   <% end -%>
 </table>
   </tr>
   <% end -%>
 </table>


@@ -21,4 +21,4 @@
 <ul class='secondary-actions clearfix'>
   <li><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %></li>
   <li><%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></li>
 <ul class='secondary-actions clearfix'>
   <li><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %></li>
   <li><%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></li>

-</ul>
\ No newline at end of file
+</ul>

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index e62873ad45a95debb7e0be1d972f24ee6c1267cb..f3d6ef1394a4ad243dc51edf3e4fd6831578a398 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -13,7 +13,7 @@
     </div>
   </div>
 
     </div>
   </div>
 

-  <%= @message.body.to_html %></td>
+  <div class="richtext"><%= @message.body.to_html %></div>

 
   <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
 
 
   <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
 


@@ -29,8 +29,8 @@
     </div>
   </div>
 
     </div>
   </div>
 

-  <%= @message.body.to_html %></td>
+  <div class="richtext"><%= @message.body.to_html %></div>

 
   <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
 
 
   <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
 

-<% end %>
\ No newline at end of file
+<% end %>

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index 798ed962a58d68092ce00af8da186279122a5c3d..2404df734e3fb78ab213bf915faecddabcf025de 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -7,7 +7,7 @@
   <b><%= t 'redaction.show.user' %></b>
   <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
 </p>
   <b><%= t 'redaction.show.user' %></b>
   <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
 </p>

-<p>
+<p class="richtext">

   <b><%= t 'redaction.show.description' %></b>
   <%= @redaction.description.to_html %>
 </p>
   <b><%= t 'redaction.show.description' %></b>
   <%= @redaction.description.to_html %>
 </p>

diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb
index 4f2f59c92d20782576845477d1f5b25c769a52c9..b1ea3f299c053d4e72e39339d38b8e9dd2b9d0e0 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -19,7 +19,7 @@
         %>
       <% end %>
     </p>
         %>
       <% end %>
     </p>

-    <%= user.description.to_html %>
+    <div class="richtext"><%= user.description.to_html %></div>

   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index de2e93f9439c2ac4757ddee1d40119832cd6b3c4..67619a5369cdb76294320da9110d066153614cf8 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -146,7 +146,7 @@
       </p>
     </div>
 
       </p>
     </div>
 

-    <div class='user-description'><%= @this_user.description.to_html %></div>
+    <div class="user-description richtext"><%= @this_user.description.to_html %></div>

 
   </div>
 
 
   </div>
 

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 73b26b9306aceb6410d5cecd8032afbaeb0cbd37..e882e6e3b61425241a5564f40e93e627e5488985 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -33,4 +33,4 @@
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
 <p><b><%= t'user_block.show.reason' %></b></p>
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
 <p><b><%= t'user_block.show.reason' %></b></p>

-<%= @user_block.reason.to_html %>
\ No newline at end of file
+<div class="richtext"><%= @user_block.reason.to_html %></div>