developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/Rulingcom/orbit into some_cool_fixes_harry

This commit is contained in:
Harry Bomrah 2013-11-19 11:55:36 +08:00
parent 5e584f7575 44c93c2dde
commit 6d2043ddaf
5 changed files with 9284 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/mobile.js
View File

@ -4,7 +4,7 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file. // the compiled file.
// //
//= require jquery //= require mobile/jquery-1.7.1
//= require lib/jquery.preload.min.js //= require lib/jquery.preload.min.js
//= require cycle2 //= require cycle2
//= require mobile/jquery.mu.image.resize //= require mobile/jquery.mu.image.resize

9266
app/assets/javascripts/mobile/jquery-1.7.1.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

16
app/assets/javascripts/mobile/orbit.mobile.js.erb
View File

@ -24,10 +24,10 @@ $('#index').live('pageinit',function(){
}); });
$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)}); $(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
$(this).find(".newpic img").muImageResize({width: 280, height: 200}); $(this).find(".newpic img").muImageResize({width: 280, height: 200});
$('.slideshow').cycle({ // $('.slideshow').cycle({
fx: $effect, // fx: $effect,
timeout: $timeout // timeout: $timeout
}); // });
$(".newlist").css({ $(".newlist").css({
"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30, "width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,
}) })
@ -113,10 +113,10 @@ $(window).bind("orientationchange", function(){
}); });
$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)}); $(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
$('.slideshow').cycle({ // $('.slideshow').cycle({
fx: $effect, // fx: $effect,
timeout: $timeout // timeout: $timeout
}); // });
$(".newlist").css({ $(".newlist").css({
"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30, "width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,

9
app/assets/stylesheets/mobile/orbit-mobile.css.erb.css
View File

@ -171,12 +171,19 @@ div[data-role="page"] {
float: left; float: left;
width: 280px; width: 280px;
min-height: 490px; min-height: 490px;
max-height: 490px; /*max-height: 490px;*/
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 10px; padding: 10px;
margin: 0 10px 10px 0; margin: 0 10px 10px 0;
box-shadow: 0px 3px 5px rgba(0,0,0,.1); box-shadow: 0px 3px 5px rgba(0,0,0,.1);
} }
.content .orbit-cycle-slideshow {
height: 300px;
}
.content .orbit-cycle-slideshow img {
width: 100%;
height: auto;
}
#index .content .newpic { #index .content .newpic {
width: 280px; width: 280px;
height: 200px; height: 200px;

2
app/controllers/mobile_controller.rb
View File

@ -7,7 +7,7 @@ class MobileController < ApplicationController
def index def index
date_now = Time.now date_now = Time.now
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page(params[:page_main]).per(15) @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page(params[:page_main]).per(15)
@ad_banner = AdBanner.where(title: "Banner")[0] @ad_banner = AdBanner.find(:all, :conditions => {:title => /Home/i})[0]
end end
def announcement def announcement