| |   |
| 35 | 35 | @title = "Summary" |
| 36 | 36 | @critical_tickets = Ticket.find_critical(@project.id) |
| 37 | 37 | @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) |
| 38 | 42 | render :action => "ac_show" |
| 39 | 43 | end |
| 40 | 44 | |
| toggle raw diff |
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -35,6 +35,10 @@ class ProjectsController < ApplicationController
@title = "Summary"
@critical_tickets = Ticket.find_critical(@project.id)
@url_suffix = ""
+ #FIXME mainline / hardcoded?
+ @repository = @project.repositories.find_by_name!("mainline")
+ @repository.has_commits? ? @commits = @repository.git.commits(@repository.head_candidate.name, 3, 0) : @commits = []
+ @messages = Message.find_by_project(@project.id, 3)
render :action => "ac_show"
end
|
| |   |
| 23 | 23 | <% end -%> |
| 24 | 24 | |
| 25 | 25 | <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> |
| 27 | 27 | </div> |
| 28 | 28 | |
| 29 | 29 | <div id='header'> |
| toggle raw diff |
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -23,7 +23,7 @@
<% end -%>
<div id="system_message">
- <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>
+ <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>
</div>
<div id='header'> |
| |   |
| 17 | 17 | |
| 18 | 18 | <%= div_formattedtext_open %> |
| 19 | 19 | |
| 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 } %> |
| 31 | 21 | |
| 32 | 22 | <%= div_formattedtext_close %> |
| 33 | 23 | |
| toggle raw diff |
--- a/app/views/members/ac_project_index.html.erb
+++ b/app/views/members/ac_project_index.html.erb
@@ -17,17 +17,7 @@
<%= div_formattedtext_open %>
-<ul>
-<% @messages.each do |m| %>
- <li>
- <% unless @is_member %>
- <strong><%= m.user.fullname %></strong>
- <% end %>
- <%= m.activity %>
- <small>(<%= time_ago_in_words(m.created_at) %> ago)</small>
- </li>
-<% end %>
-</ul>
+<%= render :partial => "ac_list_messages", :locals => { :show_name => !@is_member } %>
<%= div_formattedtext_close %>
|
| |   |
| 4 | 4 | |
| 5 | 5 | <h1 class='pagetitle'><%= @project.title %></h1> |
| 6 | 6 | |
| 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> |
| 8 | 8 | |
| 9 | 9 | <% unless @critical_tickets.empty? %> |
| 10 | 10 | <br /> |
| 11 | 11 | <h3>Critical Tickets</h3> |
| 12 | 12 | <ul> |
| 13 | 13 | <% 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> |
| 15 | 15 | <% end %> |
| 16 | 16 | </ul> |
| 17 | <%= link_to "[more]", project_tickets_path(@project.slug), :class => "small" %><br /> |
| 17 | 18 | <% end %> |
| 18 | 19 | |
| 20 | <% unless @commits.empty? %> |
| 19 | 21 | <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 %> |
| 22 | 26 | |
| 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 %> |
| 27 | 33 | |
| 28 | 34 | <%= div_formattedtext_close %> |
| 29 | 35 | |
| toggle raw diff |
--- a/app/views/projects/ac_show.html.erb
+++ b/app/views/projects/ac_show.html.erb
@@ -4,26 +4,32 @@
<h1 class='pagetitle'><%= @project.title %></h1>
-<p><%= @project.summary %> <%= link_to "[more]", project_wiki_path(@project.slug, @project.wiki_slug) %></p>
+<p><%= @project.summary %> <%= link_to "[more]", project_wiki_path(@project.slug, @project.wiki_slug), :class => "small" %></p>
<% unless @critical_tickets.empty? %>
<br />
<h3>Critical Tickets</h3>
<ul>
<% for ticket in @critical_tickets %>
- <li><%= ticket.summary %> <small>(<%= time_ago_in_words(ticket.created_at) %> ago)</small></li>
+ <li><span class='red'><%= ticket.summary %></span> <span class='small_grey'>(<%= time_ago_in_words(ticket.created_at) %> ago)</span></li>
<% end %>
</ul>
+<%= link_to "[more]", project_tickets_path(@project.slug), :class => "small" %><br />
<% end %>
+<% unless @commits.empty? %>
<br />
-<br />
-<br />
+<h3>Last Commits</h3>
+<%= render :partial => "logs/ac_log" -%>
+<%= link_to "[more]", project_repository_path(@project, @repository), :class => "small" %><br />
+<% end %>
-<div id='todo'>
-<p>3 most recent commits (mainline only?)</p>
-<p>3 most recent messages from not you</p>
-</div>
+<% unless @messages.empty? %>
+<br />
+<h3>Recent Messages</h3>
+<%= render :partial => "members/ac_list_messages", :locals => { :show_name => true } %>
+<%= link_to "[more]", project_members_path(@project), :class => "small" %><br />
+<% end %>
<%= div_formattedtext_close %>
|
| |   |
| 1 | 1 | <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %> |
| 2 | 2 | |
| 3 | <%= div_formattedtext_open %> |
| 4 | |
| 3 | 5 | <table class='public' width='100%'> |
| 4 | 6 | <thead> |
| 5 | 7 | <th width='100'>Milestone</th> |
| … | … | |
| 15 | 15 | <% for ticket in @tickets %> |
| 16 | 16 | <tr> |
| 17 | 17 | <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> |
| 19 | 19 | <td><%= ticket.fullname %></td> |
| 20 | 20 | <td><%= ticket.formatted_ttype %></td> |
| 21 | 21 | <td><%= ticket.status.to_s.capitalize %></td> |
| toggle raw diff |
--- a/app/views/tickets/ac_project_index.html.erb
+++ b/app/views/tickets/ac_project_index.html.erb
@@ -1,5 +1,7 @@
<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %>
+<%= div_formattedtext_open %>
+
<table class='public' width='100%'>
<thead>
<th width='100'>Milestone</th>
@@ -13,7 +15,7 @@
<% for ticket in @tickets %>
<tr>
<td><%= ticket.name %></td>
- <td><%= ticket.summary %></td>
+ <td><%= "<span class='red'>" if ticket.priority == :critical %><%= ticket.summary %><%= "</span>" if ticket.priority == :critical %></td>
<td><%= ticket.fullname %></td>
<td><%= ticket.formatted_ttype %></td>
<td><%= ticket.status.to_s.capitalize %></td> |
| |   |
| 132 | 132 | .formattedtext .screenshot { display: block; } |
| 133 | 133 | .formattedtext .screenshot img { border: 1px solid #aaa; display: inline; margin: 0px 10px 0px 0px; } |
| 134 | 134 | |
| 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 | |
| 135 | 139 | .formattedtext .highlight { background-color: yellow; } |
| 136 | 140 | |
| 137 | 141 | /* Admin section */ |
| … | … | |
| 272 | 272 | */ |
| 273 | 273 | |
| 274 | 274 | |
| 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; } |
| 277 | 277 | .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; } |
| 278 | 278 | |
| 279 | 279 | code, pre, tt { font-size: 0.9em; font-family: Monaco, "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; } |
| toggle raw diff |
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -132,6 +132,10 @@ html>body #content_withrightcolumn {height: auto;}
.formattedtext .screenshot { display: block; }
.formattedtext .screenshot img { border: 1px solid #aaa; display: inline; margin: 0px 10px 0px 0px; }
+.formattedtext .red { background-color: #ffe0e0; padding-left: 4px; padding-right: 4px; }
+.formattedtext .small_grey { color: grey; font-size: 0.8em; }
+.formattedtext .small { font-size: 0.8em; }
+
.formattedtext .highlight { background-color: yellow; }
/* Admin section */
@@ -268,8 +272,8 @@ Repository Specific Styles
*/
-.commit_item { margin: 10px 0px 40px 0px; }
-.commit_message { margin-top: 10px; color: #444; background-color: #f0f0f0; padding: 10px 10px 0px 10px; border: 1px solid #ddd; }
+.commit_item { margin: 10px 0px 30px 0px; }
+.commit_message { margin-top: 10px; width: 60%; color: #444; background-color: #f0f0f0; padding: 10px 10px 0px 10px; border: 1px solid #ddd; }
.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; }
code, pre, tt { font-size: 0.9em; font-family: Monaco, "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; } |