ydu

Gemfile

@@ -111,7 +111,7 @@ group :test, :development do
   gem "spork"
   gem "capybara"
   #gem 'rack-mini-profiler'
-  gem "better_errors"
+  gem "better_errors", "1.1.0"
   # gem 'yard'
   # gem "bluecloth"
 end

app/assets/javascripts/ckeditor/config.js.erb

@@ -28,6 +28,8 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'about' }
 	];
 
+	config.allowedContent = true;
+
 	config.skin = 'moono';
 
 	config.filebrowserBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path(:module_app_id=>ModuleApp.where(:key=>'asset').first.id) %>";
@@ -35,6 +37,10 @@ CKEDITOR.editorConfig = function( config ) {
 
 	//Font Config
 	config.font_names = 'Arial;Comic Sans MS;Courier New;Georgia;Helvetica;Lucida Sans Unicode;Tahoma;Times New Roman;Trebuchet MS;Verdana;微軟正黑體';
+
+	config.enterMode = CKEDITOR.ENTER_BR;
+	config.shiftEnterMode = CKEDITOR.ENTER_BR;
+	config.pasteFromWordPromptCleanup = true;
 };
 
 CKEDITOR.on('instanceReady',function(){

app/assets/javascripts/lib/ad_banner/banner_preview.js

@@ -32,7 +32,6 @@ function preview() {
             var resize = 500/bannerW
             bannerW = Math.floor(bannerW*resize);
             bannerH = Math.floor(bannerH*resize);
-            console.log(bannerW)
         };
         if(bannerH > 300) {
             var resize = 300/bannerH

app/assets/javascripts/lib/modal-preview.js

@@ -7,7 +7,12 @@ $(function() {
 		for ( instance in CKEDITOR.instances )
           CKEDITOR.instances[instance].updateElement();
         
-		var formData = new FormData( $('form.previewable')[0] );
+		var formData;
+		if(typeof(FormData) == "function"){
+			formData = new FormData( $('form.previewable')[0] );
+		}else{
+			formData = $('form.previewable').serialize()
+		}
 
 		$.ajax({
       type: "post",

app/controllers/admin/ad_banners_controller.rb

@@ -4,7 +4,7 @@ class Admin::AdBannersController < OrbitBackendController
   open_for_sub_manager
 
   def index
-    @ad_banners = AdBanner.all.page(params[:page]).per(10)
+    @ad_banners = get_sorted_and_filtered("ad_banner")
   end
   
   def show

app/controllers/admin/ad_images_controller.rb

@@ -11,7 +11,7 @@ class Admin::AdImagesController < Admin::AdBannersController
   end
 
   def index
-    @ad_images = AdImage.all.page(params[:page]).per(10)
+    @ad_images = get_sorted_and_filtered("ad_image")
   end
 
   def edit

app/controllers/admin/dashboards_controller.rb

@@ -11,7 +11,7 @@ class Admin::DashboardsController < OrbitBackendController
     check_backend_openness
     @module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'page_context', 'web_link')
     @recent_updated = get_recently_updated('bulletin', 'page_context', 'web_link')
-    @most_visited = get_most_visited('bulletin', 'page_context','page')
+    @most_visited = get_most_visited('bulletin', 'page_context')
   end
 
   def reload_all_content
@@ -22,7 +22,7 @@ class Admin::DashboardsController < OrbitBackendController
   end
 
   def reload_most_visited
-    @most_visited = get_most_visited('bulletin', 'page_context','page')
+    @most_visited = get_most_visited('bulletin', 'page_context')
     respond_to do |format|
       format.js { render 'reload', locals: {div_id: 'most_visited'} }
     end

app/controllers/application_controller.rb

@@ -321,6 +321,8 @@ class ApplicationController < ActionController::Base
             sorted_objects.flatten!
             sorted_objects.uniq!
             objects = get_with_nil(objects, option, sorted_objects)
+          elsif option.eql?('size')
+            objects = objects.order_by([ [:width, params[:direction]], [:height, params[:direction]] ])
           end
         end
       end
@@ -361,7 +363,12 @@ class ApplicationController < ActionController::Base
     end
 
     if pagination
-      Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
+      filtered_objects = filter_authorized_objects(objects)
+      if filtered_objects.is_a?(Array)
+        Kaminari.paginate_array(filtered_objects).page(params[:page]).per(10)
+      else
+        filter_authorized_objects(objects).page(params[:page]).per(10)
+      end
     else
       filter_authorized_objects(objects)
     end

app/helpers/application_helper.rb

@@ -248,15 +248,24 @@ module ApplicationHelper
   end
 
   def get_month_traffic
-    result = []
+    site = Site.first
-    (0..30).each do |i|
+    if site.month_traffic_cache.blank? or (site.month_traffic_cache['updated_at'] < (Time.now-1.day) rescue true)
+      site.month_traffic_cache = {}
+
+      site.month_traffic_cache['result'] = []
+      (1..30).each do |i|
         visits = Impression.where( created_at: {
           '$gte' => Time.now.beginning_of_day-i.days, 
           '$lte' => Time.now.end_of_day-i.days}
           ).count
-      result.push([ Time.now.beginning_of_day-i.days, visits])
+        site.month_traffic_cache['result'].push([ Time.now.beginning_of_day-i.days, visits])
       end
-    [:name=> t(:visitors_count),:data=>result]
+
+      site.month_traffic_cache['updated_at'] = Time.now
+      site.save
+    end
+    
+    [:name=> t(:visitors_count),:data=>site.month_traffic_cache['result']]
   end
 
   # def get_today_traffic

app/models/site.rb

@@ -51,6 +51,8 @@ class Site
   field :store_confirmation, :type => Boolean, :default => false
   field :meta_viewport, :type => Boolean, :default => false
 
+  field :month_traffic_cache
+
   belongs_to :design
   has_many :site_metas, :autosave => true, :dependent => :destroy
   validate :in_use_locales, :minimum_enabled_locales

config/application.rb

@@ -56,6 +56,7 @@ module Orbit
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'modules', '*.{rb,yml}').to_s]
+    config.i18n.enforce_available_locales = false
     config.i18n.default_locale = :zh_tw
 
     # JavaScript files you want as :defaults (application.js is always included).