diff options
| -rw-r--r-- | app/assets/stylesheets/common.scss | 2 | ||||
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/dashboard/activities.html.haml | 10 | ||||
| -rw-r--r-- | app/views/dashboard/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/_app_menu.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/index.html.haml | 32 | ||||
| -rw-r--r-- | app/views/projects/show.js.haml | 7 | ||||
| -rw-r--r-- | spec/requests/dashboard_spec.rb | 14 |
9 files changed, 11 insertions, 65 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c0ead28ee49..6b3455c594c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -925,7 +925,7 @@ p.time { } a:last-child h4 { border:none; } - a.active { + a:hover { h4 { color:#111; border-right:4px solid $styled_border_color; diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index e098f571913..f6b09e23430 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -34,9 +34,4 @@ class DashboardController < ApplicationController format.atom { render :layout => false } end end - - def activities - @projects = current_user.projects.all - @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40) - end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 90372cf5c8b..459beec9a73 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -13,6 +13,7 @@ class ProjectsController < ApplicationController def index @projects = current_user.projects @projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse + @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40) end def new @@ -78,7 +79,6 @@ class ProjectsController < ApplicationController render "projects/empty" end end - format.js end end diff --git a/app/views/dashboard/activities.html.haml b/app/views/dashboard/activities.html.haml deleted file mode 100644 index 2b96acc60ec..00000000000 --- a/app/views/dashboard/activities.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if @events.any? - %div.dashboard_category - %h3 - %span.ico.activities - = link_to "Activities" , "#activities", :id => "activities" - - %hr - = render @events -- else - %h3 Nothing here diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 895c47124f0..b20fafca75c 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -62,9 +62,6 @@ %h3 %span.ico.activities = link_to "Activities" , "#activities", :id => "activities" - %strong.right - = link_to dashboard_activities_path do - Visit activities page → %hr .row diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml index b96bdacc385..b9249b525b0 100644 --- a/app/views/layouts/_app_menu.html.haml +++ b/app/views/layouts/_app_menu.html.haml @@ -1,7 +1,6 @@ %nav.main_menu = render "layouts/const_menu_links" = link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}" - = link_to "Activities", dashboard_activities_path, :class => "#{"current" if current_page?(dashboard_activities_path)}" = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do Issues %span.count= current_user.assigned_issues.opened.count diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index e163851fd46..fee6363de09 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -1,22 +1,25 @@ - if @projects.any? .row - .span4 + .span11 + = render @events + .span5.right %div.leftbar.ui-box %h5 Projects + %small + (#{@projects.count}) - if current_user.can_create_project? %span.right = link_to new_project_path, :class => "btn very_small info" do New Project .content_list - @projects.each do |project| - = link_to project_path(project), :remote => true, :class => dom_class(project) do + = link_to project_path(project), :class => dom_class(project) do %h4 %span.ico.project - = truncate(project.name, :length => 22) - .span12.right - .show_holder.ui-box.padded - .loading + = truncate(project.name, :length => 25) + %span.right + → - else %h3 Nothing here @@ -31,20 +34,3 @@ New Project ยป - else If you will be added to project - it will be displayed here - - -:javascript - $(function(){ - $("a.project").live("ajax:before", function() { - $(".show_holder").html("<div class='loading'>"); - $('a.project').removeClass("active"); - $(this).addClass("active"); - }); - $('a.project:first-child').trigger("click"); - }); - -- if @projects.count == @limit - :javascript - $(function(){ - Pager.init(#{@limit}); - }); diff --git a/app/views/projects/show.js.haml b/app/views/projects/show.js.haml deleted file mode 100644 index 132ebebf23f..00000000000 --- a/app/views/projects/show.js.haml +++ /dev/null @@ -1,7 +0,0 @@ -- if @project.repo_exists? && @project.has_commits? - :plain - $(".show_holder").html("#{escape_javascript(render(:partial => 'projects/show'))}"); -- else - :plain - $(".show_holder").html("#{escape_javascript(render(:template => 'projects/empty'))}"); - diff --git a/spec/requests/dashboard_spec.rb b/spec/requests/dashboard_spec.rb index 1ca256f93ca..cfdbb8d4729 100644 --- a/spec/requests/dashboard_spec.rb +++ b/spec/requests/dashboard_spec.rb @@ -23,18 +23,4 @@ describe "Dashboard" do page.should have_content(@project.name) end end - - describe "GET /dashboard/activities" do - before do - visit dashboard_activities_path - end - - it "should be on dashboard page" do - current_path.should == dashboard_activities_path - end - - it "should have projects panel" do - page.should have_content(@project.name) - end - end end |