diff options
-rw-r--r-- | app/helpers/page_layout_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/preferences_helper.rb | 4 | ||||
-rw-r--r-- | app/models/user.rb | 2 | ||||
-rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/preferences/update.js.erb | 2 | ||||
-rw-r--r-- | db/migrate/20151005150751_add_layout_option_for_users.rb | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 8160253e59a..775cf5a3dd4 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -26,7 +26,7 @@ module PageLayoutHelper def fluid_layout(enabled = false) if @fluid_layout.nil? - @fluid_layout = (current_user && current_user.layout == "wide") || enabled + @fluid_layout = (current_user && current_user.layout == "fluid") || enabled else @fluid_layout end diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 8470d733495..4710171ebaa 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -2,8 +2,8 @@ module PreferencesHelper def layout_choices [ - ['Small', :small], - ['Wide', :wide] + ['Fixed', :fixed], + ['Fluid', :fluid] ] end diff --git a/app/models/user.rb b/app/models/user.rb index 112a85e7845..8e44e828b89 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -173,7 +173,7 @@ class User < ActiveRecord::Base after_destroy :post_destroy_hook # User's Layout preference - enum layout: [:small, :wide] + enum layout: [:fixed, :fluid] # User's Dashboard preference # Note: When adding an option, it MUST go on the end of the array. diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index c12a358651f..01e285a8dfa 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -38,7 +38,7 @@ .col-sm-10 = f.select :layout, layout_choices, {}, class: 'form-control' .help-block - Choose between small (max. 1200px) and wide (100%) application layout + Choose between fixed (max. 1200px) and fluid (100%) application layout .form-group = f.label :dashboard, class: 'control-label' do Default Dashboard diff --git a/app/views/profiles/preferences/update.js.erb b/app/views/profiles/preferences/update.js.erb index 97d856fa88c..4433cab7782 100644 --- a/app/views/profiles/preferences/update.js.erb +++ b/app/views/profiles/preferences/update.js.erb @@ -3,7 +3,7 @@ $('body').removeClass('<%= Gitlab::Themes.body_classes %>') $('body').addClass('<%= user_application_theme %>') // Toggle container-fluid class -if ('<%= current_user.layout %>' === 'wide') { +if ('<%= current_user.layout %>' === 'fluid') { $('.content-wrapper').find('.container-fluid').removeClass('container-limited') } else { $('.content-wrapper').find('.container-fluid').addClass('container-limited') diff --git a/db/migrate/20151005150751_add_layout_option_for_users.rb b/db/migrate/20151005150751_add_layout_option_for_users.rb index 5ead0c04d5a..ead9b1f8977 100644 --- a/db/migrate/20151005150751_add_layout_option_for_users.rb +++ b/db/migrate/20151005150751_add_layout_option_for_users.rb @@ -1,5 +1,5 @@ class AddLayoutOptionForUsers < ActiveRecord::Migration def change - add_column :users, :layout, :integer, :default => 0 + add_column :users, :layout, :integer, default: 0 end end
\ No newline at end of file |