+ <%= form.select :insertion_position, + options_for_select( + @view_customize.insertion_positions.map {|key, val| [l(key), val]}, + :selected => @view_customize.insertion_position), + :required => true %> +
<%= form.select :customize_type, - options_for_select(@view_customize.customize_types, :selected => @view_customize.customize_type), - :required => true %> + options_for_select( + @view_customize.customize_types.map {|key, val| [l(key), val]}, + :selected => @view_customize.customize_type), + :required => true %>
<%= form.text_area :code, - :required => true, :rows => 12 %> + :required => true, :rows => 12 %> +
++ <%= form.text_field :comments, :size => 100 %>
<%= form.check_box :is_enabled %> diff --git a/app/views/view_customizes/_header.html.erb b/app/views/view_customizes/_header.html.erb deleted file mode 100644 index 1747646..0000000 --- a/app/views/view_customizes/_header.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= stylesheet_link_tag "view_customize.css", :plugin => 'view_customize' %> diff --git a/app/views/view_customizes/edit.html.erb b/app/views/view_customizes/edit.html.erb index 533d690..9a4878c 100644 --- a/app/views/view_customizes/edit.html.erb +++ b/app/views/view_customizes/edit.html.erb @@ -1,5 +1,3 @@ -<%= render :partial => 'view_customizes/header' %> - <%= title [l(:label_view_customize_plural), view_customizes_path], @view_customize.id %> <%= labelled_form_for :view_customize, @view_customize, diff --git a/app/views/view_customizes/index.html.erb b/app/views/view_customizes/index.html.erb index 3d23c8c..bc854a6 100644 --- a/app/views/view_customizes/index.html.erb +++ b/app/views/view_customizes/index.html.erb @@ -1,5 +1,3 @@ -<%= render :partial => 'view_customizes/header' %> -
<%= l(:label_no_data) %>
<% else %> -| # | -<%=h l(:field_path_pattern) %> | -<%=h l(:field_customize_type) %> | -<%=h l(:field_code) %> | -<%=h l(:field_is_enabled) %> | -<%=h l(:field_is_private) %> | - + <%= sort_header_tag('id', :caption => '#') %> + <%= sort_header_tag('path_pattern', :caption => l(:field_path_pattern)) %> + <%= sort_header_tag('insertion_position', :caption => l(:field_insertion_position)) %> + <%= sort_header_tag('customize_type', :caption => l(:field_customize_type)) %> + <%= sort_header_tag('comments', :caption => l(:field_comments) + ' / ' + l(:field_code)) %> + <%= sort_header_tag('is_private', :caption => l(:field_is_private)) %>|||
|---|---|---|---|---|---|---|---|---|
| <%= link_to view_customize.id, view_customize_path(view_customize.id) %> | <%=h view_customize.path_pattern %> | -<%=h view_customize.customize_type_name %> | -<%=h truncate(view_customize.code, :length => 80) %> | -<%=h view_customize.is_enabled ? l(:general_text_yes) : l(:general_text_no) %> | +<%=h l(view_customize.insertion_position_label) %> | +<%=h l(view_customize.customize_type_label) %> | +<%=h view_customize.comments.present? ? view_customize.comments : truncate(view_customize.code, :length => 80) %> | <%=h view_customize.is_private ? l(:general_text_yes) : l(:general_text_no) %> | -<%=h l(:field_path_pattern) %>: | <%=h @view_customize.path_pattern %> | +
| <%=h l(:field_insertion_position) %>: | +<%=h l(@view_customize.insertion_position_label) %> | +|||||||
| <%=h l(:field_customize_type) %>: | -<%=h @view_customize.customize_type_name %> | +<%=h l(@view_customize.customize_type_label) %> | ||||||
| <%=h l(:field_code) %>: | <%= highlight_by_language( - @view_customize.code, @view_customize.customize_type == 1 ? :js : :css) %> | + @view_customize.code, @view_customize.is_javascript? ? :js : :css) %> +|||||||
| <%=h l(:field_comments) %>: | +<%=h @view_customize.comments %> | |||||||
| <%=h l(:field_is_enabled) %>: | diff --git a/assets/images/view_customize.png b/assets/images/view_customize.png new file mode 100644 index 0000000..106f5aa Binary files /dev/null and b/assets/images/view_customize.png differ diff --git a/assets/stylesheets/view_customize.css b/assets/stylesheets/view_customize.css index ce10904..509cccf 100644 --- a/assets/stylesheets/view_customize.css +++ b/assets/stylesheets/view_customize.css @@ -1,24 +1,31 @@ -table.list td.code, table.list td.path { +table.view_customize.list td.path, table.view_customize.list td.comments { text-align: left; + word-break: break-word; + overflow-wrap: break-word; + word-wrap : break-word; } -table.list td.id { - min-width: 40px; +table.view_customize.list td.id { + padding-left: 5px; } -table.list tr.disable { +table.view_customize.list td.insertion_position { + white-space: nowrap; +} + +table.view_customize.list tr.disable { color: #aaaaaa; } -table.list tr.private { +table.view_customize.list tr.private { font-style: italic; } -table.view_customize { +table.view_customize.box { width: 100%; } -table.view_customize th { +table.view_customize.box th { text-align: right; vertical-align: top; width: 10%; @@ -26,11 +33,11 @@ table.view_customize th { white-space: nowrap; } -table.view_customize td { +table.view_customize.box td { vertical-align: top; } -table.view_customize td pre { +table.view_customize.box td pre { margin: 0; padding: 2px 4px; background-color: #FFFFFF; @@ -42,6 +49,10 @@ textarea#view_customize_code { width: 95%; } -#admin-menu a.view_customize { - background-image: url("../images/server_key.png"); +input#view_customize_comments { + width: 95%; +} + +.icon-view_customize { + background-image: url("../images/view_customize.png"); } diff --git a/config/locales/en.yml b/config/locales/en.yml index dd7db9b..413a775 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,11 +3,18 @@ en: label_view_customize: "View customize" label_view_customize_plural: "View customizes" label_view_customizes_new: "New view customize" + label_javascript: "JavaScript" + label_css: "CSS" + label_insertion_position_html_head: "Head of all pages" + label_insertion_position_issue_form: "Bottom of issue form" + label_insertion_position_issue_show: "Bottom of issue detail" field_path_pattern: "Path pattern" + field_insertion_position: "Insertion position" field_customize_type: "Type" field_code: "Code" + field_comments: "Comment" field_is_private: "Private" field_is_enabled: "Enabled" field_author: "Author" text_path_pattern_info: "Path pattern is specified with a regular expression. (ex. /issues/[0-9]+)" - text_path_pattern_match_info: "If there is a match with the path of the page, the following code is executed." + text_path_pattern_match_info: "If there is a match with the path of the page, insert the following code and execute it." diff --git a/config/locales/ja.yml b/config/locales/ja.yml new file mode 100644 index 0000000..b71e9ec --- /dev/null +++ b/config/locales/ja.yml @@ -0,0 +1,19 @@ +ja: + label_view_customize: "表示のカスタマイズ" + label_view_customize_plural: "表示のカスタマイズ" + label_view_customizes_new: "新しい表示のカスタマイズ" + label_javascript: "JavaScript" + label_css: "CSS" + label_insertion_position_html_head: "全てのページのヘッダ" + label_insertion_position_issue_form: "チケット入力欄の下" + label_insertion_position_issue_show: "チケット詳細の下" + field_path_pattern: "パスのパターン" + field_insertion_position: "挿入位置" + field_customize_type: "種別" + field_code: "コード" + field_comments: "コメント" + field_is_private: "プライベート" + field_is_enabled: "有効" + field_author: "作成者" + text_path_pattern_info: "パスのパターンは正規表現で指定します。 (例 /issues/[0-9]+)" + text_path_pattern_match_info: "ページのパスが一致した場合、以下のコードを挿入し、実行します。" diff --git a/db/migrate/003_add_insertion_position_to_view_customizes.rb b/db/migrate/003_add_insertion_position_to_view_customizes.rb new file mode 100644 index 0000000..b7bed77 --- /dev/null +++ b/db/migrate/003_add_insertion_position_to_view_customizes.rb @@ -0,0 +1,27 @@ +class AddInsertionPositionToViewCustomizes < ActiveRecord::Migration + def up + add_column :view_customizes, :insertion_position, :string, :null => false, :default => "html_head" + + rename_column :view_customizes, :customize_type, :customize_type_old + add_column :view_customizes, :customize_type, :string, :null => false, :default => "javascript" + ActiveRecord::Base.connection.execute( + "UPDATE view_customizes SET customize_type = 'css' WHERE customize_type_old = 2") + remove_column :view_customizes, :customize_type_old + + change_column_null :view_customizes, :path_pattern, false + change_column_null :view_customizes, :code, false + end + + def down + change_column_null :view_customizes, :path_pattern, true + change_column_null :view_customizes, :code, true + + rename_column :view_customizes, :customize_type, :customize_type_new + add_column :view_customizes, :customize_type, :integer, :default => 1 + ActiveRecord::Base.connection.execute( + "UPDATE view_customizes SET customize_type = 1 WHERE customize_type_new = 'css'") + remove_column :view_customizes, :customize_type_new + + remove_column :view_customizes, :insertion_position + end +end diff --git a/db/migrate/004_add_comments_to_view_customizes.rb b/db/migrate/004_add_comments_to_view_customizes.rb new file mode 100644 index 0000000..e14024e --- /dev/null +++ b/db/migrate/004_add_comments_to_view_customizes.rb @@ -0,0 +1,9 @@ +class AddCommentsToViewCustomizes < ActiveRecord::Migration + def up + add_column :view_customizes, :comments, :string, :null => true + end + + def down + remove_column :view_customizes, :comments + end +end diff --git a/init.rb b/init.rb index dfd84c1..39e702b 100644 --- a/init.rb +++ b/init.rb @@ -1,17 +1,17 @@ -require_dependency 'view_customize/view_layouts_base_html_head_hook' +require_dependency 'view_customize/view_hook' Redmine::Plugin.register :view_customize do name 'View Customize plugin' author 'onozaty' description 'View Customize plugin for Redmine' - version '1.1.4' + version '1.2.0' url 'https://github.com/onozaty/redmine-view-customize' author_url 'https://github.com/onozaty' menu :admin_menu, :view_customizes, { :controller => 'view_customizes', :action => 'index' }, :caption => :label_view_customize, - :html => { :class => 'settings'}, + :html => { :class => 'icon icon-view_customize'}, :if => Proc.new { User.current.admin? } end diff --git a/lib/view_customize/view_hook.rb b/lib/view_customize/view_hook.rb new file mode 100644 index 0000000..85df8f7 --- /dev/null +++ b/lib/view_customize/view_hook.rb @@ -0,0 +1,100 @@ +module RedmineViewCustomize + class ViewHook < Redmine::Hook::ViewListener + def view_layouts_base_html_head(context={}) + + path = context[:request].path_info; + + html = "\n\n" + html << stylesheet_link_tag("view_customize", plugin: "view_customize") + html << "" + + html << create_view_customize_html(path, ViewCustomize::INSERTION_POSITION_HTML_HEAD) + + return html + end + + def view_issues_form_details_bottom(context={}) + + return create_view_customize_html(context[:request].path_info, ViewCustomize::INSERTION_POSITION_ISSUE_FORM) + end + + def view_issues_show_details_bottom(context={}) + + html = "" + + html << create_view_customize_html(context[:request].path_info, ViewCustomize::INSERTION_POSITION_ISSUE_SHOW) + + return html + end + + private + + def create_view_customize_html(path, insertion_position) + + view_customize_html_parts = match_customize(path, insertion_position).map {|item| + to_html(item) + } + return view_customize_html_parts.join("\n").html_safe + + end + + def match_customize(path, insertion_position) + + ViewCustomize.all.select {|item| + item.available? \ + && item.insertion_position == insertion_position \ + && path =~ Regexp.new(item.path_pattern) + } + end + + def to_html(view_customize) + + html = "\n" + + if view_customize.is_javascript? + html << "" + elsif view_customize.is_css? + html << "" + end + + return html + end + + def create_view_customize_context(view_hook_context) + + user = User.current + context = { + "user" => { + "id" => user.id, + "login" => user.login, + "admin" => user.admin?, + "firstname" => user.firstname, + "lastname" => user.lastname, + "groups" => user.groups.map {|group| { "id" => group.id, "name" => group.name }}, + "roles" => user.roles.map {|role| { "id" => role.id, "name" => role.name }}, + "apiKey" => (user.api_token.value unless user.api_token.nil?), + "customFields" => user.custom_field_values.map {|field| { "id" => field.custom_field.id, "name" => field.custom_field.name, "value" => field.value }} + } + } + + project = view_hook_context[:project] + if project + context["project"] = { + "identifier" => project.identifier, + "name" => project.name, + "roles" => user.roles_for_project(project).map {|role| { "id" => role.id, "name" => role.name }} + } + end + + return context + end + end +end diff --git a/lib/view_customize/view_layouts_base_html_head_hook.rb b/lib/view_customize/view_layouts_base_html_head_hook.rb deleted file mode 100644 index b29875d..0000000 --- a/lib/view_customize/view_layouts_base_html_head_hook.rb +++ /dev/null @@ -1,39 +0,0 @@ -module RedmineViewCustomize - class ViewLayoutsBaseHtmlHeadHook < Redmine::Hook::ViewListener - def view_layouts_base_html_head(context={}) - - view_customize_html_parts = match_customize(context[:request].path_info).map {|item| - html(item) - } - - return "\n" + - view_customize_html_parts.join("\n").html_safe - end - - private - - def match_customize(path) - - ViewCustomize.all.select {|item| - item.available? && path =~ Regexp.new(item.path_pattern) - } - end - - def html(view_customize) - - html = "\n" - - if view_customize.is_javascript? then - html << "" - elsif view_customize.is_stylesheet? then - html << "" - end - - return html - end - end -end diff --git a/screenshots/admin.en.png b/screenshots/admin.en.png new file mode 100644 index 0000000..36f0b4d Binary files /dev/null and b/screenshots/admin.en.png differ diff --git a/screenshots/admin.png b/screenshots/admin.png deleted file mode 100644 index ad910ad..0000000 Binary files a/screenshots/admin.png and /dev/null differ diff --git a/screenshots/detail.en.png b/screenshots/detail.en.png new file mode 100644 index 0000000..98fa619 Binary files /dev/null and b/screenshots/detail.en.png differ diff --git a/screenshots/enable_private.en.png b/screenshots/enable_private.en.png new file mode 100644 index 0000000..117803f Binary files /dev/null and b/screenshots/enable_private.en.png differ diff --git a/screenshots/example.en.png b/screenshots/example.en.png new file mode 100644 index 0000000..8bb3a26 Binary files /dev/null and b/screenshots/example.en.png differ diff --git a/screenshots/list_edit.en.png b/screenshots/list_edit.en.png new file mode 100644 index 0000000..a69e47d Binary files /dev/null and b/screenshots/list_edit.en.png differ diff --git a/screenshots/list_new.en.png b/screenshots/list_new.en.png new file mode 100644 index 0000000..0d33473 Binary files /dev/null and b/screenshots/list_new.en.png differ diff --git a/screenshots/list_new.png b/screenshots/list_new.png deleted file mode 100644 index 0aa3492..0000000 Binary files a/screenshots/list_new.png and /dev/null differ diff --git a/screenshots/new.en.png b/screenshots/new.en.png new file mode 100644 index 0000000..067a334 Binary files /dev/null and b/screenshots/new.en.png differ diff --git a/screenshots/new.png b/screenshots/new.png deleted file mode 100644 index 714f441..0000000 Binary files a/screenshots/new.png and /dev/null differ diff --git a/screenshots/new_javascript.png b/screenshots/new_javascript.png deleted file mode 100644 index 093e66f..0000000 Binary files a/screenshots/new_javascript.png and /dev/null differ diff --git a/screenshots/new_pathpattern.png b/screenshots/new_pathpattern.png deleted file mode 100644 index bb7560a..0000000 Binary files a/screenshots/new_pathpattern.png and /dev/null differ diff --git a/screenshots/new_stylesheet.png b/screenshots/new_stylesheet.png deleted file mode 100644 index 071f8b3..0000000 Binary files a/screenshots/new_stylesheet.png and /dev/null differ diff --git a/screenshots/view_javascript.png b/screenshots/view_javascript.png deleted file mode 100644 index d280f39..0000000 Binary files a/screenshots/view_javascript.png and /dev/null differ diff --git a/screenshots/view_stylesheet.png b/screenshots/view_stylesheet.png deleted file mode 100644 index 2b287b6..0000000 Binary files a/screenshots/view_stylesheet.png and /dev/null differ