diff --git a/Gemfile b/Gemfile index 0694f18..03b91d3 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem 'font-awesome-sass' gem 'jbuilder' gem 'mongoid' +gem 'mongoid-tree' gem 'mongoid-pagination' gem 'redcarpet' gem 'rouge' diff --git a/Gemfile.lock b/Gemfile.lock index 6d0ca94..f398ae4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - angularjs-rails (1.3.4) + angularjs-rails (1.3.8) arel (5.0.1.20140414130214) bson (2.3.0) builder (3.2.2) @@ -49,7 +49,7 @@ GEM celluloid (0.16.0) timers (~> 4.0.0) chunky_png (1.3.3) - codeclimate-test-reporter (0.4.3) + codeclimate-test-reporter (0.4.5) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) coffee-rails (4.1.0) @@ -60,7 +60,7 @@ GEM execjs coffee-script-source (1.8.0) connection_pool (2.1.0) - database_cleaner (1.3.0) + database_cleaner (1.4.0) diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) @@ -79,37 +79,43 @@ GEM foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foundation-rails (5.4.5.0) + foundation-rails (5.5.0.0) railties (>= 3.1.0) - sass (>= 3.2.0) - guard (2.10.1) + sass (>= 3.2.0, < 3.4) + guard (2.11.1) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) pry (>= 0.9.12) + shellany (~> 0.0) thor (>= 0.18.1) - guard-bundler (2.0.0) + guard-bundler (2.1.0) bundler (~> 1.0) guard (~> 2.2) + guard-compat (~> 1.1) + guard-compat (1.2.0) guard-rails (0.7.0) guard (~> 2.0) - guard-rspec (4.4.1) + guard-rspec (4.5.0) guard (~> 2.1) + guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) hike (1.2.3) hitimes (1.2.2) html_truncator (0.4.0) nokogiri (~> 1.5) - i18n (0.6.11) + i18n (0.7.0) jbuilder (2.2.6) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) - kgio (2.9.2) - listen (2.8.3) + json (1.8.2) + kgio (2.9.3) + listen (2.8.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -118,9 +124,9 @@ GEM mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (2.4.3) - mini_magick (4.0.1) - mini_portile (0.6.1) - minitest (5.4.3) + mini_magick (4.0.2) + mini_portile (0.6.2) + minitest (5.5.1) mongoid (4.0.0) activemodel (~> 4.0) moped (~> 2.0.0) @@ -132,19 +138,25 @@ GEM mongoid-pagination (0.2.0) activesupport mongoid - mongoid-rspec (1.10.0) - mongoid (>= 3.0.1) + mongoid-rspec (2.0.0) + mongoid (~> 4.0.0) rake - rspec (>= 2.14) - moped (2.0.2) + rspec (~> 3.1) + mongoid-tree (2.0.0) + mongoid (>= 4.0, <= 5.0) + moped (2.0.3) bson (~> 2.2) connection_pool (~> 2.0) optionable (~> 0.2.0) multi_json (1.10.1) - netrc (0.9.0) - newrelic_rpm (3.9.8.273) + nenv (0.1.1) + netrc (0.10.2) + newrelic_rpm (3.9.9.275) nokogiri (1.6.5) mini_portile (~> 0.6.0) + notiffany (0.0.3) + nenv (~> 0.1) + shellany (~> 0.0) optionable (0.2.0) origin (2.1.1) pry (0.10.1) @@ -155,10 +167,10 @@ GEM pry (>= 0.9.10, < 0.11.0) pry-rails (0.3.2) pry (>= 0.9.10) - quiet_assets (1.0.3) + quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.5.2) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.8) actionmailer (= 4.1.8) @@ -180,14 +192,14 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.1) - redis (3.1.0) + redcarpet (3.2.2) + redis (3.2.0) redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) rest-client (1.7.2) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rouge (1.7.4) + rouge (1.7.7) rqrcode-with-patches (0.5.4) chunky_png rspec (3.1.0) @@ -219,6 +231,7 @@ GEM sass (~> 3.2.2) sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) + shellany (0.0.1) sidekiq (3.3.0) celluloid (>= 0.16.0) connection_pool (>= 2.0.0) @@ -233,14 +246,15 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - slim (2.1.0) - temple (~> 0.6.9) + slim (3.0.1) + temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) - slim-rails (2.1.5) - actionpack (>= 3.0, < 4.2) - activesupport (>= 3.0, < 4.2) - railties (>= 3.0, < 4.2) - slim (~> 2.0) + slim-rails (3.0.1) + actionmailer (>= 3.1, < 5.0) + actionpack (>= 3.1, < 5.0) + activesupport (>= 3.1, < 5.0) + railties (>= 3.1, < 5.0) + slim (~> 3.0) slop (3.6.0) spring (1.2.0) sprockets (2.12.3) @@ -252,7 +266,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - temple (0.6.10) + temple (0.7.5) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -260,7 +274,7 @@ GEM hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.3) @@ -297,6 +311,7 @@ DEPENDENCIES mongoid mongoid-pagination mongoid-rspec + mongoid-tree newrelic_rpm nokogiri pry-nav diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 22041d3..ae67367 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -7,11 +7,11 @@ html title = content_for?(:title) ? yield(:title) + " | #{ENV['SITE_NAME']}" : ENV['SITE_NAME'] = stylesheet_link_tag "application", media: 'all' + / 增加 favico 图标 + link href="/favicon.png" type='image/png' rel="icon" = javascript_include_tag "vendor/modernizr" = javascript_include_tag "application" = csrf_meta_tags - / 增加 favico 图标 - link href="/favicon.png" type='image/png' rel="icon" body - if content_for?(:main) = yield(:main)