From 92f7a3178cdd2071eaede9e9223091aaa7be02eb Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 6 Jan 2013 17:28:19 -0500 Subject: [PATCH] Changed tab titles, and removed some redundant panel headers(titles) --- app/components/app_tab_panel.rb | 16 ++++++++++++---- app/components/brands_and_models_border.rb | 3 ++- app/components/logs.rb | 1 + app/components/user_profile_border.rb | 2 +- app/components/users_and_profiles_border.rb | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/components/app_tab_panel.rb b/app/components/app_tab_panel.rb index 3ad34a5..46fc83e 100644 --- a/app/components/app_tab_panel.rb +++ b/app/components/app_tab_panel.rb @@ -1,5 +1,6 @@ class AppTabPanel < Netzke::Basepack::TabPanel + action :sign_out do |c| c.icon = :door_out c.text = "Sign out #{controller.current_user.email}" if controller.current_user @@ -8,19 +9,26 @@ class AppTabPanel < Netzke::Basepack::TabPanel def configure(c) #all users - @@app_tab_panel_items = [ :bikes_border, :brands_and_models_border] + # (had to use hash for borders to get the title to display properly) + @@app_tab_panel_items = [ :bikes_border, {layout: :fit, wrappedComponent: :brands_and_models_border, title: "Brands/Models"}] #for users if controller.current_user.user? - @@app_tab_panel_items.concat [:user_profile_border] + # (had to use hash for borders to get the title to display properly) + @@app_tab_panel_items.concat [{ layout: :fit, wrappedComponent: :user_profile_border, title: "Profile"}] end #for admins if controller.current_user.admin? - @@app_tab_panel_items.concat [:users_and_profiles_border, :logs] + # (had to use hash for borders to get the title to display properly) + @@app_tab_panel_items.concat [{ layout: :fit, wrappedComponent: :users_and_profiles_border, title: "Users/Profiles"}, :logs] end @@app_tab_panel_items.each do |item| - self.class.component item + if item.kind_of?(Symbol) + self.class.component item + elsif item.kind_of?(Hash) + self.class.component item[:wrappedComponent] + end end c.active_tab = 0 diff --git a/app/components/brands_and_models_border.rb b/app/components/brands_and_models_border.rb index 9c1b8af..f7d004d 100644 --- a/app/components/brands_and_models_border.rb +++ b/app/components/brands_and_models_border.rb @@ -1,3 +1,4 @@ + class BrandsAndModelsBorder < Netzke::Base # Remember regions collapse state and size include Netzke::Basepack::ItemPersistence @@ -5,7 +6,7 @@ class BrandsAndModelsBorder < Netzke::Base component :bike_models def configure(c) super - c.title = "Brands/Models" + c.header = false c.items = [ { netzke_component: :bike_brands, region: :center, split: true }, { netzke_component: :bike_models, region: :east, width: 500, split: true} diff --git a/app/components/logs.rb b/app/components/logs.rb index 13fd152..17307bc 100644 --- a/app/components/logs.rb +++ b/app/components/logs.rb @@ -2,6 +2,7 @@ class Logs < Netzke::Basepack::Grid def configure(c) super + c.header = false c.model = "ActsAsLoggable::Log" c.columns = [ :loggable_id, diff --git a/app/components/user_profile_border.rb b/app/components/user_profile_border.rb index c064de7..2b5aa20 100644 --- a/app/components/user_profile_border.rb +++ b/app/components/user_profile_border.rb @@ -7,7 +7,7 @@ class UserProfileBorder < Netzke::Base def configure(c) super - c.title = "Profile" + c.header = false c.items = [ { netzke_component: :user_logs, region: :center, split: true}, { netzke_component: :user_stats, region: :east, width: 350, split: true}, diff --git a/app/components/users_and_profiles_border.rb b/app/components/users_and_profiles_border.rb index d0e8a84..a6dff69 100644 --- a/app/components/users_and_profiles_border.rb +++ b/app/components/users_and_profiles_border.rb @@ -7,7 +7,7 @@ class UsersAndProfilesBorder < Netzke::Base def configure(c) super - c.title = "Users/Profiles" + c.header = false c.items = [ { netzke_component: :users, region: :center, width: 300, split: true }, { netzke_component: :user_profiles, region: :south, height: 150, split: true},