Commit 0fbe692ca6005afce21c800e49adec26ea9e2b3f

Added commits and messages on summary
Critical tickets show in red

Commit diff

app/controllers/projects_controller.rb

 
3535 @title = "Summary"
3636 @critical_tickets = Ticket.find_critical(@project.id)
3737 @url_suffix = ""
38 #FIXME mainline / hardcoded?
39 @repository = @project.repositories.find_by_name!("mainline")
40 @repository.has_commits? ? @commits = @repository.git.commits(@repository.head_candidate.name, 3, 0) : @commits = []
41 @messages = Message.find_by_project(@project.id, 3)
3842 render :action => "ac_show"
3943 end
4044
toggle raw diff

app/views/layouts/application.html.erb

 
2323 <% end -%>
2424
2525 <div id="system_message">
26 <p><strong>Notice:</strong> This site is unstable work-in-progress, source for it is available on <a href='http://gitorious.org/projects/gitlab/'>gitorious.org</a>. Contact <a href='mailto:mtkd@prj2.com'>mtkd@prj2.com</a></p>
26 <p><strong>Notice:</strong> This site is unstable work-in-progress, source available on <a href='http://gitorious.org/projects/gitlab/'>gitorious.org</a>. Contact <a href='mailto:mtkd@prj2.com'>mtkd@prj2.com</a></p>
2727 </div>
2828
2929 <div id='header'>
toggle raw diff

app/views/members/_ac_list_messages.html.erb

 
1<ul>
2<% @messages.each do |m| %>
3 <li>
4 <% if show_name %>
5 <strong><%= m.user.fullname %></strong>
6 <% end %>
7 <%= m.activity %>
8 <span class='small_grey'>(<%= time_ago_in_words(m.created_at) %> ago)</span>
9 </li>
10<% end %>
11</ul>
toggle raw diff

app/views/members/ac_project_index.html.erb

 
1717
1818<%= div_formattedtext_open %>
1919
20<ul>
21<% @messages.each do |m| %>
22 <li>
23 <% unless @is_member %>
24 <strong><%= m.user.fullname %></strong>
25 <% end %>
26 <%= m.activity %>
27 <small>(<%= time_ago_in_words(m.created_at) %> ago)</small>
28 </li>
29<% end %>
30</ul>
20<%= render :partial => "ac_list_messages", :locals => { :show_name => !@is_member } %>
3121
3222<%= div_formattedtext_close %>
3323
toggle raw diff

app/views/projects/ac_show.html.erb

 
44
55<h1 class='pagetitle'><%= @project.title %></h1>
66
7<p><%= @project.summary %> <%= link_to "[more]", project_wiki_path(@project.slug, @project.wiki_slug) %></p>
7<p><%= @project.summary %> <%= link_to "[more]", project_wiki_path(@project.slug, @project.wiki_slug), :class => "small" %></p>
88
99<% unless @critical_tickets.empty? %>
1010<br />
1111<h3>Critical Tickets</h3>
1212<ul>
1313<% for ticket in @critical_tickets %>
14 <li><%= ticket.summary %> <small>(<%= time_ago_in_words(ticket.created_at) %> ago)</small></li>
14 <li><span class='red'><%= ticket.summary %></span> <span class='small_grey'>(<%= time_ago_in_words(ticket.created_at) %> ago)</span></li>
1515<% end %>
1616</ul>
17<%= link_to "[more]", project_tickets_path(@project.slug), :class => "small" %><br />
1718<% end %>
1819
20<% unless @commits.empty? %>
1921<br />
20<br />
21<br />
22<h3>Last Commits</h3>
23<%= render :partial => "logs/ac_log" -%>
24<%= link_to "[more]", project_repository_path(@project, @repository), :class => "small" %><br />
25<% end %>
2226
23<div id='todo'>
24<p>3 most recent commits (mainline only?)</p>
25<p>3 most recent messages from not you</p>
26</div>
27<% unless @messages.empty? %>
28<br />
29<h3>Recent Messages</h3>
30<%= render :partial => "members/ac_list_messages", :locals => { :show_name => true } %>
31<%= link_to "[more]", project_members_path(@project), :class => "small" %><br />
32<% end %>
2733
2834<%= div_formattedtext_close %>
2935
toggle raw diff

app/views/tickets/ac_project_index.html.erb

 
11<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %>
22
3<%= div_formattedtext_open %>
4
35<table class='public' width='100%'>
46<thead>
57<th width='100'>Milestone</th>
1515<% for ticket in @tickets %>
1616 <tr>
1717 <td><%= ticket.name %></td>
18 <td><%= ticket.summary %></td>
18 <td><%= "<span class='red'>" if ticket.priority == :critical %><%= ticket.summary %><%= "</span>" if ticket.priority == :critical %></td>
1919 <td><%= ticket.fullname %></td>
2020 <td><%= ticket.formatted_ttype %></td>
2121 <td><%= ticket.status.to_s.capitalize %></td>
toggle raw diff

public/stylesheets/base.css

 
132132.formattedtext .screenshot { display: block; }
133133.formattedtext .screenshot img { border: 1px solid #aaa; display: inline; margin: 0px 10px 0px 0px; }
134134
135.formattedtext .red { background-color: #ffe0e0; padding-left: 4px; padding-right: 4px; }
136.formattedtext .small_grey { color: grey; font-size: 0.8em; }
137.formattedtext .small { font-size: 0.8em; }
138
135139.formattedtext .highlight { background-color: yellow; }
136140
137141/* Admin section */
272272*/
273273
274274
275.commit_item { margin: 10px 0px 40px 0px; }
276.commit_message { margin-top: 10px; color: #444; background-color: #f0f0f0; padding: 10px 10px 0px 10px; border: 1px solid #ddd; }
275.commit_item { margin: 10px 0px 30px 0px; }
276.commit_message { margin-top: 10px; width: 60%; color: #444; background-color: #f0f0f0; padding: 10px 10px 0px 10px; border: 1px solid #ddd; }
277277.commit_message p { font-size: 0.9em; line-height: 1.2em; font-family: Monaco, "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; padding: 0px; margin: 0px 0px 10px 0px; }
278278
279279code, pre, tt { font-size: 0.9em; font-family: Monaco, "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; }
toggle raw diff