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
Boxiang Sun
gitlab-ce
Commits
9f38cf50
Commit
9f38cf50
authored
Jul 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Notifications page. Much easier to find muted projects now
parent
c4856e6f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
20 deletions
+41
-20
app/helpers/notifications_helper.rb
app/helpers/notifications_helper.rb
+11
-0
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-1
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+1
-0
app/views/profiles/notifications/_settings.html.haml
app/views/profiles/notifications/_settings.html.haml
+2
-0
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+26
-19
No files found.
app/helpers/notifications_helper.rb
View file @
9f38cf50
module
NotificationsHelper
module
NotificationsHelper
def
notification_icon
(
notification
)
if
notification
.
disabled?
content_tag
:i
,
nil
,
class:
'icon-circle cred'
elsif
notification
.
participating?
content_tag
:i
,
nil
,
class:
'icon-circle cblue'
elsif
notification
.
watch?
content_tag
:i
,
nil
,
class:
'icon-circle cgreen'
else
content_tag
:i
,
nil
,
class:
'icon-circle-blank cblue'
end
end
end
end
app/views/admin/users/index.html.haml
View file @
9f38cf50
...
@@ -55,4 +55,4 @@
...
@@ -55,4 +55,4 @@
-
else
-
else
=
link_to
'Block'
,
block_admin_user_path
(
user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn btn-small btn-remove"
=
link_to
'Block'
,
block_admin_user_path
(
user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn btn-small btn-remove"
=
link_to
'Destroy'
,
[
:admin
,
user
],
confirm:
"USER
#{
user
.
name
}
WILL BE REMOVED! Are you sure?"
,
method: :delete
,
class:
"btn btn-small btn-remove"
=
link_to
'Destroy'
,
[
:admin
,
user
],
confirm:
"USER
#{
user
.
name
}
WILL BE REMOVED! Are you sure?"
,
method: :delete
,
class:
"btn btn-small btn-remove"
=
paginate
@users
,
theme:
"gitlab"
=
paginate
@users
,
theme:
"gitlab"
app/views/dashboard/projects.html.haml
View file @
9f38cf50
%h3
.page-title
My Projects
.row
.row
.span3
.span3
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
...
...
app/views/profiles/notifications/_settings.html.haml
View file @
9f38cf50
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
.row
.row
.span4
.span4
%span
%span
=
notification_icon
(
notification
)
-
if
membership
.
kind_of?
UsersGroup
-
if
membership
.
kind_of?
UsersGroup
=
link_to
membership
.
group
.
name
,
membership
.
group
=
link_to
membership
.
group
.
name
,
membership
.
group
-
else
-
else
...
...
app/views/profiles/notifications/show.html.haml
View file @
9f38cf50
%h3
.page-title
Setup your notification level
%h3
.page-title
Notifications settings
%p
.light
%strong
Disabled
.alert.alert-info
–
You will not get any notifications via email
%p
%p
.light
%i
.icon-circle.cred
%strong
Participating
%strong
Disabled
–
You will receive only notifications from related resources(ex. from assigned issue or your commit)
–
You will not get any notifications via email
%p
.light
%p
%strong
Watch
%i
.icon-circle.cblue
–
You will receive all notifications from projects in which you participate
%strong
Participating
%hr
–
You will receive only notifications from related resources(ex. from assigned issue or your commit)
%p
%i
.icon-circle.cgreen
%strong
Watch
–
You will receive all notifications from projects in which you participate
.row
.row
.span4
.span4
%h5
Global setting
%h4
=
notification_icon
(
@notification
)
Global setting
.span7
.span7
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
'global'
=
hidden_field_tag
:notification_type
,
'global'
...
@@ -30,20 +36,21 @@
...
@@ -30,20 +36,21 @@
=
radio_button_tag
:notification_level
,
Notification
::
N_WATCH
,
@notification
.
watch?
,
class:
'trigger-submit'
=
radio_button_tag
:notification_level
,
Notification
::
N_WATCH
,
@notification
.
watch?
,
class:
'trigger-submit'
%span
Watch
%span
Watch
%
h
r
%
b
r
=
link_to
'#'
,
class:
'js-toggle-visibility-link'
do
=
link_to
'#'
,
class:
'js-toggle-visibility-link'
do
%
h6
.btn.btn-tiny
%
span
.btn.btn-tiny
%i
.icon-chevron-down
%i
.icon-chevron-down
%span
Advanced notifications settings
%span
Advanced notifications settings
.js-toggle-visibility-container.hide
.js-toggle-visibility-container.hide
%h5
Groups:
%hr
%ul
.well-list
%h4
Groups:
%ul
.bordered-list
-
@users_groups
.
each
do
|
users_group
|
-
@users_groups
.
each
do
|
users_group
|
-
notification
=
Notification
.
new
(
users_group
)
-
notification
=
Notification
.
new
(
users_group
)
=
render
'settings'
,
type:
'group'
,
membership:
users_group
,
notification:
notification
=
render
'settings'
,
type:
'group'
,
membership:
users_group
,
notification:
notification
%h
5
Projects:
%h
4
Projects:
%ul
.
well
-list
%ul
.
bordered
-list
-
@users_projects
.
each
do
|
users_project
|
-
@users_projects
.
each
do
|
users_project
|
-
notification
=
Notification
.
new
(
users_project
)
-
notification
=
Notification
.
new
(
users_project
)
=
render
'settings'
,
type:
'project'
,
membership:
users_project
,
notification:
notification
=
render
'settings'
,
type:
'project'
,
membership:
users_project
,
notification:
notification
...
...
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