From 01dbba72ab273b0ed9b77e3b9f6c318f626009c4 2010-02-23 21:10:15
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2010-02-23 21:10:15
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

---

diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml
index af525c8..2a5d9ae 100644
--- a/app/views/common/_calendar.rhtml
+++ b/app/views/common/_calendar.rhtml
@@ -11,14 +11,7 @@ while day <= calendar.enddt %>
 <p class="day-num"><%= day.day %></p>	
 <% calendar.events_on(day).each do |i| %>
   <% if i.is_a? Issue %>
-  <div class="<%= i.css_classes %> tooltip">
-  <%= 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 %>
+  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
   <%= h("#{i.project} -") unless @project && @project == i.project %>
   <%= link_to_issue i, :truncate => 30 %>
   <span class="tip"><%= render_issue_tooltip i %></span>
diff --git a/app/views/issues/calendar.rhtml b/app/views/issues/calendar.rhtml
index 5e7ee31..1df5aa3 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' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
-<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
-<%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
+<p class="legend cal">
+	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
+	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
+	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
+</p>
 <% 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
Hc$@<O00001

literal 885
zc%17D@N?(olHy`uVBq!ia0vp^AT~P(GmvB}(g|c>U}gyL332_;!0>+*jDnF07Pq8b
z1!f7Rk|4j}{|ryJ8+ZYEN}eu`Asp9}6Ihto*bF$+8gKFlh;^K0NM*dKvFJorq8cy{
Xu`sCjzFGMmsG7mk)z4*}Q$iB}&?y(B

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
Hc$@<O00001

literal 882
zc%17D@N?(olHy`uVBq!ia0vp^AT~P(GmvB}(g|c>U}gyL3327v%JF{`jDnF0`XgIn
zfLVg6B*-uLKf}}Q23|m(yr+v}2*>s01Qtd%HUY*|qlOtg0S!k|90Xm1xXl?ESQjy<
UNO(Ry0#wT2>FVdQ&MBb@0CkQO3;+NC

diff --git a/public/images/arrow_to.png b/public/images/arrow_to.png
deleted file mode 100644
index c88fa60d6e7dbaf4582bd77ad291b42d2c3a0319..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 884
zc%17D@N?(olHy`uVBq!ia0vp^AT~P(GmvB}(g|c>U}gyL332_;!0>+*jDnF07Pq8b
z1!f7Rk|4j}{|ryJ8+ZYEik>cxAsp9}6H-!A5)xP#*#x+cr8F>EFduOdat-4)XJlZl
WXHdEEc}XcyF@vY8pUXO@geCy7ffkAY

diff --git a/public/images/bullet_diamond.png b/public/images/bullet_diamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68cb79581e10dd539c7a53e6f33dbdc0f4469a0
GIT binary patch
literal 262
zc$@(S0r~!kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002ZNkl<ZILl-B
z|NlP&C75Aw8!$<iffIzuGGM71ljaivf&U;3Vv}UR0wo6hySyy_KX|)=F^CNkBg%le
z$_yq)1sMLnbhh~acTyi1gV-Q3kQ`nErYkVmtQKVW|JXt2|DXQW|6fWnz!<~^iGk!m
zYH%7bTbkj|LmRpO-@9x6zsrvJ|1Q=af`M$17)TDJ2B!fFL>Tyiw*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
Hc$@<O00001

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
zc$@)A0k-~$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003HNkl<ZILl-B
z|NlP&C75Aw8!$<ifs<?lmZ~vnJ`oW3|4dZkKgk9xP-4)(%ggfrgSXrNha&u>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
Hc$@<O00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f5959d8..6db5e58 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;}