Merge branch 'develop' into 'master'

Develop

See merge request !2

app/views/text_blocks/_form.html.erb

@@ -2,9 +2,11 @@
 
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
-  <p><%= f.text_area :text, label: l(:field_text_block_text) %></p>
+  <p><%= f.text_area :text, label: l(:field_text_block_text), rows: 10 %></p>
 </div>
 
+<%= wikitoolbar_for 'text_block_text' %>
+
 
 
 

app/views/text_blocks/_list.html.erb

@@ -1,5 +1,5 @@
 <% if text_blocks.any? %>
-  <table class="list">
+  <table class="list textblocks">
     <thead>
       <tr>
         <th><%= l :label_text_block_name %></th>
@@ -15,3 +15,26 @@
   <p class="nodata"><%= l :label_no_data %></p>
 <% end %>
 
+<%= content_for :header_tags do %>
+  <%= javascript_include_tag 'jquery.dotdotdot', plugin: 'redmine_text_blocks' %>
+  <%= javascript_tag do %>
+    $(document).ready(function() {
+      $("table.list.textblocks tbody td.text div").dotdotdot({
+        watch: 'window',
+      });
+
+      // make sure text is shortened when it was initially hidden and just
+      // becomes visible due to Redmine's tabbing in project settings:
+      var origShowTab = window.showTab;
+      window.showTab = function(name, url){
+        origShowTab(name, url);
+        $("table.list.textblocks tbody td.text div").trigger('update.dot');
+      }
+    });
+  <% end %>
+  <style type="text/css">
+    table.list.textblocks tbody td { vertical-align: top; }
+    table.list.textblocks tbody td.text { text-align: left; }
+    table.list.textblocks tbody td.text div { height: 3.8em; }
+  </style>
+<% end %>

app/views/text_blocks/_text_block.html.erb

@@ -1,5 +1,5 @@
 <tr>
   <td><%= link_to text_block.name, (text_block.project ? edit_project_text_block_path(text_block.project, text_block) : edit_text_block_path(text_block)) %></td>
-  <td><%= text_block.text %></td>
+  <td class="text"><div><%= textilizable text_block.text %></div></td>
   <td><%= delete_link(text_block.project ? project_text_block_path(text_block.project, text_block) : text_block_path(text_block)) %>
 </tr>

app/views/text_blocks/index.html.erb

@@ -7,4 +7,3 @@
 <%= render partial: 'list', locals: { text_blocks: @text_blocks } %>
 
 <% html_title l :label_text_block_plural -%>
-