git-svn-id: http://redmine.rubyforge.org/svn/trunk@31 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 files changed, 25 insertions, 17 deletions

diff --git a/redmine/app/helpers/custom_fields_helper.rb b/redmine/app/helpers/custom_fields_helper.rb
index 82ace311a..ac8b55565 100644
--- a/redmine/app/helpers/custom_fields_helper.rb
+++ b/redmine/app/helpers/custom_fields_helper.rb
@@ -54,6 +54,8 @@ module CustomFieldsHelper
   # Return a string used to display a custom value

   def show_value(custom_value)

     case custom_value.custom_field.field_format

+    when "date"

+      format_date(custom_value.value.to_date)

     when "bool"

       l_YesNo(custom_value.value == "1")

     else

diff --git a/redmine/app/models/user.rb b/redmine/app/models/user.rb
index ba489ac14..5ff19f2bc 100644
--- a/redmine/app/models/user.rb
+++ b/redmine/app/models/user.rb
@@ -88,7 +88,11 @@ class User < ActiveRecord::Base
   def active?

     self.status == STATUS_ACTIVE

   end

-  

+

+  def registered?

+    self.status == STATUS_REGISTERED

+  end

+    

   def locked?

     self.status == STATUS_LOCKED

   end

diff --git a/redmine/app/views/layouts/base.rhtml b/redmine/app/views/layouts/base.rhtml
index 33ddd8f99..dc470f272 100644
--- a/redmine/app/views/layouts/base.rhtml
+++ b/redmine/app/views/layouts/base.rhtml
@@ -13,7 +13,7 @@
 <%= javascript_include_tag 'calendar/calendar' %>

 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>

 <%= javascript_include_tag 'calendar/calendar-setup' %>

-<%= stylesheet_link_tag 'calendar/calendar-blue' %>

+<%= stylesheet_link_tag 'calendar' %>

 <script type='text/javascript'>

 var menu_contenu=' \

 <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \

diff --git a/redmine/app/views/projects/show.rhtml b/redmine/app/views/projects/show.rhtml
index 0716b4bf2..2cf012390 100644
--- a/redmine/app/views/projects/show.rhtml
+++ b/redmine/app/views/projects/show.rhtml
@@ -3,11 +3,11 @@
 <div class="splitcontentleft">

 	<%= simple_format(auto_link(@project.description)) %>	

 	<ul>

-	<li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>

+	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li><% end %>

 	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>

 	<% for custom_value in @custom_values %>

 	<% if !custom_value.value.empty? %>

-	   <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>

+	   <li><%= custom_value.custom_field.name%>: <%= show_value(custom_value) %></li>

 	<% end %>

 	<% end %>

 	</ul>	

diff --git a/redmine/app/views/reports/_simple.rhtml b/redmine/app/views/reports/_simple.rhtml
index 2628c1504..6838735ed 100644
--- a/redmine/app/views/reports/_simple.rhtml
+++ b/redmine/app/views/reports/_simple.rhtml
@@ -14,7 +14,7 @@
 </tr>

 

 <% for row in rows %>

-<tr style="background-color:#CEE1ED">

+<tr class="<%= cycle("odd", "even") %>">

   <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, 

                                                 :set_filter => 1, 

                                                 "#{field_name}" => row.id %></td>

@@ -43,4 +43,5 @@
 <% end %>

 </tr>

 </table>

-<% end %>
\ No newline at end of file
+<% end

+  reset_cycle %>
\ No newline at end of file
diff --git a/redmine/app/views/roles/workflow.rhtml b/redmine/app/views/roles/workflow.rhtml
index 3c2d46051..ee5b3a278 100644
--- a/redmine/app/views/roles/workflow.rhtml
+++ b/redmine/app/views/roles/workflow.rhtml
@@ -28,18 +28,19 @@
   <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>

 	<table>

 	<tr>

-	<td align="center"><strong><%=l(:label_current_status)%></strong></td>

+	<td align="center" colspan="2"><strong><%=l(:label_current_status)%></strong></td>

 	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>

 	</tr>

 	<tr>

-	<td></td>

+	<td colspan="2"></td>

 	<% for new_status in @statuses %>

-		<td width="60" align="center"><%= new_status.name %></td>

+		<td width="80" align="center"><%= new_status.name %></td>

 	<% end %>

 	</tr>

 	

 	<% for old_status in @statuses %>

 		<tr>

+		<td width="20" align="center"><div style="background-color:#<%= old_status.html_color %>">&nbsp</div></td>

 		<td><%= old_status.name %></td>

 		

 		<% for new_status in @statuses %>

diff --git a/redmine/app/views/users/list.rhtml b/redmine/app/views/users/list.rhtml
index 10540daa7..9f4438138 100644
--- a/redmine/app/views/users/list.rhtml
+++ b/redmine/app/views/users/list.rhtml
@@ -19,7 +19,7 @@
 	<td><%= user.lastname %></td>

 	<td><%= user.mail %></td>

 	<td align="center"><%= image_tag 'true' if user.admin? %></td>

-	<td align="center"><%= image_tag 'locked' if user.locked? %></td>

+	<td align="center"><%= image_tag 'locked' if user.locked? %><%= image_tag 'user_new' if user.registered? %></td>

 	<td align="center"><%= format_time(user.created_on) %></td>

 	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>

   <td align="center">

diff --git a/redmine/log/delete.me b/redmine/log/delete.me
new file mode 100644
index 000000000..18beddaa8
--- /dev/null
+++ b/redmine/log/delete.me
@@ -0,0 +1 @@
+default directory for uploaded files
\ No newline at end of file
diff --git a/redmine/public/stylesheets/calendar/calendar-blue.css b/redmine/public/stylesheets/calendar.css
index 8d634d364..f460d5cb0 100644
--- a/redmine/public/stylesheets/calendar/calendar-blue.css
+++ b/redmine/public/stylesheets/calendar.css
@@ -7,7 +7,7 @@ div.calendar { position: relative; }
   font-size: 11px;
   color: #000;
   cursor: default;
-  background: #eef;
+  background: #fafbfc;
   font-family: tahoma,verdana,sans-serif;
 }
 
@@ -19,7 +19,7 @@ div.calendar { position: relative; }
 }
 
 .calendar .nav {
-  background: #778 url(menuarrow.gif) no-repeat 100% 100%;
+  background: #467aa7 url(menuarrow.gif) no-repeat 100% 100%;
 }
 
 .calendar thead .title { /* This holds the current "month, year" */
@@ -31,7 +31,7 @@ div.calendar { position: relative; }
 }
 
 .calendar thead .headrow { /* Row <TR> containing navigation buttons */
-  background: #778;
+  background: #467aa7;
   color: #fff;
 }
 
@@ -51,9 +51,8 @@ div.calendar { position: relative; }
 }
 
 .calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background-color: #aaf;
+  background-color: #80b0da;
   color: #000;
-  border: 1px solid #04f;
   padding: 1px;
 }
 
@@ -89,11 +88,11 @@ div.calendar { position: relative; }
 }
 
 .calendar tbody .rowhilite td.wn {
-  background: #eef;
+  background: #80b0da;
 }
 
 .calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: #def;
+  background: #80b0da;
   padding: 1px 3px 1px 1px;
   border: 1px solid #bbb;
 }