updated

diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 8307189..79b97ed 100644 (file)
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -2,6 +2,7 @@ require "base64"
 
 class CommitsController < ApplicationController
   before_filter :project
+  layout "project"
 
   # Authorize
   before_filter :add_project_abilities

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index d9a6ab2..54ad601 100644 (file)
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -1,6 +1,7 @@
 class SnippetsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :project
+  layout "project"
 
   # Authorize
   before_filter :add_project_abilities

diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 48e7e9b..8a4e32e 100644 (file)
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -1,5 +1,6 @@
 class TeamMembersController < ApplicationController
   before_filter :project
+  layout "project"
 
   # Authorize
   before_filter :add_project_abilities

diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 68f973d..acf57bd 100644 (file)
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -14,32 +14,32 @@
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"
-      = render :partial => "layouts/page_title"
       .project-container
-        .project-sidebar.grid_1
-          %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
-            %aside
-              = link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
-              = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
-              = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
-              = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
-                Team
-                - if @project.users_projects.count > 0
-                  %span{ :class => "top_menu_count" }= @project.users_projects.count
-              = link_to  project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
-                Issues
-                - if @project.issues.opened.count > 0
-                  %span{ :class => "top_menu_count" }= @project.issues.opened.count
-              = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
-                Wall
-                - if @project.common_notes.count > 0
-                  %span{ :class => "top_menu_count" }= @project.common_notes.count
-              = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
-                Snippets
-                - if @project.snippets.count > 0
-                  %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
-              - if @commit
-                = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
+        .project-sidebar
+          .fixed
+            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
+              %aside
+                = link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
+                = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
+                = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
+                = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
+                  Team
+                  - if @project.users_projects.count > 0
+                    %span{ :class => "top_menu_count" }= @project.users_projects.count
+                = link_to  project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
+                  Issues
+                  - if @project.issues.opened.count > 0
+                    %span{ :class => "top_menu_count" }= @project.issues.opened.count
+                = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
+                  Wall
+                  - if @project.common_notes.count > 0
+                    %span{ :class => "top_menu_count" }= @project.common_notes.count
+                = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
+                  Snippets
+                  - if @project.snippets.count > 0
+                    %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
+                - if @commit
+                  = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
 
 
         .project-content