Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
b3208841
Commit
b3208841
authored
Aug 29, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
List groups on Dashboard#projects page
parent
07f156f5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
25 deletions
+48
-25
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+0
-17
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+19
-0
app/assets/stylesheets/gitlab_bootstrap/nav.scss
app/assets/stylesheets/gitlab_bootstrap/nav.scss
+1
-0
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+5
-1
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+23
-7
No files found.
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
b3208841
...
@@ -56,23 +56,6 @@
...
@@ -56,23 +56,6 @@
line-height
:
24px
;
line-height
:
24px
;
}
}
/** FORMS **/
input
[
type
=
'search'
]
.search-text-input
{
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
padding-left
:
25px
;
@include
border-radius
(
4px
);
border
:
1px
solid
#ccc
;
}
input
[
type
=
'text'
]
.danger
{
background
:
#F2DEDE
!
important
;
border-color
:
#D66
;
text-shadow
:
0
1px
1px
#fff
}
fieldset
legend
{
font-size
:
15px
;
}
.tab-content
{
.tab-content
{
overflow
:
visible
;
overflow
:
visible
;
...
...
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
b3208841
...
@@ -31,3 +31,22 @@ input {
...
@@ -31,3 +31,22 @@ input {
}
}
}
}
input
[
type
=
'search'
]
.search-text-input
{
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
padding-left
:
25px
;
@include
border-radius
(
4px
);
border
:
1px
solid
#ccc
;
}
input
[
type
=
'text'
]
.danger
{
background
:
#F2DEDE
!
important
;
border-color
:
#D66
;
text-shadow
:
0
1px
1px
#fff
}
fieldset
legend
{
font-size
:
16px
;
margin-bottom
:
10px
;
}
app/assets/stylesheets/gitlab_bootstrap/nav.scss
View file @
b3208841
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
background
:
#F1F1F1
;
background
:
#F1F1F1
;
color
:
$style_color
;
color
:
$style_color
;
font-weight
:
bold
;
font-weight
:
bold
;
text-shadow
:
0
1px
1px
#fff
;
}
}
&
.nav-stacked-menu
{
&
.nav-stacked-menu
{
...
...
app/controllers/dashboard_controller.rb
View file @
b3208841
...
@@ -33,9 +33,13 @@ class DashboardController < ApplicationController
...
@@ -33,9 +33,13 @@ class DashboardController < ApplicationController
current_user
.
owned_projects
current_user
.
owned_projects
else
else
current_user
.
authorized_projects
current_user
.
authorized_projects
end
.
sorted_by_activity
end
@projects
=
@projects
.
where
(
namespace_id:
Group
.
find_by_name
(
params
[
:group
]))
if
params
[
:group
].
present?
@projects
=
@projects
.
includes
(
:namespace
).
sorted_by_activity
@labels
=
current_user
.
authorized_projects
.
tags_on
(
:labels
)
@labels
=
current_user
.
authorized_projects
.
tags_on
(
:labels
)
@groups
=
current_user
.
authorized_groups
@projects
=
@projects
.
tagged_with
(
params
[
:label
])
if
params
[
:label
].
present?
@projects
=
@projects
.
tagged_with
(
params
[
:label
])
if
params
[
:label
].
present?
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
...
...
app/views/dashboard/projects.html.haml
View file @
b3208841
...
@@ -26,8 +26,24 @@
...
@@ -26,8 +26,24 @@
%span
.pull-right
%span
.pull-right
=
current_user
.
owned_projects
.
count
=
current_user
.
owned_projects
.
count
-
if
@groups
.
present?
%fieldset
%legend
Groups
%ul
.bordered-list
-
@groups
.
each
do
|
group
|
%li
{
class:
(
group
.
name
==
params
[
:group
])
?
'active'
:
'light'
}
=
link_to
projects_dashboard_path
(
group:
group
.
name
)
do
%i
.icon-folder-close-alt
=
group
.
name
%small
.pull-right
=
group
.
projects
.
count
-
if
@labels
.
present?
-
if
@labels
.
present?
%p
.light
Filter by label:
%fieldset
%legend
Labels
%ul
.bordered-list
%ul
.bordered-list
-
@labels
.
each
do
|
label
|
-
@labels
.
each
do
|
label
|
%li
{
class:
(
label
.
name
==
params
[
:label
])
?
'active'
:
'light'
}
%li
{
class:
(
label
.
name
==
params
[
:label
])
?
'active'
:
'light'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment