Merge branch 'master' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-04-13 17:52:15 +08:00
commit 92e898a656
5 changed files with 10 additions and 4 deletions

View File

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

View File

@ -1,5 +1,5 @@
<li class="span3" id = 'asd'>
<%= image_tag ad_image.file rescue nil %>
<li class="span3">
<%= image_tag ad_image.file rescue nil%>
<p>
<%= ad_image.display? ? '[Showing]' : '[NotShawing]' %>
<%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %>

View File

@ -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>

View File

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