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

Conflicts:
	app/helpers/admin/item_helper.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-11 18:09:34 +08:00
commit ef49df448d
6 files changed
+83 -6

No files matched your search

+1
View File
@@ -11,6 +11,7 @@ module Admin::ItemHelper
no_nested = 'no-nest'
end
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'>"