##// END OF EJS Templates
Welcome text misses wiki div (#5770)....
Jean-Philippe Lang -
r14066:f1072337b9bc
parent child
Show More
@@ -1,41 +1,43
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 <div class="wiki">
5 <%= textilizable Setting.welcome_text %>
6 </div>
5 <% if @news.any? %>
7 <% if @news.any? %>
6 <div class="news box">
8 <div class="news box">
7 <h3><%=l(:label_news_latest)%></h3>
9 <h3><%=l(:label_news_latest)%></h3>
8 <%= render :partial => 'news/news', :collection => @news %>
10 <%= render :partial => 'news/news', :collection => @news %>
9 <%= link_to l(:label_news_view_all), :controller => 'news' %>
11 <%= link_to l(:label_news_view_all), :controller => 'news' %>
10 </div>
12 </div>
11 <% end %>
13 <% end %>
12 <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
14 <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
13 </div>
15 </div>
14
16
15 <div class="splitcontentright">
17 <div class="splitcontentright">
16 <% if @projects.any? %>
18 <% if @projects.any? %>
17 <div class="projects box">
19 <div class="projects box">
18 <h3><%=l(:label_project_latest)%></h3>
20 <h3><%=l(:label_project_latest)%></h3>
19 <ul>
21 <ul>
20 <% for project in @projects %>
22 <% for project in @projects %>
21 <% @project = project %>
23 <% @project = project %>
22 <li>
24 <li>
23 <%= link_to_project project %> (<%= format_time(project.created_on) %>)
25 <%= link_to_project project %> (<%= format_time(project.created_on) %>)
24 <div class="wiki">
26 <div class="wiki">
25 <%= textilizable project.short_description, :project => project %>
27 <%= textilizable project.short_description, :project => project %>
26 </div>
28 </div>
27 </li>
29 </li>
28 <% end %>
30 <% end %>
29 <% @project = nil %>
31 <% @project = nil %>
30 </ul>
32 </ul>
31 </div>
33 </div>
32 <% end %>
34 <% end %>
33 <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
35 <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
34 </div>
36 </div>
35
37
36 <% content_for :header_tags do %>
38 <% content_for :header_tags do %>
37 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
39 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
38 :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
40 :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
39 <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
41 <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
40 :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
42 :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
41 <% end %>
43 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now