diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 2f656f6..406f232 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -25,7 +25,7 @@ a.extra_options {padding:7px 0px;display:block;border-top:1px solid #ccc;} height:95px; background:url(bgs/main_logo_bg.png) no-repeat; background-position:bottom left; - border-top:1px solid #aaa; + // border-top:1px solid #aaa; } #wrapper > #content { height:100%; diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index d1e0855..a008a68 100755 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -7,7 +7,7 @@ <%= link_to(icon("items") + " " + Item.model_name.human(:count => :other), {:action => "all_items", :controller => "items"}, :class => params[:action] == "all_items" ? :selected : nil ) %> <%#= render :partial => "items/all_items_menu" %> <%= render :partial => "items/menu" %> - <% end if @setting[:section_items] %> + <% end %> <%= content_tag(:li, :class => (params[:controller] == "pages") ? :selected : nil) do %> <%= link_to(icon("pages") + " " + Page.model_name.human(:count => :other), {:action => "index", :controller => "pages"}, :class => current_page?(pages_path) && params[:type].blank? ? :selected : nil) %> <%= render :partial => "pages/menu" %> diff --git a/app/views/application/_top.html.erb b/app/views/application/_top.html.erb index 0d82392..f64f231 100755 --- a/app/views/application/_top.html.erb +++ b/app/views/application/_top.html.erb @@ -2,7 +2,7 @@
- <% if @setting[:section_items] %> + <% if true %>
<%= render :partial => "/settings/list_settings", :locals => {:settings => Setting.find(:all, :conditions => ["setting_type = ?", "User"]), :title => User.model_name.human}%> -
-
- <%= render :partial => "/settings/list_settings", :locals => {:settings => Setting.find(:all, :conditions => ["setting_type = ?", "Section"]), :title => t("single.section")}%> -
+
- -
diff --git a/app/views/user/_menu.html.erb b/app/views/user/_menu.html.erb index 58ed244..37ebcc9 100755 --- a/app/views/user/_menu.html.erb +++ b/app/views/user/_menu.html.erb @@ -6,7 +6,7 @@ <% end %> <%= content_tag :li, :class => params[:controller] == "items" ? :selected : nil do %> <%= link_to(icon("items") + " " + Item.model_name.human(:count => :other), {:action => "my", :controller => "items"}, :class => params[:controller] == "items" ? :selected : nil) %> - <% end if (Setting.get_setting_bool("let_users_create_items") || @logged_in_user.is_admin?) && @setting[:section_items] %> + <% end if (Setting.get_setting_bool("let_users_create_items") || @logged_in_user.is_admin?) %> <%= content_tag :li, :class => params[:controller] == "messages" ? :selected : nil do %> <%= link_to(icon("mail") + " " + UserMessage.model_name.human(:count => :other), {:action => "for_me", :controller => "messages"}, :class => params[:controller] == "messages" ? :selected : nil) %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d2e2f09..8197d13 100755 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -72,7 +72,7 @@ <%= @user.group.name %> <% end if @logged_in_user.is_admin? %> - <% if @setting[:section_items] && @items.size > 0 %> + <% if @items.size > 0 %> <%= render :partial => "navigation" %>
diff --git a/db/migrate/20120521230728_remove_section_settings.rb b/db/migrate/20120521230728_remove_section_settings.rb new file mode 100755 index 0000000..590c524 --- /dev/null +++ b/db/migrate/20120521230728_remove_section_settings.rb @@ -0,0 +1,11 @@ +class RemoveSectionSettings < ActiveRecord::Migration + def up + Setting.find_by_name("section_items").destroy + Setting.find_by_name("section_blog").destroy + end + + def down + Setting.create(:name => "section_items", :value => "1", :setting_type => "Section", :item_type => "bool") + Setting.create(:name => "section_blog", :value => "1", :setting_type => "Section", :item_type => "bool") + end +end diff --git a/db/schema.rb b/db/schema.rb index c0e3dfc..e287415 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -11,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120311001715) do +ActiveRecord::Schema.define(:version => 20120521230728) do create_table "authentications", :force => true do |t| t.integer "user_id" @@ -139,7 +138,6 @@ t.boolean "display_children", :default => true t.boolean "group_access_only", :default => false t.string "group_ids" - t.text "side" t.string "slug" end