Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/helpers/view_customizes_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@ def highlight_by_language(code, language)
Redmine::SyntaxHighlighting.highlight_by_language(code, language) +
"</code></pre>").html_safe
end

def sprite_icon_or_label(icon_name, label, **options)
if Gem::Version.new(Redmine::VERSION.to_s) >= Gem::Version.new('6.0.0')
sprite_icon(icon_name, label, **options)
else
label
end
end
end
6 changes: 3 additions & 3 deletions app/views/view_customizes/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="contextual">
<%= link_to l(:label_view_customizes_new),
<%= link_to sprite_icon_or_label(:add, l(:label_view_customizes_new)),
new_view_customize_path, :class => 'icon icon-add' %>
</div>

Expand Down Expand Up @@ -40,11 +40,11 @@
</table>

<p class="buttons">
<%= link_to l(:label_disable_all),
<%= link_to sprite_icon_or_label(:view_customize_disable, l(:label_disable_all), plugin: :view_customize),
view_customizes_path(view_customize: {is_enabled: 0}),
:data => {:confirm => l(:text_are_you_sure)}, :method => :put,
:class => 'icon icon-view_customize-disable' %>
<%= link_to l(:label_enable_all),
<%= link_to sprite_icon_or_label(:view_customize_enable, l(:label_enable_all), plugin: :view_customize),
view_customizes_path(view_customize: {is_enabled: 1}),
:data => {:confirm => l(:text_are_you_sure)}, :method => :put,
:class => 'icon icon-view_customize-enable' %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/view_customizes/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<%= stylesheet_link_tag "scm" %>

<div class="contextual">
<%= link_to(l(:button_edit),
<%= link_to(sprite_icon_or_label(:edit, l(:button_edit)),
{:action => 'edit', :id => @view_customize.id},
:class => 'icon icon-edit') %>
<%= link_to(l(:button_delete),
<%= link_to(sprite_icon_or_label(:del, l(:button_delete)),
{:action => 'destroy', :id => @view_customize.id},
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
:class => 'icon icon-del') %>
Expand Down
25 changes: 25 additions & 0 deletions assets/images/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 10 additions & 3 deletions assets/stylesheets/view_customize.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,21 @@ input#view_customize_comments {
width: 95%;
}

.icon-view_customize {
.icon-view_customize:not(:has(svg)) {
background-image: url("../images/view_customize.png");
}

.icon-view_customize-disable {
.icon-view_customize-disable:not(:has(svg)) {
background-image: url("../images/disable.png");
}

.icon-view_customize-enable {
.icon-view_customize-enable:not(:has(svg)) {
background-image: url("../images/enable.png");
}

/* PNG icon support for Redmine 5.1 and earlier */
.icon:not(:has(svg)) {
background-position: 0% 50%;
background-repeat: no-repeat;
padding-left: 20px;
}
6 changes: 6 additions & 0 deletions config/icon_source.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- name: view_customize
svg: file-settings
- name: view_customize_enable
svg: circle-check
- name: view_customize_disable
svg: xbox-x
1 change: 1 addition & 0 deletions init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{ :controller => 'view_customizes', :action => 'index' },
:caption => :label_view_customize,
:html => { :class => 'icon icon-view_customize'},
:icon => 'view_customize', :plugin => 'view_customize',
:if => Proc.new { User.current.admin? }

settings :default => { 'create_api_access_key' => '' }, :partial => 'settings/view_customize_settings'
Expand Down