Skip to content

Commit

Permalink
Merge pull request #1802 from europ/remove-ui-constants-17
Browse files Browse the repository at this point in the history
Removed unnecessary BG_COLORS and bg_color_changed
  • Loading branch information
mzazrivec authored Aug 3, 2017
2 parents 109ac96 + 8841834 commit d7c1feb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
13 changes: 0 additions & 13 deletions app/controllers/configuration_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,6 @@ def theme_changed
end
end

# AJAX driven routine for background color selection
def bg_color_changed
# ui1 bgcolor changed
@edit = session[:edit]
@edit[:new][:display][:bg_color] = params[:bg_color] # Capture the new setting
session[:changed] = (@edit[:new] != @edit[:current])
@changed = session[:changed]
render :update do |page|
page << javascript_prologue
page.replace 'tab_div', :partial => "ui_1"
end
end

def update
if params["save"]
get_form_vars if @tabform != "ui_3"
Expand Down
11 changes: 0 additions & 11 deletions app/helpers/ui_constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@ module UiConstants
TIMELINES_FOLDER = File.join(Rails.root, "product/timelines")
TOOLBARS_FOLDER = File.join(Rails.root, "product/toolbars")

# Screen background color choices
BG_COLORS = [
"#c00", # First entry is the default
"#ff8a00",
"#ffe400",
"#6b9130",
"#0c7ad7",
"#000"
]

# Theme settings - each subitem will be set in @settings[:css][:<subitem>] based on the selected theme
THEME_CSS_SETTINGS = {
"red" => {
Expand Down Expand Up @@ -158,7 +148,6 @@ module UiConstants
:reporttheme => "MIQ",
:quad_truncate => "m",
:theme => "red", # Luminescent Blue
:bg_color => BG_COLORS.first, # Background color
:taskbartext => true, # Show button text on taskbar
:vmcompare => "Compressed", # Start VM compare and drift in compressed mode
:hostcompare => "Compressed", # Start Host compare in compressed mode
Expand Down

0 comments on commit d7c1feb

Please sign in to comment.