<%
  css = []
  css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
  css << "first" if menu_branch_counter == 0
  css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
  domid = "item_#{menu_branch_counter}" unless menu_branch.parent_id.present? or menu_branch.title.blank?
-%>
<% if menu_branch.in_menu? %>
  <li<%= " class='#{css.join(' ')}'" if css.present? -%><%= " id='#{domid}'" if domid.present? -%>>
    <%= link_to menu_branch.title, menu_branch.url %>
    <%
      unless hide_children or
        menu_branch.parent_id.present? or
        (children = Page.find(:all, :conditions => "parent_id = #{menu_branch.id}").collect{|c| c if c.in_menu? }.compact).empty?
    -%>
      <ul class='clearfix'>
        <%= render :partial => "/shared/menu_branch",
                    :collection => children,
                    :locals => {:hide_children => hide_children, :sibling_count => children.size-1} -%>
      </ul>
    <% end -%>
  </li>
<% end -%>
<%
  css = []
  css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
  css << "first" if menu_branch_counter == 0
  css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
  domid = "item_#{menu_branch_counter}" unless menu_branch.parent_id.present? or menu_branch.title.blank?
-%>
<% if menu_branch.in_menu? %>
  <li<%= " class='#{css.join(' ')}'" if css.present? -%><%= " id='#{domid}'" if domid.present? -%>>
    <%= link_to menu_branch.title, menu_branch.url %>
    <%
      unless hide_children or
        menu_branch.parent_id.present? or
        (children = menu_branch.children.collect{|c| c if c.in_menu?}.compact).empty?
    -%>
      <ul class='clearfix'>
        <%= render :partial => "/shared/menu_branch",
                    :collection => children,
                    :locals => {:hide_children => hide_children, :sibling_count => children.size-1} -%>
      </ul>
    <% end -%>
  </li>
<% end -%>
Fix bug that was introduced that threw out page ordering in the menu
Fix bug that was introduced that threw out page ordering in the menu
