summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2024-09-05 21:32:22 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2024-09-05 21:32:22 +0000
commitcc50cfc3248869ead8fe1100cb0e897d5a1d618c (patch)
tree91b7ed918a411b0dc509953566da777d8f20c3d2 /app/views
parented866a45c56860da9ca4632a8bf2f8be23956c61 (diff)
downloadredmine-cc50cfc3248869ead8fe1100cb0e897d5a1d618c.tar.gz
redmine-cc50cfc3248869ead8fe1100cb0e897d5a1d618c.zip
Replaces icons in calendar view with SVG icons (#23980).
git-svn-id: https://svn.redmine.org/redmine/trunk@23024 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/calendars/show.html.erb6
-rw-r--r--app/views/common/_calendar.html.erb8
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index adfd288b9..950836a15 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -54,9 +54,9 @@
<%= call_hook(:view_calendars_show_bottom, :year => @year, :month => @month, :project => @project, :query => @query) %>
<p class="legend cal">
- <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
- <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
- <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
+ <span class="starting"><%= icon_with_label('bullet-go', l(:text_tip_issue_begin_day)) %></span>
+ <span class="ending"><%= icon_with_label('bullet-end', l(:text_tip_issue_end_day)) %></span>
+ <span class="starting ending"><%= icon_with_label('bullet-go-end', l(:text_tip_issue_begin_end_day)) %></span>
</p>
<% end %>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 533ed2c4d..e1b202333 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -16,14 +16,20 @@
</p>
<% calendar.events_on(day).each do |i| %>
<% if i.is_a? Issue %>
- <%= tag.div class: [ i.css_classes, 'tooltip hascontextmenu', starting: day == i.start_date, ending: day == i.due_date] do %>
+ <% starting = day == i.start_date %>
+ <% ending = day == i.due_date %>
+ <%= tag.div class: [ i.css_classes, 'tooltip hascontextmenu', starting: starting, ending: ending] do %>
<%= "#{i.project} -" unless @project && @project == i.project %>
+ <%= sprite_icon('bullet-go') if starting && starting != ending %>
+ <%= sprite_icon('bullet-end') if ending && starting != ending %>
+ <%= sprite_icon('bullet-go-end') if starting && ending %>
<%= link_to_issue i, :truncate => 30 %>
<span class="tip"><%= render_issue_tooltip i %></span>
<%= check_box_tag 'ids[]', i.id, false, :style => 'display:none;', :id => nil %>
<% end %>
<% else %>
<span class="icon icon-package">
+ <%= sprite_icon 'package' %>
<%= "#{i.project} -" unless @project && @project == i.project %>
<%= link_to_version i %>
</span>