dashboard tabs

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index a456d64..902358f 100644 (file)
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -507,3 +507,25 @@ body.project-page table.no-borders td{
   right: 5px;
 }
 .box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;}
+
+h4.dash-tabs { 
+  margin: 0; 
+  border-bottom: 1px solid #ccc; 
+  padding: 10px 10px;
+  font-size: 11px;
+  padding-left:20px;
+  font-weight: bold; text-transform: uppercase;
+  background: #F7F7F7;
+  margin-bottom:20px;
+}
+
+.dash-button { 
+  margin-right:5px;
+  @include round-borders-all(4px);
+  border: 1px solid #ddd;
+  background:none;
+
+  &.active { 
+    background: #eaeaea;
+  }
+}

diff --git a/app/views/dashboard/_issues_feed.html.haml b/app/views/dashboard/_issues_feed.html.haml
index 5945a37..528b7b0 100644 (file)
--- a/app/views/dashboard/_issues_feed.html.haml
+++ b/app/views/dashboard/_issues_feed.html.haml
@@ -1,14 +1,3 @@
-%div
-  = link_to dashboard_path, :remote => true, :class => "left" do 
-    .box-arrow
-      ←
-  %h2{:style => "width:86%; text-align:center"}
-    Issues
-  = link_to dashboard_merge_requests_path, :remote => true, :class => "right" do 
-    .box-arrow 
-      →
-
-
 #feeds_content_holder
   .project-box.project-updates.ui-box.ui-box-small.ui-box-big
     .data

diff --git a/app/views/dashboard/_menu.html.haml b/app/views/dashboard/_menu.html.haml
new file mode 100644 (file)
index 0000000..2cb45fa
--- /dev/null
+++ b/app/views/dashboard/_menu.html.haml
@@ -0,0 +1,13 @@
+%h4.dash-tabs
+  = link_to "Activities", dashboard_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
+  = link_to "Issues", dashboard_issues_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
+  = link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
+
+
+:javascript 
+  $(function(){
+    $(".dash-button").live("click", function() { 
+      $(".dash-button").removeClass("active");
+      $(this).addClass("active");
+    })
+  });

diff --git a/app/views/dashboard/_merge_requests_feed.html.haml b/app/views/dashboard/_merge_requests_feed.html.haml
index 22a7e70..53272c9 100644 (file)
--- a/app/views/dashboard/_merge_requests_feed.html.haml
+++ b/app/views/dashboard/_merge_requests_feed.html.haml
@@ -1,13 +1,3 @@
-%div
-  = link_to dashboard_issues_path, :remote => true, :class => "left" do 
-    .box-arrow
-      ←
-  %h2{:style => "width:86%; text-align:center"}
-    Merge Requests
-  = link_to dashboard_path, :remote => true, :class => "right" do 
-    .box-arrow 
-      →
-
 #feeds_content_holder
   .project-box.project-updates.ui-box.ui-box-small.ui-box-big
     .data

diff --git a/app/views/dashboard/_projects_feed.html.haml b/app/views/dashboard/_projects_feed.html.haml
index bae5fbf..da9b45f 100644 (file)
--- a/app/views/dashboard/_projects_feed.html.haml
+++ b/app/views/dashboard/_projects_feed.html.haml
@@ -1,13 +1,3 @@
-%div
-  = link_to dashboard_merge_requests_path, :remote => true, :class => "left", :id => "merge_requests_slide" do 
-    .box-arrow
-      ←
-  %h2{:style => "width:86%; text-align:center"}
-    Activities
-  = link_to dashboard_issues_path, :remote => true, :class => "right", :id => "issues_slide" do 
-    .box-arrow 
-      →
-
 #feeds_content_holder
   - @active_projects.first(3).each do |project|
     .project-box.project-updates.ui-box.ui-box-small.ui-box-big

diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index b3de30f..7f6beff 100644 (file)
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -2,4 +2,5 @@
 
 #dashboard-content.dashboard-content.content
   = render "dashboard/sidebar"
+  = render "dashboard/menu"
   #news-feed.news-feed= render "dashboard/projects_feed"

diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 063183e..4b7af96 100644 (file)
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -2,4 +2,5 @@
 
 #dashboard-content.dashboard-content.content
   = render "dashboard/sidebar"
+  = render "dashboard/menu"
   #news-feed.news-feed= render "dashboard/issues_feed"

diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 088577e..3497062 100644 (file)
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -2,4 +2,5 @@
 
 #dashboard-content.dashboard-content.content
   = render "dashboard/sidebar"
+  = render "dashboard/menu"
   #news-feed.news-feed= render "dashboard/merge_requests_feed"