From f6735a9933f90f8cfee8c26e18ba14fc322a2e78 Mon Sep 17 00:00:00 2001 From: Adrian Toth Date: Wed, 9 Aug 2017 11:04:58 +0200 Subject: [PATCH] removing code --- app/controllers/dashboard_controller.rb | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index cf6ab4402e5..a3e485b1fcf 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -2,17 +2,6 @@ class DashboardController < ApplicationController include DashboardHelper include StartUrl - # UI Themes - THEMES = [ - [_("Red"), "red"], - [_("Orange"), "orange"], - [_("Yellow"), "yellow"], - [_("Green"), "green"], - [_("Blue"), "blue"], - [_("ManageIQ-Blue"), "manageiq-blue"], - [_("Black"), "black"] - ].freeze - menu_section :vi @@items_per_page = 8 @@ -382,9 +371,7 @@ def login @user_name = params[:user_name] @user_password = params[:user_password] end - css = settings(:css) # Save prior CSS settings @settings = copy_hash(DEFAULT_SETTINGS) # Need settings, else pages won't display - @settings[:css] = css if css # Restore CSS settings for other tabs previusly logged in @more = params[:type] && params[:type] != "less" flash[:notice] = _("Session was timed out due to inactivity. Please log in again.") if params[:timeout] == "true" logon_details = MiqServer.my_server(true).logon_status_details @@ -694,16 +681,6 @@ def session_init(db_user) @settings[:default_search] = db_user.settings[:default_search] # Get the user's default search setting end - # Copy ALL display settings into the :css hash so we can easily add new settings - @settings[:css] ||= {} - @settings[:css].merge!(@settings[:display]) - @settings.store_path(:display, :theme, THEMES.first.last) unless THEMES.collect(&:last).include?(settings(:display, :theme)) - @settings[:css].merge!(THEME_CSS_SETTINGS[settings(:display, :theme)]) - - @css ||= {} - @css.merge!(@settings[:display]) - @css.merge!(THEME_CSS_SETTINGS[settings(:display, :theme)]) - session[:user_TZO] = params[:user_TZO] ? params[:user_TZO].to_i : nil # Grab the timezone (future use) session[:browser] ||= Hash.new("Unknown") if params[:browser_name]