diff options
| author | Peter Göbel <peter.goebel@debd.de> | 2015-10-05 17:22:47 +0200 |
|---|---|---|
| committer | Peter Göbel <peter.goebel@debd.de> | 2015-10-05 17:22:47 +0200 |
| commit | e2c5d08e7e4482bd13b8e2e4f77db73dc757d6a7 (patch) | |
| tree | 3e2ed73cc5a01b257e4f32f6f35a2bb778e2176e /app/helpers | |
| parent | 144eef38507a5b3e21f8aa5e38247bdfd73fba23 (diff) | |
| download | gitlab-ce-e2c5d08e7e4482bd13b8e2e4f77db73dc757d6a7.tar.gz | |
added user preference to change layout width
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/preferences_helper.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index df37be51ce9..8160253e59a 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 = enabled + @fluid_layout = (current_user && current_user.layout == "wide") || enabled else @fluid_layout end diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 1b1f4162df4..8470d733495 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -1,5 +1,12 @@ # Helper methods for per-User preferences module PreferencesHelper + def layout_choices + [ + ['Small', :small], + ['Wide', :wide] + ] + end + # Maps `dashboard` values to more user-friendly option text DASHBOARD_CHOICES = { projects: 'Your Projects (default)', |