diff --git a/Gemfile b/Gemfile index 92c415bc..6b84c911 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails' +gem 'rails' gem 'yajl-ruby', :require => 'yajl' gem 'bson_ext' @@ -10,19 +10,19 @@ gem 'devise' gem 'mini_magick' gem 'rubyzip' gem 'sinatra' -gem 'execjs' + gem 'mongoid' -gem 'rake' -gem 'jquery-rails' +gem 'rake', '>=0.9.2' +gem 'jquery-rails', '>= 1.0.3' gem 'sprockets' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails' - gem 'coffee-rails' + gem 'sass-rails', "~> 3.1.0.rc" + gem 'coffee-rails', "~> 3.1.0.rc" gem 'uglifier' end diff --git a/Gemfile.lock b/Gemfile.lock index a94a968d..d36a30ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,45 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.1) - actionpack (= 3.1.1) + actionmailer (3.1.0) + actionpack (= 3.1.0) mail (~> 2.3.0) - actionpack (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) rack (~> 1.3.2) - rack-cache (~> 1.1) + rack-cache (~> 1.0.3) 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.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - activesupport (3.1.1) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) multi_json (~> 1.0) archive-tar-minitar (0.5.2) arel (2.2.1) bcrypt-ruby (3.0.1) - bson (1.4.1) - bson_ext (1.4.1) + bson (1.4.0) + bson_ext (1.4.0) builder (3.0.0) carrierwave (0.5.4) activesupport (~> 3.0) chronic (0.6.4) - ckeditor (3.6.3) + ckeditor (3.6.2) mime-types (~> 1.16) orm_adapter (~> 0.0.5) coffee-rails (3.1.1) @@ -51,7 +52,7 @@ GEM columnize (0.3.4) delorean (1.1.0) chronic - devise (1.4.8) + devise (1.4.7) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) warden (~> 1.0.3) @@ -59,17 +60,16 @@ GEM erubis (2.7.0) execjs (1.2.9) multi_json (~> 1.0) - factory_girl (2.2.0) + factory_girl (2.1.2) activesupport - factory_girl_rails (1.3.0) - factory_girl (~> 2.2.0) + factory_girl_rails (1.2.0) + factory_girl (~> 2.1.0) railties (>= 3.0.0) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.16) + jquery-rails (1.0.14) railties (~> 3.0) thor (~> 0.14) - json (1.6.1) linecache19 (0.5.12) ruby_core_source (>= 0.1.4) mail (2.3.0) @@ -79,58 +79,55 @@ GEM mime-types (1.16) mini_magick (3.3) subexec (~> 0.1.0) - mongo (1.4.1) - bson (= 1.4.1) - mongoid (2.3.2) - activemodel (~> 3.1) - mongo (~> 1.4) + mongo (1.3.1) + bson (>= 1.3.1) + mongoid (2.2.1) + activemodel (~> 3.0) + mongo (>= 1.3, < 1.4) tzinfo (~> 0.3.22) multi_json (1.0.3) orm_adapter (0.0.5) polyglot (0.3.2) - rack (1.3.4) - rack-cache (1.1) + rack (1.3.3) + rack-cache (1.0.3) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) - rack-protection (1.1.4) - rack rack-ssl (1.3.2) rack rack-test (0.6.1) 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.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) bundler (~> 1.0) - railties (= 3.1.1) - railties (3.1.1) - actionpack (= 3.1.1) - activesupport (= 3.1.1) + railties (= 3.1.0) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2) - rcov (0.9.11) - rdoc (3.11) - json (~> 1.4) - rspec (2.7.0) - rspec-core (~> 2.7.0) - rspec-expectations (~> 2.7.0) - rspec-mocks (~> 2.7.0) - rspec-core (2.7.0) - rspec-expectations (2.7.0) + rcov (0.9.10) + rdoc (3.9.4) + rspec (2.6.0) + rspec-core (~> 2.6.0) + rspec-expectations (~> 2.6.0) + rspec-mocks (~> 2.6.0) + rspec-core (2.6.4) + rspec-expectations (2.6.0) diff-lcs (~> 1.1.2) - rspec-mocks (2.7.0) - rspec-rails (2.7.0) + rspec-mocks (2.6.0) + rspec-rails (2.6.1) actionpack (~> 3.0) activesupport (~> 3.0) railties (~> 3.0) - rspec (~> 2.7.0) + rspec (~> 2.6.0) ruby-debug-base19 (0.11.25) columnize (>= 0.3.1) linecache19 (>= 0.5.11) @@ -142,19 +139,18 @@ GEM ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.4) - sass (3.1.10) - sass-rails (3.1.4) + sass (3.1.7) + sass-rails (3.1.3) actionpack (~> 3.1.0) railties (~> 3.1.0) sass (>= 3.1.4) sprockets (~> 2.0.0) tilt (~> 1.3.2) shoulda-matchers (1.0.0.beta3) - sinatra (1.3.1) - rack (~> 1.3, >= 1.3.4) - rack-protection (~> 1.1, >= 1.1.2) - tilt (~> 1.3, >= 1.3.3) - sprockets (2.0.3) + sinatra (1.2.6) + rack (~> 1.1) + tilt (>= 1.2.2, < 2.0) + sprockets (2.0.0) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -164,11 +160,11 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.30) + tzinfo (0.3.29) uglifier (1.0.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) - warden (1.0.6) + warden (1.0.5) rack (>= 1.0) watchr (0.7) yajl-ruby (1.0.0) @@ -180,22 +176,21 @@ DEPENDENCIES bson_ext carrierwave (= 0.5.4) ckeditor - coffee-rails + coffee-rails (~> 3.1.0.rc) delorean devise - execjs factory_girl_rails - jquery-rails + jquery-rails (>= 1.0.3) mini_magick mongoid rails - rake + rake (>= 0.9.2) rcov rspec (~> 2.0) rspec-rails (~> 2.0) ruby-debug19 rubyzip - sass-rails + sass-rails (~> 3.1.0.rc) shoulda-matchers sinatra sprockets diff --git a/app/assets/javascripts/plugin.js b/app/assets/javascripts/plugin.js deleted file mode 100644 index 2c80827e..00000000 --- a/app/assets/javascripts/plugin.js +++ /dev/null @@ -1,3 +0,0 @@ -$(function (){ - $(".engine_loading").load($(this).attr("widget_path")); - }); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 9833ffda..1ebdd64f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,5 +3,5 @@ *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. *= require_self - + * */ diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb index ffa1e687..cde4a425 100644 --- a/app/controllers/admin/page_parts_controller.rb +++ b/app/controllers/admin/page_parts_controller.rb @@ -28,7 +28,6 @@ class Admin::PagePartsController < ApplicationController @partial = 'edit_text' @part_locale = params[:part_locale] || I18n.locale.to_s when 'module' - @plugins=[{:module=>"Blog",:widgets=>[{:name=>"Blog",:path=>"panel/blog/widget_latest_post"},{:name=>"Blog",:path=>"panel/blog/widget_index"}]}] when 'snippet' end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 68b32238..af703630 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,25 +6,6 @@ class ApplicationController < ActionController::Base helper :all before_filter :set_locale, :set_site - def get_all_app_engines - ary = ["vender/plugins/NewBlog"] - app_engines = ary.collect{|t| - Rails::Engine.find t - } - app_engines.each{ |t| - # t. - } - end - - def flaten_controller - ary=[] - Find.find(File.join(Rails.root , 'vendor/plugins/')) { |name| - require_dependency(name) if /_controller\.rb$/ =~ name - ary << name - } - ary - end - # Find the parent for the given item def find_parent_item @parent_item = Item.first(:conditions => { :id => BSON::ObjectId(params[:parent_id]) }) rescue nil @@ -97,6 +78,4 @@ class ApplicationController < ActionController::Base Item.first(:conditions => {:parent_id => nil}) end - - end diff --git a/app/views/admin/sites/_registration.html.erb b/app/views/admin/sites/_registration.html.erb index 8e2a5096..77afb680 100644 --- a/app/views/admin/sites/_registration.html.erb +++ b/app/views/admin/sites/_registration.html.erb @@ -3,9 +3,9 @@ <%= t('admin.registered') %> <% else %> -
+
<%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" + {:site => {:school => @site.school, :department => @site.department}}.to_query, :target => '_blank' %>
-<% end %> +<% end %> \ No newline at end of file diff --git a/calendar/.gitignore b/calendar/.gitignore deleted file mode 100644 index 1463de6d..00000000 --- a/calendar/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.bundle/ -log/*.log -pkg/ -test/dummy/db/*.sqlite3 -test/dummy/log/*.log -test/dummy/tmp/ \ No newline at end of file diff --git a/calendar/Gemfile b/calendar/Gemfile deleted file mode 100644 index fd3a2811..00000000 --- a/calendar/Gemfile +++ /dev/null @@ -1,14 +0,0 @@ -source "http://rubygems.org" - -# Declare your gem's dependencies in calendar.gemspec. -# Bundler will treat runtime dependencies like base dependencies, and -# development dependencies will be added by default to the :development group. -gemspec - -# Declare any dependencies that are still in development here instead of in -# your gemspec. These might include edge Rails or gems from your path or -# Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' \ No newline at end of file diff --git a/calendar/MIT-LICENSE b/calendar/MIT-LICENSE deleted file mode 100644 index 80cf031a..00000000 --- a/calendar/MIT-LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright 2011 YOURNAME - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/calendar/README.rdoc b/calendar/README.rdoc deleted file mode 100644 index 86e63591..00000000 --- a/calendar/README.rdoc +++ /dev/null @@ -1,3 +0,0 @@ -= Calendar - -This project rocks and uses MIT-LICENSE. \ No newline at end of file diff --git a/calendar/Rakefile b/calendar/Rakefile deleted file mode 100644 index 1c2d1ab6..00000000 --- a/calendar/Rakefile +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env rake -begin - require 'bundler/setup' -rescue LoadError - puts 'You must `gem install bundler` and `bundle install` to run rake tasks' -end -begin - require 'rdoc/task' -rescue LoadError - require 'rdoc/rdoc' - require 'rake/rdoctask' - RDoc::Task = Rake::RDocTask -end - -RDoc::Task.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'Calendar' - rdoc.options << '--line-numbers' - rdoc.rdoc_files.include('README.rdoc') - rdoc.rdoc_files.include('lib/**/*.rb') -end - -APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__) -load 'rails/tasks/engine.rake' - - -Bundler::GemHelper.install_tasks - -require 'rake/testtask' - -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.libs << 'test' - t.pattern = 'test/**/*_test.rb' - t.verbose = false -end - - -task :default => :test diff --git a/calendar/app/assets/images/calendar/.gitkeep b/calendar/app/assets/images/calendar/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/assets/javascripts/calendar/.gitkeep b/calendar/app/assets/javascripts/calendar/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/assets/stylesheets/calendar/.gitkeep b/calendar/app/assets/stylesheets/calendar/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/controllers/.gitkeep b/calendar/app/controllers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/helpers/.gitkeep b/calendar/app/helpers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/mailers/.gitkeep b/calendar/app/mailers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/models/.gitkeep b/calendar/app/models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/app/views/.gitkeep b/calendar/app/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/calendar.gemspec b/calendar/calendar.gemspec deleted file mode 100644 index 29968ccb..00000000 --- a/calendar/calendar.gemspec +++ /dev/null @@ -1,23 +0,0 @@ -$:.push File.expand_path("../lib", __FILE__) - -# Maintain your gem's version: -require "calendar/version" - -# Describe your gem and declare its dependencies: -Gem::Specification.new do |s| - s.name = "calendar" - s.version = Calendar::VERSION - s.authors = ["TODO: Your name"] - s.email = ["TODO: Your email"] - s.homepage = "TODO" - s.summary = "TODO: Summary of Calendar." - s.description = "TODO: Description of Calendar." - - s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] - s.test_files = Dir["test/**/*"] - - s.add_dependency "rails", "~> 3.1.0.rc6" - # s.add_dependency "jquery-rails" - - s.add_development_dependency "sqlite3" -end diff --git a/calendar/config/routes.rb b/calendar/config/routes.rb deleted file mode 100644 index 1daf9a41..00000000 --- a/calendar/config/routes.rb +++ /dev/null @@ -1,2 +0,0 @@ -Rails.application.routes.draw do -end diff --git a/calendar/lib/calendar.rb b/calendar/lib/calendar.rb deleted file mode 100644 index d6c39efe..00000000 --- a/calendar/lib/calendar.rb +++ /dev/null @@ -1,4 +0,0 @@ -require "calendar/engine" - -module Calendar -end diff --git a/calendar/lib/calendar/engine.rb b/calendar/lib/calendar/engine.rb deleted file mode 100644 index 33214237..00000000 --- a/calendar/lib/calendar/engine.rb +++ /dev/null @@ -1,4 +0,0 @@ -module Calendar - class Engine < Rails::Engine - end -end diff --git a/calendar/lib/calendar/version.rb b/calendar/lib/calendar/version.rb deleted file mode 100644 index 820606d3..00000000 --- a/calendar/lib/calendar/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module Calendar - VERSION = "0.0.1" -end diff --git a/calendar/lib/tasks/calendar_tasks.rake b/calendar/lib/tasks/calendar_tasks.rake deleted file mode 100644 index f5f67ef6..00000000 --- a/calendar/lib/tasks/calendar_tasks.rake +++ /dev/null @@ -1,4 +0,0 @@ -# desc "Explaining what the task does" -# task :calendar do -# # Task goes here -# end diff --git a/calendar/script/rails b/calendar/script/rails deleted file mode 100755 index e323e44b..00000000 --- a/calendar/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -ENGINE_PATH = File.expand_path('../..', __FILE__) -load File.expand_path('../../test/dummy/script/rails', __FILE__) diff --git a/calendar/test/calendar_test.rb b/calendar/test/calendar_test.rb deleted file mode 100644 index fe53cb4d..00000000 --- a/calendar/test/calendar_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class CalendarTest < ActiveSupport::TestCase - test "truth" do - assert_kind_of Module, Calendar - end -end diff --git a/calendar/test/dummy/Rakefile b/calendar/test/dummy/Rakefile deleted file mode 100644 index 36458522..00000000 --- a/calendar/test/dummy/Rakefile +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env rake -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Dummy::Application.load_tasks diff --git a/calendar/test/dummy/app/assets/javascripts/application.js b/calendar/test/dummy/app/assets/javascripts/application.js deleted file mode 100644 index 37c7bfcd..00000000 --- a/calendar/test/dummy/app/assets/javascripts/application.js +++ /dev/null @@ -1,9 +0,0 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -//= require jquery -//= require jquery_ujs -//= require_tree . diff --git a/calendar/test/dummy/app/assets/stylesheets/application.css b/calendar/test/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index fc25b572..00000000 --- a/calendar/test/dummy/app/assets/stylesheets/application.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require_tree . -*/ \ No newline at end of file diff --git a/calendar/test/dummy/app/controllers/application_controller.rb b/calendar/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index e8065d95..00000000 --- a/calendar/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery -end diff --git a/calendar/test/dummy/app/helpers/application_helper.rb b/calendar/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/calendar/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/calendar/test/dummy/app/mailers/.gitkeep b/calendar/test/dummy/app/mailers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/test/dummy/app/models/.gitkeep b/calendar/test/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/test/dummy/app/views/layouts/application.html.erb b/calendar/test/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index 9a8a761b..00000000 --- a/calendar/test/dummy/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Dummy - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/calendar/test/dummy/config.ru b/calendar/test/dummy/config.ru deleted file mode 100644 index 1989ed8d..00000000 --- a/calendar/test/dummy/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run Dummy::Application diff --git a/calendar/test/dummy/config/application.rb b/calendar/test/dummy/config/application.rb deleted file mode 100644 index 4437d041..00000000 --- a/calendar/test/dummy/config/application.rb +++ /dev/null @@ -1,42 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -Bundler.require -require "calendar" - -module Dummy - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Enable the asset pipeline - config.assets.enabled = true - end -end - diff --git a/calendar/test/dummy/config/boot.rb b/calendar/test/dummy/config/boot.rb deleted file mode 100644 index eba06813..00000000 --- a/calendar/test/dummy/config/boot.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'rubygems' -gemfile = File.expand_path('../../../../Gemfile', __FILE__) - -if File.exist?(gemfile) - ENV['BUNDLE_GEMFILE'] = gemfile - require 'bundler' - Bundler.setup -end - -$:.unshift File.expand_path('../../../../lib', __FILE__) \ No newline at end of file diff --git a/calendar/test/dummy/config/database.yml b/calendar/test/dummy/config/database.yml deleted file mode 100644 index 51a4dd45..00000000 --- a/calendar/test/dummy/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/calendar/test/dummy/config/environment.rb b/calendar/test/dummy/config/environment.rb deleted file mode 100644 index 3da5eb91..00000000 --- a/calendar/test/dummy/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Dummy::Application.initialize! diff --git a/calendar/test/dummy/config/environments/development.rb b/calendar/test/dummy/config/environments/development.rb deleted file mode 100644 index 1f1595dc..00000000 --- a/calendar/test/dummy/config/environments/development.rb +++ /dev/null @@ -1,27 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin - - # Do not compress assets - config.assets.compress = false -end diff --git a/calendar/test/dummy/config/environments/production.rb b/calendar/test/dummy/config/environments/production.rb deleted file mode 100644 index 67a50850..00000000 --- a/calendar/test/dummy/config/environments/production.rb +++ /dev/null @@ -1,51 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false - - # Compress JavaScripts and CSS - config.assets.compress = true - - # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify -end diff --git a/calendar/test/dummy/config/environments/test.rb b/calendar/test/dummy/config/environments/test.rb deleted file mode 100644 index 6810c914..00000000 --- a/calendar/test/dummy/config/environments/test.rb +++ /dev/null @@ -1,39 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true - - # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true - config.static_cache_control = "public, max-age=3600" - - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Raise exceptions instead of rendering exception templates - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr -end diff --git a/calendar/test/dummy/config/initializers/backtrace_silencers.rb b/calendar/test/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/calendar/test/dummy/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/calendar/test/dummy/config/initializers/inflections.rb b/calendar/test/dummy/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131..00000000 --- a/calendar/test/dummy/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/calendar/test/dummy/config/initializers/mime_types.rb b/calendar/test/dummy/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/calendar/test/dummy/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/calendar/test/dummy/config/initializers/secret_token.rb b/calendar/test/dummy/config/initializers/secret_token.rb deleted file mode 100644 index ce2fbc61..00000000 --- a/calendar/test/dummy/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Dummy::Application.config.secret_token = 'c2a09569a65cf0d6b38bb32cfeea2223e2e33cac844bb8101298534617191aae4180e5ca39dd385e65c66ae4179b3c434b457e7f88a7322bd5f39deed2d8a35a' diff --git a/calendar/test/dummy/config/initializers/session_store.rb b/calendar/test/dummy/config/initializers/session_store.rb deleted file mode 100644 index 952473ff..00000000 --- a/calendar/test/dummy/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Dummy::Application.config.session_store :active_record_store diff --git a/calendar/test/dummy/config/initializers/wrap_parameters.rb b/calendar/test/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index 999df201..00000000 --- a/calendar/test/dummy/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end diff --git a/calendar/test/dummy/config/locales/en.yml b/calendar/test/dummy/config/locales/en.yml deleted file mode 100644 index 179c14ca..00000000 --- a/calendar/test/dummy/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/calendar/test/dummy/config/routes.rb b/calendar/test/dummy/config/routes.rb deleted file mode 100644 index bb509f27..00000000 --- a/calendar/test/dummy/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Dummy::Application.routes.draw do - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end diff --git a/calendar/test/dummy/lib/assets/.gitkeep b/calendar/test/dummy/lib/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/test/dummy/log/.gitkeep b/calendar/test/dummy/log/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/test/dummy/public/404.html b/calendar/test/dummy/public/404.html deleted file mode 100644 index 9a48320a..00000000 --- a/calendar/test/dummy/public/404.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - -
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
- - diff --git a/calendar/test/dummy/public/422.html b/calendar/test/dummy/public/422.html deleted file mode 100644 index 83660ab1..00000000 --- a/calendar/test/dummy/public/422.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - -
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
- - diff --git a/calendar/test/dummy/public/500.html b/calendar/test/dummy/public/500.html deleted file mode 100644 index b80307fc..00000000 --- a/calendar/test/dummy/public/500.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - -
-

We're sorry, but something went wrong.

-

We've been notified about this issue and we'll take a look at it shortly.

-
- - diff --git a/calendar/test/dummy/public/favicon.ico b/calendar/test/dummy/public/favicon.ico deleted file mode 100644 index e69de29b..00000000 diff --git a/calendar/test/dummy/script/rails b/calendar/test/dummy/script/rails deleted file mode 100755 index f8da2cff..00000000 --- a/calendar/test/dummy/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -APP_PATH = File.expand_path('../../config/application', __FILE__) -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands' diff --git a/calendar/test/integration/navigation_test.rb b/calendar/test/integration/navigation_test.rb deleted file mode 100644 index 97a94c9b..00000000 --- a/calendar/test/integration/navigation_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'test_helper' - -class NavigationTest < ActionDispatch::IntegrationTest - fixtures :all - - # test "the truth" do - # assert true - # end -end - diff --git a/calendar/test/test_helper.rb b/calendar/test/test_helper.rb deleted file mode 100644 index dcd3b276..00000000 --- a/calendar/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Configure Rails Environment -ENV["RAILS_ENV"] = "test" - -require File.expand_path("../dummy/config/environment.rb", __FILE__) -require "rails/test_help" - -Rails.backtrace_cleaner.remove_silencers! - -# Load support files -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } diff --git a/config/application.rb b/config/application.rb index bcd418ac..3a0d774d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -60,5 +60,5 @@ module PrototypeR4 config.assets.enabled = true end end -Orbit_Apps = [] + VALID_LOCALES = ["en", "zh_tw"] diff --git a/config/routes.rb b/config/routes.rb index 0bb23607..ddeddb56 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,9 +7,7 @@ PrototypeR4::Application.routes.draw do match '/site/public_key', :to => CentralServerExchangeApp match '/site/update', :to => GithubApp match '/purchase/design', :to => CentralServerExchangeApp - match "/panel/:app_name/frontend/:action" => redirect {|params| "/panel/#{params[:app_name]}/#{params[:action]}" } - - + # routes for admin namespace :admin do resources :assets diff --git a/vendor/plugins/NewBlog/Gemfile b/vendor/plugins/NewBlog/Gemfile index 52a1640b..a1b6a676 100644 --- a/vendor/plugins/NewBlog/Gemfile +++ b/vendor/plugins/NewBlog/Gemfile @@ -3,8 +3,6 @@ source "http://rubygems.org" # Declare your gem's dependencies in NewBlog.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. - -gem "mongoid" gemspec # Declare any dependencies that are still in development here instead of in @@ -13,4 +11,4 @@ gemspec # your gem to rubygems.org. # To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' +# gem 'ruby-debug19', :require => 'ruby-debug' \ No newline at end of file diff --git a/vendor/plugins/NewBlog/Gemfile.lock b/vendor/plugins/NewBlog/Gemfile.lock deleted file mode 100644 index e986f6fe..00000000 --- a/vendor/plugins/NewBlog/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -PATH - remote: . - specs: - NewBlog (0.0.1) - rails (~> 3.1.0.rc6) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) - mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) - multi_json (~> 1.0) - arel (2.2.1) - bcrypt-ruby (3.0.0) - bson (1.3.1) - builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) - i18n (0.6.0) - mail (2.3.0) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.16) - mongo (1.3.1) - bson (>= 1.3.1) - mongoid (2.1.9) - activemodel (~> 3.0) - mongo (~> 1.3) - tzinfo (~> 0.3.22) - multi_json (1.0.3) - polyglot (0.3.2) - rack (1.3.2) - rack-cache (1.0.3) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) - bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2) - rdoc (3.9.4) - sprockets (2.0.0) - hike (~> 1.2) - rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.29) - -PLATFORMS - ruby - -DEPENDENCIES - NewBlog! - mongoid diff --git a/vendor/plugins/NewBlog/NewBlog.gemspec b/vendor/plugins/NewBlog/NewBlog.gemspec index 93e5b31d..ef0e236c 100644 --- a/vendor/plugins/NewBlog/NewBlog.gemspec +++ b/vendor/plugins/NewBlog/NewBlog.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.add_dependency "rails", "~> 3.1.0.rc6" # s.add_dependency "jquery-rails" - #s.add_development_dependency "sqlite3" + s.add_development_dependency "sqlite3" end diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css deleted file mode 100644 index 69b4b126..00000000 --- a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - *This is a manifest file that'll automatically include all the stylesheets available in this directory - *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require_tree . -*/ diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/blog.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/blog.css deleted file mode 100644 index f656dccb..00000000 --- a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/blog.css +++ /dev/null @@ -1,9 +0,0 @@ -.preview h2 { - font-size: large; - background-color: red; - } - -.production h2 { - font-size: large; - background-color: green; - } diff --git a/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb b/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb index 41468846..52f18ceb 100644 --- a/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb +++ b/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb @@ -4,14 +4,6 @@ class Panel::Blog::PostsController < ApplicationController # GET /posts # GET /posts.xml - def widget_index - @posts = Post.all - widget_default_layout - end - def widget_latest_post - @post = Post.all.last - widget_default_layout - end def index @posts = Post.all @@ -92,20 +84,3 @@ class Panel::Blog::PostsController < ApplicationController end end end - - -def widget_default_layout - respond_to do |format| - format.html { - if params[:edit_view] - #in the case of editing,should be displayed in modal window and - #be restricted by the border developer sat. - render :layout => 'admin' - else - #in the case of fetching data for ajax display,should - render :layout => 'production' - end - } - format.xml { render :xml => @posts } - end -end diff --git a/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb b/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb deleted file mode 100644 index 28bf833a..00000000 --- a/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Blog - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - -
- <%= yield %> -
- - diff --git a/vendor/plugins/NewBlog/app/views/layouts/production.html.erb b/vendor/plugins/NewBlog/app/views/layouts/production.html.erb deleted file mode 100644 index dbc98e7a..00000000 --- a/vendor/plugins/NewBlog/app/views/layouts/production.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<%= stylesheet_link_tag "production"%> -
- <%= yield %> -
diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb deleted file mode 100644 index 9eb6ebbb..00000000 --- a/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%=stylesheet_link_tag "NewBlog/application"%> -

<%=@post.title%>

-

- <%= @post.body%> -

diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb deleted file mode 100644 index 0f019c46..00000000 --- a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<%=stylesheet_link_tag "NewBlog/application"%> - - - - - - -<% @posts.each do |post| %> - - - - -<% end %> -
<%= t('blog.title') %><%= t('blog.body') %>
<%= post.title %><%= post.body.truncate(14) %>
diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb deleted file mode 100644 index 39433774..00000000 --- a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%=stylesheet_link_tag "NewBlog/application"%> -

<%= @post.title %>

-

- <%= @post.body %> -

diff --git a/vendor/plugins/NewBlog/config/routes.rb b/vendor/plugins/NewBlog/config/routes.rb index b619df18..1d1e477e 100644 --- a/vendor/plugins/NewBlog/config/routes.rb +++ b/vendor/plugins/NewBlog/config/routes.rb @@ -2,11 +2,8 @@ Rails.application.routes.draw do namespace :panel do namespace :blog do - root :to => "posts#index" resources :posts resources :comments - match "widget_latest_post" => "posts#widget_latest_post" - match "widget_index" => "posts#widget_index" end end diff --git a/vendor/plugins/NewBlog/lib/NewBlog.rb b/vendor/plugins/NewBlog/lib/NewBlog.rb index 09046450..a4542438 100644 --- a/vendor/plugins/NewBlog/lib/NewBlog.rb +++ b/vendor/plugins/NewBlog/lib/NewBlog.rb @@ -1,5 +1,4 @@ require "NewBlog/engine" - module NewBlog end diff --git a/vendor/plugins/NewBlog/lib/NewBlog/engine.rb b/vendor/plugins/NewBlog/lib/NewBlog/engine.rb index 90afca77..631c2e83 100644 --- a/vendor/plugins/NewBlog/lib/NewBlog/engine.rb +++ b/vendor/plugins/NewBlog/lib/NewBlog/engine.rb @@ -1,6 +1,4 @@ module NewBlog class Engine < Rails::Engine - isolate_namespace NewBlog - PrototypeR4::Application::Orbit_Apps << "NewBlog" end end diff --git a/vendor/plugins/NewBlog/test/dummy/config/application.rb b/vendor/plugins/NewBlog/test/dummy/config/application.rb index 5e17b68c..8d18c3f5 100644 --- a/vendor/plugins/NewBlog/test/dummy/config/application.rb +++ b/vendor/plugins/NewBlog/test/dummy/config/application.rb @@ -1,10 +1,6 @@ require File.expand_path('../boot', __FILE__) -require "action_controller/railtie" -require "action_mailer/railtie" -require "active_resource/railtie" -require "rails/test_unit/railtie" -require "sprockets/railtie" # Uncomment this line for Rails 3.1+ +require 'rails/all' Bundler.require require "NewBlog" diff --git a/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml b/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml deleted file mode 120000 index 75196a04..00000000 --- a/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../orbit/config/mongoid.yml \ No newline at end of file diff --git a/vendor/plugins/new_blog_old_bak.tar.bz2 b/vendor/plugins/new_blog_old_bak.tar.bz2 deleted file mode 100644 index 516f1e47..00000000 Binary files a/vendor/plugins/new_blog_old_bak.tar.bz2 and /dev/null differ