diff --git a/Gemfile b/Gemfile index d400b8b6..7f90929c 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,8 @@ gem 'jquery-ui-rails' gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' -gem "memcached", "~> 1.4.3" -gem "memcache-client" +# gem "memcached", "~> 1.4.3" +# gem "memcache-client" gem 'mini_magick' gem 'mongoid' diff --git a/Gemfile.lock b/Gemfile.lock index abfe1fe1..44c69616 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,8 +115,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memcache-client (1.8.5) - memcached (1.4.3) mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) @@ -310,8 +308,6 @@ DEPENDENCIES jquery-rails jquery-ui-rails kaminari! - memcache-client - memcached (~> 1.4.3) mini_magick mongo_session_store-rails3 mongoid diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 392ffe3d..2b57ecfa 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -3,7 +3,7 @@ class PagesController < ApplicationController include ApplicationHelper before_filter :get_item, :only => [:index_from_link, :show_from_link] - caches_page :index +# caches_page :index def index @item = Page.find_by_name('home') diff --git a/config/environments/development.rb b/config/environments/development.rb index 048dfff1..b940c9ce 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -23,7 +23,7 @@ Orbit::Application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin - config.cache_store = :mem_cache_store +# config.cache_store = :mem_cache_store config.assets.debug = true diff --git a/public/index.html b/public/index.html new file mode 100644 index 00000000..d94cc9c5 --- /dev/null +++ b/public/index.html @@ -0,0 +1,222 @@ + + + + + 國立政治大學 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

測試

+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+

活動行事曆

+ + prev + next +
+
    +
  • +
    + + +
    + +
    +
  • +
  • +
    + + +
    + +
    +
  • +
  • +
    + + +
    + +
    +
  • +
+
+
+
+ +
+ + +
+
+ + +
+ + + diff --git a/public/panel/news/widget/home_banner.html b/public/panel/news/widget/home_banner.html new file mode 100644 index 00000000..fca8803b --- /dev/null +++ b/public/panel/news/widget/home_banner.html @@ -0,0 +1,55 @@ + + + + + + + + + + + + +

校園新聞

+
+ + 更多+ + + + +
+
previous page
+
next page
+ + + +