developers/orbit-4-1
Archived
2
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-04-13 16:52:14 +08:00
2 parents 4af73ecf6f ca0fc4c767
commit 430b0fd9ae
8 files changed
+109 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_banners/_ad_image_update.html.erb
+1 -1
View File
@@ -1,4 +1,4 @@
<li class="span3" id = 'asd'>
<li class="span3">
<%= image_tag ad_image.file rescue nil%>
<p>
<%= ad_image.display? ? '[Showing]' : '[NotShawing]' %>