@@ -54,8 +54,7 @@ class HomeController < ApplicationController end def offline - redirect_to 'http://pwww.teacherswithoutborders.org' - #render :layout => false + render :layout => false end private app/controllers/home_controller.rb @@ -5,18 +5,9 @@ </head> <body> <div style="width:500px;margin:50px auto;"> - <img src="https://na5.salesforce.com/servlet/servlet.ImageServer?id=01570000000g4my&oid=00D700000008wUh" /> <div style="border-top-color:#FF9933;border-top-style:solid;border-top-width:6px;"> - <p>Dear Colleagues,</p> - <p>Teachers Without Borders is improving our website and will be migrating our content over to a new server. The TWB website will be offline on April 15, 2009, from 6pm to 12am Pacific Standard Time.</p> - <p>We apologize for any inconvenience and encourage you to share feedback about our site when it resumes operations on April 16th.</p> - <p>Best Regards,</p> - <p> - Brandon Waterman<br /> - Webmaster<br /> - Teachers Without Borders<br /> - www.teacherswithoutborders.org - </p> + <p>We are currently offline</p> + <p>We apologize for any inconvenience.</p> </div> </div> </body> app/views/home/offline.html.erb @@ -29,7 +29,8 @@ <li><%= link_to _('Member Stories'), admin_member_stories_path %></li> <li><%= link_to _('Pages'), admin_pages_path %></li> <li><%= link_to _('Permissions'), admin_roles_path %></li> - <li><%= link_to _('Settings'), edit_admin_site_path(global_site) %></li> + <li><%= link_to _('Settings'), edit_admin_site_path(global_site) %></li> + <li><%= link_to _('Themes'), edit_admin_theme_path %></li> </ul> <div id="log-out" class="right"> <% if logged_in? -%> @@ -64,7 +65,7 @@ <div class="clear"></div> </div> </div> - <div id="footer" class="text_c" style="padding-top: 20px;"> - </div> + <div id="footer" class="text_c" style="padding-top: 20px;"> + </div> </body> </html> app/views/layouts/admin.html.erb @@ -3,7 +3,6 @@ <div class="activity_box"> <h2><%= sanitize news_item.title -%> <%= _('Posted by') + link_to(h(news_item.creator.login), profile_path(news_item.creator)) if news_item.creator %></h2> <div class="left"> - <img class="alignleft" src="<%= icon_url(news_item, {:size => :bigger, :file_column_version => :bigger }) -%>" /> <div class="standard-format"> <%= process_body_content(news_item) %> </div> app/views/news/_news_item.html.erb @@ -1,8 +1,6 @@ ActionController::Routing::Routes.draw do |map| -# map.root :controller => 'home', :action => 'home' - - map.root :controller => 'home', :action => 'offline' + map.root :controller => 'home', :action => 'home' # home map.with_options(:controller => 'home') do |home| @@ -124,7 +122,7 @@ ActionController::Routing::Routes.draw do |map| a.resources :uploads, :collection => { :images => :get, :files => :get } a.resources :member_stories a.resources :pages, :member => { :children => :get } - a.resource :theme + a.resource :theme end # messages config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090307163458) do +ActiveRecord::Schema.define(:version => 20090318002859) do create_table "bag_properties", :force => true do |t| t.integer "bag_id", :default => 1 @@ -91,8 +91,6 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.integer "contentable_id" t.string "contentable_type" t.integer "parent_id", :default => 0 - t.integer "lft" - t.integer "rgt" end create_table "content_pages", :force => true do |t| @@ -106,10 +104,8 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.text "body_raw" t.integer "contentable_id" t.string "contentable_type" - t.integer "parent_id" + t.integer "parent_id", :default => 0, :null => false t.integer "version" - t.integer "lft" - t.integer "rgt" end add_index "content_pages", ["parent_id"], :name => "index_content_pages_on_parent_id" @@ -232,6 +228,10 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.integer "visibility", :default => 2 t.boolean "requires_approval_to_join", :default => false t.integer "member_count" + t.integer "icon_file_size" + t.string "icon_file_name" + t.string "icon_content_type" + t.datetime "icon_updated_at" end add_index "groups", ["url_key"], :name => "index_groups_on_url_key" @@ -266,22 +266,18 @@ ActiveRecord::Schema.define(:version => 20090307163458) do create_table "logos", :force => true do |t| t.integer "site_id" - t.integer "parent_id" t.integer "user_id" - t.integer "size" - t.integer "width" - t.integer "height" - t.string "content_type" - t.string "filename" - t.string "thumbnail" + t.integer "image_file_size" + t.string "image_content_type" + t.string "image_file_name" t.datetime "created_at" t.datetime "updated_at" + t.datetime "image_updated_at" end add_index "logos", ["site_id"], :name => "index_logos_on_site_id" - add_index "logos", ["parent_id"], :name => "index_logos_on_parent_id" add_index "logos", ["user_id"], :name => "index_logos_on_user_id" - add_index "logos", ["content_type"], :name => "index_logos_on_content_type" + add_index "logos", ["image_content_type"], :name => "index_logos_on_content_type" create_table "membership_requests", :force => true do |t| t.integer "group_id" @@ -335,6 +331,10 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.string "url_key" t.string "icon" t.integer "creator_id" + t.integer "icon_file_size" + t.string "icon_file_name" + t.string "icon_content_type" + t.datetime "icon_updated_at" end add_index "news_items", ["url_key"], :name => "index_news_items_on_url_key" @@ -362,13 +362,16 @@ ActiveRecord::Schema.define(:version => 20090307163458) do end create_table "photos", :force => true do |t| - t.string "caption", :limit => 1000 + t.string "caption", :limit => 1000 t.datetime "created_at" t.datetime "updated_at" t.integer "photoable_id" - t.string "image" t.string "photoable_type" t.integer "creator_id" + t.integer "image_file_size" + t.string "image_file_name" + t.string "image_content_type" + t.datetime "image_updated_at" end add_index "photos", ["photoable_id"], :name => "index_photos_on_user_id" @@ -532,7 +535,7 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.integer "user_id" t.string "content_type" t.string "name" - t.string "caption", :limit => 1000 + t.string "caption", :limit => 1000 t.text "description" t.string "filename" t.string "thumbnail" @@ -541,9 +544,13 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.integer "height" t.datetime "created_at" t.datetime "updated_at" - t.boolean "is_public", :default => true + t.boolean "is_public", :default => true t.integer "uploadable_id" t.string "uploadable_type" + t.integer "data_file_size" + t.string "data_file_name" + t.string "data_content_type" + t.datetime "data_updated_at" end add_index "uploads", ["parent_id"], :name => "index_uploads_on_parent_id" @@ -605,6 +612,10 @@ ActiveRecord::Schema.define(:version => 20090307163458) do t.integer "posts_count", :default => 0 t.datetime "last_seen_at" t.string "api_key" + t.integer "icon_file_size" + t.string "icon_file_name" + t.string "icon_content_type" + t.datetime "icon_updated_at" end add_index "users", ["login"], :name => "index_users_on_login" db/schema.rb 2ac96374ba47f411461fc750c16681f14d541b07 Justin Ball justinball@gmail.com http://github.com/jbasdf/luvfoo/commit/ad88433214a4ead1cfc2131a27b61ff0c835ef9e ad88433214a4ead1cfc2131a27b61ff0c835ef9e

2009-05-12T10:06:18-07:00

added theme code c56b0737ec216558b60b5bcbc84e36f30c7e92d4 Justin Ball justinball@gmail.com