Revision 443:350acce374a2 app/views/welcome

View differences:

app/views/welcome/index.rhtml
9 9
<div class="splitcontentleft">
10 10
  <%= textilizable Setting.welcome_text %>
11 11
  
12
  <% if @news.any? %>
13
  <div class="news box">
14
	<h3><%=l(:label_news_latest)%></h3>
15
		<%= render :partial => 'news/news', :collection => @news %>
16
		<%= link_to l(:label_news_view_all), :controller => 'news' %>
17
  </div>
18
  <% end %>
19 12
  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
20 13
</div>
21 14

  
22 15
<div class="splitcontentright">
23
  <% if not @tipsoftheday.empty? %>
24
    <div class="newsoftheday box">
25
          <h3><%=l(:label_tipoftheday)%></h3>
26
          <%= textilizable @tipsoftheday %>
27
    </div>
16
  <% if @site_news.any? %>
17
  <div class="news box">
18
	<h3><%=l(:label_news_site_latest)%></h3>
19
	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
20
	
21
	<%= link_to l(:label_news_more), { :controller => 'projects', :action => @site_project.identifier, :id => 'news' } %>
22
  </div>
28 23
  <% end %>
29

  
30 24
    <% if @projects.any? %>
31 25
	<div class="projects box">
32 26
	<h3><%=l(:label_project_latest)%></h3>
33 27
		<ul>
34 28
		<% for project in @projects %>
35 29
		  <% @project = project %>
36
			<li>
37
			<%= link_to_project project %> (<%= format_time(project.created_on) %>)
38
			<%= textilizable project.short_description, :project => project %>
30
			<li class="latest">
31
			<span class="title"><%= link_to_project project %></span>
32
			<span class="time"><%= format_time(project.created_on)%></span>
33
			<%= render_project_short_description project %>
39 34
			</li>
40 35
		<% end %>
41 36
    <% @project = nil %>
42 37
		</ul>
38
	<%= link_to l(:label_projects_more), :controller => 'projects' %>
43 39
	</div>
44 40
	<% end %>
45 41
    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>

Also available in: Unified diff