Commit d4351d13b500903bf8c0691ef21acb193a33c48e

slight improvements to project lists and user pages

Commit diff

app/controllers/projects_controller.rb

 
33 before_filter :require_user_has_ssh_keys, :only => [:new, :create]
44
55 def index
6 @projects = Project.paginate(:all, :order => "created_at desc",
7 :page => params[:page])
6 @projects = Project.paginate(:all, :order => "projects.created_at desc",
7 :page => params[:page], :include => [:tags])
88 @atom_auto_discovery_url = formatted_projects_path(:atom)
99 respond_to do |format|
1010 format.html { @tags = Project.tag_counts }
toggle raw diff

app/controllers/users_controller.rb

 
55
66 def show
77 @user = User.find_by_login!(params[:id])
8 @repositories = @user.repositories.paginate(:all, :include => :project,
9 :order => "project_id desc",
10 :page => params[:page])
8 @projects = @user.projects.find(:all, :include => [:tags])
9 @repositories = @user.repositories.find(:all, :conditions => ["mainline = ?", false])
1110 end
1211
1312 def create
toggle raw diff

app/models/project.rb

 
5353 find_by_slug(slug) || raise(ActiveRecord::RecordNotFound)
5454 end
5555
56 def self.per_page() 20 end
57
5658 def to_param
5759 slug
5860 end
toggle raw diff

app/views/projects/_project.html.erb

 
1<h3><%= link_to project.title, project_path(project) -%></h3>
2<p><%= truncate project.description, 250 -%></p>
3<p class="hint">
4 <strong>Categories:</strong>
5 <%= project.tag_list.blank? ? "none" : linked_tag_list_as_sentence(project.tags) -%>
6</p>
toggle raw diff

app/views/projects/index.html.erb

 
22
33<ul class="project_list">
44<% @projects.each do |project| -%>
5 <li>
6 <h3><%= link_to project.title, project_path(project) -%></h3>
7 <em><%= truncate project.description, 250 -%></em>
5 <li class="project_list_item">
6 <%= render :partial => project, :object => project -%>
87 </li>
98<% end -%>
109</ul>
toggle raw diff

app/views/users/show.html.erb

 
1<% @page_title = @user.login -%>
2<h1><%=h @user.login -%></h1>
1<% @page_title = h(@user.login) -%>
2
3<h1>
4 <%=h @user.login -%>
5 <small><%= @user.fullname.blank? ? "" : "(#{h(@user.fullname)})" -%></small>
6</h1>
37
48<ul class="infobox">
5 <li><strong>Username:</strong> <%= h(@user.login) -%></li>
6 <li><strong>Realname:</strong> <%= @user.fullname.blank? ? "N/A" : h(@user.fullname) -%></li>
79 <li><strong>Email:</strong> <%= encoded_mail_to(@user.email) -%></li>
810 <li><strong>Url:</strong> <a href="<%=h @user.url -%>"><%=h @user.url -%></a></li>
911 <li><strong>Member for</strong> <%= time_ago_in_words(@user.created_at) -%></li>
1012</ul>
1113
12<h2>Repositories<small>, per project</small></h2>
14<div id="left">
15<% unless @projects.blank? -%>
16 <h2>Projects</h2>
17 <ul class="project_list">
18 <% @projects.each do |project| -%>
19 <li class="project_list_item">
20 <%= render :partial => project, :object => project -%>
21 </li>
22 <% end -%>
23 </ul>
24<% end -%>
25</div>
1326
14<ul>
15 <% @repositories.group_by(&:project).each do |project, repositories| -%>
16
27<div id="right">
28<% unless @repositories.blank? -%>
29 <h2>Repositories</h2>
30 <% @repositories.each do |repos| -%>
1731 <li>
18 <strong><%= link_to h(project.title) , project_url(project) -%></strong>
19 <ul>
20 <% repositories.each do |repos| -%>
21 <li><%= link_to h(repos.name), project_repository_url(repos.project, repos) -%></li>
22 <% end -%>
23 </ul>
32 <%= link_to h(repos.name), project_repository_url(repos.project, repos) -%>
33 of <%= link_to h(repos.project.title), repos.project -%>
2434 </li>
2535 <% end -%>
26 <%= will_paginate(@repositories) -%>
27</ul>
36 </ul>
37<% end -%>
38</div>
2839
2940<% if current_user && (current_user == @user) -%>
3041 <% content_for :submenu do -%>
toggle raw diff

public/stylesheets/base.css

 
758758 text-align: center;
759759 margin-bottom:0;
760760 padding: 5px;
761}
762
763.project_list_item p {
764 margin-top: 0;
765 margin-bottom: 0;
766}
767
768#left {
769 float:left;
770 width: 48%;
771}
772
773#right {
774 float:right;
775 width: 48%;
776 clear:right;
761777}
toggle raw diff