Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

app/helpers/admin/items_helper.rb

@@ -0,0 +1,45 @@
+module Admin::ItemsHelper
+  
+  def render_node_and_children(node)
+    ret = ''
+    if node
+      case node.class.to_s
+        when 'Page'
+          dest = admin_page_path(node)
+        when 'Link'
+          dest = admin_link_path(node)
+          no_nested = 'no-nest'
+      end
+      ret << "<li id='#{node.id}' class='#{no_nested}'>"
+      # ret << "<i class='icons-moves'></i>"
+      ret << "<div class='with_action'><i class='icons-moves'></i>"
+      ret << (link_to node.title, dest, :class => 'js_history')
+      ret << "<div class='quick-edit hide'>"
+      ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
+      ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
+      ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
+      ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
+      ret << "</div>"
+      ret << "</div>"
+      ret << render_children(node)
+      ret << "</li>"
+    end
+    ret.html_safe
+  end
+  
+  def render_children(parent)
+    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