Compare commits

..
9 changed files with 9284 additions and 20 deletions

No files matched your search

-2
View File
@@ -38,8 +38,6 @@ $(document).ready(function() {
}
}
})
$('.page_footer').append($('#last_update_date')[0]);
});
// Ad Banner FX code [end]
+1 -1
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
// the compiled file.
//
//= require jquery
//= require mobile/jquery-1.7.1
//= require lib/jquery.preload.min.js
//= require cycle2
//= require mobile/jquery.mu.image.resize
File diff suppressed because it is too large. Load diff
@@ -24,10 +24,10 @@ $('#index').live('pageinit',function(){
});
$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
$(this).find(".newpic img").muImageResize({width: 280, height: 200});
$('.slideshow').cycle({
fx: $effect,
timeout: $timeout
});
// $('.slideshow').cycle({
// fx: $effect,
// timeout: $timeout
// });
$(".newlist").css({
"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)});
$('.slideshow').cycle({
fx: $effect,
timeout: $timeout
});
// $('.slideshow').cycle({
// fx: $effect,
// timeout: $timeout
// });
$(".newlist").css({
"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,
@@ -171,12 +171,19 @@ div[data-role="page"] {
float: left;
width: 280px;
min-height: 490px;
max-height: 490px;
/*max-height: 490px;*/
background-color: #FFFFFF;
padding: 10px;
margin: 0 10px 10px 0;
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 {
width: 280px;
height: 200px;
-5
View File
@@ -2,7 +2,6 @@ class PagesController < ApplicationController
include ApplicationHelper
before_filter :get_item, :only => [:index_from_link, :show_from_link]
before_filter :check_frontend_open, :only => [:index,:show]
before_filter :get_last_update_date, :only => [:index,:show]
# caches_page :index
def index
@@ -215,8 +214,4 @@ class PagesController < ApplicationController
return false
end
end
def get_last_update_date
@last_update_date = t(:total_visitors)+' : '+ Impression.count.to_s+' | '+t(:update_at)+' : '+Bulletin.order_by(:updated_at.desc).limit(1).first[:updated_at].to_s
end
end
-1
View File
@@ -41,6 +41,5 @@
}
</style>
<% end %>
<div id='last_update_date_wrap' style='display:none;'><div id='last_update_date'><%= @last_update_date %></div></div>
</body>
</html>
@@ -8,7 +8,7 @@ var galleryAPI = function(){
g = this;
this.urlVars = rcom.getUrlVars();
this.albumArea = $("#orbit_gallery");
this.loadArea = null;
this.loadArea = "theater";
this.tagList = $(".taglist ul");
this.loading = $("#loading");
// this.authenticated = false;
@@ -57,7 +57,6 @@
galleryAPI.prototype.locale = "<%= I18n.locale %>";
var gallery = new galleryAPI();
gallery.initialize();
gallery.loadArea = "theater";
gallery.loadTheater("<%= params[:id] %>","<%= params[:image_id] %>");
</script>