Merge branch 'develop' into 'master'

move view hook into hooks file, unify css

See merge request !3

Author: dkastl

app/views/text_blocks/_list.html.erb

@@ -32,9 +32,4 @@
       }
     });
   <% 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 %>

assets/stylesheets/text_blocks.css

@@ -1,5 +1,14 @@
 /**************************************************************/
-/* 		                  ICONS
+/*                  ICONS
 /**************************************************************/
 
 #admin-menu a.text-blocks { background-image: url(../images/text_signature.png);}
+
+
+/**************************************************************/
+/*                  TextBlocks table
+/**************************************************************/
+
+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; }

init.rb

@@ -18,7 +18,7 @@
 
   project_module :text_blocks do
 
-    permission :view_text_blocks, {}, require: :member, read: :true
+    permission :view_text_blocks, {}, require: :member, read: true
     permission :manage_text_blocks, {
       text_blocks: %i( new edit update create destroy ),
       projects: %i( manage_text_blocks )
@@ -31,8 +31,3 @@
 
 end
 
-class TextBlocksListener < Redmine::Hook::ViewListener
-  render_on :view_layouts_base_html_head, inline: <<-END
-      <%= stylesheet_link_tag 'text_blocks', :plugin => 'redmine_text_blocks' %>
-    END
-end

lib/redmine_text_blocks/view_hooks.rb

@@ -4,5 +4,8 @@ class ViewHooks < Redmine::Hook::ViewListener
     render_on :view_issues_edit_notes_bottom,
       partial: 'hooks/text_blocks/view_issues_edit_notes_bottom'
 
+    render_on :view_layouts_base_html_head, inline: <<-END
+        <%= stylesheet_link_tag 'text_blocks', plugin: 'redmine_text_blocks' %>
+    END
   end
 end