diff --git a/app/views/meeting_contents/_form.html.erb b/app/views/meeting_contents/_form.html.erb index 86b33328da..0222116abd 100644 --- a/app/views/meeting_contents/_form.html.erb +++ b/app/views/meeting_contents/_form.html.erb @@ -6,4 +6,8 @@


<%= f.text_field :comment, :size => 120 %>

<%= submit_tag l(:button_save) %> <%= link_to l(:button_cancel), "#", :onclick => "Element.show(\"#{content_type}-text\"); Element.hide(\"edit-#{content_type}\"); return false;" %>

<%= wikitoolbar_for "#{content_type}_text" %> +<% end %> + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> <% end %> \ No newline at end of file diff --git a/app/views/meeting_contents/_show.html.erb b/app/views/meeting_contents/_show.html.erb index 6564953989..ebb8d1ff66 100644 --- a/app/views/meeting_contents/_show.html.erb +++ b/app/views/meeting_contents/_show.html.erb @@ -12,4 +12,8 @@
<%= textilizable(content.present? ? content.text : "") %>
- \ No newline at end of file + + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> \ No newline at end of file diff --git a/app/views/meeting_contents/diff.html.erb b/app/views/meeting_contents/diff.html.erb index 76b72793a8..8759872dc3 100644 --- a/app/views/meeting_contents/diff.html.erb +++ b/app/views/meeting_contents/diff.html.erb @@ -15,3 +15,7 @@
<%= html_diff(@diff) %> + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> diff --git a/app/views/meeting_contents/history.html.erb b/app/views/meeting_contents/history.html.erb index 490a609169..60f9ee4692 100644 --- a/app/views/meeting_contents/history.html.erb +++ b/app/views/meeting_contents/history.html.erb @@ -7,7 +7,7 @@ # - + <%= l(:field_updated_on) %> <%= l(:field_author) %> <%= l(:field_comments) %> @@ -29,3 +29,7 @@ <%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %> <%= pagination_links_full @version_pages, @version_count, :page_param => :p %> <% end %> + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> diff --git a/app/views/meetings/_form.html.erb b/app/views/meetings/_form.html.erb index fb71f32691..296b25d96f 100644 --- a/app/views/meetings/_form.html.erb +++ b/app/views/meetings/_form.html.erb @@ -31,4 +31,8 @@ <%= hidden_field_tag "copy_from_id", params[:copy_from_id] if params[:copy_from_id].present? %> - \ No newline at end of file + + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> diff --git a/app/views/meetings/index.html.erb b/app/views/meetings/index.html.erb index 8af30a4f6c..6ce02f0061 100644 --- a/app/views/meetings/index.html.erb +++ b/app/views/meetings/index.html.erb @@ -35,4 +35,8 @@ <% end -%> <% end -%> -<% end -%> \ No newline at end of file +<% end -%> + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> \ No newline at end of file diff --git a/app/views/meetings/show.html.erb b/app/views/meetings/show.html.erb index 0228833820..f0076524d8 100644 --- a/app/views/meetings/show.html.erb +++ b/app/views/meetings/show.html.erb @@ -21,4 +21,8 @@
-<%= render_tabs [{:name => 'agenda', :action => :create_meeting_agendas, :partial => 'meeting_contents/tab', :label => :label_meeting_agenda, :content => @meeting.agenda, :content_type => "meeting_agenda"}, {:name => 'minutes', :action => :create_meeting_minutes, :partial => 'meeting_contents/tab', :label => :label_meeting_minutes, :content => @meeting.minutes, :content_type => "meeting_minutes"}] %> \ No newline at end of file +<%= render_tabs [{:name => 'agenda', :action => :create_meeting_agendas, :partial => 'meeting_contents/tab', :label => :label_meeting_agenda, :content => @meeting.agenda, :content_type => "meeting_agenda"}, {:name => 'minutes', :action => :create_meeting_minutes, :partial => 'meeting_contents/tab', :label => :label_meeting_minutes, :content => @meeting.minutes, :content_type => "meeting_minutes"}] %> + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' %> +<% end %> \ No newline at end of file diff --git a/init.rb b/init.rb index 1532b57c07..ffad493577 100644 --- a/init.rb +++ b/init.rb @@ -7,8 +7,6 @@ Dispatcher.to_prepare do Project.send(:include, ::Plugin::Meeting::Project) end -require_dependency 'redmine_meeting/view_hooks' - Redmine::Plugin.register :redmine_meeting do name 'Redmine Meeting' author 'Felix Schäfer @ finnlabs' @@ -16,9 +14,9 @@ Redmine::Plugin.register :redmine_meeting do description 'This plugin adds a meeting module with functionality to plan and save the minutes of a meeting.' url 'http://finn.de' version '0.0.1' - + requires_redmine :version_or_higher => '0.9' - + project_module :meetings do permission :create_meetings, {:meetings => [:new, :create]}, :require => :member permission :edit_meetings, {:meetings => [:edit, :update]}, :require => :member @@ -27,7 +25,7 @@ Redmine::Plugin.register :redmine_meeting do permission :create_meeting_agendas, {:meeting_agendas => [:update]}, :require => :member permission :create_meeting_minutes, {:meeting_minutes => [:update]}, :require => :member end - + menu :project_menu, :meetings, {:controller => 'meetings', :action => 'index'}, :caption => :project_module_meetings, :param => :project_id - + end diff --git a/lib/redmine_meeting/view_hooks.rb b/lib/redmine_meeting/view_hooks.rb deleted file mode 100644 index 3ac965ffc6..0000000000 --- a/lib/redmine_meeting/view_hooks.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Plugin - module Meeting - class ViewHooks < Redmine::Hook::ViewListener - def view_layouts_base_html_head(context={}) - stylesheet_link_tag 'redmine_meeting', :plugin => 'redmine_meeting' - end - end - end -end \ No newline at end of file