From 01dbba72ab273b0ed9b77e3b9f6c318f626009c4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 23 Feb 2010 21:10:15 +0000 Subject: [PATCH] Move hardcoded calendar images to css classes. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3477 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/common/_calendar.rhtml | 9 +-------- app/views/issues/calendar.rhtml | 8 +++++--- public/images/arrow_bw.png | Bin 885 -> 0 bytes public/images/arrow_from.png | Bin 882 -> 0 bytes public/images/arrow_to.png | Bin 884 -> 0 bytes public/images/bullet_diamond.png | Bin 0 -> 262 bytes public/images/bullet_end.png | Bin 0 -> 329 bytes public/stylesheets/application.css | 4 ++++ 8 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 public/images/arrow_bw.png delete mode 100644 public/images/arrow_from.png delete mode 100644 public/images/arrow_to.png create mode 100644 public/images/bullet_diamond.png create mode 100644 public/images/bullet_end.png diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml index af525c87..2a5d9ae2 100644 --- a/app/views/common/_calendar.rhtml +++ b/app/views/common/_calendar.rhtml @@ -11,14 +11,7 @@ while day <= calendar.enddt %>

<%= day.day %>

<% calendar.events_on(day).each do |i| %> <% if i.is_a? Issue %> -
- <%= if day == i.start_date && day == i.due_date - image_tag('arrow_bw.png') - elsif day == i.start_date - image_tag('arrow_from.png') - elsif day == i.due_date - image_tag('arrow_to.png') - end %> +
<%= h("#{i.project} -") unless @project && @project == i.project %> <%= link_to_issue i, :truncate => 30 %> <%= render_issue_tooltip i %> diff --git a/app/views/issues/calendar.rhtml b/app/views/issues/calendar.rhtml index 5e7ee31b..1df5aa3b 100644 --- a/app/views/issues/calendar.rhtml +++ b/app/views/issues/calendar.rhtml @@ -40,9 +40,11 @@ <% if @query.valid? %> <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %> -<%= image_tag 'arrow_from.png' %>  <%= l(:text_tip_task_begin_day) %>
-<%= image_tag 'arrow_to.png' %>  <%= l(:text_tip_task_end_day) %>
-<%= image_tag 'arrow_bw.png' %>  <%= l(:text_tip_task_begin_end_day) %>
+

+ <%= l(:text_tip_task_begin_day) %> + <%= l(:text_tip_task_end_day) %> + <%= l(:text_tip_task_begin_end_day) %> +

<% end %> <% content_for :sidebar do %> diff --git a/public/images/arrow_bw.png b/public/images/arrow_bw.png deleted file mode 100644 index 8155a2f2e56a537be6e89da8f120f0c41de4b7d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 885 zcmeAS@N?(olHy`uVBq!ia0vp^AT~P(GmvB}(g|c>U}gyL332_;!0>+*jE2BS4S~fi zX;*<+f~h3PFZe&h)9nUcK%SDPi(?4K_2dK=CN?$$&a}pxJOW}JXBko%Z)z+$k(Hb-APz6Yvi@O1TaS?83{1OU(}7o-3H diff --git a/public/images/arrow_from.png b/public/images/arrow_from.png deleted file mode 100644 index c76ae1f3a63b3ec4b1110f92aa8333132674795b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 882 zcmeAS@N?(olHy`uVBq!ia0vp^AT~P(GmvB}(g|c>U}gyL3327v%JF{`jE2BS4T1j1 zmKb1`U@8gn3;xgWbi08UkSFiy;uyklJvo7ek&R7&G1aJH22Vi4krW3(*C1|lMh4bJ W3@Q?yPmchVGI+ZBxvXU}gyL332_;!0>+*jE2BS4S~fi zX;*<+f~h3PFZe&h)9nUcK%Szfi(?4K_2h(FVdQ&MBb@0I`7Tyiw*1B8g1;a&c*9_q z2m=q$zkjiW!C#OZQL%7^hk+A47C>SorGv);T%53U0Adf(yg&>F0FWNJGe*bqKL7v# M07*qoM6N<$g1AU)VgLXD literal 0 HcmV?d00001 diff --git a/public/images/bullet_end.png b/public/images/bullet_end.png new file mode 100644 index 0000000000000000000000000000000000000000..0ff03323fb97e541a58ff3bf8ff54947fa4be095 GIT binary patch literal 329 zcmV-P0k-~$P)88BCw z!Q`j_!~d7g7XSZF>ihr3)&BnuQHFnqgc$yv=4beKlZW9SP6MVZFxadXWcdHsLFfOU z{?`9rN;3Zco80sNXJ708KNC9s|C!kH{~;I4f1C!)mS*_#&_?e6_wJhi@3JHQzl-(% z{~;;#|EKhr|DUsx{{Npk>HiZE0o(>G5Mkg4y5KLm3qW20Y5qTD%Kw+5lK=6B!7dR7 z9$*;!MGk{ULcD*U2?_muDJuK-xt!8}g0XOghk+9o3qU7-B`X~~7U1Fpr30XozYgKN bKnw-|T=B~^a;O_E00000NkvXXu0mjfSVy2Y literal 0 HcmV?d00001 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f5959d88..6db5e58d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -481,6 +481,10 @@ table.cal td p.day-num {font-size: 1.1em; text-align:right;} table.cal td.odd p.day-num {color: #bbb;} table.cal td.today {background:#ffffdd;} table.cal td.today p.day-num {font-weight: bold;} +table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;} +table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;} +table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;} +p.cal.legend span {display:block;} /***** Tooltips ******/ .tooltip{position:relative;z-index:24;}