Revision 1061:01076ed49ffc app/views

View differences:

app/views/activities/_busy.html.erb
1 1
<% events = @events_by_day %>
2 2
<% if (events.nil?) 
3
     activity = Redmine::Activity::Fetcher.new(User.current)
3
     activity = Redmine::Activity::Fetcher.new(User.anonymous)
4 4
     events = activity.events(Date.today - 14, Date.today + 1)
5 5
   end
6 6
%>
app/views/activities/_busy_institution.html.erb
1 1
<% events = @events_by_day %>
2 2
<% if (events.nil?) 
3
     activity = Redmine::Activity::Fetcher.new(User.current)
4
     events = activity.events(Date.today - 14, Date.today + 1)
3
     activity = Redmine::Activity::Fetcher.new(User.anonymous)
4
     days = Setting.activity_days_default.to_i
5
     events = activity.events(Date.today - days, Date.today + 1)
5 6
   end
6 7
%>
7 8

  
......
24 25
    <% end %>
25 26
  </ul>
26 27
<% end %>
28

  
app/views/projects/_form.html.erb
21 21
<br />
22 22
  <em> <%= l(:text_project_homepage_info) %></em>
23 23
</p>
24
<p><%= f.check_box :is_public %>
24
<p>
25
<%= label(:project, :is_public_1, l(:field_public_or_private) + content_tag("span", " *", :class => "required")) %>
26
<%
27
   # if the project hasn't been created fully yet, then we don't
28
   # want to set either public or private (make the user decide)
29
   initialised = !@project.id.nil?
30
%>
31
  <%= f.radio_button :is_public, 1, :checked => (initialised && @project.is_public?) %>
32
  <%= l(:text_project_public_info) %>
25 33
<br />
26
  <em> <%= l(:text_project_visibility_info) %></em>
34
  <%= f.radio_button :is_public, 0, :checked => (initialised && !@project.is_public?) %> 
35
  <%= l(:text_project_private_info) %>
36
<br>
37
  <em><%= l(:text_project_visibility_info) %></em>
27 38
</p>
28 39
<%= wikitoolbar_for 'project_description' %>
29 40

  
app/views/projects/_members_box.html.erb
1 1
  <% if @users_by_role.any? %>
2
  <div class="members box">
2
  <div id="memberbox"><div class="box">
3 3
    <h3><%=l(:label_member_plural)%></h3>
4 4
    <p><% @users_by_role.keys.sort.each do |role| %>
5 5
    <%=h role %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %><br />
6 6
    <% end %></p>
7
  </div>
7
  </div></div>
8 8
  <% end %>
app/views/projects/explore.html.erb
1
<% content_for :header_tags do %>
2
    <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
3
<% end %>
1 4

  
5
<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>
2 6
<h2><%= l(:label_explore_projects) %></h2>
3

  
4 7
  <div class="tags box">
5 8
  <h3><%=l(:label_project_tags_all)%></h3>
6 9
    <%= render :partial => 'projects/tagcloud' %>
7 10
  </div>
11
<% end %>
12

  
8 13
<div class="splitcontentleft">
14
  <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>
9 15
  <div class="institutions box">
10 16
  <h3><%=l(:label_institutions_busy)%></h3>
11 17
    <%= render :partial => 'activities/busy_institution' %>
12 18
  </div>
19
  <% end %>
13 20
  <div class="projects box">
14 21
  <h3><%=l(:label_project_latest)%></h3>
15 22
    <%= render :partial => 'projects/latest' %>
16 23
  </div>
17 24
</div>
18 25
<div class="splitcontentright">
26
  <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>
19 27
  <div class="projects box">
20 28
  <h3><%=l(:label_projects_busy)%></h3>
21 29
    <%= render :partial => 'activities/busy' %>
22 30
  </div>
31
  <% end %>
23 32
</div>
app/views/projects/new.html.erb
3 3
<% labelled_tabular_form_for @project do |f| %>
4 4
<%= render :partial => 'form', :locals => { :f => f } %>
5 5
<%= submit_tag l(:button_create) %>
6
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
7 6
<%= javascript_tag "Form.Element.focus('project_name');" %>
8 7
<% end %>

Also available in: Unified diff