0
@@ -25,8 +25,8 @@
0
   <%= f.submit "Save" -%>
0
 <% end -%>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "&#x2190; My account", account_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -17,8 +17,8 @@
0
 <% end -%>
0
 
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "+ Add SSH key", new_account_key_path -%></li>
0
     <li><%= link_to "&#x2192; Edit details", edit_account_path -%></li>
0
   </ul>

0
@@ -4,4 +4,4 @@
0
 </h1>
0
 <pre><%=h @blob.contents -%></pre>
0
 
0
-<%= render :partial => "sidebar" -%>
0
+<%= render :partial => "submenu" -%>

0
@@ -24,4 +24,4 @@
0
   </div>
0
 <% end -%>
0
 
0
-<%= render :partial => "sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "submenu" -%>
0
\ No newline at end of file

0
@@ -10,4 +10,4 @@
0
   <p><pre><%=h file.patch -%></pre></p>
0
 <% end -%>
0
 
0
-<%= render :partial => "sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "submenu" -%>
0
\ No newline at end of file

0
@@ -27,14 +27,16 @@
0
   <% end -%>
0
 </table>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
-    <li><%= link_to "&#x2190; Repository page", 
0
-              project_repository_path(@project, @repository) -%></li>
0
-    <li><%= link_to "&#x2190; Project page", 
0
-              project_path(@project) -%></li>
0
-  </ul>
0
-  
0
+<% content_for :submenu do -%>
0
+<ul>
0
+  <li><%= link_to "&#x2190; Repository page", 
0
+            project_repository_path(@project, @repository) -%></li>
0
+  <li><%= link_to "&#x2190; Project page", 
0
+            project_path(@project) -%></li>
0
+</ul>
0
+<% end -%>
0
+
0
+<% content_for :sidebar do -%>  
0
   <h5>Branches:</h5>
0
   <ul class="links">
0
     <% @git.branches.each do |branch| -%>

0
@@ -20,4 +20,4 @@
0
   <% end -%>
0
 </table>
0
 
0
-<%= render :partial => "sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "submenu" -%>
0
\ No newline at end of file

0
@@ -15,4 +15,4 @@
0
 
0
 <%= render :partial => "form", :locals => {:sha1 => @commit.sha} -%>
0
 
0
-<%= render :partial => "browse/sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "browse/submenu" -%>
0
\ No newline at end of file

0
@@ -21,4 +21,4 @@
0
 
0
 <%= render :partial => "form" -%>
0
 
0
-<%= render :partial => "repositories/sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "repositories/submenu" -%>
0
\ No newline at end of file

0
@@ -14,7 +14,7 @@
0
   </p>
0
 <% end -%>
0
 
0
-<% content_for :sidebar do -%>
0
+<% content_for :submenu do -%>
0
   <ul class="links">
0
     <li><%= link_to "&#x2190; " + h(@repository.project.title), @repository.project -%></li>
0
   </ul>

0
@@ -10,8 +10,8 @@
0
   <%= f.submit "Save" -%>
0
 <% end -%>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "Account", account_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -10,8 +10,8 @@
0
 
0
 <p><%= link_to "Add", new_account_key_path  -%></p>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "Account", account_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -13,8 +13,8 @@
0
   <%= f.submit "Save" -%>
0
 <% end -%>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "&#x2190; My account", account_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -1,7 +1,7 @@
0
 <%= render :partial => "key", :locals => {:ssh_key => @ssh_key} -%>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "Account", account_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -38,8 +38,13 @@
0
           <li><%= link_to "About", about_path -%></li>
0
         </ul>
0
       </div>
0
+      <div id="submenu">
0
+        <%= yield :submenu -%>
0
+      </div>
0
     </div>
0
+    <% unless @content_for_sidebar.blank? -%>
0
     <div id="main">
0
+    <% end -%>
0
       <div id="content">
0
         <% if flash[:notice] -%>
0
           <div class="flash_message notice">
0
@@ -53,11 +58,13 @@
0
         <% end -%>
0
         <%= yield -%>
0
       </div>
0
+    <% unless @content_for_sidebar.blank? -%>
0
     </div>
0
     <div id="sidebar">
0
       <%= yield :sidebar -%>
0
     </div>
0
     <div class="clear"></div>
0
+    <% end -%>
0
     <div id="footer">
0
       <ul>
0
         <li><%= link_to "Home", root_path -%> | </li>

0
@@ -11,11 +11,13 @@
0
 
0
 <%= will_paginate @projects -%>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "+ New project", new_project_path -%></li>
0
   </ul>
0
-  
0
+<% end -%>
0
+
0
+<% content_for :sidebar do -%>  
0
   <h4>Categories:</h4>
0
   <ul class="tag_list">
0
     <% tag_cloud @tags, default_css_tag_sizes do |tag, css_class| %>

0
@@ -59,10 +59,10 @@
0
   <% end -%>
0
 </table>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
-    <% if @project.admin?(current_user) -%>
0
-      <li><%= link_to "&#x2192; Edit project", edit_project_path(@project) -%></li>
0
-    <% end -%>
0
+<% content_for :submenu do -%>
0
+  <% if @project.admin?(current_user) -%>
0
+  <ul>
0
+    <li><%= link_to "&#x2192; Edit project", edit_project_path(@project) -%></li>
0
   </ul>
0
+  <% end -%>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -20,8 +20,8 @@
0
   the clone here until there's something to push.</em>
0
 </p>
0
 
0
-<% content_for :sidebar do -%>
0
-  <ul class="links">
0
+<% content_for :submenu do -%>
0
+  <ul>
0
     <li><%= link_to "&#x2190; Repository page", 
0
               project_repository_path(@project, @repository_to_clone) -%></li>
0
     <li><%= link_to "&#x2190; Project page", 

0
@@ -36,4 +36,28 @@
0
   
0
 <% end -%>
0
 
0
-<%= render :partial => "sidebar" -%>
0
\ No newline at end of file
0
+<%= render :partial => "submenu" -%>
0
+
0
+<% content_for :sidebar do -%>  
0
+  <div class="user_list">    
0
+    <h4>Committers</h4>    
0
+    <ul>
0
+    <% @repository.committers.each do |user| -%>
0
+      <li>
0
+        <%= link_to h(user.login), user -%> 
0
+        <% if @repository.user == user -%>
0
+        <small>(owner)</small>
0
+        <% end -%>
0
+        <% if @repository.user == current_user -%>
0
+          <small>
0
+          <%= link_to "Remove", 
0
+                { :controller => "committers", :action => "destroy", :id => user.id, 
0
+                  :project_id => @project, :repository_id => @repository}, # FIXME: meh!
0
+                :confirm => "Are you sure?", :method => :delete unless user == current_user -%>
0
+          </small>
0
+        <% end -%>
0
+      </li>
0
+    <% end -%>
0
+    </ul>
0
+  </div>
0
+<% end -%>
0
\ No newline at end of file

0
@@ -20,8 +20,8 @@
0
   <p><%= submit_tag 'Log in' %></p>
0
 <% end -%>
0
 
0
-<% content_for(:sidebar) do -%>
0
-  <ul class="links">
0
+<% content_for(:submenu) do -%>
0
+  <ul>
0
     <li><%= link_to "&#x2192; Register", new_user_path -%></li>
0
   </ul>
0
 <% end -%>
0
\ No newline at end of file

0
@@ -26,8 +26,8 @@
0
 </ul>
0
 
0
 <% if current_user && (current_user == @user)  -%>
0
-  <% content_for :sidebar do -%>
0
-    <ul class="links">
0
+  <% content_for :submenu do -%>
0
+    <ul>
0
       <li><%= link_to "+ Edit your account", edit_account_url -%>
0
     </ul>
0
   <% end -%>

0
@@ -64,6 +64,7 @@ module AuthenticatedSystem
0
       respond_to do |accepts|
0
         accepts.html do
0
           store_location
0
+          flash[:error] = "Action requires login"
0
           redirect_to :controller => '/sessions', :action => 'new'
0
         end
0
         accepts.xml do

0
@@ -146,12 +146,15 @@ abbr {
0
   float:left;
0
   margin-right: -160px;
0
 }
0
-#container #main #content {
0
+#container #content { /* when there's no sidebar*/
0
+  margin: 0 0 1em 2.5em;
0
+}
0
+#container #main #content { /* when there's sidebar contents */
0
+  margin:0;
0
   margin-right: 160px;
0
   margin-top: 20px;
0
   padding: 0 1em 1em 2em;
0
 }
0
-
0
 #container #sidebar {
0
   margin-top: 20px;
0
   padding-left: 5px;
0
@@ -232,6 +235,31 @@ abbr {
0
   border-bottom: 3px solid #630;
0
 }
0
 
0
+/* submenu */
0
+#submenu {
0
+  margin-bottom: 0.5em;
0
+  border-bottom: 1px solid #ccc;
0
+}
0
+#submenu ul {
0
+  list-style: none;
0
+  padding: 2px 0 2px 0;
0
+  margin: 0 0 0 2em;
0
+}
0
+
0
+#submenu ul li {
0
+  display: inline;
0
+  margin-right: 30px;
0
+}
0
+
0
+#submenu ul li a { 
0
+/*  font-size: 12px;*/
0
+}
0
+
0
+#submenu ul li a:hover {
0
+  text-decoration: none;
0
+  border-bottom: 2px solid #630;
0
+}
0
+
0
 /* Forms */
0
 
0
 textarea {