Christophe Vilayphiou 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb		2012-04-25 16:39:26 +08:00
..
_ad_banner_tab.html.erb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-25 16:39:26 +08:00
_ad_image_update.html.erb	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
_modal_ad_banner_form.html.erb	Fix ad_banner	2012-04-24 14:37:06 +08:00
_modal_preview.html.erb	Remove JS debug msg.	2012-04-25 16:10:11 +08:00
_new_add_banner_file.html.erb	The new AdBanner.	2012-04-02 03:04:38 +08:00
_preview_block.html.erb	fix i18n vars in ad_banner	2012-04-23 14:07:13 +08:00
create_error_msg.js.erb	AdImage and AnBanner JS fixed	2012-04-23 14:07:13 +08:00
index.html.erb	fix js	2012-04-23 14:07:14 +08:00
new.html.erb	The new AdBanner.	2012-04-02 03:04:38 +08:00
new_created_node.js.erb	fix js	2012-04-23 14:07:14 +08:00
realtime_preview.js.erb	realtime preview is working. but save to object when preview	2012-04-23 14:06:37 +08:00