diff --git a/app/assets/images/menu-delimiter.png b/app/assets/images/menu-delimiter.png deleted file mode 100644 index 642e391cb..000000000 Binary files a/app/assets/images/menu-delimiter.png and /dev/null differ 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: Код