Commit 0abaf722ddd93ed085d37142ef7e925d811a37d0

move sidebar menu into a submenu at the top

Commit diff

app/views/accounts/edit.html.erb

 
2525 <%= f.submit "Save" -%>
2626<% end -%>
2727
28<% content_for :sidebar do -%>
29 <ul class="links">
28<% content_for :submenu do -%>
29 <ul>
3030 <li><%= link_to "&#x2190; My account", account_path -%></li>
3131 </ul>
3232<% end -%>
toggle raw diff

app/views/accounts/show.html.erb

 
1717<% end -%>
1818
1919
20<% content_for :sidebar do -%>
21 <ul class="links">
20<% content_for :submenu do -%>
21 <ul>
2222 <li><%= link_to "+ Add SSH key", new_account_key_path -%></li>
2323 <li><%= link_to "&#x2192; Edit details", edit_account_path -%></li>
2424 </ul>
toggle raw diff

app/views/browse/_sidebar.html.erb

 
0<% content_for :sidebar do -%>
1 <ul class="links">
2 <li><%= link_to "&#x2190; shortlog index", 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/_submenu.html.erb

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

app/views/browse/blob.html.erb

 
44</h1>
55<pre><%=h @blob.contents -%></pre>
66
7<%= render :partial => "sidebar" -%>
7<%= render :partial => "submenu" -%>
toggle raw diff

app/views/browse/commit.html.erb

 
2424 </div>
2525<% end -%>
2626
27<%= render :partial => "sidebar" -%>
27<%= render :partial => "submenu" -%>
toggle raw diff

app/views/browse/diff.html.erb

 
1010 <p><pre><%=h file.patch -%></pre></p>
1111<% end -%>
1212
13<%= render :partial => "sidebar" -%>
13<%= render :partial => "submenu" -%>
toggle raw diff

app/views/browse/index.html.erb

 
2727 <% end -%>
2828</table>
2929
30<% content_for :sidebar do -%>
31 <ul class="links">
32 <li><%= link_to "&#x2190; Repository page",
33 project_repository_path(@project, @repository) -%></li>
34 <li><%= link_to "&#x2190; Project page",
35 project_path(@project) -%></li>
36 </ul>
37
30<% content_for :submenu do -%>
31<ul>
32 <li><%= link_to "&#x2190; Repository page",
33 project_repository_path(@project, @repository) -%></li>
34 <li><%= link_to "&#x2190; Project page",
35 project_path(@project) -%></li>
36</ul>
37<% end -%>
38
39<% content_for :sidebar do -%>
3840 <h5>Branches:</h5>
3941 <ul class="links">
4042 <% @git.branches.each do |branch| -%>
toggle raw diff

app/views/browse/tree.html.erb

 
2020 <% end -%>
2121</table>
2222
23<%= render :partial => "sidebar" -%>
23<%= render :partial => "submenu" -%>
toggle raw diff

app/views/comments/commit.html.erb

 
1515
1616<%= render :partial => "form", :locals => {:sha1 => @commit.sha} -%>
1717
18<%= render :partial => "browse/sidebar" -%>
18<%= render :partial => "browse/submenu" -%>
toggle raw diff

app/views/comments/index.html.erb

 
2121
2222<%= render :partial => "form" -%>
2323
24<%= render :partial => "repositories/sidebar" -%>
24<%= render :partial => "repositories/submenu" -%>
toggle raw diff

app/views/committers/new.html.erb

 
1414 </p>
1515<% end -%>
1616
17<% content_for :sidebar do -%>
17<% content_for :submenu do -%>
1818 <ul class="links">
1919 <li><%= link_to "&#x2190; " + h(@repository.project.title), @repository.project -%></li>
2020 </ul>
toggle raw diff

app/views/keys/edit.html.erb

 
1010 <%= f.submit "Save" -%>
1111<% end -%>
1212
13<% content_for :sidebar do -%>
14 <ul class="links">
13<% content_for :submenu do -%>
14 <ul>
1515 <li><%= link_to "Account", account_path -%></li>
1616 </ul>
1717<% end -%>
toggle raw diff

app/views/keys/index.html.erb

 
1010
1111<p><%= link_to "Add", new_account_key_path -%></p>
1212
13<% content_for :sidebar do -%>
14 <ul class="links">
13<% content_for :submenu do -%>
14 <ul>
1515 <li><%= link_to "Account", account_path -%></li>
1616 </ul>
1717<% end -%>
toggle raw diff

app/views/keys/new.html.erb

 
1313 <%= f.submit "Save" -%>
1414<% end -%>
1515
16<% content_for :sidebar do -%>
17 <ul class="links">
16<% content_for :submenu do -%>
17 <ul>
1818 <li><%= link_to "&#x2190; My account", account_path -%></li>
1919 </ul>
2020<% end -%>
toggle raw diff

app/views/keys/show.html.erb

 
11<%= render :partial => "key", :locals => {:ssh_key => @ssh_key} -%>
22
3<% content_for :sidebar do -%>
4 <ul class="links">
3<% content_for :submenu do -%>
4 <ul>
55 <li><%= link_to "Account", account_path -%></li>
66 </ul>
77<% end -%>
toggle raw diff

app/views/layouts/application.html.erb

 
3838 <li><%= link_to "About", about_path -%></li>
3939 </ul>
4040 </div>
41 <div id="submenu">
42 <%= yield :submenu -%>
43 </div>
4144 </div>
45 <% unless @content_for_sidebar.blank? -%>
4246 <div id="main">
47 <% end -%>
4348 <div id="content">
4449 <% if flash[:notice] -%>
4550 <div class="flash_message notice">
……
5858 <% end -%>
5959 <%= yield -%>
6060 </div>
61 <% unless @content_for_sidebar.blank? -%>
6162 </div>
6263 <div id="sidebar">
6364 <%= yield :sidebar -%>
6465 </div>
6566 <div class="clear"></div>
67 <% end -%>
6668 <div id="footer">
6769 <ul>
6870 <li><%= link_to "Home", root_path -%> | </li>
toggle raw diff

app/views/projects/index.html.erb

 
1111
1212<%= will_paginate @projects -%>
1313
14<% content_for :sidebar do -%>
15 <ul class="links">
14<% content_for :submenu do -%>
15 <ul>
1616 <li><%= link_to "+ New project", new_project_path -%></li>
1717 </ul>
18
18<% end -%>
19
20<% content_for :sidebar do -%>
1921 <h4>Categories:</h4>
2022 <ul class="tag_list">
2123 <% tag_cloud @tags, default_css_tag_sizes do |tag, css_class| %>
toggle raw diff

app/views/projects/show.html.erb

 
5959 <% end -%>
6060</table>
6161
62<% content_for :sidebar do -%>
63 <ul class="links">
64 <% if @project.admin?(current_user) -%>
65 <li><%= link_to "&#x2192; Edit project", edit_project_path(@project) -%></li>
66 <% end -%>
62<% content_for :submenu do -%>
63 <% if @project.admin?(current_user) -%>
64 <ul>
65 <li><%= link_to "&#x2192; Edit project", edit_project_path(@project) -%></li>
6766 </ul>
67 <% end -%>
6868<% end -%>
toggle raw diff

app/views/repositories/_sidebar.html.erb

 
0<% content_for :sidebar do -%>
1 <div class="user_list">
2 <ul class="links">
3 <% if @repository.ready? -%>
4 <li><%= link_to "&#x2192; Browse repository", project_repository_browse_path(@project, @repository) -%></li>
5 <li><%= link_to "+ Clone this repository", new_project_repository_path(@project, @repository) -%></li>
6 <% end -%>
7 <% if @repository.user == current_user -%>
8 <li><%= link_to "+ Add committer",
9 { :controller => "committers", :action => "new", :project_id => @project,
10 :repository_id => @repository } -%></li>
11 <% end -%>
12 </ul>
13
14 <h4>Committers</h4>
15 <ul>
16 <% @repository.committers.each do |user| -%>
17 <li>
18 <%= link_to h(user.login), user -%>
19 <% if @repository.user == user -%>
20 <small>(owner)</small>
21 <% end -%>
22 <% if @repository.user == current_user -%>
23 <small>
24 <%= link_to "Remove",
25 { :controller => "committers", :action => "destroy", :id => user.id,
26 :project_id => @project, :repository_id => @repository}, # FIXME: meh!
27 :confirm => "Are you sure?", :method => :delete unless user == current_user -%>
28 </small>
29 <% end -%>
30 </li>
31 <% end -%>
32 </ul>
33 </div>
34<% end -%>
toggle raw diff

app/views/repositories/_submenu.html.erb

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

app/views/repositories/new.html.erb

 
2020 the clone here until there's something to push.</em>
2121</p>
2222
23<% content_for :sidebar do -%>
24 <ul class="links">
23<% content_for :submenu do -%>
24 <ul>
2525 <li><%= link_to "&#x2190; Repository page",
2626 project_repository_path(@project, @repository_to_clone) -%></li>
2727 <li><%= link_to "&#x2190; Project page",
toggle raw diff

app/views/repositories/show.html.erb

 
3636
3737<% end -%>
3838
39<%= render :partial => "sidebar" -%>
39<%= render :partial => "submenu" -%>
40
41<% content_for :sidebar do -%>
42 <div class="user_list">
43 <h4>Committers</h4>
44 <ul>
45 <% @repository.committers.each do |user| -%>
46 <li>
47 <%= link_to h(user.login), user -%>
48 <% if @repository.user == user -%>
49 <small>(owner)</small>
50 <% end -%>
51 <% if @repository.user == current_user -%>
52 <small>
53 <%= link_to "Remove",
54 { :controller => "committers", :action => "destroy", :id => user.id,
55 :project_id => @project, :repository_id => @repository}, # FIXME: meh!
56 :confirm => "Are you sure?", :method => :delete unless user == current_user -%>
57 </small>
58 <% end -%>
59 </li>
60 <% end -%>
61 </ul>
62 </div>
63<% end -%>
toggle raw diff

app/views/sessions/new.html.erb

 
2020 <p><%= submit_tag 'Log in' %></p>
2121<% end -%>
2222
23<% content_for(:sidebar) do -%>
24 <ul class="links">
23<% content_for(:submenu) do -%>
24 <ul>
2525 <li><%= link_to "&#x2192; Register", new_user_path -%></li>
2626 </ul>
2727<% end -%>
toggle raw diff

app/views/users/show.html.erb

 
2626</ul>
2727
2828<% if current_user && (current_user == @user) -%>
29 <% content_for :sidebar do -%>
30 <ul class="links">
29 <% content_for :submenu do -%>
30 <ul>
3131 <li><%= link_to "+ Edit your account", edit_account_url -%>
3232 </ul>
3333 <% end -%>
toggle raw diff

lib/authenticated_system.rb

 
6464 respond_to do |accepts|
6565 accepts.html do
6666 store_location
67 flash[:error] = "Action requires login"
6768 redirect_to :controller => '/sessions', :action => 'new'
6869 end
6970 accepts.xml do
toggle raw diff

public/stylesheets/base.css

 
146146 float:left;
147147 margin-right: -160px;
148148}
149#container #main #content {
149#container #content { /* when there's no sidebar*/
150 margin: 0 0 1em 2.5em;
151}
152#container #main #content { /* when there's sidebar contents */
153 margin:0;
150154 margin-right: 160px;
151155 margin-top: 20px;
152156 padding: 0 1em 1em 2em;
153157}
154
155158#container #sidebar {
156159 margin-top: 20px;
157160 padding-left: 5px;
……
235235 border-bottom: 3px solid #630;
236236}
237237
238/* submenu */
239#submenu {
240 margin-bottom: 0.5em;
241 border-bottom: 1px solid #ccc;
242}
243#submenu ul {
244 list-style: none;
245 padding: 2px 0 2px 0;
246 margin: 0 0 0 2em;
247}
248
249#submenu ul li {
250 display: inline;
251 margin-right: 30px;
252}
253
254#submenu ul li a {
255/* font-size: 12px;*/
256}
257
258#submenu ul li a:hover {
259 text-decoration: none;
260 border-bottom: 2px solid #630;
261}
262
238263/* Forms */
239264
240265textarea {
toggle raw diff