Commit 220f6fd145d914cda926e2310977ab8cbeaff95d

New fancier design

break things up a little clearer and less dull colors.

Commit diff

app/helpers/application_helper.rb

 
2626 else
2727 concat(build_notice_for(object), blk.binding)
2828 end
29 end
30
31 def selected_if_current_page(url_options)
32 "selected" if current_page?(url_options)
33 end
34
35 def link_to_with_selected(name, options = {}, html_options = nil)
36 html_options = current_page?(options) ? {:class => "selected"} : nil
37 link_to(name, options = {}, html_options)
2938 end
3039end
toggle raw diff

app/views/browse/_submenu.html.erb

 
0<% content_for :submenu do -%>
1 <ul>
2 <li><%= link_to "&#x2190; Browse repository", project_repository_browse_path(@project, @repository) -%></li>
3 <li><%= link_to "&#x2190; repository page",
4 project_repository_path(@project, @repository) -%></li>
5 <li><%= link_to "&#x2190; project page",
6 project_path(@project) -%></li>
7 </ul>
8<% end -%>
toggle raw diff

app/views/browse/blob.html.erb

 
1515</h1>
1616
1717<pre><%= with_line_numbers{ h(@blob.contents) } -%></pre>
18
19<%= render :partial => "submenu" -%>
toggle raw diff

app/views/browse/commit.html.erb

 
2727 <%= render_diff(file.patch, file.src, file.dst, @diffmode) -%>
2828 <% end -%>
2929<% end -%>
30
31<%= render :partial => "submenu" -%>
toggle raw diff

app/views/browse/index.html.erb

 
1<% @page_title = "Browsing #{@repository.name} in #{@project.title}" -%>
1<% @page_title = "Commits in #{@repository.name} in #{@project.title}" -%>
22<h1>
3 Browsing <%= link_to h(@repository.name), project_repository_path(@project, @repository) -%>
4 repository in <%= link_to h(@project.title), project_path(@project) -%>
3 Commits in the <%= h(@repository.name) -%> repository in <%= h(@project.title) -%>
54</h1>
65
76<ul class="infobox">
……
1010 tree_path(@commits.first.gtree.sha) -%></li>
1111</ul>
1212
13<h2>shortlog</h2>
13<h2>Commits</h2>
1414<%= render :partial => "log", :locals => {:commits => @commits} -%>
1515
16<% content_for :submenu do -%>
17<ul>
18 <li><%= link_to "&#x2190; Repository page",
19 project_repository_path(@project, @repository) -%></li>
20 <li><%= link_to "&#x2190; Project page",
21 project_path(@project) -%></li>
22</ul>
23<% end -%>
24
2516<% content_for :sidebar do -%>
2617 <h5>Branches:</h5>
2718 <ul class="links">
toggle raw diff

app/views/browse/log.html.erb

 
77<h2>Commit Log</h2>
88<%= render :partial => "log", :locals => {:commits => @commits} -%>
99
10<%= render :partial => "submenu" -%>
11
1210<% content_for :sidebar do -%>
1311 <h5>Branches:</h5>
1412 <ul class="links">
toggle raw diff

app/views/browse/tree.html.erb

 
11<% @page_title = "Tree for #{@repository.name} in #{@project.title}" -%>
22<h1>
3 Browsing tree of <%= link_to h(@repository.name), project_repository_path(@project, @repository) -%>
4 repository in <%= link_to h(@project.title), project_path(@project) -%>
3 Browsing tree of <%= h(@repository.name) -%> repository in <%= h(@project.title) -%>
54</h1>
65
76<table class="listing tree">
……
1919 </tr>
2020 <% end -%>
2121</table>
22
23<%= render :partial => "submenu" -%>
toggle raw diff

app/views/comments/commit.html.erb

 
11<% @page_title = "Comments in #{@repository.name}" -%>
2<h1>Comments on commit <%= link_to h(@commit.sha),
3 project_repository_commit_path(@project, @repository, @commit.sha) -%></h1>
2<h1>Comments on commit <%= h(@commit.sha) -%> in <%= h(@repository.name) -%></h1>
43
54<p><pre><%=h @commit.message -%></pre></p>
65
……
1414<%= render :partial => @comments -%>
1515
1616<%= render :partial => "form", :locals => {:sha1 => @commit.sha} -%>
17
18<%= render :partial => "browse/submenu" -%>
toggle raw diff

app/views/comments/index.html.erb

 
11<% @page_title = "Comments on #{@project.title}" -%>
22<h1>
3 Comments for &quot;<%= h(@repository.name) -%>&quot; repository in
4 <%= link_to h(@repository.project.title), @repository.project -%>
3 Comments for &quot;<%= h(@repository.name) -%>&quot; repository in <%= h(@repository.project.title) -%>
54</h1>
65
76<%= render :partial => "repositories/infobox" -%>
……
1919
2020<%= render :partial => @comments -%>
2121
22<%= render :partial => "form" -%>
23
24<%= render :partial => "repositories/submenu" -%>
22<%= render :partial => "form" -%>
toggle raw diff

app/views/committers/new.html.erb

 
11<h1>
2 Give a user commit rights to <%= link_to(h(@repository.name), [@repository.project, @repository]) -%>
3 <small>(in <%= link_to h(@repository.project.title), @repository.project -%>)</small>
2 Give a user commit rights to <%= h(@repository.name) -%>
43</h1>
54
65<% form_for @committer,
……
99 <%= text_field_with_auto_complete :user, :login, {}, :skip_style => true -%>
1010 </p>
1111 <p>
12 <%= f.submit "Add as committer" -%>
12 <%= f.submit "Add as committer" -%> or <%= link_to "cancel", [@repository.project, @repository] -%>
1313 </p>
1414<% end -%>
15
16<% content_for :submenu do -%>
17 <ul class="links">
18 <li><%= link_to "&#x2190; " + h(@repository.project.title), @repository.project -%></li>
19 </ul>
20<% end -%>
toggle raw diff

app/views/layouts/application.html.erb

 
1919 <p><strong>System notice:</strong> <%= GitoriousConfig["system_message"] -%></p>
2020 </div>
2121 <% end -%>
22 <div id="header">
23 <h1 id="logo">
24 <%= link_to image_tag("logo-white.png"), root_path -%>
25 <!-- <h1><%= link_to "Gitorious", root_path -%></h1> -->
26 </h1>
27 <ul id="menu">
28 <% unless logged_in? -%>
29 <li><%= link_to "Home", root_path -%></li>
30 <% end -%>
31 <% if logged_in? -%>
32 <li><%= link_to "Dashboard", dashboard_path -%></li>
33 <% end -%>
34 <li><%= link_to "Projects", projects_path -%></li>
35 <% if logged_in? -%>
36 <li><%= link_to "FAQ", faq_path -%></li>
37 <% else -%>
38 <li><%= link_to "About", about_path -%></li>
39 <% end -%>
40 <%- if logged_in? -%>
41 <li class="secondary">( <%= link_to "My account", account_path -%></li>
42 <li class="secondary"><%= link_to "Logout", logout_path -%> )</li>
43 <%- else -%>
44 <li class="secondary"><%= link_to "Register", new_user_path -%></li>
45 <li class="secondary"><%= link_to "Login", login_path -%></li>
46 <%- end -%>
47 </ul>
48 <ul id="submenu">
49 <% if @project -%>
50 <li class="<%= selected_if_current_page(project_path(@project)) -%>">
51 <%= link_to h(@project.title), project_path(@project) -%>
52 </li>
53 <% if @repository -%>
54 <!-- <li class="menu_title"><%= h(@repository.name) -%>:</li> -->
55 <li class="<%= selected_if_current_page(project_repository_path(@project, @repository)) -%>">
56 <%= link_to "#{h(@repository.name)} repository", project_repository_path(@project, @repository) -%>
57 </li>
58 <li class="<%= selected_if_current_page(project_repository_browse_path(@project, @repository)) -%>">
59 <%= link_to "Commits", project_repository_browse_path(@project, @repository) -%>
60 </li>
61 <li class="<%= selected_if_current_page(project_repository_tree_path(@project, @repository)) -%>">
62 <%= link_to "HEAD Tree", project_repository_tree_path(@project, @repository, "HEAD") -%>
63 </li>
64 <!-- <li class="<%= selected_if_current_page(project_repository_comments_path(@project, @repository)) -%>">
65 <%= link_to "Comments", project_repository_comments_path(@project, @repository) -%>
66 </li> -->
67 <% end -%>
68 <% end -%>
69 <%= yield :submenu -%>
70 </ul>
71 </div>
2272 <div id="container">
23 <div id="header">
24 <div class="login-logout">
25 <p>(
26 <%- if logged_in? -%>
27 <%= link_to "My account", account_path -%> |
28 <%= link_to "Logout", logout_path -%>
29 <%- else -%>
30 <%= link_to "Register", new_user_path -%> |
31 <%= link_to "Login", login_path -%>
32 <%- end -%>
33 )</p>
34 </div>
35 <div id="logo">
36 <%= link_to image_tag("logo.png"), root_path -%>
37 <!-- <h1><%= link_to "Gitorious", root_path -%></h1> -->
38 </div>
39 <div id="menu">
40 <ul>
41 <li><%= link_to "Home", root_path -%></li>
42 <% if logged_in? -%>
43 <li><%= link_to "Dashboard", dashboard_path -%></li>
44 <% end -%>
45 <li><%= link_to "Projects", projects_path -%></li>
46 <% if logged_in? -%>
47 <li><%= link_to "FAQ", faq_path -%></li>
48 <% else -%>
49 <li><%= link_to "About", about_path -%></li>
50 <% end -%>
51 </ul>
52 </div>
53 <div id="submenu">
54 <%= yield :submenu -%>
55 </div>
56 </div>
5773 <% unless @content_for_sidebar.blank? -%>
5874 <div id="main">
5975 <% end -%>
toggle raw diff

app/views/projects/edit.html.erb

 
44<% form_for(@project) do |f| -%>
55 <%= render :partial => "form", :locals => {:form => f} -%>
66 <%= f.submit "Update" -%>
7<% end -%>
8
9<% content_for :submenu do -%>
10 <li class="selected"><%= link_to "Edit project", edit_project_path(@project) -%>)</li>
711<% end -%>
toggle raw diff

app/views/projects/index.html.erb

 
1212
1313<% content_for :submenu do -%>
1414 <ul>
15 <li><%= link_to "+ New project", new_project_path -%></li>
15 <li><%= link_to "New project", new_project_path -%></li>
1616 </ul>
1717<% end -%>
1818
toggle raw diff

app/views/projects/show.html.erb

 
4242 <td>
4343 <%= repos.last_commit ? repos.last_commit.author.date.to_s(:short) : "<em>none</em>" -%>
4444 </td>
45 <td><%= link_to "browse", project_repository_browse_path(@project, repos) -%></td>
45 <td><%= link_to "commits", project_repository_browse_path(@project, repos) -%></td>
4646 </tr>
4747 <% else -%>
4848 <tr class="<%= cycle("even", "odd") -%> clone">
……
5555 <td>
5656 <%= repos.last_commit ? repos.last_commit.author.date.to_s(:short) : "<em>none</em>" -%>
5757 </td>
58 <td><%= link_to "browse", project_repository_browse_path(@project, repos) -%></td>
58 <td><%= link_to "commits", project_repository_browse_path(@project, repos) -%></td>
5959 </tr>
6060 <% end -%>
6161 <% end -%>
6262</table>
6363
6464<% content_for :submenu do -%>
65 <% if @project.admin?(current_user) -%>
66 <ul>
67 <li><%= link_to "&#x2192; Edit project", edit_project_path(@project) -%></li>
68 </ul>
69 <% end -%>
65<% if @project.admin?(current_user) -%>
66 <li><%= link_to "Edit project", edit_project_path(@project) -%>)</li>
67<% end -%>
7068<% end -%>
toggle raw diff

app/views/repositories/_submenu.html.erb

 
0<% content_for :submenu do -%>
1 <ul>
2 <% if @repository.ready? -%>
3 <li><%= link_to "&#x2192; Browse repository", project_repository_browse_path(@project, @repository) -%></li>
4 <li><%= link_to "+ Clone this repository", new_project_repository_path(@project, @repository) -%></li>
5 <% end -%>
6 <% if @repository.user == current_user -%>
7 <li><%= link_to "+ Add committer",
8 { :controller => "committers", :action => "new", :project_id => @project,
9 :repository_id => @repository } -%></li>
10 <% end -%>
11 </ul>
12<% end -%>
toggle raw diff

app/views/repositories/new.html.erb

 
1919 with lots of empty repositories), so it's a good idea to wait with creating
2020 the clone here until there's something to push.</em>
2121</p>
22
23<% content_for :submenu do -%>
24 <ul>
25 <li><%= link_to "&#x2190; Repository page",
26 project_repository_path(@project, @repository_to_clone) -%></li>
27 <li><%= link_to "&#x2190; Project page",
28 project_path(@project) -%></li>
29 </ul>
30<% end -%>
toggle raw diff

app/views/repositories/show.html.erb

 
11<% @page_title = "#{@repository.name} in #{@project.title}" -%>
22<h1>
3 &quot;<%= h(@repository.name) -%>&quot; repository in
4 <%= link_to h(@repository.project.title), @repository.project -%>
3 &quot;<%= h(@repository.name) -%>&quot; repository in <%= h(@repository.project.title) -%>
54</h1>
65
76<% render_if_ready(@repository) do -%>
……
1212 <li><%= link_to "comments (#{@comment_count})", project_repository_comments_path(@project, @repository) -%></li>
1313 </ul>
1414
15 <h2>
16 Recent commits
17 <small>
18 (<%= link_to "Shortlog", project_repository_browse_path(@project, @repository) -%> |
19 <%= link_to "HEAD tree", project_repository_tree_path(@project, @repository, "HEAD", []) -%>)
20 </small>
21 </h2>
15 <h2>Recent commits</h2>
2216 <ul>
2317 <% if @commits.blank? -%>
2418 <li><em>No commits yet…</em></li>
……
2929
3030<% end -%>
3131
32<%= render :partial => "submenu" -%>
33
3432<% content_for :sidebar do -%>
33 <ul class="links">
34 <% if @repository.ready? -%>
35 <li><%= link_to "Clone this repository", new_project_repository_path(@project, @repository) -%></li>
36 <% end -%>
37 <% if @repository.user == current_user -%>
38 <li><%= link_to "Add committer",
39 { :controller => "committers", :action => "new", :project_id => @project,
40 :repository_id => @repository } -%></li>
41 <% end -%>
42 </ul>
3543 <div class="user_list">
3644 <h4>Committers</h4>
3745 <ul>
toggle raw diff

app/views/sessions/new.html.erb

 
2222
2323<% content_for(:submenu) do -%>
2424 <ul>
25 <li><%= link_to "&#x2192; Register", new_user_path -%></li>
25 <li><%= link_to "Register", new_user_path -%></li>
2626 </ul>
2727<% end -%>
toggle raw diff

public/images/logo-white.png

 
toggle raw diff

public/stylesheets/base.css

 
8484}
8585a {
8686/* color: #630;*/
87 color: #811E00;
87/* color: #811E00;*/
88 color: #e7371a;
8889 text-decoration: none;
8990}
9091a:hover {
……
122122
123123#container {
124124 width: 90%;
125 margin-top: 20px;
125126}
126127
127128#header {
128 /*background: #C7BA99;*/
129 background: #292929;
129130 padding-left: 0.5em;
130131}
131132
132#container #logo {
133 margin: 0.5em 0.5em 1em 2em;
134}
135
136#container #logo h1 { line-height: 100%; }
137#container #logo h1 a { color: #666; }
138
139.login-logout {
140 float: right;
141}
142
143#container #menu {
144 height: 21px;
145 border-bottom: 1px solid #333;
133#header #logo {
134 padding: 10px 0 20px 30px;
135 line-height: 100%;
136 margin:0;
146137}
138#header #logo a { color: #666; }
147139
148140#container #main {
149141 min-height: 300px;
……
212212
213213/* menu */
214214
215#menu ul {
215#menu {
216 float: right;
217 margin-top: -50px;
218 margin-right: 20px;
216219 list-style: none;
217 margin-left: 2em;
218220 padding-top: 2px;
219221}
220222
221#menu ul li {
223#menu li {
222224 display: inline;
223225 margin-right: 20px;
224226}
227#menu li.secondary {
228 margin-right: 5px;
229 color: #666;
230}
231#menu li a {
232 font-size: 14px;
233 color: #eab239;
234}
225235
226#menu ul li a {
227 font-size: 16px;
236#menu li.secondary a {
237 font-size: 11px;
228238}
229239
230#menu ul li a:hover {
240#menu li a:hover {
231241 text-decoration: none;
232 border-bottom: 4px solid #630;
242 border-bottom: 2px solid #eab239;
233243}
234244
235245/* submenu */
236246#submenu {
237 margin-bottom: 1.5em;
238 margin-top: 2px;
239 border-top: 1px dotted #666;
240 border-bottom: 1px solid #ccc;
241 font-size: 90%;
242 min-height: 2px;
243}
244#submenu ul {
247/* font-size: 90%;*/
245248 list-style: none;
246 padding: 2px 0 1px 0;
247 margin: 0 0 0 2em;
249 margin: 0 0 0 30px;
248250}
249251
250#submenu ul li {
252#submenu li {
251253 display: inline;
252254 margin-right: 20px;
253255}
256#submenu li.menu_title {
257 color: #ccc;
258 margin-right: 5px;
259 margin-left: 20px;
260}
254261
255#submenu ul li a {
256/* font-size: 12px;*/
262#submenu li a {
263 font-size: 12px;
264 background: #9cce2e;
265 color: #09460f;
266 padding: 5px 10px 3px 10px;
267}
268#submenu li.selected a {
269 background: #fff;
270 color: #000;
257271}
258272
259#submenu ul li a:hover {
273#submenu li a:hover {
260274 text-decoration: none;
261 border-bottom: 3px solid #630;
275 background: #3b5f02;
276 color: #fff;
277}
278
279#submenu li.selected a:hover {
280 background: #fff;
281 color: #000;
262282}
263283
264284/* Forms */
toggle raw diff