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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
3cae81a5
Commit
3cae81a5
authored
Jun 05, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the "Design" templates and logic to Preferences
cherry-picked
parent
471ea73a
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
112 additions
and
105 deletions
+112
-105
app/assets/javascripts/profile.js.coffee
app/assets/javascripts/profile.js.coffee
+1
-1
app/controllers/profiles/preferences_controller.rb
app/controllers/profiles/preferences_controller.rb
+4
-1
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+15
-7
app/views/profiles/design.html.haml
app/views/profiles/design.html.haml
+0
-56
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+56
-1
app/views/profiles/preferences/update.js.erb
app/views/profiles/preferences/update.js.erb
+3
-1
app/views/profiles/update.js.erb
app/views/profiles/update.js.erb
+0
-3
config/routes.rb
config/routes.rb
+0
-1
features/profile/profile.feature
features/profile/profile.feature
+0
-13
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+0
-21
spec/features/profiles/preferences_spec.rb
spec/features/profiles/preferences_spec.rb
+33
-0
No files found.
app/assets/javascripts/profile.js.coffee
View file @
3cae81a5
...
@@ -4,7 +4,7 @@ class @Profile
...
@@ -4,7 +4,7 @@ class @Profile
# Submit the form
# Submit the form
$
(
'.edit_user'
).
submit
()
$
(
'.edit_user'
).
submit
()
new
Flash
(
"Appearance settings saved"
,
"notice"
)
new
Flash
(
'Preferences saved.'
,
'notice'
)
$
(
'.update-username form'
).
on
'ajax:before'
,
->
$
(
'.update-username form'
).
on
'ajax:before'
,
->
$
(
'.loading-gif'
).
show
()
$
(
'.loading-gif'
).
show
()
...
...
app/controllers/profiles/preferences_controller.rb
View file @
3cae81a5
...
@@ -24,6 +24,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController
...
@@ -24,6 +24,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController
end
end
def
preferences_params
def
preferences_params
params
.
require
(
:user
).
permit
(
:color_scheme_id
,
:theme_id
)
params
.
require
(
:user
).
permit
(
:color_scheme_id
,
:theme_id
)
end
end
end
end
app/controllers/profiles_controller.rb
View file @
3cae81a5
...
@@ -8,9 +8,6 @@ class ProfilesController < Profiles::ApplicationController
...
@@ -8,9 +8,6 @@ class ProfilesController < Profiles::ApplicationController
def
show
def
show
end
end
def
design
end
def
applications
def
applications
@applications
=
current_user
.
oauth_applications
@applications
=
current_user
.
oauth_applications
@authorized_tokens
=
current_user
.
oauth_authorized_tokens
@authorized_tokens
=
current_user
.
oauth_authorized_tokens
...
@@ -65,10 +62,21 @@ class ProfilesController < Profiles::ApplicationController
...
@@ -65,10 +62,21 @@ class ProfilesController < Profiles::ApplicationController
def
user_params
def
user_params
params
.
require
(
:user
).
permit
(
params
.
require
(
:user
).
permit
(
:email
,
:password
,
:password_confirmation
,
:bio
,
:name
,
:avatar
,
:username
,
:skype
,
:linkedin
,
:twitter
,
:website_url
,
:bio
,
:color_scheme_id
,
:theme_id
,
:avatar
,
:hide_no_ssh_key
,
:email
,
:hide_no_password
,
:location
,
:public_email
:hide_no_password
,
:hide_no_ssh_key
,
:linkedin
,
:location
,
:name
,
:password
,
:password_confirmation
,
:public_email
,
:skype
,
:twitter
,
:username
,
:website_url
)
)
end
end
end
end
app/views/profiles/design.html.haml
deleted
100644 → 0
View file @
471ea73a
-
page_title
"Design"
%h3
.page-title
=
page_title
%p
.light
Appearance settings will be saved to your profile and made available across all devices.
%hr
=
form_for
@user
,
url:
profile_path
,
remote:
true
,
method: :put
do
|
f
|
.panel.panel-default.application-theme
.panel-heading
Application theme
.panel-body
.themes_opts
=
label_tag
do
.prev.default
=
f
.
radio_button
:theme_id
,
1
Graphite
=
label_tag
do
.prev.classic
=
f
.
radio_button
:theme_id
,
2
Charcoal
=
label_tag
do
.prev.modern
=
f
.
radio_button
:theme_id
,
3
Green
=
label_tag
do
.prev.gray
=
f
.
radio_button
:theme_id
,
4
Gray
=
label_tag
do
.prev.violet
=
f
.
radio_button
:theme_id
,
5
Violet
=
label_tag
do
.prev.blue
=
f
.
radio_button
:theme_id
,
6
Blue
%br
.clearfix
.panel.panel-default.code-preview-theme
.panel-heading
Code preview theme
.panel-body
.code_highlight_opts
-
color_schemes
.
each
do
|
color_scheme_id
,
color_scheme
|
=
label_tag
do
.prev
=
image_tag
"
#{
color_scheme
}
-scheme-preview.png"
=
f
.
radio_button
:color_scheme_id
,
color_scheme_id
=
color_scheme
.
gsub
(
/[-_]+/
,
' '
).
humanize
app/views/profiles/preferences/show.html.haml
View file @
3cae81a5
TODO
-
page_title
"Design"
%h3
.page-title
=
page_title
%p
.light
Appearance settings will be saved to your profile and made available across all devices.
%hr
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
do
|
f
|
.panel.panel-default.application-theme
.panel-heading
Application theme
.panel-body
.themes_opts
=
label_tag
do
.prev.default
=
f
.
radio_button
:theme_id
,
1
Graphite
=
label_tag
do
.prev.classic
=
f
.
radio_button
:theme_id
,
2
Charcoal
=
label_tag
do
.prev.modern
=
f
.
radio_button
:theme_id
,
3
Green
=
label_tag
do
.prev.gray
=
f
.
radio_button
:theme_id
,
4
Gray
=
label_tag
do
.prev.violet
=
f
.
radio_button
:theme_id
,
5
Violet
=
label_tag
do
.prev.blue
=
f
.
radio_button
:theme_id
,
6
Blue
%br
.clearfix
.panel.panel-default.code-preview-theme
.panel-heading
Code preview theme
.panel-body
.code_highlight_opts
-
color_schemes
.
each
do
|
color_scheme_id
,
color_scheme
|
=
label_tag
do
.prev
=
image_tag
"
#{
color_scheme
}
-scheme-preview.png"
=
f
.
radio_button
:color_scheme_id
,
color_scheme_id
=
color_scheme
.
gsub
(
/[-_]+/
,
' '
).
humanize
app/views/profiles/preferences/update.js.erb
View file @
3cae81a5
// TODO
// Remove body class for any previous theme, re-add current one
$('body').removeClass('
<%=
Gitlab
::
Theme
.
body_classes
%>
')
$('body').addClass('
<%=
app_theme
%>
<%=
theme_type
%>
')
app/views/profiles/update.js.erb
deleted
100644 → 0
View file @
471ea73a
// Remove body class for any previous theme, re-add current one
$('body').removeClass('
<%=
Gitlab
::
Theme
.
body_classes
%>
')
$('body').addClass('
<%=
app_theme
%>
<%=
theme_type
%>
')
config/routes.rb
View file @
3cae81a5
...
@@ -203,7 +203,6 @@ Gitlab::Application.routes.draw do
...
@@ -203,7 +203,6 @@ Gitlab::Application.routes.draw do
resource
:profile
,
only:
[
:show
,
:update
]
do
resource
:profile
,
only:
[
:show
,
:update
]
do
member
do
member
do
get
:history
get
:history
get
:design
get
:applications
get
:applications
put
:reset_private_token
put
:reset_private_token
...
...
features/profile/profile.feature
View file @
3cae81a5
...
@@ -84,16 +84,3 @@ Feature: Profile
...
@@ -84,16 +84,3 @@ Feature: Profile
Then
I visit profile applications page
Then
I visit profile applications page
And
I click to remove application
And
I click to remove application
Then
I see that application is removed
Then
I see that application is removed
@javascript
Scenario
:
I
change my application theme
Given
I visit profile design page
When
I change my application theme
Then
I should see the theme change immediately
And
I should receive feedback that the changes were saved
@javascript
Scenario
:
I
change my code preview theme
Given
I visit profile design page
When
I change my code preview theme
Then
I should receive feedback that the changes were saved
features/steps/profile/profile.rb
View file @
3cae81a5
...
@@ -114,27 +114,6 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
...
@@ -114,27 +114,6 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
expect
(
page
).
to
have_content
"
#{
current_user
.
name
}
closed issue"
expect
(
page
).
to
have_content
"
#{
current_user
.
name
}
closed issue"
end
end
step
"I change my application theme"
do
page
.
within
'.application-theme'
do
choose
"Violet"
end
end
step
"I change my code preview theme"
do
page
.
within
'.code-preview-theme'
do
choose
"Solarized dark"
end
end
step
"I should see the theme change immediately"
do
expect
(
page
).
to
have_selector
(
'body.ui_color'
)
expect
(
page
).
not_to
have_selector
(
'body.ui_basic'
)
end
step
"I should receive feedback that the changes were saved"
do
expect
(
page
).
to
have_content
(
"saved"
)
end
step
'my password is expired'
do
step
'my password is expired'
do
current_user
.
update_attributes
(
password_expires_at:
Time
.
now
-
1
.
hour
)
current_user
.
update_attributes
(
password_expires_at:
Time
.
now
-
1
.
hour
)
end
end
...
...
spec/features/profiles/preferences_spec.rb
0 → 100644
View file @
3cae81a5
require
'spec_helper'
describe
'Profile > Preferences'
do
let
(
:user
)
{
create
(
:user
)
}
before
do
login_as
(
user
)
end
describe
'User changes their application theme'
,
js:
true
do
let
(
:default_class
)
{
Gitlab
::
Theme
.
css_class_by_id
(
nil
)
}
let
(
:theme_5_class
)
{
Gitlab
::
Theme
.
css_class_by_id
(
5
)
}
before
do
visit
profile_preferences_path
end
it
'changes immediately'
do
expect
(
page
).
to
have_selector
(
"body.
#{
default
.
css_class
}
"
)
choose
"user_theme_id_
#{
theme
.
id
}
"
expect
(
page
).
not_to
have_selector
(
"body.
#{
default
.
css_class
}
"
)
expect
(
page
).
to
have_selector
(
"body.
#{
theme
.
css_class
}
"
)
end
end
describe
'User changes their syntax highlighting theme'
do
before
do
visit
profile_preferences_path
end
end
end
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