fix

Hesham E committed Sep 01, 2010

commit 558909cd8b193802200b5fe45b8bdb47410b18c4

Showing 2 changed files with 5 additions and 6 deletions

app/views/cms_admin/assets/_index.html.erb +5 -5

@@	@@ -1,11 +1,11 @@
+	<div id='upload_container'>
+	<div id='filelist'></div>
+	<%= link_to 'select files', '#', :id => 'pickfiles', :class => 'button' %>
+	</div>
+
	<div id='assets_list'>
	<% cms_assets = CmsAsset.all %>
	<% if cms_assets.present? %>
	<%= render :partial => 'cms_admin/assets/asset', :collection => cms_assets %>
	<% end %>
-	</div>
-
-	<div id='upload_container'>
-	<div id='filelist'></div>
-	<%= link_to 'select files', '#', :id => 'pickfiles', :class => 'button' %>
	</div>
	\ No newline at end of file

app/views/cms_admin/pages/_form.html.erb +0 -1

@@	@@ -7,5 +7,4 @@
	<% end %>

	<h2>Assets</h2>
-	<%= render :partial => 'cms_admin/assets/uploader' %>
	<%= render :partial => 'cms_admin/assets/index' %>
	\ No newline at end of file