Commit 4d372ef9ab1c5c08425c46066e6b103ed07d06c4

- Smaller commit graphs
- move commit graph to the logs page

Commit diff


23	23	<div id="header">
24	24	<h1 id="logo">
25	25	<%= link_to image_tag("logo-white.png"), root_path -%>
26		~~<!-- <h1><%= link_to "Gitorious", root_path -%></h1> -->~~
27	26	</h1>
28	27	<ul id="menu">
29	28	<% unless logged_in? -%>
toggle raw diff
--- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,7 +23,6 @@ <div id="header"> <h1 id="logo"> <%= link_to image_tag("logo-white.png"), root_path -%> - <!-- <h1><%= link_to "Gitorious", root_path -%></h1> --> </h1> <ul id="menu"> <% unless logged_in? -%>


3	3	Commitlog for <%= h(@repository.name) -%>:<%=h params[:id] -%> in <%= h(@project.title) -%>
4	4	</h1>
5	5
	6	<div class="commit_graph">
	7	<%= commit_graph_tag(@repository) %>
	8	</div>
	9
	10	<%= render :partial => "log" -%>
	11
6	12	<% content_for :submenu do -%>
7	13	<%= render :partial => "repositories/context_menu" -%>
8	14	<% end -%>
9	15
10		~~<%= render :partial => "log" -%>~~
11
12	16	<% content_for :sidebar do -%>
13	17	<ul>
14	18	<li><strong>Project:</strong> <%= link_to h(@repository.project.title), @repository.project -%></li>
toggle raw diff
--- a/app/views/logs/show.html.erb +++ b/app/views/logs/show.html.erb @@ -3,12 +3,16 @@ Commitlog for <%= h(@repository.name) -%>:<%=h params[:id] -%> in <%= h(@project.title) -%> </h1> +<div class="commit_graph"> + <%= commit_graph_tag(@repository) %> +</div> + +<%= render :partial => "log" -%> + <% content_for :submenu do -%> <%= render :partial => "repositories/context_menu" -%> <% end -%> -<%= render :partial => "log" -%> - <% content_for :sidebar do -%> <ul> <li><strong>Project:</strong> <%= link_to h(@repository.project.title), @repository.project -%></li>


6	6	<% render_if_ready(@repository) do -%>
7	7
8	8	<%= render :partial => "infobox" -%>
9
10		~~<div class="commit_graph">~~
11		~~<%= commit_graph_tag(@repository) %>~~
12		~~</div>~~
13	9
14	10	<h2>Activities</h2>
15	11	<%= render :partial => "events/events", :locals => { :events => @events } -%>
toggle raw diff
--- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -6,10 +6,6 @@ <% render_if_ready(@repository) do -%> <%= render :partial => "infobox" -%> - - <div class="commit_graph"> - <%= commit_graph_tag(@repository) %> - </div> <h2>Activities</h2> <%= render :partial => "events/events", :locals => { :events => @events } -%>


18	18	def initialize(repository, branch)
19	19	@repository = repository
20	20	@branch = branch
21		~~@graph = Gruff::Area.new("650x150")~~
	21	@graph = Gruff::Area.new("650x100")
22	22	@graph.title = "Commits by week (24 week period)"
23	23	#@graph.x_axis_label = 'Commits by week (24 week period)'
24	24	#@graph.y_axis_label = "Commits"
toggle raw diff
--- a/lib/gitorious/graphs/commits_builder.rb +++ b/lib/gitorious/graphs/commits_builder.rb @@ -18,7 +18,7 @@ module Gitorious def initialize(repository, branch) @repository = repository @branch = branch - @graph = Gruff::Area.new("650x150") + @graph = Gruff::Area.new("650x100") @graph.title = "Commits by week (24 week period)" #@graph.x_axis_label = 'Commits by week (24 week period)' #@graph.y_axis_label = "Commits"