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

Collapse all files

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

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module CustomFieldsHelper
               # Return custom field html tag corresponding to its format
               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
                 field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "string", "int"
                   text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 when "date"
                   text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                 when "text"
                   text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
                 when "bool"
                   check_box 'custom_value', 'value', :name => field_name, :id => field_id
                 when "list"
                   select 'custom_value', 'value', custom_field.possible_values.split('|'), { :include_blank => true }, :name => field_name, :id => field_id
                 end
               end
               # Return custom field label tag
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "custom_fields_#{custom_value.custom_field.id}",
             	:class => (custom_value.errors.empty? ? nil : "error" )
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(custom_value)
                 custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
               end
               # 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
                   custom_value.value
                 end
               end
               # Return an array of custom field formats which can be used in select_tag
               def custom_field_formats_for_select
                 CustomField::FIELD_FORMATS.keys.collect { |k| [ l(CustomField::FIELD_FORMATS[k]), k ] }
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/sha1"
             class User < ActiveRecord::Base
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true
               has_many :custom_values, :dependent => true, :as => :customized
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_]+$/i
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
                     # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = $RDM_DEFAULT_LANG
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
                       logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
               def display_name
                 firstname + " " + lastname
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
+              def registered?
+                self.status == STATUS_REGISTERED
+              end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project_id)
                 @role_for_projects ||=
                   begin
                     roles = {}
                     self.memberships.each { |m| roles.store m.project_id, m.role_id }
                     roles
                   end
                 @role_for_projects[project_id]
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

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

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= $RDM_HEADER_TITLE %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "menu" %>
             <%= stylesheet_link_tag "rails" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= 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)"> \
             <a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=l(:label_project_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=l(:label_user_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/roles"><%=l(:label_role_and_permissions)%><\/a> \
             <a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=l(:label_tracker_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/custom_fields"><%=l(:label_custom_field_plural)%><\/a> \
             <a class="menuItem" href="\/enumerations"><%=l(:label_enumerations)%><\/a> \
             <a class="menuItem" href="\/admin\/mail_options"><%=l(:field_mail_notification)%><\/a> \
             <a class="menuItem" href="\/auth_sources"><%=l(:label_authentication)%><\/a> \
             <a class="menuItem" href="\/admin\/info"><%=l(:label_information_plural)%><\/a> \
             <\/div> \
             <div id="menuTrackers" class="menu"> \
             <a class="menuItem" href="\/issue_statuses"><%=l(:label_issue_status_plural)%><\/a> \
             <a class="menuItem" href="\/roles\/workflow"><%=l(:label_workflow)%><\/a> \
             <\/div> \
             <div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=l(:label_new)%><\/a><\/div> \
             <div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=l(:label_new)%><\/a><\/div> \
              \
             <% unless @project.nil? || @project.id.nil? %> \
             <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
             <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
             <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
             <\/div> \
             <% end %> \
             ';
             </script>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= $RDM_HEADER_TITLE %></h1>
                     <h2><%= $RDM_HEADER_SUBTITLE %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'account', :action => 'my_page'}, :class => "picUserPage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'account', :action => 'my_account' }, :class => "picUser" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => @params[:controller], :page => @params[:action] }, :target => "new", :class => "picHelp" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
             	<% end %>
             		</ul>
             	</div>
             	<script type='text/javascript'>if(document.getElementById) {document.write(menu_contenu);}</script>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
             			<h2><%=l(:label_my_projects) %></h2>
             			<ul class="menublock">
             				<% for membership in @logged_in_user.memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= @content_for_layout %>
             	</div>
             	<div id="footer">
             		<p>
             		<%= auto_link $RDM_FOOTER_SIG %> |
             		<a href="http://redmine.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
             		</p>
             	</div>
             </div>
             </body>
             </html>

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

             <h2><%=l(:label_overview)%></h2>
             <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>
               <div class="box">
                 <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
                   <%= lwr(:label_open_issues, issue_count) %>
                   </li>
                 <% end %>
                 </ul>
                 <% if authorize_for 'projects', 'add_issue' %>
                     &#187; <%=l(:label_issue_new)%>:
                     <ul>
                     <% @trackers.each do |tracker| %>
                     <li><%= link_to tracker.name, :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
                     <% end %>
                     </ul>
                 <% end %>
                 <center><small>[ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>
             		<% for member in @members %>
             		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
             		<% end %>
             	</div>
               <% if @subprojects %>
              	<div class="box">
             		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>
             		<% for subproject in @subprojects %>
             		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
             		<% end %>
             	</div>
               <% end %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <% for news in @news %>
                   <p><b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.summary %>
                   <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small></p>
                   <hr />
                 <% end %>
                 <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
               </div>
             </div>

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

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
             <% col_width = 70 / (@statuses.length+3) %>
             <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <tr>
             <td width="25%"></td>
             <% for status in @statuses %>
               <td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
             <% end %>
             <td align="center" width="<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></td>
             <td align="center" width="<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></td>
             <td align="center" width="<%= col_width %>%"><strong><%=l(:label_total)%></strong></td>
             </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>
               <% for status in @statuses %>
                 <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "status_id" => status.id,
                                                             "#{field_name}" => row.id %></td>
               <% end %>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "O" %></td>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "C" %></td>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "A" %></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

             <h2><%=l(:label_workflow)%></h2>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= start_form_tag ({:action => 'workflow'}, :method => 'get') %>
             <div style="float:left;margin-right:10px;">
             <p><label for="role_id"><%=l(:label_role)%></label><br/>
             <select id="role_id" name="role_id">
               <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
             </select></p>
             </div>
             <div>
             <p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
             <select id="tracker_id" name="tracker_id">
               <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
             </select>
             <%= submit_tag l(:button_edit) %>
             </p>
             </div>
             <%= end_form_tag %>
             <% unless @tracker.nil? or @role.nil? %>
             <div class="box">
               <%= 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 %>
             			<td align="center">
                  <input type="checkbox"
                   name="issue_status[<%= old_status.id %>][]"
                   value="<%= new_status.id %>"
                   <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
                   <%if old_status==new_status%>disabled<%end%>
                   >
             			</td>
             		<% end %>
             		</tr>
             	<% end %>
             	</table>
             <br />
             <p>
             <a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
             <a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
             </p>
             <br />
             <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>
             <% end %>
             </div>

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

             <h2><%=l(:label_user_plural)%></h2>
             <table class="listTableContent">
             <tr class="ListHead">
             	<%= sort_header_tag('login', :caption => l(:field_login)) %>
             	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
             	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
             	<th><%=l(:field_mail)%></th>
             	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
             	<%= sort_header_tag('status', :caption => l(:field_status)) %>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
             	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
               <th></th>
             </tr>
             <% for user in @users %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
             	<td><%= user.firstname %></td>
             	<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">
                 <%= start_form_tag :action => 'edit', :id => user %>
                 <% if user.locked? %>
                   <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
                   <%= submit_tag l(:button_unlock), :class => "button-small"  %>
                 <% else %>
                   <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
                   <%= submit_tag l(:button_lock), :class => "button-small"  %>
                 <% end %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <p><%= pagination_links_full @user_pages %>
             [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
             </p>
             <p>
             <%= link_to '&#187; ' + l(:label_user_new), :action => 'add' %>
             </p>

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

             /* The main calendar widget.  DIV containing a table. */
             div.calendar { position: relative; }
             .calendar, .calendar table {
               border: 1px solid #556;
               font-size: 11px;
               color: #000;
               cursor: default;
-              background: #eef;
+              background: #fafbfc;
               font-family: tahoma,verdana,sans-serif;
             }
             /* Header part -- contains navigation buttons and day names. */
             .calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
               text-align: center;    /* They are the navigation buttons */
               padding: 2px;          /* Make the buttons seem like they're pressing */
             }
             .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" */
               font-weight: bold;      /* Pressing it will take you to the current date */
               text-align: center;
               background: #fff;
               color: #000;
               padding: 2px;
             }
             .calendar thead .headrow { /* Row <TR> containing navigation buttons */
-              background: #778;
+              background: #467aa7;
               color: #fff;
             }
             .calendar thead .daynames { /* Row <TR> containing the day names */
               background: #bdf;
             }
             .calendar thead .name { /* Cells <TD> containing the day names */
               border-bottom: 1px solid #556;
               padding: 2px;
               text-align: center;
               color: #000;
             }
             .calendar thead .weekend { /* How a weekend day name shows in header */
               color: #a66;
             }
             .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 thead .active { /* Active (pressed) buttons in header */
               background-color: #77c;
               padding: 2px 0px 0px 2px;
             }
             /* The body part -- contains all the days in month. */
             .calendar tbody .day { /* Cells <TD> containing month days dates */
               width: 2em;
               color: #456;
               text-align: right;
               padding: 2px 4px 2px 2px;
             }
             .calendar tbody .day.othermonth {
               font-size: 80%;
               color: #bbb;
             }
             .calendar tbody .day.othermonth.oweekend {
               color: #fbb;
             }
             .calendar table .wn {
               padding: 2px 3px 2px 2px;
               border-right: 1px solid #000;
               background: #bdf;
             }
             .calendar tbody .rowhilite td {
               background: #def;
             }
             .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;
             }
             .calendar tbody td.active { /* Active (pressed) cells <TD> */
               background: #cde;
               padding: 2px 2px 0px 2px;
             }
             .calendar tbody td.selected { /* Cell showing today date */
               font-weight: bold;
               border: 1px solid #000;
               padding: 1px 3px 1px 1px;
               background: #fff;
               color: #000;
             }
             .calendar tbody td.weekend { /* Cells showing weekend days */
               color: #a66;
             }
             .calendar tbody td.today { /* Cell showing selected date */
               font-weight: bold;
               color: #f00;
             }
             .calendar tbody .disabled { color: #999; }
             .calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
               visibility: hidden;
             }
             .calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
               display: none;
             }
             /* The footer part -- status bar and "Close" button */
             .calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
               text-align: center;
               background: #556;
               color: #fff;
             }
             .calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
               background: #fff;
               color: #445;
               border-top: 1px solid #556;
               padding: 1px;
             }
             .calendar tfoot .hilite { /* Hover style for buttons in footer */
               background: #aaf;
               border: 1px solid #04f;
               color: #000;
               padding: 1px;
             }
             .calendar tfoot .active { /* Active (pressed) style for buttons in footer */
               background: #77c;
               padding: 2px 0px 0px 2px;
             }
             /* Combo boxes (menus that display months/years for direct selection) */
             .calendar .combo {
               position: absolute;
               display: none;
               top: 0px;
               left: 0px;
               width: 4em;
               cursor: default;
               border: 1px solid #655;
               background: #def;
               color: #000;
               font-size: 90%;
               z-index: 100;
             }
             .calendar .combo .label,
             .calendar .combo .label-IEfix {
               text-align: center;
               padding: 1px;
             }
             .calendar .combo .label-IEfix {
               width: 4em;
             }
             .calendar .combo .hilite {
               background: #acf;
             }
             .calendar .combo .active {
               border-top: 1px solid #46a;
               border-bottom: 1px solid #46a;
               background: #eef;
               font-weight: bold;
             }
             .calendar td.time {
               border-top: 1px solid #000;
               padding: 1px 0px;
               text-align: center;
               background-color: #f4f0e8;
             }
             .calendar td.time .hour,
             .calendar td.time .minute,
             .calendar td.time .ampm {
               padding: 0px 3px 0px 4px;
               border: 1px solid #889;
               font-weight: bold;
               background-color: #fff;
             }
             .calendar td.time .ampm {
               text-align: center;
             }
             .calendar td.time .colon {
               padding: 0px 2px 0px 3px;
               font-weight: bold;
             }
             .calendar td.time span.hilite {
               border-color: #000;
               background-color: #667;
               color: #fff;
             }
             .calendar td.time span.active {
               border-color: #f00;
               background-color: #000;
               color: #0f0;
             }

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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