developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-04-13 17:52:15 +08:00
parent a2e35f3626 430b0fd9ae
commit 92e898a656
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/admin/ad_banner_preview.css.erb Normal file
View File

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

2
app/assets/stylesheets/widget.css
View File

@ -58,7 +58,7 @@
cursor: pointer; cursor: pointer;
} }
.select-role { .select-role {
display:none; display:none;
padding: 10px 0; padding: 10px 0;
} }
.file-upload { .file-upload {

4
app/views/admin/ad_banners/_ad_image_update.html.erb
View File

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

2
app/views/admin/ad_banners/_preview_block.html.erb
View File

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

2
app/views/admin/ad_banners/index.html.erb
View File

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