jro_apps/redmine Commit - r29:4a1cfb3df94b

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

Jean-Philippe Lang -

r29:4a1cfb3df94b

parent child

Context file:

r29:4a1cfb3df94b

redmine/log/delete.me created 644 +1 0

	@@ -0,0 +1,1
				1	default directory for uploaded files No newline at end of file

redmine/app/helpers/custom_fields_helper.rb +2 0

               # 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

redmine/app/models/user.rb +5 -1

               def active?
                 self.status == STATUS_ACTIVE
               end
+              def registered?
+                self.status == STATUS_REGISTERED
+              end
               def locked?
                 self.status == STATUS_LOCKED
               end

redmine/app/views/layouts/base.rhtml +1 -1

             <%= 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)"> \

redmine/app/views/projects/show.rhtml +2 -2

             <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>

redmine/app/views/reports/_simple.rhtml +3 -2

             </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>
             <% end %>
             </tr>
             </table>
-            <% end %>
  No newline at end of file
+            <% end
+              reset_cycle %>
  No newline at end of file

redmine/app/views/roles/workflow.rhtml +4 -3

               <%= 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 %>

redmine/app/views/users/list.rhtml +1 -1

             	<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">

redmine/public/stylesheets/calendar.css ~~redmine/public/stylesheets/calendar/calendar-blue.css~~ renamed +6 -7

               font-size: 11px;
               color: #000;
               cursor: default;
-              background: #eef;
+              background: #fafbfc;
               font-family: tahoma,verdana,sans-serif;
             }
             }
             .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" */
             }
             .calendar thead .headrow { /* Row <TR> containing navigation buttons */
-              background: #778;
+              background: #467aa7;
               color: #fff;
             }
             }
             .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;
             }
             }
             .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;
             }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages