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 %>
<%#= form_remote_tag :update => "content", :url => { :action => 'search'} %>
<%= form_tag({:action => 'search', :controller => "items"},{:id => "search_form", :method => :get}) %>
diff --git a/app/views/browse/index.html.erb b/app/views/browse/index.html.erb
index 49cc7eb..1983993 100755
--- a/app/views/browse/index.html.erb
+++ b/app/views/browse/index.html.erb
@@ -2,12 +2,12 @@
homepage = Page.find_by_name("home")
homepage_sidebar = Page.system.find_by_name("home_page_sidebar")
homepage_subpages = homepage.pages.display_in_menu.published.in_order
- show_sidebar = homepage_subpages.size > 0 || @setting[:section_items] || !homepage_sidebar.content.blank?
+ show_sidebar = homepage_subpages.size > 0 || !homepage_sidebar.content.blank?
%>
<% content_for :side do %>
<%= render :partial => "pages/menu_for_page", :locals => {:page => homepage, :subpages => homepage_subpages} if homepage_subpages.size > 0 %>
- <% if @setting[:section_items] %>
+ <% if true %>
<% if @setting[:homepage_type] != "categories" %>
<%= render :partial => "items/category_menu", :locals => {:options => {:category => @category}} %>
<% end %>
@@ -22,9 +22,9 @@
<% end if show_sidebar %>
<%= render homepage if homepage %>
-<% if @setting[:homepage_type] == "new_items" && @setting[:section_items] %>
+<% if @setting[:homepage_type] == "new_items" %>
<%= render :partial => "browse/homepage_new_items" %>
-<% elsif @setting[:homepage_type] == "categories" && @setting[:section_items] %>
+<% elsif @setting[:homepage_type] == "categories" %>
<%= render :partial => "browse/homepage_categories" %>
<% else %>
<%# Display nothing %>
diff --git a/app/views/pages/_list_pages.html.erb b/app/views/pages/_list_pages.html.erb
index 0118aa6..dccb787 100755
--- a/app/views/pages/_list_pages.html.erb
+++ b/app/views/pages/_list_pages.html.erb
@@ -9,7 +9,7 @@
-
-
|