Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

app/helpers/admin/items_helper.rb

@@ -32,7 +32,7 @@ module Admin::ItemsHelper
     if !parent.children.entries.blank?
       ret = ''
       ret << "<ol class='#{'sortable' if parent.parent.nil?}'>"
-      children.each do |child|
+      children.reverse.each do |child|
         ret << render_node_and_children(child)
       end
       ret << '</ol>'

app/views/layouts/_orbit_bar.html.erb

@@ -1,5 +1,5 @@
 <header id="orbit-bar" class="navbar">
-	<div class="navbar-inner">
+<div class="navbar-inner">
   <div class="container clear">
     <div class="dropdown orbit-logo pull-left">
       <% if !current_user.nil?  %>
@@ -30,7 +30,7 @@
         <input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
         <input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
         <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
-            <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
+        <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_google) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
       </form>
       </li>
       <% if user_signed_in? %>

lib/orbit_core_lib.rb

@@ -140,7 +140,7 @@ module  OrbitCoreLib
     
     protected
      def generate_token
-       self.s_token = ActiveSupport::SecureRandom.hex(16)
+       self.s_token = SecureRandom.hex(16)
        self.save!
      end
   end