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
e2c5d08e
Commit
e2c5d08e
authored
Oct 05, 2015
by
Peter Göbel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added user preference to change layout width
parent
144eef38
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
2 deletions
+35
-2
CHANGELOG
CHANGELOG
+1
-0
app/controllers/profiles/preferences_controller.rb
app/controllers/profiles/preferences_controller.rb
+1
-0
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+1
-1
app/helpers/preferences_helper.rb
app/helpers/preferences_helper.rb
+7
-0
app/models/user.rb
app/models/user.rb
+4
-0
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+7
-0
app/views/profiles/preferences/update.js.erb
app/views/profiles/preferences/update.js.erb
+7
-0
db/migrate/20151005150751_add_layout_option_for_users.rb
db/migrate/20151005150751_add_layout_option_for_users.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
No files found.
CHANGELOG
View file @
e2c5d08e
...
@@ -31,6 +31,7 @@ v 8.1.0 (unreleased)
...
@@ -31,6 +31,7 @@ v 8.1.0 (unreleased)
- Hide password in the service settings form
- Hide password in the service settings form
- Fix anchors to comments in diffs
- Fix anchors to comments in diffs
- Move CI web hooks page to project settings area
- Move CI web hooks page to project settings area
- Add user preference to change layout width (Peter Göbel)
v 8.0.3
v 8.0.3
- Fix URL shown in Slack notifications
- Fix URL shown in Slack notifications
...
...
app/controllers/profiles/preferences_controller.rb
View file @
e2c5d08e
...
@@ -31,6 +31,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
...
@@ -31,6 +31,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
def
preferences_params
def
preferences_params
params
.
require
(
:user
).
permit
(
params
.
require
(
:user
).
permit
(
:color_scheme_id
,
:color_scheme_id
,
:layout
,
:dashboard
,
:dashboard
,
:project_view
,
:project_view
,
:theme_id
:theme_id
...
...
app/helpers/page_layout_helper.rb
View file @
e2c5d08e
...
@@ -26,7 +26,7 @@ module PageLayoutHelper
...
@@ -26,7 +26,7 @@ module PageLayoutHelper
def
fluid_layout
(
enabled
=
false
)
def
fluid_layout
(
enabled
=
false
)
if
@fluid_layout
.
nil?
if
@fluid_layout
.
nil?
@fluid_layout
=
enabled
@fluid_layout
=
(
current_user
&&
current_user
.
layout
==
"wide"
)
||
enabled
else
else
@fluid_layout
@fluid_layout
end
end
...
...
app/helpers/preferences_helper.rb
View file @
e2c5d08e
# Helper methods for per-User preferences
# Helper methods for per-User preferences
module
PreferencesHelper
module
PreferencesHelper
def
layout_choices
[
[
'Small'
,
:small
],
[
'Wide'
,
:wide
]
]
end
# Maps `dashboard` values to more user-friendly option text
# Maps `dashboard` values to more user-friendly option text
DASHBOARD_CHOICES
=
{
DASHBOARD_CHOICES
=
{
projects:
'Your Projects (default)'
,
projects:
'Your Projects (default)'
,
...
...
app/models/user.rb
View file @
e2c5d08e
...
@@ -54,6 +54,7 @@
...
@@ -54,6 +54,7 @@
# public_email :string(255) default(""), not null
# public_email :string(255) default(""), not null
# dashboard :integer default(0)
# dashboard :integer default(0)
# project_view :integer default(0)
# project_view :integer default(0)
# layout :integer default(0)
#
#
require
'carrierwave/orm/activerecord'
require
'carrierwave/orm/activerecord'
...
@@ -171,6 +172,9 @@ class User < ActiveRecord::Base
...
@@ -171,6 +172,9 @@ class User < ActiveRecord::Base
after_create
:post_create_hook
after_create
:post_create_hook
after_destroy
:post_destroy_hook
after_destroy
:post_destroy_hook
# User's Layout preference
enum
layout:
[
:small
,
:wide
]
# User's Dashboard preference
# User's Dashboard preference
# Note: When adding an option, it MUST go on the end of the array.
# Note: When adding an option, it MUST go on the end of the array.
enum
dashboard:
[
:projects
,
:stars
,
:project_activity
,
:starred_project_activity
]
enum
dashboard:
[
:projects
,
:stars
,
:project_activity
,
:starred_project_activity
]
...
...
app/views/profiles/preferences/show.html.haml
View file @
e2c5d08e
...
@@ -32,6 +32,13 @@
...
@@ -32,6 +32,13 @@
.panel-heading
.panel-heading
Behavior
Behavior
.panel-body
.panel-body
.form-group
=
f
.
label
:layout
,
class:
'control-label'
do
Layout width
.col-sm-10
=
f
.
select
:layout
,
layout_choices
,
{},
class:
'form-control'
.help-block
Choose between small (max. 1200px) and wide (100%) application layout
.form-group
.form-group
=
f
.
label
:dashboard
,
class:
'control-label'
do
=
f
.
label
:dashboard
,
class:
'control-label'
do
Default Dashboard
Default Dashboard
...
...
app/views/profiles/preferences/update.js.erb
View file @
e2c5d08e
...
@@ -2,6 +2,13 @@
...
@@ -2,6 +2,13 @@
$('body').removeClass('
<%=
Gitlab
::
Themes
.
body_classes
%>
')
$('body').removeClass('
<%=
Gitlab
::
Themes
.
body_classes
%>
')
$('body').addClass('
<%=
user_application_theme
%>
')
$('body').addClass('
<%=
user_application_theme
%>
')
// Toggle container-fluid class
if ('
<%=
current_user
.
layout
%>
' === 'wide') {
$('.content-wrapper').find('.container-fluid').removeClass('container-limited')
} else {
$('.content-wrapper').find('.container-fluid').addClass('container-limited')
}
// Re-enable the "Save" button
// Re-enable the "Save" button
$('input[type=submit]').enable()
$('input[type=submit]').enable()
...
...
db/migrate/20151005150751_add_layout_option_for_users.rb
0 → 100644
View file @
e2c5d08e
class
AddLayoutOptionForUsers
<
ActiveRecord
::
Migration
def
change
add_column
:users
,
:layout
,
:integer
,
:default
=>
0
end
end
\ No newline at end of file
db/schema.rb
View file @
e2c5d08e
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2015
0930095736
)
do
ActiveRecord
::
Schema
.
define
(
version:
2015
1005150751
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
@@ -753,6 +753,7 @@ ActiveRecord::Schema.define(version: 20150930095736) do
...
@@ -753,6 +753,7 @@ ActiveRecord::Schema.define(version: 20150930095736) do
t
.
integer
"dashboard"
,
default:
0
t
.
integer
"dashboard"
,
default:
0
t
.
integer
"project_view"
,
default:
0
t
.
integer
"project_view"
,
default:
0
t
.
integer
"consumed_timestep"
t
.
integer
"consumed_timestep"
t
.
integer
"layout"
,
default:
0
end
end
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
...
...
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