diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss new file mode 100644 index 00000000..37064f07 --- /dev/null +++ b/app/assets/stylesheets/settings.scss @@ -0,0 +1,32 @@ +@import "bootstrap"; +@import "font-awesome"; +@import "theme"; + +/* Show it is fixed to the top */ +// body { +// min-height: 75rem; +// padding-top: 4.5rem; +// } + +.setting_nav{ + background-color: #2f5663; +} + +ul.navbar-nav li a{ + text-decoration :none; + color :#e6e6e6; +} + +ul.dropdown-menu li a{ + text-decoration :none; + color :#525252; +} + +.setting_breadcrumb{ + background-color: transparent !important; + margin-bottom: 0px !important; +} +.page-header{ + border-bottom :0px solid #000 !important; + margin :0px !important; +} \ No newline at end of file diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 438b2f08..b488ac6f 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -4,7 +4,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items # GET /settings/menu_items.json def index - @settings_menu_items = @category.menu_items + @settings_menu_items = @category.menu_items.page(params[:page]).per(10) end # GET /settings/menu_items/1 @@ -15,6 +15,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/new def new @settings_menu_item = MenuItem.new + @settings_menu_item.type = "SetMenuItem" end # GET /settings/menu_items/1/edit diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index e81d6817..6b3c4bb4 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -4,7 +4,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items # GET /settings/menu_items.json def index - @settings_menu_items = @category.menu_items + @settings_menu_items = @category.menu_items.page(params[:page]).per(10) end # GET /settings/menu_items/1 diff --git a/app/models/menu.rb b/app/models/menu.rb index ac9ea4d3..0c956a1e 100644 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -2,7 +2,7 @@ class Menu < ApplicationRecord has_many :menu_categories, dependent: :destroy validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to - validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i, :on => :create + validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i #Default Scope to pull the active version only default_scope { where(is_active: true).order("created_at desc") } diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index b73cc5ae..47c10ac9 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,8 +1,8 @@ -