##// END OF EJS Templates
Merged r1400 from trunk....
Jean-Philippe Lang -
r1393:76ec11422d85
parent child
Show More
@@ -1,33 +1,35
1 <h2><%= l(:label_home) %></h2>
1 <h2><%= l(:label_home) %></h2>
2
2
3 <div class="splitcontentleft">
3 <div class="splitcontentleft">
4 <%= textilizable Setting.welcome_text %>
4 <%= textilizable Setting.welcome_text %>
5 <% if @news.any? %>
5 <% if @news.any? %>
6 <div class="box">
6 <div class="box">
7 <h3><%=l(:label_news_latest)%></h3>
7 <h3><%=l(:label_news_latest)%></h3>
8 <%= render :partial => 'news/news', :collection => @news %>
8 <%= render :partial => 'news/news', :collection => @news %>
9 <%= link_to l(:label_news_view_all), :controller => 'news' %>
9 <%= link_to l(:label_news_view_all), :controller => 'news' %>
10 </div>
10 </div>
11 <% end %>
11 <% end %>
12 </div>
12 </div>
13
13
14 <div class="splitcontentright">
14 <div class="splitcontentright">
15 <% if @projects.any? %>
15 <div class="box">
16 <div class="box">
16 <h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
17 <h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
17 <ul>
18 <ul>
18 <% for project in @projects %>
19 <% for project in @projects %>
19 <li>
20 <li>
20 <%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
21 <%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
21 <%= textilizable project.short_description, :project => project %>
22 <%= textilizable project.short_description, :project => project %>
22 </li>
23 </li>
23 <% end %>
24 <% end %>
24 </ul>
25 </ul>
25 </div>
26 </div>
27 <% end %>
26 </div>
28 </div>
27
29
28 <% content_for :header_tags do %>
30 <% content_for :header_tags do %>
29 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
31 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
30 :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
32 :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
31 <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :key => User.current.rss_key, :format => 'atom'},
33 <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :key => User.current.rss_key, :format => 'atom'},
32 :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
34 :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
33 <% end %>
35 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now