##// END OF EJS Templates
jro_apps » redmine
RSS
git-svn-id: http://redmine.rubyforge.org/svn/trunk@31 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang -
r29:4a1cfb3df94b
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,1
1 default directory for uploaded files No newline at end of file
Show file before | Show file after | Hide comments
@@ -54,6 +54,8 module CustomFieldsHelper
54 54 # Return a string used to display a custom value
55 55 def show_value(custom_value)
56 56 case custom_value.custom_field.field_format
57 when "date"
58 format_date(custom_value.value.to_date)
57 59 when "bool"
58 60 l_YesNo(custom_value.value == "1")
59 61 else
Show file before | Show file after | Hide comments
@@ -88,7 +88,11 class User < ActiveRecord::Base
88 88 def active?
89 89 self.status == STATUS_ACTIVE
90 90 end
91
91
92 def registered?
93 self.status == STATUS_REGISTERED
94 end
95
92 96 def locked?
93 97 self.status == STATUS_LOCKED
94 98 end
Show file before | Show file after | Hide comments
@@ -13,7 +13,7
13 13 <%= javascript_include_tag 'calendar/calendar' %>
14 14 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
15 15 <%= javascript_include_tag 'calendar/calendar-setup' %>
16 <%= stylesheet_link_tag 'calendar/calendar-blue' %>
16 <%= stylesheet_link_tag 'calendar' %>
17 17 <script type='text/javascript'>
18 18 var menu_contenu=' \
19 19 <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \
Show file before | Show file after | Hide comments
@@ -3,11 +3,11
3 3 <div class="splitcontentleft">
4 4 <%= simple_format(auto_link(@project.description)) %>
5 5 <ul>
6 <li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>
6 <% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li><% end %>
7 7 <li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
8 8 <% for custom_value in @custom_values %>
9 9 <% if !custom_value.value.empty? %>
10 <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>
10 <li><%= custom_value.custom_field.name%>: <%= show_value(custom_value) %></li>
11 11 <% end %>
12 12 <% end %>
13 13 </ul>
Show file before | Show file after | Hide comments
@@ -14,7 +14,7
14 14 </tr>
15 15
16 16 <% for row in rows %>
17 <tr style="background-color:#CEE1ED">
17 <tr class="<%= cycle("odd", "even") %>">
18 18 <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project,
19 19 :set_filter => 1,
20 20 "#{field_name}" => row.id %></td>
@@ -43,4 +43,5
43 43 <% end %>
44 44 </tr>
45 45 </table>
46 <% end %> No newline at end of file
46 <% end
47 reset_cycle %> No newline at end of file
Show file before | Show file after | Hide comments
@@ -28,18 +28,19
28 28 <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>
29 29 <table>
30 30 <tr>
31 <td align="center"><strong><%=l(:label_current_status)%></strong></td>
31 <td align="center" colspan="2"><strong><%=l(:label_current_status)%></strong></td>
32 32 <td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
33 33 </tr>
34 34 <tr>
35 <td></td>
35 <td colspan="2"></td>
36 36 <% for new_status in @statuses %>
37 <td width="60" align="center"><%= new_status.name %></td>
37 <td width="80" align="center"><%= new_status.name %></td>
38 38 <% end %>
39 39 </tr>
40 40
41 41 <% for old_status in @statuses %>
42 42 <tr>
43 <td width="20" align="center"><div style="background-color:#<%= old_status.html_color %>">&nbsp</div></td>
43 44 <td><%= old_status.name %></td>
44 45
45 46 <% for new_status in @statuses %>
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 19 <td><%= user.lastname %></td>
20 20 <td><%= user.mail %></td>
21 21 <td align="center"><%= image_tag 'true' if user.admin? %></td>
22 <td align="center"><%= image_tag 'locked' if user.locked? %></td>
22 <td align="center"><%= image_tag 'locked' if user.locked? %><%= image_tag 'user_new' if user.registered? %></td>
23 23 <td align="center"><%= format_time(user.created_on) %></td>
24 24 <td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
25 25 <td align="center">
Show file before | Show file after | Hide comments
@@ -7,7 +7,7 div.calendar { position: relative; }
7 7 font-size: 11px;
8 8 color: #000;
9 9 cursor: default;
10 background: #eef;
10 background: #fafbfc;
11 11 font-family: tahoma,verdana,sans-serif;
12 12 }
13 13
@@ -19,7 +19,7 div.calendar { position: relative; }
19 19 }
20 20
21 21 .calendar .nav {
22 background: #778 url(menuarrow.gif) no-repeat 100% 100%;
22 background: #467aa7 url(menuarrow.gif) no-repeat 100% 100%;
23 23 }
24 24
25 25 .calendar thead .title { /* This holds the current "month, year" */
@@ -31,7 +31,7 div.calendar { position: relative; }
31 31 }
32 32
33 33 .calendar thead .headrow { /* Row <TR> containing navigation buttons */
34 background: #778;
34 background: #467aa7;
35 35 color: #fff;
36 36 }
37 37
@@ -51,9 +51,8 div.calendar { position: relative; }
51 51 }
52 52
53 53 .calendar thead .hilite { /* How do the buttons in header appear when hover */
54 background-color: #aaf;
54 background-color: #80b0da;
55 55 color: #000;
56 border: 1px solid #04f;
57 56 padding: 1px;
58 57 }
59 58
@@ -89,11 +88,11 div.calendar { position: relative; }
89 88 }
90 89
91 90 .calendar tbody .rowhilite td.wn {
92 background: #eef;
91 background: #80b0da;
93 92 }
94 93
95 94 .calendar tbody td.hilite { /* Hovered cells <TD> */
96 background: #def;
95 background: #80b0da;
97 96 padding: 1px 3px 1px 1px;
98 97 border: 1px solid #bbb;
99 98 }
General Comments 0
You need to be logged in to leave comments. Login now