From e99affbddd6616d72716ee5f84393ecd13cace00 Mon Sep 17 00:00:00 2001 From: chris2tof Date: Sun, 20 Nov 2011 01:26:24 +0800 Subject: [PATCH] Merge with Matt's code --- lib/NewBlog/NewBlog/.gitignore | 6 - lib/NewBlog/NewBlog/Gemfile | 16 --- lib/NewBlog/NewBlog/Gemfile.lock | 101 ---------------- lib/NewBlog/NewBlog/MIT-LICENSE | 20 ---- lib/NewBlog/NewBlog/NewBlog.gemspec | 23 ---- lib/NewBlog/NewBlog/NewBlog.json | 9 -- lib/NewBlog/NewBlog/README.rdoc | 3 - lib/NewBlog/NewBlog/Rakefile | 39 ------ .../app/assets/images/NewBlog/.gitkeep | 0 .../app/assets/javascripts/NewBlog/.gitkeep | 0 .../app/assets/stylesheets/NewBlog/.gitkeep | 0 .../stylesheets/NewBlog/application.css | 7 -- .../assets/stylesheets/NewBlog/production.css | 21 ---- lib/NewBlog/NewBlog/app/controllers/.gitkeep | 0 .../app/controllers/application_controller.rb | 23 ---- .../panel/blog/comments_controller.rb | 7 -- .../panel/blog/posts_controller.rb | 111 ------------------ lib/NewBlog/NewBlog/app/helpers/.gitkeep | 0 .../NewBlog/app/helpers/application_helper.rb | 2 - lib/NewBlog/NewBlog/app/mailers/.gitkeep | 0 lib/NewBlog/NewBlog/app/models/.gitkeep | 0 lib/NewBlog/NewBlog/app/models/comment.rb | 7 -- lib/NewBlog/NewBlog/app/models/post.rb | 8 -- lib/NewBlog/NewBlog/app/views/.gitkeep | 0 .../app/views/layouts/application.html.erb | 14 --- .../app/views/layouts/edit_view.html.erb | 14 --- .../app/views/layouts/production.html.erb | 3 - .../app/views/panel/blog/posts/_form.html.erb | 14 --- .../app/views/panel/blog/posts/edit.html.erb | 8 -- .../app/views/panel/blog/posts/index.html.erb | 25 ---- .../panel/blog/posts/latest_post.html.erb | 5 - .../app/views/panel/blog/posts/new.html.erb | 6 - .../app/views/panel/blog/posts/show.html.erb | 38 ------ .../panel/blog/posts/widget_index.html.erb | 16 --- .../blog/posts/widget_latest_post.html.erb | 7 -- lib/NewBlog/NewBlog/config/routes.rb | 13 -- lib/NewBlog/NewBlog/lib/NewBlog.rb | 5 - lib/NewBlog/NewBlog/lib/NewBlog/engine.rb | 6 - lib/NewBlog/NewBlog/lib/NewBlog/version.rb | 3 - .../NewBlog/lib/tasks/NewBlog_tasks.rake | 4 - lib/NewBlog/NewBlog/script/rails | 6 - lib/NewBlog/NewBlog/test/NewBlog_test.rb | 7 -- lib/NewBlog/NewBlog/test/dummy/Rakefile | 7 -- .../app/assets/javascripts/application.js | 9 -- .../app/assets/stylesheets/application.css | 7 -- .../app/controllers/application_controller.rb | 3 - .../dummy/app/helpers/application_helper.rb | 2 - .../NewBlog/test/dummy/app/mailers/.gitkeep | 0 .../NewBlog/test/dummy/app/models/.gitkeep | 0 .../app/views/layouts/application.html.erb | 14 --- lib/NewBlog/NewBlog/test/dummy/config.ru | 4 - .../NewBlog/test/dummy/config/application.rb | 46 -------- lib/NewBlog/NewBlog/test/dummy/config/boot.rb | 10 -- .../NewBlog/test/dummy/config/database.yml | 25 ---- .../NewBlog/test/dummy/config/environment.rb | 5 - .../dummy/config/environments/development.rb | 27 ----- .../dummy/config/environments/production.rb | 51 -------- .../test/dummy/config/environments/test.rb | 39 ------ .../initializers/backtrace_silencers.rb | 7 -- .../dummy/config/initializers/inflections.rb | 10 -- .../dummy/config/initializers/mime_types.rb | 5 - .../dummy/config/initializers/secret_token.rb | 7 -- .../config/initializers/session_store.rb | 8 -- .../config/initializers/wrap_parameters.rb | 14 --- .../NewBlog/test/dummy/config/locales/en.yml | 5 - .../NewBlog/test/dummy/config/mongoid.yml | 1 - .../NewBlog/test/dummy/config/routes.rb | 58 --------- .../NewBlog/test/dummy/lib/assets/.gitkeep | 0 lib/NewBlog/NewBlog/test/dummy/log/.gitkeep | 0 .../NewBlog/test/dummy/public/404.html | 26 ---- .../NewBlog/test/dummy/public/422.html | 26 ---- .../NewBlog/test/dummy/public/500.html | 26 ---- .../NewBlog/test/dummy/public/favicon.ico | 0 lib/NewBlog/NewBlog/test/dummy/script/rails | 6 - .../test/integration/navigation_test.rb | 10 -- lib/NewBlog/NewBlog/test/test_helper.rb | 10 -- public/static/kernel.js | 1 + vendor/plugins/NewBlog/NewBlog.json | 0 .../assets/stylesheets/NewBlog/production.css | 69 ++++++++--- vendor/plugins/NewBlog/script/rails | 0 .../plugins/NewBlog/test/dummy/script/rails | 0 81 files changed, 51 insertions(+), 1084 deletions(-) delete mode 100644 lib/NewBlog/NewBlog/.gitignore delete mode 100644 lib/NewBlog/NewBlog/Gemfile delete mode 100644 lib/NewBlog/NewBlog/Gemfile.lock delete mode 100644 lib/NewBlog/NewBlog/MIT-LICENSE delete mode 100644 lib/NewBlog/NewBlog/NewBlog.gemspec delete mode 100755 lib/NewBlog/NewBlog/NewBlog.json delete mode 100644 lib/NewBlog/NewBlog/README.rdoc delete mode 100644 lib/NewBlog/NewBlog/Rakefile delete mode 100644 lib/NewBlog/NewBlog/app/assets/images/NewBlog/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/assets/javascripts/NewBlog/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/application.css delete mode 100644 lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/production.css delete mode 100644 lib/NewBlog/NewBlog/app/controllers/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/controllers/application_controller.rb delete mode 100644 lib/NewBlog/NewBlog/app/controllers/panel/blog/comments_controller.rb delete mode 100644 lib/NewBlog/NewBlog/app/controllers/panel/blog/posts_controller.rb delete mode 100644 lib/NewBlog/NewBlog/app/helpers/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/helpers/application_helper.rb delete mode 100644 lib/NewBlog/NewBlog/app/mailers/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/models/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/models/comment.rb delete mode 100644 lib/NewBlog/NewBlog/app/models/post.rb delete mode 100644 lib/NewBlog/NewBlog/app/views/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/app/views/layouts/application.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/layouts/edit_view.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/layouts/production.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/_form.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/edit.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/index.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/latest_post.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/new.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/show.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_index.html.erb delete mode 100644 lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb delete mode 100644 lib/NewBlog/NewBlog/config/routes.rb delete mode 100644 lib/NewBlog/NewBlog/lib/NewBlog.rb delete mode 100644 lib/NewBlog/NewBlog/lib/NewBlog/engine.rb delete mode 100644 lib/NewBlog/NewBlog/lib/NewBlog/version.rb delete mode 100644 lib/NewBlog/NewBlog/lib/tasks/NewBlog_tasks.rake delete mode 100755 lib/NewBlog/NewBlog/script/rails delete mode 100644 lib/NewBlog/NewBlog/test/NewBlog_test.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/Rakefile delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/assets/javascripts/application.js delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/assets/stylesheets/application.css delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/controllers/application_controller.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/helpers/application_helper.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/mailers/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/models/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/test/dummy/app/views/layouts/application.html.erb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config.ru delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/application.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/boot.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/database.yml delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/environment.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/environments/development.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/environments/production.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/environments/test.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/inflections.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/mime_types.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/secret_token.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/session_store.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/initializers/wrap_parameters.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/locales/en.yml delete mode 120000 lib/NewBlog/NewBlog/test/dummy/config/mongoid.yml delete mode 100644 lib/NewBlog/NewBlog/test/dummy/config/routes.rb delete mode 100644 lib/NewBlog/NewBlog/test/dummy/lib/assets/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/test/dummy/log/.gitkeep delete mode 100644 lib/NewBlog/NewBlog/test/dummy/public/404.html delete mode 100644 lib/NewBlog/NewBlog/test/dummy/public/422.html delete mode 100644 lib/NewBlog/NewBlog/test/dummy/public/500.html delete mode 100644 lib/NewBlog/NewBlog/test/dummy/public/favicon.ico delete mode 100755 lib/NewBlog/NewBlog/test/dummy/script/rails delete mode 100644 lib/NewBlog/NewBlog/test/integration/navigation_test.rb delete mode 100644 lib/NewBlog/NewBlog/test/test_helper.rb mode change 100644 => 100755 vendor/plugins/NewBlog/NewBlog.json mode change 100644 => 100755 vendor/plugins/NewBlog/script/rails mode change 100644 => 100755 vendor/plugins/NewBlog/test/dummy/script/rails diff --git a/lib/NewBlog/NewBlog/.gitignore b/lib/NewBlog/NewBlog/.gitignore deleted file mode 100644 index 1463de6df..000000000 --- a/lib/NewBlog/NewBlog/.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/lib/NewBlog/NewBlog/Gemfile b/lib/NewBlog/NewBlog/Gemfile deleted file mode 100644 index 52a1640b9..000000000 --- a/lib/NewBlog/NewBlog/Gemfile +++ /dev/null @@ -1,16 +0,0 @@ -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 -# 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' diff --git a/lib/NewBlog/NewBlog/Gemfile.lock b/lib/NewBlog/NewBlog/Gemfile.lock deleted file mode 100644 index e986f6fe9..000000000 --- a/lib/NewBlog/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/lib/NewBlog/NewBlog/MIT-LICENSE b/lib/NewBlog/NewBlog/MIT-LICENSE deleted file mode 100644 index 80cf031a6..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/NewBlog.gemspec b/lib/NewBlog/NewBlog/NewBlog.gemspec deleted file mode 100644 index 93e5b31d4..000000000 --- a/lib/NewBlog/NewBlog/NewBlog.gemspec +++ /dev/null @@ -1,23 +0,0 @@ -$:.push File.expand_path("../lib", __FILE__) - -# Maintain your gem's version: -require "NewBlog/version" - -# Describe your gem and declare its dependencies: -Gem::Specification.new do |s| - s.name = "NewBlog" - s.version = NewBlog::VERSION - s.authors = ["TODO: Your name"] - s.email = ["TODO: Your email"] - s.homepage = "TODO" - s.summary = "TODO: Summary of NewBlog." - s.description = "TODO: Description of NewBlog." - - 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/lib/NewBlog/NewBlog/NewBlog.json b/lib/NewBlog/NewBlog/NewBlog.json deleted file mode 100755 index 0197b9d05..000000000 --- a/lib/NewBlog/NewBlog/NewBlog.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name_of_app": "NewBlog", - "version": "0.1", - "organization": "Rulingcom", - "author": "RD dep", - "intro": "A simple blog……", - "update_info": "Some info", - "create_date": "11-11-2011" -} \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/README.rdoc b/lib/NewBlog/NewBlog/README.rdoc deleted file mode 100644 index 4845c91f0..000000000 --- a/lib/NewBlog/NewBlog/README.rdoc +++ /dev/null @@ -1,3 +0,0 @@ -= NewBlog - -This project rocks and uses MIT-LICENSE. \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/Rakefile b/lib/NewBlog/NewBlog/Rakefile deleted file mode 100644 index 01e88eefb..000000000 --- a/lib/NewBlog/NewBlog/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 = 'NewBlog' - 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/lib/NewBlog/NewBlog/app/assets/images/NewBlog/.gitkeep b/lib/NewBlog/NewBlog/app/assets/images/NewBlog/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/assets/javascripts/NewBlog/.gitkeep b/lib/NewBlog/NewBlog/app/assets/javascripts/NewBlog/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep b/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/application.css b/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/application.css deleted file mode 100644 index 69b4b126f..000000000 --- a/lib/NewBlog/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/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/production.css b/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/production.css deleted file mode 100644 index 202a62a43..000000000 --- a/lib/NewBlog/NewBlog/app/assets/stylesheets/NewBlog/production.css +++ /dev/null @@ -1,21 +0,0 @@ -.preview h2 { - font-size: large; - background-color: red; - } - -.production h2 { - font-size: large; - background-color: green; - } - -.widget_index { - width: 200px; - height: 120px; - border: solid; -} - -.widget_latest_post{ - width: 200px; - height: 120px; - border: solid; -} \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/controllers/.gitkeep b/lib/NewBlog/NewBlog/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/controllers/application_controller.rb b/lib/NewBlog/NewBlog/app/controllers/application_controller.rb deleted file mode 100644 index 307a4acd8..000000000 --- a/lib/NewBlog/NewBlog/app/controllers/application_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery - before_filter :set_locale - - # Set I18n.locale - def set_locale - # update session if passed - session[:locale] = params[:locale] if params[:locale] - - # set locale based on session or default - begin - # check if locale is valid for non site pages - if !VALID_LOCALES.include?(session[:locale]) - I18n.locale = I18n.default_locale - else - I18n.locale = session[:locale] - end - rescue - I18n.locale = I18n.default_locale - end - end - -end diff --git a/lib/NewBlog/NewBlog/app/controllers/panel/blog/comments_controller.rb b/lib/NewBlog/NewBlog/app/controllers/panel/blog/comments_controller.rb deleted file mode 100644 index 971f58a60..000000000 --- a/lib/NewBlog/NewBlog/app/controllers/panel/blog/comments_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Panel::Blog::CommentsController < ApplicationController - def create - @post = Post.find(params[:post_id]) - @comment = @post.comments.create!(params[:comment]) - redirect_to panel_blog_post_url(@post) - end -end \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/controllers/panel/blog/posts_controller.rb b/lib/NewBlog/NewBlog/app/controllers/panel/blog/posts_controller.rb deleted file mode 100644 index 41468846c..000000000 --- a/lib/NewBlog/NewBlog/app/controllers/panel/blog/posts_controller.rb +++ /dev/null @@ -1,111 +0,0 @@ -class Panel::Blog::PostsController < ApplicationController - - layout 'admin' - - # 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 - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @posts } - end - end - - # GET /posts/1 - # GET /posts/1.xml - def show - @post = Post.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @post } - end - end - - # GET /posts/new - # GET /posts/new.xml - def new - @post = Post.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @post } - end - end - - # GET /posts/1/edit - def edit - @post = Post.find(params[:id]) - end - - # POST /posts - # POST /posts.xml - def create - @post = Post.new(params[:post]) - - respond_to do |format| - if @post.save - format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.create_post_success')) } - format.xml { render :xml => @post, :status => :created, :location => @post } - else - format.html { render :action => "new" } - format.xml { render :xml => @post.errors, :status => :unprocessable_entity } - end - end - end - - # PUT /posts/1 - # PUT /posts/1.xml - def update - @post = Post.find(params[:id]) - - respond_to do |format| - if @post.update_attributes(params[:post]) - format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.update_post_success')) } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @post.errors, :status => :unprocessable_entity } - end - end - end - - # DELETE /posts/1 - # DELETE /posts/1.xml - def destroy - @post = Post.find(params[:id]) - @post.destroy - - respond_to do |format| - format.html { redirect_to(panel_blog_posts_url) } - format.xml { head :ok } - 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/lib/NewBlog/NewBlog/app/helpers/.gitkeep b/lib/NewBlog/NewBlog/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/helpers/application_helper.rb b/lib/NewBlog/NewBlog/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945..000000000 --- a/lib/NewBlog/NewBlog/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/lib/NewBlog/NewBlog/app/mailers/.gitkeep b/lib/NewBlog/NewBlog/app/mailers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/models/.gitkeep b/lib/NewBlog/NewBlog/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/models/comment.rb b/lib/NewBlog/NewBlog/app/models/comment.rb deleted file mode 100644 index a85b7a434..000000000 --- a/lib/NewBlog/NewBlog/app/models/comment.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Comment - include Mongoid::Document - include Mongoid::Timestamps - field :name, :type => String - field :body, :type => String - embedded_in :post, :inverse_of => :comments -end \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/models/post.rb b/lib/NewBlog/NewBlog/app/models/post.rb deleted file mode 100644 index f60c1c196..000000000 --- a/lib/NewBlog/NewBlog/app/models/post.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Post - include Mongoid::Document - include Mongoid::Timestamps - field :title, :type => String - field :body, :type => String - embeds_many :comments - validates_presence_of :title, :body -end \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/views/.gitkeep b/lib/NewBlog/NewBlog/app/views/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/app/views/layouts/application.html.erb b/lib/NewBlog/NewBlog/app/views/layouts/application.html.erb deleted file mode 100644 index e8c469896..000000000 --- a/lib/NewBlog/NewBlog/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Blog - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - - -<%= yield %> - - - diff --git a/lib/NewBlog/NewBlog/app/views/layouts/edit_view.html.erb b/lib/NewBlog/NewBlog/app/views/layouts/edit_view.html.erb deleted file mode 100644 index 28bf833ac..000000000 --- a/lib/NewBlog/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/lib/NewBlog/NewBlog/app/views/layouts/production.html.erb b/lib/NewBlog/NewBlog/app/views/layouts/production.html.erb deleted file mode 100644 index d90a4112a..000000000 --- a/lib/NewBlog/NewBlog/app/views/layouts/production.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
- <%= yield %> -
diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/_form.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/_form.html.erb deleted file mode 100644 index 3c459566f..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/_form.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - <%= f.error_messages %> - -
- <%= f.label :title %>
- <%= f.text_field :title %> -
-
- <%= f.label :body %>
- <%= f.text_area :body %> -
-
- <%= f.submit %> -
diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/edit.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/edit.html.erb deleted file mode 100644 index 8b2b1f1df..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/edit.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

<%= t('blog.editing_post') %>

- -<%= form_for @post, :url => panel_blog_post_path(@post) do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> - -<%= link_to t('blog.show'), panel_blog_post_path(@post) %> | -<%= link_back %> diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/index.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/index.html.erb deleted file mode 100644 index 346cd1332..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/index.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -

<%= t('blog.list_post') %>

- - - - - - - - - - -<% @posts.each do |post| %> - - - - - - - -<% end %> -
<%= t('blog.title') %><%= t('blog.body') %>
<%= post.title %><%= post.body %><%= link_to t('blog.show'), panel_blog_post_path(post) %><%= link_to t('blog.edit'), edit_panel_blog_post_path(post) %><%= link_to t('blog.delete'), panel_blog_post_path(post), :confirm => t('blog.sure?'), :method => :delete %>
- -
- -<%= link_to t('blog.new_post'), new_panel_blog_post_path %> \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/latest_post.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/latest_post.html.erb deleted file mode 100644 index 9eb6ebbbd..000000000 --- a/lib/NewBlog/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/lib/NewBlog/NewBlog/app/views/panel/blog/posts/new.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/new.html.erb deleted file mode 100644 index 5e6eee2fe..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/new.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

<%= t('blog.new_post') %>

-<%= form_for @post, :url => panel_blog_posts_path do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> - -<%= link_back %> diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/show.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/show.html.erb deleted file mode 100644 index 7fce5fd16..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/show.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -

<%= flash_messages %>

- -

- <%= t('blog.body') %> - <%=h @post.body %> -

- -

<%= t('blog.comments') %>

- -<% @post.comments.each do |c| %> -

- <%=h c.name %> said:
- <%= time_ago_in_words(c.created_at) %> ago -

- -

- <%=h c.body %> -

-<% end %> - -<%= form_for Comment.new, :url => panel_blog_comments_path do |f| %> -

- - <%= f.label :name, "Author" %>
- <%= f.text_field :name %>
- <%= f.label :body, "Comment Description" %>
- <%= f.text_area :body %> - <%= hidden_field_tag :post_id, @post.id %> -

- -

- <%= f.submit "Add Comment" %> -

-<% end %> - - -<%= link_to t('blog.edit'), edit_panel_blog_post_path(@post) %> | -<%= link_back %> \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_index.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_index.html.erb deleted file mode 100644 index cd16cfc70..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_index.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<%=stylesheet_link_tag "NewBlog/application"%> -
- - - - - - - <% @posts.each do |post| %> - - - - - <% end %> -
<%= t('blog.title') %><%= t('blog.body') %>
<%= link_to post.title,panel_blog_post_path(post) %><%= post.body.truncate(14) %>
-
\ No newline at end of file diff --git a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb b/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb deleted file mode 100644 index 2312fc741..000000000 --- a/lib/NewBlog/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%=stylesheet_link_tag "NewBlog/application"%> -
-

<%= @post.title %>

-

- <%= @post.body %> -

-
\ No newline at end of file diff --git a/lib/NewBlog/NewBlog/config/routes.rb b/lib/NewBlog/NewBlog/config/routes.rb deleted file mode 100644 index b619df18e..000000000 --- a/lib/NewBlog/NewBlog/config/routes.rb +++ /dev/null @@ -1,13 +0,0 @@ -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 - -end diff --git a/lib/NewBlog/NewBlog/lib/NewBlog.rb b/lib/NewBlog/NewBlog/lib/NewBlog.rb deleted file mode 100644 index 090464509..000000000 --- a/lib/NewBlog/NewBlog/lib/NewBlog.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "NewBlog/engine" - - -module NewBlog -end diff --git a/lib/NewBlog/NewBlog/lib/NewBlog/engine.rb b/lib/NewBlog/NewBlog/lib/NewBlog/engine.rb deleted file mode 100644 index 90afca77a..000000000 --- a/lib/NewBlog/NewBlog/lib/NewBlog/engine.rb +++ /dev/null @@ -1,6 +0,0 @@ -module NewBlog - class Engine < Rails::Engine - isolate_namespace NewBlog - PrototypeR4::Application::Orbit_Apps << "NewBlog" - end -end diff --git a/lib/NewBlog/NewBlog/lib/NewBlog/version.rb b/lib/NewBlog/NewBlog/lib/NewBlog/version.rb deleted file mode 100644 index 9690b5375..000000000 --- a/lib/NewBlog/NewBlog/lib/NewBlog/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module NewBlog - VERSION = "0.0.1" -end diff --git a/lib/NewBlog/NewBlog/lib/tasks/NewBlog_tasks.rake b/lib/NewBlog/NewBlog/lib/tasks/NewBlog_tasks.rake deleted file mode 100644 index 0975b49b1..000000000 --- a/lib/NewBlog/NewBlog/lib/tasks/NewBlog_tasks.rake +++ /dev/null @@ -1,4 +0,0 @@ -# desc "Explaining what the task does" -# task :NewBlog do -# # Task goes here -# end diff --git a/lib/NewBlog/NewBlog/script/rails b/lib/NewBlog/NewBlog/script/rails deleted file mode 100755 index e323e44b8..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/NewBlog_test.rb b/lib/NewBlog/NewBlog/test/NewBlog_test.rb deleted file mode 100644 index 2870704b1..000000000 --- a/lib/NewBlog/NewBlog/test/NewBlog_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class NewBlogTest < ActiveSupport::TestCase - test "truth" do - assert_kind_of Module, NewBlog - end -end diff --git a/lib/NewBlog/NewBlog/test/dummy/Rakefile b/lib/NewBlog/NewBlog/test/dummy/Rakefile deleted file mode 100644 index 36458522c..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/app/assets/javascripts/application.js b/lib/NewBlog/NewBlog/test/dummy/app/assets/javascripts/application.js deleted file mode 100644 index 37c7bfcdb..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/app/assets/stylesheets/application.css b/lib/NewBlog/NewBlog/test/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index fc25b5723..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/app/controllers/application_controller.rb b/lib/NewBlog/NewBlog/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index e8065d950..000000000 --- a/lib/NewBlog/NewBlog/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery -end diff --git a/lib/NewBlog/NewBlog/test/dummy/app/helpers/application_helper.rb b/lib/NewBlog/NewBlog/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945..000000000 --- a/lib/NewBlog/NewBlog/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/lib/NewBlog/NewBlog/test/dummy/app/mailers/.gitkeep b/lib/NewBlog/NewBlog/test/dummy/app/mailers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/test/dummy/app/models/.gitkeep b/lib/NewBlog/NewBlog/test/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/test/dummy/app/views/layouts/application.html.erb b/lib/NewBlog/NewBlog/test/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index 9a8a761bd..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config.ru b/lib/NewBlog/NewBlog/test/dummy/config.ru deleted file mode 100644 index 1989ed8d0..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/application.rb b/lib/NewBlog/NewBlog/test/dummy/config/application.rb deleted file mode 100644 index 5e17b68c8..000000000 --- a/lib/NewBlog/NewBlog/test/dummy/config/application.rb +++ /dev/null @@ -1,46 +0,0 @@ -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+ - -Bundler.require -require "NewBlog" - -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/lib/NewBlog/NewBlog/test/dummy/config/boot.rb b/lib/NewBlog/NewBlog/test/dummy/config/boot.rb deleted file mode 100644 index eba068137..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/database.yml b/lib/NewBlog/NewBlog/test/dummy/config/database.yml deleted file mode 100644 index 51a4dd459..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/environment.rb b/lib/NewBlog/NewBlog/test/dummy/config/environment.rb deleted file mode 100644 index 3da5eb91d..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/environments/development.rb b/lib/NewBlog/NewBlog/test/dummy/config/environments/development.rb deleted file mode 100644 index 1f1595dcc..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/environments/production.rb b/lib/NewBlog/NewBlog/test/dummy/config/environments/production.rb deleted file mode 100644 index 67a508507..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/environments/test.rb b/lib/NewBlog/NewBlog/test/dummy/config/environments/test.rb deleted file mode 100644 index 6810c9147..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf3..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/initializers/inflections.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131f..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/initializers/mime_types.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e44..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/initializers/secret_token.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/secret_token.rb deleted file mode 100644 index 500605a4f..000000000 --- a/lib/NewBlog/NewBlog/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 = 'd50c02c22eac460faa82296161da6222762a7baff08669429b7b14b1e80b33f14cf1e1f8daf99486dda3b4d281c73b835169269a121027552299286a818c7d03' diff --git a/lib/NewBlog/NewBlog/test/dummy/config/initializers/session_store.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/session_store.rb deleted file mode 100644 index 952473ff9..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/initializers/wrap_parameters.rb b/lib/NewBlog/NewBlog/test/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index 999df2018..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/locales/en.yml b/lib/NewBlog/NewBlog/test/dummy/config/locales/en.yml deleted file mode 100644 index 179c14ca5..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/config/mongoid.yml b/lib/NewBlog/NewBlog/test/dummy/config/mongoid.yml deleted file mode 120000 index 75196a040..000000000 --- a/lib/NewBlog/NewBlog/test/dummy/config/mongoid.yml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../orbit/config/mongoid.yml \ No newline at end of file diff --git a/lib/NewBlog/NewBlog/test/dummy/config/routes.rb b/lib/NewBlog/NewBlog/test/dummy/config/routes.rb deleted file mode 100644 index bb509f27a..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/lib/assets/.gitkeep b/lib/NewBlog/NewBlog/test/dummy/lib/assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/test/dummy/log/.gitkeep b/lib/NewBlog/NewBlog/test/dummy/log/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/test/dummy/public/404.html b/lib/NewBlog/NewBlog/test/dummy/public/404.html deleted file mode 100644 index 9a48320a5..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/public/422.html b/lib/NewBlog/NewBlog/test/dummy/public/422.html deleted file mode 100644 index 83660ab18..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/public/500.html b/lib/NewBlog/NewBlog/test/dummy/public/500.html deleted file mode 100644 index b80307fc1..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/dummy/public/favicon.ico b/lib/NewBlog/NewBlog/test/dummy/public/favicon.ico deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/NewBlog/NewBlog/test/dummy/script/rails b/lib/NewBlog/NewBlog/test/dummy/script/rails deleted file mode 100755 index f8da2cffd..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/integration/navigation_test.rb b/lib/NewBlog/NewBlog/test/integration/navigation_test.rb deleted file mode 100644 index 97a94c9bb..000000000 --- a/lib/NewBlog/NewBlog/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/lib/NewBlog/NewBlog/test/test_helper.rb b/lib/NewBlog/NewBlog/test/test_helper.rb deleted file mode 100644 index dcd3b276e..000000000 --- a/lib/NewBlog/NewBlog/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/public/static/kernel.js b/public/static/kernel.js index 089c41e21..bde5dd056 100644 --- a/public/static/kernel.js +++ b/public/static/kernel.js @@ -7,4 +7,5 @@ $(document).ready(function() { }); } ); + $("#main_content").addClass("module"); }); \ No newline at end of file diff --git a/vendor/plugins/NewBlog/NewBlog.json b/vendor/plugins/NewBlog/NewBlog.json old mode 100644 new mode 100755 diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css index 202a62a43..475b26415 100644 --- a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css +++ b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css @@ -1,21 +1,52 @@ -.preview h2 { - font-size: large; - background-color: red; - } - -.production h2 { - font-size: large; - background-color: green; - } - -.widget_index { - width: 200px; - height: 120px; - border: solid; +/* module */ +#module{ + float: left; + width: 170px; + margin-left: 20px; } - -.widget_latest_post{ - width: 200px; - height: 120px; - border: solid; +.production { + padding: 10px; + font-size: 12px; + border: 1px solid #e1e1e1; + margin-bottom: 10px; + background: #DDDAD0; + color: #484339; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 0 5px #33322C; + -webkit-box-shadow: 0 0 5px #33322C; + box-shadow: 0 0 5px #33322C; + text-shadow: 0 1px 0 #fff; + line-height: 1.4; + font-family: Arial; +} +.production h2{ + font-size: 18px; + margin-bottom: 10px; + text-shadow: 0 1px 0 #fff; + border-left: 4px solid #B6300C; + line-height: 20px; + padding-left: 5px; +} +.production table{ + border: 1px solid #9b968c; + padding: 5px; + width: 145px; +} +.production th{ + background: #d3cfc3; + font-weight: bold; +} +.production th, .production tr, .production td{ + border: 1px solid #9b968c; + padding: 5px; +} +.production a{ + color: #9a460e; + text-decoration: none; +} +.production a:hover{ + text-decoration: underline; +>>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc } \ No newline at end of file diff --git a/vendor/plugins/NewBlog/script/rails b/vendor/plugins/NewBlog/script/rails old mode 100644 new mode 100755 diff --git a/vendor/plugins/NewBlog/test/dummy/script/rails b/vendor/plugins/NewBlog/test/dummy/script/rails old mode 100644 new mode 100755