From 942d5a669e0e28edde1d2070f5176b964d35f997 Mon Sep 17 00:00:00 2001
From: Alexander Machehin <alexander.machehin@gmail.com>
Date: Mon, 13 May 2013 22:23:49 +0600
Subject: [PATCH] [#98] add top menu for activity & tracker/pull requests

---
 app/assets/images/menu-delimiter.png          | Bin 2823 -> 0 bytes
 app/assets/stylesheets/design/custom.scss     |  10 +++++++++-
 app/views/activity_feeds/_feed_tabs.html.haml |   9 +++++----
 app/views/activity_feeds/_top_menu.html.haml  |   7 +++++++
 app/views/activity_feeds/index.html.haml      |   3 ++-
 app/views/users/users/issues_index.html.haml  |   2 +-
 config/locales/menu.en.yml                    |   4 ++++
 config/locales/menu.ru.yml                    |   4 ++++
 8 files changed, 32 insertions(+), 7 deletions(-)
 delete mode 100644 app/assets/images/menu-delimiter.png
 create mode 100644 app/views/activity_feeds/_top_menu.html.haml

diff --git a/app/assets/images/menu-delimiter.png b/app/assets/images/menu-delimiter.png
deleted file mode 100644
index 642e391cb213a33e98b5970a6176ee671c1df1b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2823
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
Z09ehZJM@PX4wnD`002ovPDHLkV1k%8K0E*b

diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss
index 075500d6f..d3ff261d7 100644
--- a/app/assets/stylesheets/design/custom.scss
+++ b/app/assets/stylesheets/design/custom.scss
@@ -2025,4 +2025,12 @@ article .activity .top {
         width: auto;
     }
     th { text-align: center; }
-}
\ No newline at end of file
+}
+
+.activity-tabs {
+  margin: 10px 0 0 0;
+  background: none;
+  -webkit-box-shadow: 0;
+  -moz-box-shadow: 0;
+  box-shadow: 0;
+}
diff --git a/app/views/activity_feeds/_feed_tabs.html.haml b/app/views/activity_feeds/_feed_tabs.html.haml
index 606900a84..eb2dc3abc 100644
--- a/app/views/activity_feeds/_feed_tabs.html.haml
+++ b/app/views/activity_feeds/_feed_tabs.html.haml
@@ -1,8 +1,9 @@
-.sub-menu
+.sub-menu.activity-tabs
   %nav
     %ul
       - (collection = t 'feed_menu').each do |base, title|
         %li= link_to title, root_path(:filter => base), :class => controller_name == 'activity_feeds' && @filter == base ? 'active' : ''
-      %li
-        = image_tag 'menu-delimiter.png', :style => 'margin-bottom: -7px;'
-      %li=link_to t('users.users.issues_index.title'), issues_path, :class => controller_name== 'users' && action_name == 'issues' ? 'active' : ''
+      -#
+        %li
+          = image_tag 'menu-delimiter.png', :style => 'margin-bottom: -7px;'
+        %li=link_to t('users.users.issues_index.title'), issues_path, :class => controller_name== 'users' && action_name == 'issues' ? 'active' : ''
diff --git a/app/views/activity_feeds/_top_menu.html.haml b/app/views/activity_feeds/_top_menu.html.haml
new file mode 100644
index 000000000..2df5dacd7
--- /dev/null
+++ b/app/views/activity_feeds/_top_menu.html.haml
@@ -0,0 +1,7 @@
+- content_for :feed_tabs do
+  .sub-menu
+    %nav
+      %ul
+        %li= link_to t('activity_menu.activity_feed'), root_path, :class => controller_name == 'activity_feeds' ? 'active' : ''
+        %li= link_to t('activity_menu.tracker'), issues_path, :class => controller_name == 'users' && action_name == 'issues' ? 'active' : ''
+        %li= link_to t('activity_menu.pull_requests'), root_path, :class => controller_name == 'users' && action_name == 'pull_requests' ? 'active' : ''
\ No newline at end of file
diff --git a/app/views/activity_feeds/index.html.haml b/app/views/activity_feeds/index.html.haml
index a8bdf4758..5e84c4279 100644
--- a/app/views/activity_feeds/index.html.haml
+++ b/app/views/activity_feeds/index.html.haml
@@ -2,7 +2,8 @@
 %h3.fix
   = t("layout.activity_feed.header")
   = link_to image_tag("rss.ico", :width => '15px', :height => '15px', :class => 'atom_icon'), atom_activity_feeds_path(:format => 'atom', :token => current_user.authentication_token)
+  =render('feed_tabs')
 =render 'list'
 
 - content_for :sidebar, render('sidebar')
-- content_for :feed_tabs, render('feed_tabs')
+-render 'top_menu'
diff --git a/app/views/users/users/issues_index.html.haml b/app/views/users/users/issues_index.html.haml
index 0f15c918d..d5e14d473 100644
--- a/app/views/users/users/issues_index.html.haml
+++ b/app/views/users/users/issues_index.html.haml
@@ -1,5 +1,5 @@
 -set_meta_tags :title => t('.title')
--content_for :feed_tabs, render('activity_feeds/feed_tabs')
+-render('activity_feeds/top_menu')
 -content_for :sidebar do
   =form_tag issues_path, :id => 'filter_issues', :method => :get do
     .bordered
diff --git a/config/locales/menu.en.yml b/config/locales/menu.en.yml
index a2b0ccdec..ebd4d1c86 100644
--- a/config/locales/menu.en.yml
+++ b/config/locales/menu.en.yml
@@ -35,6 +35,10 @@ en:
     readme: Readme
     settings: Settings
     pull_requests: Pull Requests (%{count})
+  activity_menu:
+    activity_feed: Activity Feed
+    tracker: Tracker
+    pull_requests: Pull Requests
   feed_menu:
     all: All
     code: Code
diff --git a/config/locales/menu.ru.yml b/config/locales/menu.ru.yml
index dcd696821..9bf4f1f16 100644
--- a/config/locales/menu.ru.yml
+++ b/config/locales/menu.ru.yml
@@ -35,6 +35,10 @@ ru:
     readme: Readme
     settings: Настройки
     pull_requests: Пул реквесты (%{count})
+  activity_menu:
+    activity_feed: Лента активности
+    tracker: Трекер
+    pull_requests: Пул реквесты
   feed_menu:
     all: Все
     code: Код