Revision 1349:4ff3f8b81ab3

View differences:

app/controllers/welcome_controller.rb
24 24
  def index
25 25
    @site_project = Project.find_by_identifier "soundsoftware-site"
26 26
    @site_news = []
27
    @site_news = News.latest_for @site_project if @site_project
27
    @site_news = News.latest_for(@site_project, 3) if @site_project
28 28
    
29 29
    # tests if user is logged in to generate the tips of the day list
30 30
    if User.current.logged?
app/views/activities/_busy.html.erb
13 13
   <ul>
14 14

  
15 15
   <% 
16
      for project in busy_projects(events, 5)
16
      for project in busy_projects(events, 7)
17 17
   %>
18 18

  
19 19
   <li class="busy">
app/views/projects/explore.html.erb
11 11
<h2><%= l(:label_explore_projects) %></h2>
12 12

  
13 13
<div class="threecolumnleft">
14
<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>
14
<% cache(:action => 'explore', :action_suffix => 'tags') do %>
15 15
  <div class="tags box">
16 16
  <h3><%=l(:label_project_tags_all)%></h3>
17 17
    <%= render :partial => 'projects/tagcloud' %>
......
28 28
</div>
29 29

  
30 30
<div class="threecolumnleft">
31
  <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>
31
  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
32 32
  <div class="institutions box">
33 33
  <h3><%=l(:label_institutions_busy)%></h3>
34 34
    <%= render :partial => 'activities/busy_institution' %>
......
38 38
</div>
39 39

  
40 40
<div class="threecolumnmid">
41
  <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>
41
  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
42 42
  <div class="projects box">
43 43
  <h3><%=l(:label_projects_busy)%></h3>
44 44
    <%= render :partial => 'activities/busy' %>
app/views/welcome/index.html.erb
5 5
  </div>
6 6
<% end %>
7 7

  
8
<div id="welcomepagenews">
9
  <% if @site_news.any? %>
10
    <div class="news box">
11
       <h3><%=l(:label_news_site_latest)%></h3>
12
	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
13
	<%= link_to l(:label_news_more), { :controller => 'news', :project_id => @site_project.identifier, :action => 'index' } %>
14
    </div>
15
  <% end %>
16
</div>
17

  
8 18
<div id="welcomepage">
9

  
10 19
<%= textilizable Setting.welcome_text %>
11

  
12 20
</div>
13 21
  
14 22
<% content_for :header_tags do %>
plugins/redmine_tags/assets/stylesheets/redmine_tags.css
22 22
ul.tags li { margin: .25em 0px; }
23 23

  
24 24
div.tags { text-align: center; }
25
div.tags h3 { text-align: left; }
25 26
div.tags .tag-label { margin: .25em; }
26 27
div.tags .tag-nube-1 { font-size: .8em; }
27 28
div.tags .tag-nube-2 { font-size: .9em; }
public/stylesheets/application.css
5 5
#content h1, h2, h3, h4 {color: #555;}
6 6
h2, .wiki h1 {font-size: 20px;}
7 7
h3, .wiki h2 {font-size: 16px;}
8
h4, .wiki h3 {font-size: 13px;}
8
h4, .wiki h4, .wiki h5, .wiki h6 {font-size: 14px;}
9
.wiki h3 {font-size: 15px;}
10
.wiki h5 {font-weight: normal; font-style: italic; }
11
.wiki h6 {font-weight: normal; font-style: normal; }
12

  
13

  
9 14
h4 {border-bottom: 1px dotted #bbb;}
10 15

  
11 16
/***** Layout *****/
public/themes/soundsoftware/stylesheets/application.css
178 178

  
179 179
#welcomepage {
180 180
    width: 80%;
181
    margin-left: 10%;
181
    margin-left: 71px;
182 182
    margin-top: 10px;
183 183
}
184 184
#welcomepage blockquote {
......
187 187
    padding-left: 0;
188 188
    margin-left: 0;
189 189
}
190
#welcomepage h2 {
191
    font-size: 2em;
192
    margin-bottom: 0.8em;
193
}
190 194
#welcomepage p, #welcomepage li {
191
    font-size: 1.2em;
195
    font-size: 1.25em;
192 196
    color: #3e442c;
193 197
}
194 198
#welcomepage p {
195 199
    margin-left: 2em;
196
    margin-top: 0.7em;
200
    margin-top: 1em;
197 201
    margin-bottom: 0.7em;
198 202
}
203
#welcomepage a {
204
    white-space: nowrap;
205
}
206
#welcomepagenews {
207
    float: right;
208
    width: 27%;
209
    margin-right: 3%;
210
    margin-top: 1em;
211
    margin-left: 2em;
212
    margin-bottom: 2em;
213
}
199 214

  
200 215
div.flash.newsalert {
201 216
  float: right;

Also available in: Unified diff