From 2cbb5a9c01b8d1c50e9bc53fa1321bac7e6118ad Mon Sep 17 00:00:00 2001
From: Jens Kraemer <jk@jkraemer.net>
Date: Thu, 7 Sep 2017 10:02:47 +0800
Subject: [PATCH] move view hook into hooks file, unify css

---
 app/views/text_blocks/_list.html.erb  |  5 -----
 assets/stylesheets/text_blocks.css    | 11 ++++++++++-
 init.rb                               |  7 +------
 lib/redmine_text_blocks/view_hooks.rb |  3 +++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/views/text_blocks/_list.html.erb b/app/views/text_blocks/_list.html.erb
index 226d7d2..6af5313 100644
--- a/app/views/text_blocks/_list.html.erb
+++ b/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 %>
diff --git a/assets/stylesheets/text_blocks.css b/assets/stylesheets/text_blocks.css
index da858cb..91567d9 100644
--- a/assets/stylesheets/text_blocks.css
+++ b/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; }
diff --git a/init.rb b/init.rb
index 9aa0205..a83bcf1 100644
--- a/init.rb
+++ b/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
diff --git a/lib/redmine_text_blocks/view_hooks.rb b/lib/redmine_text_blocks/view_hooks.rb
index 0a12645..c042402 100644
--- a/lib/redmine_text_blocks/view_hooks.rb
+++ b/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