Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config

app/assets/stylesheets/default_widget.css

@@ -3,7 +3,7 @@
 .defulat_widget_typeA{
     font: 12px/100% 'open sans',sans-serif;
     margin:0 0 20px;
-    width:510px;
+    
 }
 .defulat_widget_tb{
   border-collapse:collapse;
@@ -19,17 +19,24 @@
 .defulat_widget_tb td{
     border-bottom: 1px solid #AAAAAA;
     padding: 10px;
+    vertical-align: top;
     white-space: normal;
     word-wrap: break-word;
 }
-
-
+.defulat_widget_tb .date{
+  display: block;
+  max-width: 80px;
+}
+.defulat_widget_tb .category{
+  display: block;
+  max-width: 100px;
+}
 /* 2 */
 
 .defulat_widget_typeB_style2{
     font: 12px/100% 'open sans',sans-serif;
     margin:0 0 20px;
-    width:510px;
+    
 }
 
 .defulat_widget_typeB_style2 ul{
@@ -69,7 +76,7 @@
 .defulat_widget_typeB_style3{
     font: 12px/100% 'open sans',sans-serif;
     margin:0 0 20px;
-    width:510px;
+    
 }
 .defulat_widget_typeB_style3 ul{
   margin: 0;
@@ -114,7 +121,7 @@
 .defulat_widget_typeB_style4{
     font: 12px/100% 'open sans',sans-serif;
     margin:0 0 20px;
-    width:510px;
+    
 }
 .defulat_widget_typeB_style4 ul{
   margin: 0;
@@ -159,7 +166,6 @@
     font: 12px/100% 'open sans',sans-serif;
     margin: 0 0 20px;
     position: relative;
-    width: 510px;
 }
 .defulat_widget_typeC ul{
     margin: 0 0 0 70px;

app/jobs/fetch_time.rb

@@ -1,15 +0,0 @@
-# require 'open-uri'
-# require 'nokogiri'
-class FetchTime < Resque::Plugins::RestrictionJob
-  restrict :per_300 => 10
-  
-  @queue = :low
-
-  def self.perform()
-#    sleep 10
-    doc = Nokogiri::HTML(open('http://www.timeanddate.com/worldclock/city.html?n=241'))
-    CronMail.time_check(doc.at('#ct').children.first.text).deliver
-    puts "Mail Sent"
-    true
-  end
-end

app/jobs/update_tag_cloud.rb

@@ -0,0 +1,9 @@
+class UpdateTagCloud 
+  @queue = :high
+
+  def self.perform()
+    Tag.all.each do |tag|
+      tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
+    end
+  end
+end

app/models/tag.rb

@@ -12,6 +12,8 @@ class Tag
   
   field :key
   field :view_count, :type => Integer, :default => 0
+  field :cloud_view_count, :type => Integer, :default => 0
+
   #field :cloud_amper,:type: Integer,:default=> 0 
 
   def self.sorted_for_cloud