Move groups and teams to tabs on dashboard. Remember tab with cookie

This commit is contained in:
Dmitriy Zaporozhets 2013-03-10 11:57:14 +02:00
parent 96c627edd8
commit 8812d9dee2
5 changed files with 44 additions and 10 deletions

View file

@ -1,5 +1,6 @@
window.dashboardPage = ->
Pager.init 20, true
initSidebarTab()
$(".event_filter_link").bind "click", (event) ->
event.preventDefault()
toggleFilter $(this)
@ -25,3 +26,14 @@ toggleFilter = (sender) ->
event_filters.splice index, 1
$.cookie "event_filter", event_filters.join(",")
initSidebarTab = ->
key = "dashboard_sidebar_filter"
# store selection in cookie
$('.dash-sidebar-tabs a').on 'click', (e) ->
$.cookie(key, $(e.target).attr('id'))
# show tab from cookie
sidebar_filter = $.cookie(key)
$("#" + sidebar_filter).tab('show') if sidebar_filter

View file

@ -6,6 +6,10 @@
.side {
@extend .pull-right;
.projects_box, .ui-box {
margin: 3px;
}
.projects_box {
> .title {
padding: 2px 15px;

View file

@ -16,3 +16,6 @@
%span.pull-right.light
- if group.owner == current_user
%i.icon-wrench
- if groups.blank?
%li
%h3.nothing_here_message You have no groups yet.

View file

@ -1,13 +1,25 @@
- if @teams.present?
= render "teams", teams: @teams
- if @groups.present?
%ul.nav.nav-tabs.dash-sidebar-tabs
%li.active
= link_to 'Projects', '#projects', 'data-toggle' => 'tab', id: 'sidebar-projects-tab'
%li
= link_to 'Groups', '#groups', 'data-toggle' => 'tab', id: 'sidebar-groups-tab'
%li
= link_to 'Teams', '#teams', 'data-toggle' => 'tab', id: 'sidebar-teams-tab'
.tab-content
.tab-pane.active#projects
= render "projects", projects: @projects
.tab-pane#groups
= render "groups", groups: @groups
= render "projects", projects: @projects
%div
.tab-pane#teams
= render "teams", teams: @teams
.prepend-top-20
%span.rss-icon
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
= image_tag "rss_ui.png", title: "feed"
%strong News Feed
%strong
%i.icon-rss
News Feed
%hr
.gitlab-promo

View file

@ -2,13 +2,13 @@
%h5.title
Teams
%small
(#{@teams.count})
(#{teams.count})
%span.pull-right
= link_to new_team_path, class: "btn btn-tiny info" do
%i.icon-plus
New Team
%ul.well-list
- @teams.each do |team|
- teams.each do |team|
%li
= link_to team_path(id: team.path), class: dom_class(team) do
%strong.well-title= truncate(team.name, length: 35)
@ -18,3 +18,6 @@
- tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
- if tm
= tm.access_human
- if teams.blank?
%li
%h3.nothing_here_message You have no teams yet.