lil restyle

Gemfile

@@ -6,6 +6,7 @@ gem "sqlite3"
 gem "devise", "1.5.0"
 gem "stamp"
 gem "kaminari"
+gem "haml", "3.1.4"
 gem "haml-rails"
 gem "jquery-rails"
 gem "grit", :git => "https://github.com/gitlabhq/grit.git"
@@ -25,6 +26,7 @@ gem "drapper"
 gem "resque"
 gem "httparty"
 gem "charlock_holmes"
+gem "foreman"
 
 group :assets do
   gem "sass-rails",   "~> 3.1.0"

Gemfile.lock

@@ -104,8 +104,11 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.11)
+    foreman (0.27.0)
+      term-ansicolor (~> 1.0.5)
+      thor (>= 0.13.6)
     git (1.2.5)
-    haml (3.1.3)
+    haml (3.1.4)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
@@ -246,6 +249,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     stamp (0.1.6)
+    term-ansicolor (1.0.7)
     therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thin (1.3.1)
@@ -291,9 +295,11 @@ DEPENDENCIES
   devise (= 1.5.0)
   drapper
   faker
+  foreman
   git
   gitolite!
   grit!
+  haml (= 3.1.4)
   haml-rails
   httparty
   jquery-rails

app/assets/javascripts/tree.js

@@ -5,7 +5,7 @@
 var Tree = { 
   init: 
     function() { 
-      (new Image).src = "/assets/ajax-loader-tree.gif";
+      (new Image).src = "ajax-loader-facebook.gif";
 
       $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live("click", function() {
         history.pushState({ path: this.path }, '', this.href)
@@ -20,8 +20,8 @@ var Tree = {
       });
 
       $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live({ 
-        "ajax:beforeSend": function() { $('h2.icon').addClass("loading") },
-        "ajax:complete": function() { $('h2.icon').removeClass("loading")} 
+        "ajax:beforeSend": function() { $('.tree_progress').addClass("loading"); },
+        "ajax:complete": function() { $('.tree_progress').removeClass("loading"); } 
       });
     }
 }

app/assets/stylesheets/projects.css.scss

@@ -693,3 +693,36 @@ a.project-update.titled {
     top: 0;
   }
 }
+
+.add_new { 
+  float:right;
+  padding: 5px 12px;
+  border: 1px solid #CCC;
+
+  &:hover { 
+    background:#eee;
+  }
+
+  &:active { 
+    background:#ddd;
+  }
+}
+
+.tree_progress { 
+  float:left;
+  width:16px;
+  height:16px;
+  margin:6px;
+  &.loading { 
+    background-position: 0px 0px;
+    background: url("ajax-loader-facebook.gif") no-repeat;
+  }
+}
+
+#tree-breadcrumbs { 
+  h2 {
+    margin:0;
+    margin-bottom:20px;
+    float:left;
+  }
+}

app/controllers/dashboard_controller.rb

@@ -3,7 +3,7 @@ class DashboardController < ApplicationController
 
   def index
     @projects = current_user.projects.all
-    @active_projects = @projects.select(&:last_activity_date_cached).sort_by(&:last_activity_date_cached).reverse
+    @active_projects = @projects.select(&:repo_exists?).select(&:last_activity_date_cached).sort_by(&:last_activity_date_cached).reverse
 
     respond_to do |format|
       format.html

app/helpers/projects_helper.rb

@@ -28,10 +28,8 @@ module ProjectsHelper
   end
 
   def tree_tab_class
-    current_page?(:controller => "refs",
-                  :action => "tree", 
-                  :project_id => @project, 
-                  :id => @ref || @project.root_ref ) ? "current" : nil
+    controller.controller_name == "refs" ? 
+     "current" : nil
   end
 
   def repository_tab_class

app/views/hooks/index.html.haml

 = render "repositories/head"
-
-
-
-
-.right= link_to "Add new", new_project_hook_path(@project), :class => "grey-button append-bottom-10"
 - unless @hooks.empty?
   %div.update-data.ui-box.ui-box-small
     .data
@@ -19,7 +14,7 @@
   %h3 No hooks
 
 .clear
-%h3 Help
+%hr
 %p 
   Post receive hooks. For now only POST request allowed. We send some data with request. Example below
 

app/views/projects/_project_head.html.haml

@@ -15,4 +15,13 @@
     %span
     Snippets
 
+  - if current_page?(project_snippets_path(@project))
+    - if can? current_user, :write_snippet, @project
+      = link_to new_project_snippet_path(@project), :class => "add_new", :title => "New Snippet" do 
+        = image_tag "add_new.png", :width => 14
 
+
+  - if current_page?(team_project_path(@project))
+    - if can? current_user, :admin_team_member, @project
+      = link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member", :remote => true do 
+        = image_tag "add_new.png", :width => 14

app/views/projects/_team.html.haml

-- if can? current_user, :admin_team_member, @project
-  %div#new-member-holder
-    .right= link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "grey-button"
-  .clear
-  %br
 %table.round-borders#team-table
   %thead
     %th Name

app/views/projects/_top_menu.html.haml

-%div.top_project_menu
-  - if @project.repo_exists?
-    %span= link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
-    %span= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
-    %span= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
-    %span
-      = 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
-  %span
-    = 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
-  %span
-    = 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
-  %span
-    = 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
-    %span= 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
-

app/views/refs/_tree.html.haml

 #tree-breadcrumbs
-  %h2.icon
-    %span
-    %d
+  %h2
     = link_to tree_project_ref_path(@project, @ref, :path => nil), :remote => true do
       = @project.code
-      - tree.breadcrumbs(3) do |link|
+    - tree.breadcrumbs(4) do |link|
       \/
       = link
      
+  %span.tree_progress
 .clear
 #tree-content-holder
   - if tree.is_blob?

app/views/repositories/_head.html.haml

@@ -15,5 +15,9 @@
     %span
     Deploy Keys
 
+  - if current_page?(project_hooks_path(@project))
+    - if can? current_user, :admin_project, @project
+      = link_to new_project_hook_path(@project), :class => "add_new", :title => "New Web Hook" do 
+        = image_tag "add_new.png", :width => 14
 
 

app/views/snippets/index.html.haml

 = render "projects/project_head"
-- if can? current_user, :write_snippet, @project
-  .right= link_to 'New Snippet', new_project_snippet_path(@project), :class => "grey-button append-bottom-10"
 
 - unless @snippets.fresh.empty?
   %div{ :class => "update-data ui-box ui-box-small ui-box-big" }

spec/requests/team_members_spec.rb

@@ -22,7 +22,7 @@ describe "TeamMembers" do
     before do
       @user_1 = Factory :user
       visit team_project_path(@project)
-      click_link "Add new"
+      click_link "New Team Member"
     end
 
     it "should open new team member popup" do