.

Author: huacnlee

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.1.1"
+gem "rails", "3.1.12"
 gem "bson", "1.3.1"
 gem "bson_ext", "1.3.1"
 gem "mongoid", "2.2.4"
@@ -17,7 +17,7 @@ gem 'mongoid_auto_increment_id', "0.2.2"
 # 用户系统
 gem "devise", "1.4.5"
 # 分页
-gem 'will_paginate', '3.0.pre2'  
+gem 'will_paginate', '3.0.pre2'
 # 三方平台 OAuth 验证登陆
 gem 'omniauth', '0.3.0'
 gem "oa-openid", '0.3.0'
@@ -43,16 +43,17 @@ gem "rails_autolink", ">= 1.0.4"
 # YAML 配置信息
 gem "settingslogic", "~> 2.0.6"
 gem "cells", "3.6.7"
-gem "resque", "~> 1.19.0", :require => "resque/server"
+gem "resque", "~> 1.20.0", :require => "resque/server"
 gem "resque_mailer", '2.0.2'
 gem "aws-ses", "~> 0.4.3"
-gem 'mail_view', :git => 'git://github.com/37signals/mail_view.git'
+gem 'mail_view'
 gem "daemon-spawn", "~> 0.4.2"
-gem "unicorn"
 # 用于组合小图片
 gem "sprite-factory", "1.4.1"
+gem 'unicorn'
 
 group :assets do
+  gem 'sprockets'
   gem 'sass-rails', "  ~> 3.1.4"
   gem 'coffee-rails', "~> 3.1.1"
   gem 'uglifier'

Gemfile.lock

@@ -1,44 +1,38 @@
-GIT
-  remote: git://github.com/37signals/mail_view.git
-  revision: 7c0cf5df704f999acab375836026297801c9c6bb
-  specs:
-    mail_view (1.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     XMLCanonicalizer (1.0.1)
       log4r (>= 1.0.4)
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
-      mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionmailer (3.1.12)
+      actionpack (= 3.1.12)
+      mail (~> 2.4.4)
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+    activesupport (3.1.12)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.2.1)
+    arel (2.2.3)
     aws-ses (0.4.3)
       builder
       mail (> 2.2.5)
@@ -47,7 +41,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bson (1.3.1)
     bson_ext (1.3.1)
-    builder (3.0.0)
+    builder (3.0.4)
     capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
@@ -67,19 +61,18 @@ GEM
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
+    coffee-script-source (1.9.1.1)
     daemon-spawn (0.4.2)
     dalli (1.1.1)
     devise (1.4.5)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.7.0)
-    execjs (1.2.9)
-      multi_json (~> 1.0)
+    execjs (2.6.0)
     factory_girl (2.2.0)
       activesupport
     factory_girl_rails (1.3.0)
@@ -90,21 +83,23 @@ GEM
       multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     highline (1.6.2)
-    hike (1.2.1)
-    i18n (0.6.0)
+    hike (1.2.3)
+    i18n (0.7.0)
     jquery-rails (1.0.16)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.1)
-    kgio (2.6.0)
+    json (1.8.3)
+    kgio (2.8.0)
     log4r (1.1.9)
     macaddr (1.4.0)
       systemu (~> 2.2.0)
-    mail (2.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mail_view (2.0.4)
+      tilt
+    mime-types (1.25.1)
     mini_magick (3.3)
       subexec (~> 0.1.0)
     mongo (1.3.1)
@@ -117,7 +112,7 @@ GEM
     mongoid-eager-loading (0.3.1)
     mongoid_auto_increment_id (0.2.2)
       mongoid (~> 2.2.0)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     multi_xml (0.4.1)
     multipart-post (1.1.3)
     net-ldap (0.2.2)
@@ -169,48 +164,48 @@ GEM
       oa-oauth (= 0.3.0)
       oa-openid (= 0.3.0)
     orm_adapter (0.0.5)
-    polyglot (0.3.3)
+    polyglot (0.3.5)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.3.10)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (1.1.4)
+    rack-protection (1.5.3)
       rack
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.1.12)
+      actionmailer (= 3.1.12)
+      actionpack (= 3.1.12)
+      activerecord (= 3.1.12)
+      activeresource (= 3.1.12)
+      activesupport (= 3.1.12)
       bundler (~> 1.0)
-      railties (= 3.1.1)
+      railties (= 3.1.12)
     rails-i18n (0.1.8)
       i18n (~> 0.5)
     rails_autolink (1.0.4)
       rails (>= 3.1.0)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+    railties (3.1.12)
+      actionpack (= 3.1.12)
+      activesupport (= 3.1.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    raindrops (0.8.0)
-    rake (0.9.2.2)
+    raindrops (0.11.0)
+    rake (10.4.2)
     rdiscount (1.6.8)
-    rdoc (3.11)
+    rdoc (3.12.2)
       json (~> 1.4)
     redis (2.2.2)
-    redis-namespace (1.0.3)
+    redis-namespace (1.0.2)
       redis (< 3.0.0)
     redis-objects (0.5.2)
       redis (>= 2.1.1)
@@ -219,7 +214,7 @@ GEM
       redis (>= 2.1.1)
       redis-namespace (~> 1.0.2)
       rmmseg-cpp-huacnlee (>= 0.2.8)
-    resque (1.19.0)
+    resque (1.20.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
@@ -234,41 +229,40 @@ GEM
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
     rubyntlm (0.1.1)
-    sass (3.1.10)
-    sass-rails (3.1.4)
+    sass (3.4.18)
+    sass-rails (3.1.7)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
-      sass (>= 3.1.4)
-      sprockets (~> 2.0.0)
+      sass (>= 3.1.10)
       tilt (~> 1.3.2)
     settingslogic (2.0.6)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     sprite-factory (1.4.1)
-    sprockets (2.0.3)
+    sprockets (2.0.5)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.1.0)
     systemu (2.2.0)
     thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    tilt (1.3.7)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.44)
     uglifier (1.0.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    unicorn (4.1.1)
-      kgio (~> 2.4)
+    unicorn (4.6.3)
+      kgio (~> 2.6)
       rack
-      raindrops (~> 0.6)
+      raindrops (~> 0.7)
     uuid (2.3.4)
       macaddr (~> 1.0)
-    vegas (0.1.8)
+    vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.0.6)
       rack (>= 1.0)
@@ -294,7 +288,7 @@ DEPENDENCIES
   devise (= 1.4.5)
   factory_girl_rails
   jquery-rails (= 1.0.16)
-  mail_view!
+  mail_view
   mini_magick (= 3.3)
   mongo-rails-instrumentation (= 0.2.4)
   mongoid (= 2.2.4)
@@ -303,19 +297,23 @@ DEPENDENCIES
   nokogiri (= 1.5.0)
   oa-openid (= 0.3.0)
   omniauth (= 0.3.0)
-  rails (= 3.1.1)
+  rails (= 3.1.12)
   rails-i18n (= 0.1.8)
   rails_autolink (>= 1.0.4)
   rdiscount (= 1.6.8)
   redis-namespace (~> 1.0.2)
   redis-objects (= 0.5.2)
   redis-search (= 0.6.3)
-  resque (~> 1.19.0)
+  resque (~> 1.20.0)
   resque_mailer (= 2.0.2)
   rmmseg-cpp-huacnlee (= 0.2.8)
   sass-rails (~> 3.1.4)
   settingslogic (~> 2.0.6)
   sprite-factory (= 1.4.1)
+  sprockets
   uglifier
   unicorn
   will_paginate (= 3.0.pre2)
+
+BUNDLED WITH
+   1.10.6

app/assets/stylesheets/application.scss

@@ -1,7 +1,7 @@
 /*
- *= require bootstrap
- *= require jquery.jdialog
- *= require wikistyle
+ *= require ./bootstrap
+ *= require ./jquery.jdialog
+ *= require ./wikistyle
  *= require_tree ./sprites/
  *= require_self
  */
@@ -43,9 +43,9 @@ form {
 a.label:hover { text-decoration: none; color:#FFF;}
 
 
-.box { 
+.box {
   background-color: #fff;
-  padding:10px;  
+  padding:10px;
   margin: 0 0 20px 0; /* negative indent the amount of the padding to maintain the grid system */
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;

app/assets/stylesheets/front.scss

@@ -1,5 +1,5 @@
 /*
- *= require application
+ *= require ./application
  *= require_self
  */
 #login {   }
@@ -8,7 +8,7 @@
 .box ol { margin-bottom:0; }
 
 .sidebar h2 { font-size:14px; line-height:100%; margin-bottom:10px; color:#666;}
-.sidebar ul, 
+.sidebar ul,
 .sidebar ol { margin-bottom:0; }
 .sidebar p { margin-bottom:6px; }
 .sidebar li { margin-bottom:4px; }
@@ -48,7 +48,7 @@
 .body code{font-size:12px!important;background-color:#f8f8ff!important;color:#444!important;padding:0 .2em!important;border:1px solid #dedede!important;}
 
 .cell_comments {
-  .comment { 
+  .comment {
     margin-bottom:10px;
     .info {
       .user_avatar {
@@ -66,4 +66,4 @@
   }
 }
 
-.help-block ul { margin-bottom:0; }
+.help-block ul { margin-bottom:0; }