Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner ...

Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb

2012-04-13 16:52:14 +08:00

..

_ad_banner_tab.html.erb

ad banner preview

2012-04-12 07:14:06 +08:00

_ad_image_update.html.erb

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

2012-04-13 16:52:14 +08:00

_modal_ad_banner_form.html.erb

ad banner preview

2012-04-12 07:14:06 +08:00

_new_add_banner_file.html.erb

The new AdBanner.

2012-04-02 03:04:38 +08:00

_preview_block.html.erb

fix preview window size.

2012-04-13 16:46:16 +08:00

index.html.erb

fix preview window size.

2012-04-13 16:46:16 +08:00

new.html.erb

The new AdBanner.

2012-04-02 03:04:38 +08:00