Revision 918:04114f36670d app

View differences:

app/views/activities/_recent.erb
1
<% events = @events_by_day %>
2
<% max = 5 %>
3
<% if (events.nil?) 
4
     activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
5
     
6
     if @project
7
        # Don't show news (duplicated with News box) or wiki edits (too
8
	# tedious) in project front page
9
        activity.scope = [ "changesets", "files", "issues", "documents" ]
10
     end
11
     
12
     events = activity.events(Date.today - 28, Date.today + 1)
13
     
14
     if defined? user
15
       events = events.select { |e| user.member_of? e.project }
16
     end
17
     
18
     events = events.first(max)
19

  
20
   end
21
%>
22

  
23
<div id="activity">
24

  
25
<% if @project.nil? %>
26
   <%= content_tag('h3', l(:label_activity_my_recent)) %>
27
   <div class="activity box">
28
<% end %>
29

  
30
<% if events.empty? %>
31

  
32
   <% if @project.nil? %>
33
     <p><%= l(:label_activity_my_recent_none) %></p>
34
   <% end %>
35

  
36
<% else %>
37

  
38
   <% if !@project.nil? %>
39
     <div class="activity box">
40
     <%= content_tag('h3', l(:label_activity_recent)) %>
41
   <% end %>
42

  
43
   <dl>
44
   <% events.sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
45
     <dt class="<%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
46
	<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
47
     <span class="time"><%= format_time(e.event_datetime) %></span>
48
     <%= content_tag('span', link_to_project(e.project), :class => 'project') if @project.nil? || @project != e.project %>
49
     <% if e.respond_to?(:event_author) %>
50
       <span class="author"><%= e.event_author %></span>
51
     <% end %>
52
     </dt>
53
     <dd><%= link_to format_activity_title(e.event_title), e.event_url %>
54
     <span class="description"><%= format_activity_description(e.event_description) %></span>
55
     </dd>
56
   <% end -%>
57
   </dl>
58

  
59
   </div>
60

  
61
<% end %>
62

  
63
<% if events.empty? and @project.nil? %></div><% end %>
64

  
65
</div>
app/views/activities/_recent.html.erb
1
<% events = @events_by_day %>
2
<% max = 5 %>
3
<% if (events.nil?) 
4
     activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
5
     
6
     if @project
7
        # Don't show news (duplicated with News box) or wiki edits (too
8
	# tedious) in project front page
9
        activity.scope = [ "changesets", "files", "issues", "documents" ]
10
     end
11
     
12
     events = activity.events(Date.today - 28, Date.today + 1)
13
     
14
     if defined? user
15
       events = events.select { |e| user.member_of? e.project }
16
     end
17
     
18
     events = events.first(max)
19

  
20
   end
21
%>
22

  
23
<div id="activity">
24

  
25
<% if @project.nil? %>
26
   <%= content_tag('h3', l(:label_activity_my_recent)) %>
27
   <div class="activity box">
28
<% end %>
29

  
30
<% if events.empty? %>
31

  
32
   <% if @project.nil? %>
33
     <p><%= l(:label_activity_my_recent_none) %></p>
34
   <% end %>
35

  
36
<% else %>
37

  
38
   <% if !@project.nil? %>
39
     <div class="activity box">
40
     <%= content_tag('h3', l(:label_activity_recent)) %>
41
   <% end %>
42

  
43
   <dl>
44
   <% events.sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
45
     <dt class="<%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
46
	<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
47
     <span class="time"><%= format_time(e.event_datetime) %></span>
48
     <%= content_tag('span', link_to_project(e.project), :class => 'project') if @project.nil? || @project != e.project %>
49
     <% if e.respond_to?(:event_author) %>
50
       <span class="author"><%= e.event_author %></span>
51
     <% end %>
52
     </dt>
53
     <dd><%= link_to format_activity_title(e.event_title), e.event_url %>
54
     <span class="description"><%= format_activity_description(e.event_description) %></span>
55
     </dd>
56
   <% end -%>
57
   </dl>
58

  
59
   </div>
60

  
61
<% end %>
62

  
63
<% if events.empty? and @project.nil? %></div><% end %>
64

  
65
</div>
app/views/attachments/toggle_active.erb
1
<%=
2
file = Attachment.find(params[:id])
3
active_id = "active-" + file.id.to_s
4
link_to_remote image_tag(file.active? ? 'fav.png' : 'fav_off.png'),
5
  :url => {:controller => 'attachments', :action => 'toggle_active', :project_id => @project.id, :id => file},
6
  :update => active_id
7
%>
app/views/attachments/toggle_active.html.erb
1
<%=
2
file = Attachment.find(params[:id])
3
active_id = "active-" + file.id.to_s
4
link_to_remote image_tag(file.active? ? 'fav.png' : 'fav_off.png'),
5
  :url => {:controller => 'attachments', :action => 'toggle_active', :project_id => @project.id, :id => file},
6
  :update => active_id
7
%>
app/views/members/_editlist.erb
1
<%= error_messages_for 'member' %>
2

  
3
<% roles = Role.find_all_givable
4
   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
5

  
6
<% if members.any? %>
7
<table class="list members">
8
	<thead><tr>
9
	  <th><%= l(:label_user) %></th>
10
	  <th><%= l(:label_role_plural) %></th>
11
          <th style="width:15%"></th>
12
	</tr></thead>
13
	<tbody>
14
	<% members.each do |member| %>
15
          <% next if member.new_record? %>
16
          <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
17
          <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
18
          <td class="roles">
19
            <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
20
            <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
21
      			 :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
22
            <p><% roles.each do |role| %>
23
              <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
24
             <% end %></p>
25
        <%= hidden_field_tag 'member[role_ids][]', '' %>
26
        <p><%= submit_tag l(:button_change), :class => "small" %>
27
        <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
28
    <% end %>
29
  </td>
30
  <td class="buttons">
31
      <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
32
      <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
33
                                              :method => :post,
34
                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
35
                                            }, :title => l(:button_delete),
36
                                               :class => 'icon icon-del') if member.deletable? %>
37
  </td>
38
	</tr>
39
<% end; reset_cycle %>
40
	</tbody>
41
</table>
42
<% else %>
43
<p class="nodata"><%= l(:label_no_data) %></p>
44
<% end %>
45

  
46
<% content_for :sidebar do %>
47
<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
48

  
49
<% if roles.any? && principals.any? %>
50
  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
51
									   :loading => '$(\'member-add-submit\').disable();',
52
									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
53
    <h3><%=l(:label_member_new)%></h3>
54
    
55
		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
56
		<%= observe_field(:principal_search,
57
                 :frequency => 0.5,
58
                 :update => :principals,
59
                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
60
                 :with => 'q')
61
                  %>
62

  
63
		<div id="principals">
64
		<% if params[:q] && params[:q].length > 1 %>
65
  		  <%= principals_check_box_tags 'member[user_ids][]', @principals %>
66
		<% end %>
67
		</div>
68
		
69
    <p><%= l(:label_set_role_plural) %>:</p>
70
    <% roles.each do |role| %>
71
    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
72
   	<% end %>
73
   	
74
    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
75
  <% end %>
76
<% end %>
77
<% end %>
app/views/members/_editlist.html.erb
1
<%= error_messages_for 'member' %>
2

  
3
<% roles = Role.find_all_givable
4
   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
5

  
6
<% if members.any? %>
7
<table class="list members">
8
	<thead><tr>
9
	  <th><%= l(:label_user) %></th>
10
	  <th><%= l(:label_role_plural) %></th>
11
          <th style="width:15%"></th>
12
	</tr></thead>
13
	<tbody>
14
	<% members.each do |member| %>
15
          <% next if member.new_record? %>
16
          <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
17
          <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
18
          <td class="roles">
19
            <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
20
            <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
21
      			 :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
22
            <p><% roles.each do |role| %>
23
              <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
24
             <% end %></p>
25
        <%= hidden_field_tag 'member[role_ids][]', '' %>
26
        <p><%= submit_tag l(:button_change), :class => "small" %>
27
        <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
28
    <% end %>
29
  </td>
30
  <td class="buttons">
31
      <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
32
      <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
33
                                              :method => :post,
34
                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
35
                                            }, :title => l(:button_delete),
36
                                               :class => 'icon icon-del') if member.deletable? %>
37
  </td>
38
	</tr>
39
<% end; reset_cycle %>
40
	</tbody>
41
</table>
42
<% else %>
43
<p class="nodata"><%= l(:label_no_data) %></p>
44
<% end %>
45

  
46
<% content_for :sidebar do %>
47
<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
48

  
49
<% if roles.any? && principals.any? %>
50
  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
51
									   :loading => '$(\'member-add-submit\').disable();',
52
									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
53
    <h3><%=l(:label_member_new)%></h3>
54
    
55
		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
56
		<%= observe_field(:principal_search,
57
                 :frequency => 0.5,
58
                 :update => :principals,
59
                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
60
                 :with => 'q')
61
                  %>
62

  
63
		<div id="principals">
64
		<% if params[:q] && params[:q].length > 1 %>
65
  		  <%= principals_check_box_tags 'member[user_ids][]', @principals %>
66
		<% end %>
67
		</div>
68
		
69
    <p><%= l(:label_set_role_plural) %>:</p>
70
    <% roles.each do |role| %>
71
    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
72
   	<% end %>
73
   	
74
    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
75
  <% end %>
76
<% end %>
77
<% end %>
app/views/members/_list.erb
1

  
2
<% roles = Role.find_all_givable
3
   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
4

  
5
<% if members.any? %>
6

  
7
<div id="members">
8
<dl>
9
<% members.each do |member| %>
10
<dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
11
<%= avatar(member.user, :size => "24") %>
12
<span class="user"><%= link_to_user member.principal %></span>
13
<span class="email"><%= member.user.mail if !member.user.pref.hide_mail %></span>
14
<dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
15
<span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
16
</dd>
17
<% end %>
18
</dl>
19
<% else %>
20
<p class="nodata"><%= l(:label_no_data) %></p>
21
<% end %>
22
</div>
23

  
24
<% content_for :sidebar do %>
25
<% end %>
26

  
app/views/members/_list.html.erb
1

  
2
<% roles = Role.find_all_givable
3
   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
4

  
5
<% if members.any? %>
6

  
7
<div id="members">
8
<dl>
9
<% members.each do |member| %>
10
<dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
11
<%= avatar(member.user, :size => "24") %>
12
<span class="user"><%= link_to_user member.principal %></span>
13
<span class="email"><%= member.user.mail if !member.user.pref.hide_mail %></span>
14
<dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
15
<span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
16
</dd>
17
<% end %>
18
</dl>
19
<% else %>
20
<p class="nodata"><%= l(:label_no_data) %></p>
21
<% end %>
22
</div>
23

  
24
<% content_for :sidebar do %>
25
<% end %>
26

  
app/views/members/index.erb
1

  
2
<h2><%=l(:label_member_plural)%></h2> 
3

  
4
<% editable = authorize_for('members', 'edit') %>
5

  
6
<div id="memberlist">
7
<% if editable %>
8
<%= render :partial => 'editlist' %>
9
<% else %>
10
<%= render :partial => 'list' %>
11
<% end %>
12
</div>
13

  
app/views/members/index.html.erb
1

  
2
<h2><%=l(:label_member_plural)%></h2> 
3

  
4
<% editable = authorize_for('members', 'edit') %>
5

  
6
<div id="memberlist">
7
<% if editable %>
8
<%= render :partial => 'editlist' %>
9
<% else %>
10
<%= render :partial => 'list' %>
11
<% end %>
12
</div>
13

  
app/views/my/blocks/_activitymyprojects.erb
1

  
2
<%= render :partial => 'activities/recent', :locals => { :user => User.current } %>
3

  
4

  
app/views/my/blocks/_activitymyprojects.html.erb
1

  
2
<%= render :partial => 'activities/recent', :locals => { :user => User.current } %>
3

  
4

  
app/views/my/blocks/_tipoftheday.erb
1
    <h3><%=l(:label_tipoftheday)%></h3>
2
    <div class="tipoftheday box">
3
          <div class="tip"><%= textilizable Setting.tipoftheday_text %></div>
4
    </div>
app/views/my/blocks/_tipoftheday.html.erb
1
    <h3><%=l(:label_tipoftheday)%></h3>
2
    <div class="tipoftheday box">
3
          <div class="tip"><%= textilizable Setting.tipoftheday_text %></div>
4
    </div>
app/views/projects/settings/_overview.erb
1

  
2
<% form_for :project, @project,
3
            :url => { :action => 'overview', :id => @project },
4
            :html => {:id => 'overview-form'} do |f| %>
5

  
6
<div class="box tabular">
7

  
8
<p><%= l(:text_has_welcome_page_info, { :overview_link => link_to(l(:label_overview), { :controller => 'projects', :action => 'show' } ) } ) %></p>
9

  
10
<% if @project.module_enabled? :wiki %>
11

  
12
<p><%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
13

  
14
<% else %>
15

  
16
<p><%= l(:text_has_welcome_page_wiki_disabled, { :modules_link => link_to(l(:label_module_plural), { :controller => 'projects', :action => 'settings', :tab => 'modules' } ) } ) %></p>
17

  
18
<% end %>
19

  
20
<p><label for="has_welcome_page"><%= l(:label_has_welcome_page) %></label>
21
<%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%>
22
<br/><em><%= l(:setting_has_welcome_page) %></em>
23

  
24
</p>
25

  
26
</div>
27

  
28
<%= submit_tag l(:button_save) %>
29

  
30
<% end %>
app/views/projects/settings/_overview.html.erb
1

  
2
<% form_for :project, @project,
3
            :url => { :action => 'overview', :id => @project },
4
            :html => {:id => 'overview-form'} do |f| %>
5

  
6
<div class="box tabular">
7

  
8
<p><%= l(:text_has_welcome_page_info, { :overview_link => link_to(l(:label_overview), { :controller => 'projects', :action => 'show' } ) } ) %></p>
9

  
10
<% if @project.module_enabled? :wiki %>
11

  
12
<p><%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
13

  
14
<% else %>
15

  
16
<p><%= l(:text_has_welcome_page_wiki_disabled, { :modules_link => link_to(l(:label_module_plural), { :controller => 'projects', :action => 'settings', :tab => 'modules' } ) } ) %></p>
17

  
18
<% end %>
19

  
20
<p><label for="has_welcome_page"><%= l(:label_has_welcome_page) %></label>
21
<%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%>
22
<br/><em><%= l(:setting_has_welcome_page) %></em>
23

  
24
</p>
25

  
26
</div>
27

  
28
<%= submit_tag l(:button_save) %>
29

  
30
<% end %>

Also available in: Unified diff