Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing template apply button in Redmine 6.0 #116

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Fix missing template apply button in Redmine 6.0 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/views/global_issue_templates/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<div class='box'>
<% if apply_all_projects %>
<p>
<i class='issue_template icon settings'></i>
<i class='issue_template icon-only settings'></i>
<span class='issue_template help_content'>
<%= l(:note_apply_global_template_to_all_projects_setting_enabled) %>
</span>
Expand Down
3 changes: 1 addition & 2 deletions app/views/global_issue_templates/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= issue_template.title %></span>
<%= textilizable(issue_template.description) %>
Expand Down Expand Up @@ -92,4 +92,3 @@
</a>

<div id='orphaned_templates' style='display: none'></div>

2 changes: 1 addition & 1 deletion app/views/global_note_templates/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<div class='box'>
<% if apply_all_projects %>
<p>
<i class='issue_template icon settings'></i>
<i class='issue_template icon-only settings'></i>
<span class='issue_template help_content'>
<%= l(:note_apply_global_template_to_all_projects_setting_enabled) %>
</span>
Expand Down
12 changes: 6 additions & 6 deletions app/views/issue_templates/_list_templates.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= template.title %></span>
<%= textilizable(template.description) %>
Expand All @@ -33,7 +33,7 @@
<td class='center'><%= checked_image template.is_default? %></td>
<td>
<i data-issue-template-id='<%= template.id %>'
class='icon icon-test template-update-link'></i>
class='icon-only icon-test template-update-link'></i>
</td>
</tr>
<% end %>
Expand All @@ -47,7 +47,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class="title"><%= template.title %></span>
<%= textilizable(template.description) %>
Expand All @@ -62,7 +62,7 @@
<td class='center'><%= checked_image template == default_template %></td>
<td>
<i data-issue-template-id='<%= template.id %>'
class='icon icon-test template-update-link'></i>
class='icon-only icon-test template-update-link'></i>
</td>
</tr>
<% end %>
Expand All @@ -76,7 +76,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= template.issue_title %></span>
<%= textilizable(template.description) %>
Expand All @@ -91,7 +91,7 @@
<td class='center'><%= checked_image template == default_template %></td>
<td>
<i data-issue-template-id='<%= template.id %>'
class='icon icon-test template-update-link template-global cursor: pointer;'></i>
class='icon-only icon-test template-update-link template-global cursor: pointer;'></i>
</td>
</tr>
<% end %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/note_templates/_list_note_templates.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= template.name %></span>
<%= textilizable(template.description) %>
Expand All @@ -27,7 +27,7 @@
<td>
<a data-note-template-id='<%= template.id %>'
onclick='noteTemplateNS.applyNoteTemplate(this)'
class='icon icon-test template-update-link'></a>
class='icon-only icon-test template-update-link'></a>
</td>
</tr>
<% end %>
Expand All @@ -38,7 +38,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' href='#' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= template.name %></span>
<%= textilizable(template.description) %>
Expand All @@ -51,7 +51,7 @@
<td>
<a data-note-template-id='<%= template.id %>'
onclick='noteTemplateNS.applyNoteTemplate(this)'
class='icon icon-test template-global template-update-link'></a>
class='icon-only icon-test template-global template-update-link'></a>
</td>
</tr>
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/note_templates/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= note_template.name %></span>
<%= textilizable(note_template.description) %>
Expand Down Expand Up @@ -107,7 +107,7 @@

<% if apply_all_projects %>
<p>
<i class='issue_template icon settings'></i>
<i class='issue_template icon-only settings'></i>
<span class="issue_template help_content">
<%= l(:note_apply_global_template_to_all_projects_setting_enabled) %><br/>
<%= l(:note_project_local_template_override_global_template) %>
Expand Down Expand Up @@ -150,7 +150,7 @@
</td>
<td>
<div class='template_tooltip_wrapper'>
<a class='icon template_tooltip' title='<%= l(:label_preview) %>'></a>
<a class='icon-only template_tooltip' title='<%= l(:label_preview) %>'></a>
<div class='wiki template_tooltip_body'>
<span class='title'><%= note_template.name %></span>
<%= textilizable(note_template.description) %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/settings/_redmine_issue_templates.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
<div id='enabled_help_content' class='wiki' style='display: none;'>
<%= l(:help_project_local_template_override_global_template) %>
<br>
<span class='icon icon-warning'></span>
<span class='icon-only icon-warning'></span>
<%= l(:warning_project_local_template_override_global_template) %>
</div>

<div id='enable_builtin_fields_help_content' class='wiki' style='display: none;'>
<%= l(:help_enable_builtin_fields) %>
<br>
<span class='icon icon-warning'></span>
<span class='icon-only icon-warning'></span>
<%= l(:warning_enable_builtin_fields) %>
</div>
</div>
2 changes: 1 addition & 1 deletion assets/stylesheets/issue_templates.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ select.issue_template {
width: 240px;
}

.issue_template.icon.settings {
.issue_template.icon-only.settings {
background: url("../images/lamp.png") no-repeat 3px center;
}

Expand Down