saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Ad_Banner frontend for IE8 

Fix backend bug in editing banner
Translation Added
This commit is contained in:
Manson Wang 2013-10-15 19:33:31 +08:00
parent b9fbba2962
commit 76ba7087b2
8 changed files with 134 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/assets/javascripts/kernel.js
View File

@ -1,29 +1,57 @@
var banners = [];
var banner_index = 0;
$(document).ready(function() { $(document).ready(function() {
$.each($(".dymanic_load"),function(){ $.each($(".dymanic_load"),function(){
if($(this).attr("path")==''){$(this).html("App setting Failed");} if($(this).attr("path")==''){
$(this).html("App setting Failed");
if($(this).attr("path")!=''){ }else{
ajax_load_proc($(this),$(this).attr("path")); // Check if this App is AD_Banner
} if($(this).attr("path").indexOf("show_banner")>0){
ajax_load_proc($(this),$(this).attr("path"),"true");
}else{
ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
} }
); }
$("#main_content").addClass("module");
}); });
function ajax_load_proc(wapper,url){ $("#main_content").addClass("module");
});
function ajax_load_proc(wapper,url,isBanner){
$.get(encodeURI(url), {}, function(respText,textSta,XML){ $.get(encodeURI(url), {}, function(respText,textSta,XML){
if (textSta == 'success') { if (textSta == 'success') {
if(isBanner=="true"){
wapper.html(respText); wapper.html(respText);
}; var banner = banners[banner_index];
if(textSta == 'error') $(banner.banner_name+" > img").each(function(){
wapper.html("Loading Failed<br/> <a href='"+$(this).attr('path')+"'>Go See</a>"); $(this).load(function(){ banner.image_loaded++; });
});
BannerCycle(banner_index);
banner_index++;
}else{
wapper.html(respText);
}
};
if(textSta == 'error')
wapper.html("Loading Failed<br/> <a href='"+$(this).attr('path')+"'>Go See</a>");
}); });
} }
// Ad Banner FX code [start] function BannerCycle(banner_index){
function getTimeout() { var banner = banners[banner_index];
return $(this).attr('time_to_next'); // Wait untill all images are loaded
if (banner.image_loaded==$(banner.banner_name+" img").length){
$(banner.banner_name).cycle({
delay: -1000,
fx: banner.banner_fx,
timeout: banner.time_to_next,
pager: banner.banner_pager,
pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
});
}else{
setTimeout("BannerCycle("+banner_index+")",500);
}
} }
$(document).ready(function() { $(document).ready(function() {

1
app/controllers/admin/ad_banners_controller.rb
View File

@ -40,6 +40,7 @@ class Admin::AdBannersController < OrbitBackendController
def edit def edit
@ad_banner = AdBanner.find(params[:id]) @ad_banner = AdBanner.find(params[:id])
render layout: false
end end
def update def update

56
app/views/admin/ad_banners/_edit.html.erb
View File

@ -1,25 +1,31 @@
<div class="content"> <%= form_for @ad_banner, url: admin_ad_banner_path(@ad_banner), remote: true do |f| %>
<%= form_for(:ad_banner, :url => admin_ad_banner_path(:ad_banner), :remote => true) do |f| %> <fieldset>
<fieldset> <legend><%= t("ad_banner.banner") %></legend>
<legend>Ad Banner</legend> <label><%= t("ad_banner.banner_name") %></label>
<label>Banner Name</label> <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
<%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %> <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
<span class="help-block">Banner Name only english</span> <label for="timeout"><%= t("ad_banner.ste") %></label>
<label for="timeout">Ste</label> <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
<%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %> <span class="help-block"><%= t("ad_banner.ste_note") %></span>
<span class="help-block">Please enter the number of seconds</span> <label><%= t("ad_banner.best_size") %></label>
<label>Best Size</label> <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
<%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %> <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
<span class="help-block">Best Size EX:120x30 </span> <label><%= t("ad_banner.effect") %></label>
<label>Effect</label> <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %> <div class="preview">
<div class="preview"> <%= image_tag "slideshow_preview_A.png", :width=>220 %>
<%= image_tag "slideshow_preview_A.png", :width=>220 %> <%= image_tag "slideshow_preview_B.png", :width=>220 %>
<%= image_tag "slideshow_preview_B.png", :width=>220 %> </div>
</div> <span class="help-block"><%= t("ad_banner.effect") %></span>
<span class="help-block">Effect</span> <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a> <%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
<%= f.submit t(:create_), class: 'btn btn-primary btn-small' %> </fieldset>
</fieldset> <% end %>
<% end %> <script type="text/javascript">
</div> $('select').on('change', function() {
$(".preview").cycle({
delay: -3000,
fx: $(this).val()
});
});
</script>

10
app/views/admin/ad_banners/_index.html.erb
View File

@ -1,3 +1,5 @@
<%= javascript_include_tag "lib/jquery.cycle.all.latest.js"%>
<table class="table main-list"> <table class="table main-list">
<thead> <thead>
<tr> <tr>
@ -13,7 +15,7 @@
<div class="quick-edit"> <div class="quick-edit">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<% if is_admin?%> <% if is_admin?%>
<li><%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner)%></li> <li><%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner), :class => "open-slide" %></li>
<li><%= link_to 'Destroy', admin_ad_banner_path(ad_banner), method: :delete , :confirm => t(:sure?) %></li> <li><%= link_to 'Destroy', admin_ad_banner_path(ad_banner), method: :delete , :confirm => t(:sure?) %></li>
<% end %> <% end %>
@ -30,12 +32,8 @@
<!-- footer --> <!-- footer -->
<div class="bottomnav clearfix"> <div class="bottomnav clearfix">
<div class="action pull-right"> <div class="action pull-right">
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), "#add-banner", :class => "btn btn-primary open-slide"%> <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), new_admin_ad_banner_path, :class => "btn btn-primary open-slide"%>
</div> </div>
</div> </div>
<div id="add-banner" class="nano" style="display:none">
<%= render 'new' %>
</div>
<% end %> <% end %>

56
app/views/admin/ad_banners/_new.html.erb
View File

@ -1,25 +1,31 @@
<div class="content"> <%= form_for(:ad_banner, :url => admin_ad_banners_path) do |f| %>
<%= form_for(:ad_banner, :url => admin_ad_banners_path) do |f| %> <fieldset>
<fieldset> <legend><%= t("ad_banner.banner") %></legend>
<legend>Ad Banner</legend> <label><%= t("ad_banner.banner_name") %></label>
<label>Banner Name</label> <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
<%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %> <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
<span class="help-block">Banner Name only english</span> <label for="timeout"><%= t("ad_banner.ste") %></label>
<label for="timeout">Ste</label> <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
<%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %> <span class="help-block"><%= t("ad_banner.ste_note") %></span>
<span class="help-block">Please enter the number of seconds</span> <label><%= t("ad_banner.best_size") %></label>
<label>Best Size</label> <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
<%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %> <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
<span class="help-block">Best Size EX:120x30 </span> <label><%= t("ad_banner.effect") %></label>
<label>Effect</label> <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %> <div class="preview">
<div class="preview"> <%= image_tag "slideshow_preview_A.png", :width=>220 %>
<%= image_tag "slideshow_preview_A.png", :width=>220 %> <%= image_tag "slideshow_preview_B.png", :width=>220 %>
<%= image_tag "slideshow_preview_B.png", :width=>220 %> </div>
</div> <span class="help-block"><%= t("ad_banner.effect") %></span>
<span class="help-block">Effect</span> <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a> <%= f.submit t(:create_), class: 'btn btn-primary btn-small' %>
<%= f.submit t(:create_), class: 'btn btn-primary btn-small' %> </fieldset>
</fieldset> <% end %>
<% end %> <script type="text/javascript">
</div> $('select').on('change', function() {
$(".preview").cycle({
delay: -3000,
fx: $(this).val()
});
});
</script>

23
app/views/front/show_banner.html.erb
View File

@ -1,4 +1,3 @@
<%= javascript_include_tag "lib/jquery.cycle.all.latest.js"%>
<div style='position:relative'> <div style='position:relative'>
<ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul> <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
<div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'> <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
@ -10,18 +9,12 @@
</div> </div>
</div> </div>
<script type='text/javascript'> <script type='text/javascript'>
$(document).ready(function(){ var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
jQuery(function( $ ){ "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
"banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
$('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({ "image_count":"<%= @ad_banner.ad_images.length %>",
delay: -1000, "image_loaded":0,
fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>", "time_to_next":<%= @ad_banner.transition_msec %>,
timeoutFn: getTimeout, };
pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>', banners.push(banner);
pagerAnchorBuilder: function(idx, slide) {
return "<li><a href='#'></a></li>";
}
});
});
});
</script> </script>

6
vendor/built_in_modules/ad_banner/config/locales/en.yml vendored
View File

@ -3,6 +3,12 @@ en:
ad_banner: ad_banner:
ad_banner: Ad Banner ad_banner: Ad Banner
banner: Banner banner: Banner
banner_name: Banner Name
banner_name_note: Banner Name only english
ste: Transition Interval
ste_note: Please enter the number of seconds
best_size: Best Size
effect: Effect
all: All all: All
categories: Categories categories: Categories
add: Add add: Add

6
vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml vendored
View File

@ -3,6 +3,12 @@ zh_tw:
ad_banner: ad_banner:
ad_banner: 廣告輪播 ad_banner: 廣告輪播
banner: 橫幅 banner: 橫幅
banner_name: 橫幅名稱
banner_name_note: 橫幅名稱只能為英文
ste: 轉換間隔時間
ste_note: 請輸入秒數
best_size: 最佳尺寸
effect: 效果
all: 全部 all: 全部
categories: 類別 categories: 類別
add: 新增 add: 新增