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

Conflicts:
	config/locales/zh_tw.yml

app/helpers/admin/item_helper.rb

@@ -8,9 +8,10 @@ module Admin::ItemHelper
           dest = admin_page_path(node)
         when 'Link'
           dest = admin_link_path(node)
+          no_nested = 'no-nest'
       end
-      ret << "<ul>" unless node.parent.nil?
-      ret << "<li>"
+      ret << "<li id='#{node.id}' class='#{no_nested}'>"
+      ret << "<i class='icons-moves'></i>"
       ret << "<div class='with_action'>"
       ret << (link_to node.i18n_variable[I18n.locale], dest)
       ret << "<div class='quick-edit hide'>"
@@ -22,22 +23,23 @@ module Admin::ItemHelper
       ret << "</div>"
       ret << render_children(node)
       ret << "</li>"
-      ret << "</ul>" unless node.parent.nil?
     end
     ret.html_safe
   end
   
   def render_children(parent)
-    children = parent.ordered_children
-    if !children.entries.blank?
+    children = parent.children
+    if !parent.children.entries.blank?
       ret = ''
+      ret << "<ol class='#{'sortable' if parent.parent.nil?}'>"
       children.each do |child|
         ret << render_node_and_children(child)
       end
+      ret << '</ol>'
       ret
     else
       ''
     end
   end
   
-end
+end