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
Jérome Perrin
gitlab-ce
Commits
7fd4dc1e
Commit
7fd4dc1e
authored
Mar 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove group rendering from dashboard page
parent
c572bdb5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
46 deletions
+6
-46
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+0
-6
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+0
-21
app/views/dashboard/_sidebar.html.haml
app/views/dashboard/_sidebar.html.haml
+1
-16
app/views/dashboard/_zero_authorized_projects.html.haml
app/views/dashboard/_zero_authorized_projects.html.haml
+3
-2
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+1
-0
app/views/dashboard/show.html.haml
app/views/dashboard/show.html.haml
+1
-1
No files found.
app/controllers/dashboard_controller.rb
View file @
7fd4dc1e
...
@@ -5,15 +5,9 @@ class DashboardController < ApplicationController
...
@@ -5,15 +5,9 @@ class DashboardController < ApplicationController
before_filter
:event_filter
,
only: :show
before_filter
:event_filter
,
only: :show
def
show
def
show
@projects_limit
=
20
@groups
=
current_user
.
authorized_groups
.
order_name_asc
@has_authorized_projects
=
@projects
.
count
>
0
@projects_count
=
@projects
.
count
@projects
=
@projects
.
includes
(
:namespace
)
@projects
=
@projects
.
includes
(
:namespace
)
@last_push
=
current_user
.
recent_push
@last_push
=
current_user
.
recent_push
@publicish_project_count
=
Project
.
publicish
(
current_user
).
count
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
...
...
app/views/dashboard/_groups.html.haml
deleted
100644 → 0
View file @
c572bdb5
.panel.panel-default
.panel-heading.clearfix
.input-group
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter form-control'
-
if
current_user
.
can_create_group?
.input-group-addon.dash-new-group
=
link_to
new_group_path
,
class:
""
do
%strong
New group
%ul
.well-list.dash-list
-
groups
.
each
do
|
group
|
%li
.group-row
=
link_to
group_path
(
id:
group
.
path
),
class:
dom_class
(
group
)
do
.dash-project-avatar
=
image_tag
group_icon
(
group
.
path
),
class:
"avatar s40"
%span
.group-name.filter-title
=
truncate
(
group
.
name
,
length:
35
)
%span
.arrow
%i
.fa.fa-angle-right
-
if
groups
.
blank?
%li
.nothing-here-block
You have no groups yet.
app/views/dashboard/_sidebar.html.haml
View file @
7fd4dc1e
%ul
.nav.nav-tabs.dash-sidebar-tabs
=
render
"dashboard/projects"
,
projects:
@projects
%li
.active
=
link_to
'#projects'
,
'data-toggle'
=>
'tab'
,
id:
'sidebar-projects-tab'
do
Projects
%span
.badge
=
@projects_count
%li
=
link_to
'#groups'
,
'data-toggle'
=>
'tab'
,
id:
'sidebar-groups-tab'
do
Groups
%span
.badge
=
@groups
.
count
.tab-content
.tab-pane.active
#projects
=
render
"dashboard/projects"
,
projects:
@projects
.tab-pane
#groups
=
render
"dashboard/groups"
,
groups:
@groups
.prepend-top-20
.prepend-top-20
=
render
'shared/promo'
=
render
'shared/promo'
app/views/dashboard/_zero_authorized_projects.html.haml
View file @
7fd4dc1e
-
publicish_project_count
=
Project
.
publicish
(
current_user
).
count
%h3
.page-title
Welcome to GitLab!
%h3
.page-title
Welcome to GitLab!
%p
.light
Self hosted Git management application.
%p
.light
Self hosted Git management application.
%hr
%hr
...
@@ -35,7 +36,7 @@
...
@@ -35,7 +36,7 @@
%i
.fa.fa-plus
%i
.fa.fa-plus
New Group
New Group
-
if
@
publicish_project_count
>
0
-
if
publicish_project_count
>
0
%hr
%hr
%div
%div
.dashboard-intro-icon
.dashboard-intro-icon
...
@@ -43,7 +44,7 @@
...
@@ -43,7 +44,7 @@
.dashboard-intro-text
.dashboard-intro-text
%p
.slead
%p
.slead
There are
There are
%strong
=
@
publicish_project_count
%strong
=
publicish_project_count
public projects on this server.
public projects on this server.
%br
%br
Public projects are an easy way to allow everyone to have read-only access.
Public projects are an easy way to allow everyone to have read-only access.
...
...
app/views/dashboard/groups/index.html.haml
View file @
7fd4dc1e
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
%i
.fa.fa-sign-out
%i
.fa.fa-sign-out
Leave
Leave
=
image_tag
group_icon
(
group
.
path
),
class:
"avatar s40 avatar-tile"
=
link_to
group
,
class:
'group-name'
do
=
link_to
group
,
class:
'group-name'
do
%strong
=
group
.
name
%strong
=
group
.
name
...
...
app/views/dashboard/show.html.haml
View file @
7fd4dc1e
-
if
@
has_authorized_projects
-
if
@
projects
.
any?
.dashboard.row
.dashboard.row
%section
.activities.col-md-8
%section
.activities.col-md-8
=
render
'activities'
=
render
'activities'
...
...
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