Merge branch 'master' into ldap

app/assets/stylesheets/admin/ad_banner_preview.css.erb

@@ -0,0 +1,4 @@
+.banner-preview {
+   width: auto;
+   left: 35%;
+}

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

@@ -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]' %>

app/views/admin/ad_banners/_preview_block.html.erb

@@ -1,7 +1,7 @@
 <% if ad_banner -%>
 <%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
 
-<div class="modal hide fade in" id='slideshow-<%=ad_banner.title.dehumanize%>'>
+<div class="modal hide fade in banner-preview" id='slideshow-<%=ad_banner.title.dehumanize%>'>
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>

app/views/admin/ad_banners/index.html.erb

@@ -1,3 +1,5 @@
+<%= stylesheet_link_tag "admin/ad_banner_preview" %>
+
 <div id="post-body-content" class="clear">
 	<ul class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>