From 821d9b71883b9f6cf17eb55eb31f12872e6796c3 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 12:20:22 -0800 Subject: [PATCH 01/45] Adding controllers complete with crud actions and views for each action. --- app/assets/javascripts/albums.coffee | 3 ++ app/assets/javascripts/books.coffee | 3 ++ app/assets/javascripts/movies.coffee | 3 ++ app/assets/stylesheets/albums.scss | 3 ++ app/assets/stylesheets/books.scss | 3 ++ app/assets/stylesheets/movies.scss | 3 ++ app/controllers/albums_controller.rb | 24 ++++++++++++++ app/controllers/books_controller.rb | 24 ++++++++++++++ app/controllers/movies_controller.rb | 24 ++++++++++++++ app/helpers/albums_helper.rb | 2 ++ app/helpers/books_helper.rb | 2 ++ app/helpers/movies_helper.rb | 2 ++ app/views/albums/create.html.erb | 2 ++ app/views/albums/destroy.html.erb | 2 ++ app/views/albums/edit.html.erb | 2 ++ app/views/albums/index.html.erb | 2 ++ app/views/albums/new.html.erb | 2 ++ app/views/albums/show.html.erb | 2 ++ app/views/albums/update.html.erb | 2 ++ app/views/books/create.html.erb | 2 ++ app/views/books/destroy.html.erb | 2 ++ app/views/books/edit.html.erb | 2 ++ app/views/books/index.html.erb | 2 ++ app/views/books/new.html.erb | 2 ++ app/views/books/show.html.erb | 2 ++ app/views/books/update.html.erb | 2 ++ app/views/movies/create.html.erb | 2 ++ app/views/movies/destroy.html.erb | 2 ++ app/views/movies/edit.html.erb | 2 ++ app/views/movies/index.html.erb | 2 ++ app/views/movies/new.html.erb | 2 ++ app/views/movies/show.html.erb | 2 ++ app/views/movies/update.html.erb | 2 ++ config/routes.rb | 48 ++++++++++++++++++++++++++++ 34 files changed, 186 insertions(+) create mode 100644 app/assets/javascripts/albums.coffee create mode 100644 app/assets/javascripts/books.coffee create mode 100644 app/assets/javascripts/movies.coffee create mode 100644 app/assets/stylesheets/albums.scss create mode 100644 app/assets/stylesheets/books.scss create mode 100644 app/assets/stylesheets/movies.scss create mode 100644 app/controllers/albums_controller.rb create mode 100644 app/controllers/books_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/helpers/albums_helper.rb create mode 100644 app/helpers/books_helper.rb create mode 100644 app/helpers/movies_helper.rb create mode 100644 app/views/albums/create.html.erb create mode 100644 app/views/albums/destroy.html.erb create mode 100644 app/views/albums/edit.html.erb create mode 100644 app/views/albums/index.html.erb create mode 100644 app/views/albums/new.html.erb create mode 100644 app/views/albums/show.html.erb create mode 100644 app/views/albums/update.html.erb create mode 100644 app/views/books/create.html.erb create mode 100644 app/views/books/destroy.html.erb create mode 100644 app/views/books/edit.html.erb create mode 100644 app/views/books/index.html.erb create mode 100644 app/views/books/new.html.erb create mode 100644 app/views/books/show.html.erb create mode 100644 app/views/books/update.html.erb create mode 100644 app/views/movies/create.html.erb create mode 100644 app/views/movies/destroy.html.erb create mode 100644 app/views/movies/edit.html.erb create mode 100644 app/views/movies/index.html.erb create mode 100644 app/views/movies/new.html.erb create mode 100644 app/views/movies/show.html.erb create mode 100644 app/views/movies/update.html.erb diff --git a/app/assets/javascripts/albums.coffee b/app/assets/javascripts/albums.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/albums.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/books.coffee b/app/assets/javascripts/books.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/books.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/movies.coffee b/app/assets/javascripts/movies.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/movies.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/albums.scss b/app/assets/stylesheets/albums.scss new file mode 100644 index 0000000000..0eb33ca0f6 --- /dev/null +++ b/app/assets/stylesheets/albums.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the albums controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/books.scss b/app/assets/stylesheets/books.scss new file mode 100644 index 0000000000..81379d103f --- /dev/null +++ b/app/assets/stylesheets/books.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the books controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/movies.scss b/app/assets/stylesheets/movies.scss new file mode 100644 index 0000000000..70aaa8a9a4 --- /dev/null +++ b/app/assets/stylesheets/movies.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the movies controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb new file mode 100644 index 0000000000..43432ba755 --- /dev/null +++ b/app/controllers/albums_controller.rb @@ -0,0 +1,24 @@ +class AlbumsController < ApplicationController + def index + end + + def show + end + + def new + end + def create + end + + def edit + end + + def update + end + + def destroy + end + + def new + end +end diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb new file mode 100644 index 0000000000..ea073f4389 --- /dev/null +++ b/app/controllers/books_controller.rb @@ -0,0 +1,24 @@ +class BooksController < ApplicationController + def index + end + + def show + end + + def new + end + def create + end + + def edit + end + + def update + end + + def destroy + end + + def new + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 0000000000..f25fe9b942 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,24 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def new + end + def create + end + + def edit + end + + def update + end + + def destroy + end + + def new + end +end diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb new file mode 100644 index 0000000000..d976b7cef8 --- /dev/null +++ b/app/helpers/albums_helper.rb @@ -0,0 +1,2 @@ +module AlbumsHelper +end diff --git a/app/helpers/books_helper.rb b/app/helpers/books_helper.rb new file mode 100644 index 0000000000..4b9311e0be --- /dev/null +++ b/app/helpers/books_helper.rb @@ -0,0 +1,2 @@ +module BooksHelper +end diff --git a/app/helpers/movies_helper.rb b/app/helpers/movies_helper.rb new file mode 100644 index 0000000000..493eee555f --- /dev/null +++ b/app/helpers/movies_helper.rb @@ -0,0 +1,2 @@ +module MoviesHelper +end diff --git a/app/views/albums/create.html.erb b/app/views/albums/create.html.erb new file mode 100644 index 0000000000..ae7adc53cd --- /dev/null +++ b/app/views/albums/create.html.erb @@ -0,0 +1,2 @@ +

Albums#create

+

Find me in app/views/albums/create.html.erb

diff --git a/app/views/albums/destroy.html.erb b/app/views/albums/destroy.html.erb new file mode 100644 index 0000000000..d7c151276a --- /dev/null +++ b/app/views/albums/destroy.html.erb @@ -0,0 +1,2 @@ +

Albums#destroy

+

Find me in app/views/albums/destroy.html.erb

diff --git a/app/views/albums/edit.html.erb b/app/views/albums/edit.html.erb new file mode 100644 index 0000000000..0378dcfda1 --- /dev/null +++ b/app/views/albums/edit.html.erb @@ -0,0 +1,2 @@ +

Albums#edit

+

Find me in app/views/albums/edit.html.erb

diff --git a/app/views/albums/index.html.erb b/app/views/albums/index.html.erb new file mode 100644 index 0000000000..820280646e --- /dev/null +++ b/app/views/albums/index.html.erb @@ -0,0 +1,2 @@ +

Albums#index

+

Find me in app/views/albums/index.html.erb

diff --git a/app/views/albums/new.html.erb b/app/views/albums/new.html.erb new file mode 100644 index 0000000000..dcbdbdae0f --- /dev/null +++ b/app/views/albums/new.html.erb @@ -0,0 +1,2 @@ +

Albums#new

+

Find me in app/views/albums/new.html.erb

diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb new file mode 100644 index 0000000000..69a0f0e52f --- /dev/null +++ b/app/views/albums/show.html.erb @@ -0,0 +1,2 @@ +

Albums#show

+

Find me in app/views/albums/show.html.erb

diff --git a/app/views/albums/update.html.erb b/app/views/albums/update.html.erb new file mode 100644 index 0000000000..f0b23f0bc2 --- /dev/null +++ b/app/views/albums/update.html.erb @@ -0,0 +1,2 @@ +

Albums#update

+

Find me in app/views/albums/update.html.erb

diff --git a/app/views/books/create.html.erb b/app/views/books/create.html.erb new file mode 100644 index 0000000000..82309de0b2 --- /dev/null +++ b/app/views/books/create.html.erb @@ -0,0 +1,2 @@ +

Books#create

+

Find me in app/views/books/create.html.erb

diff --git a/app/views/books/destroy.html.erb b/app/views/books/destroy.html.erb new file mode 100644 index 0000000000..75803de647 --- /dev/null +++ b/app/views/books/destroy.html.erb @@ -0,0 +1,2 @@ +

Books#destroy

+

Find me in app/views/books/destroy.html.erb

diff --git a/app/views/books/edit.html.erb b/app/views/books/edit.html.erb new file mode 100644 index 0000000000..caa37608f9 --- /dev/null +++ b/app/views/books/edit.html.erb @@ -0,0 +1,2 @@ +

Books#edit

+

Find me in app/views/books/edit.html.erb

diff --git a/app/views/books/index.html.erb b/app/views/books/index.html.erb new file mode 100644 index 0000000000..f8376a7ff1 --- /dev/null +++ b/app/views/books/index.html.erb @@ -0,0 +1,2 @@ +

Books#index

+

Find me in app/views/books/index.html.erb

diff --git a/app/views/books/new.html.erb b/app/views/books/new.html.erb new file mode 100644 index 0000000000..47996564a0 --- /dev/null +++ b/app/views/books/new.html.erb @@ -0,0 +1,2 @@ +

Books#new

+

Find me in app/views/books/new.html.erb

diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb new file mode 100644 index 0000000000..e883546b3b --- /dev/null +++ b/app/views/books/show.html.erb @@ -0,0 +1,2 @@ +

Books#show

+

Find me in app/views/books/show.html.erb

diff --git a/app/views/books/update.html.erb b/app/views/books/update.html.erb new file mode 100644 index 0000000000..4342321722 --- /dev/null +++ b/app/views/books/update.html.erb @@ -0,0 +1,2 @@ +

Books#update

+

Find me in app/views/books/update.html.erb

diff --git a/app/views/movies/create.html.erb b/app/views/movies/create.html.erb new file mode 100644 index 0000000000..af70ce57b6 --- /dev/null +++ b/app/views/movies/create.html.erb @@ -0,0 +1,2 @@ +

Movies#create

+

Find me in app/views/movies/create.html.erb

diff --git a/app/views/movies/destroy.html.erb b/app/views/movies/destroy.html.erb new file mode 100644 index 0000000000..be36dee5d5 --- /dev/null +++ b/app/views/movies/destroy.html.erb @@ -0,0 +1,2 @@ +

Movies#destroy

+

Find me in app/views/movies/destroy.html.erb

diff --git a/app/views/movies/edit.html.erb b/app/views/movies/edit.html.erb new file mode 100644 index 0000000000..1eef71aad9 --- /dev/null +++ b/app/views/movies/edit.html.erb @@ -0,0 +1,2 @@ +

Movies#edit

+

Find me in app/views/movies/edit.html.erb

diff --git a/app/views/movies/index.html.erb b/app/views/movies/index.html.erb new file mode 100644 index 0000000000..3c7486d0ff --- /dev/null +++ b/app/views/movies/index.html.erb @@ -0,0 +1,2 @@ +

Movies#index

+

Find me in app/views/movies/index.html.erb

diff --git a/app/views/movies/new.html.erb b/app/views/movies/new.html.erb new file mode 100644 index 0000000000..ca5da028ec --- /dev/null +++ b/app/views/movies/new.html.erb @@ -0,0 +1,2 @@ +

Movies#new

+

Find me in app/views/movies/new.html.erb

diff --git a/app/views/movies/show.html.erb b/app/views/movies/show.html.erb new file mode 100644 index 0000000000..85a9cc3280 --- /dev/null +++ b/app/views/movies/show.html.erb @@ -0,0 +1,2 @@ +

Movies#show

+

Find me in app/views/movies/show.html.erb

diff --git a/app/views/movies/update.html.erb b/app/views/movies/update.html.erb new file mode 100644 index 0000000000..1d77c2eb73 --- /dev/null +++ b/app/views/movies/update.html.erb @@ -0,0 +1,2 @@ +

Movies#update

+

Find me in app/views/movies/update.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 3f66539d54..202677cd16 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,52 @@ Rails.application.routes.draw do + get 'albums/index' + + get 'albums/show' + + get 'albums/new' + + get 'albums/create' + + get 'albums/edit' + + get 'albums/update' + + get 'albums/destroy' + + get 'albums/new' + + get 'books/index' + + get 'books/show' + + get 'books/new' + + get 'books/create' + + get 'books/edit' + + get 'books/update' + + get 'books/destroy' + + get 'books/new' + + get 'movies/index' + + get 'movies/show' + + get 'movies/new' + + get 'movies/create' + + get 'movies/edit' + + get 'movies/update' + + get 'movies/destroy' + + get 'movies/new' + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 030cf4f78f453722cae5b6771cc1840fbf93bf97 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 12:29:36 -0800 Subject: [PATCH 02/45] Adding models for book, movie, album and home --- app/assets/javascripts/home.coffee | 3 ++ app/assets/stylesheets/home.scss | 3 ++ app/controllers/home_controller.rb | 4 ++ app/helpers/home_helper.rb | 2 + app/models/album.rb | 2 + app/models/book.rb | 2 + app/models/movie.rb | 2 + app/views/home/index.html.erb | 2 + config/routes.rb | 2 + db/migrate/20151130202636_create_movies.rb | 12 ++++++ db/migrate/20151130202704_create_albums.rb | 12 ++++++ db/migrate/20151130202722_create_books.rb | 12 ++++++ db/schema.rb | 43 ++++++++++++++++++++++ 13 files changed, 101 insertions(+) create mode 100644 app/assets/javascripts/home.coffee create mode 100644 app/assets/stylesheets/home.scss create mode 100644 app/controllers/home_controller.rb create mode 100644 app/helpers/home_helper.rb create mode 100644 app/models/album.rb create mode 100644 app/models/book.rb create mode 100644 app/models/movie.rb create mode 100644 app/views/home/index.html.erb create mode 100644 db/migrate/20151130202636_create_movies.rb create mode 100644 db/migrate/20151130202704_create_albums.rb create mode 100644 db/migrate/20151130202722_create_books.rb create mode 100644 db/schema.rb diff --git a/app/assets/javascripts/home.coffee b/app/assets/javascripts/home.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/home.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss new file mode 100644 index 0000000000..f0ddc6846a --- /dev/null +++ b/app/assets/stylesheets/home.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the home controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 0000000000..95f29929ca --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,4 @@ +class HomeController < ApplicationController + def index + end +end diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb new file mode 100644 index 0000000000..23de56ac60 --- /dev/null +++ b/app/helpers/home_helper.rb @@ -0,0 +1,2 @@ +module HomeHelper +end diff --git a/app/models/album.rb b/app/models/album.rb new file mode 100644 index 0000000000..46fa309e4e --- /dev/null +++ b/app/models/album.rb @@ -0,0 +1,2 @@ +class Album < ActiveRecord::Base +end diff --git a/app/models/book.rb b/app/models/book.rb new file mode 100644 index 0000000000..6f68b44465 --- /dev/null +++ b/app/models/book.rb @@ -0,0 +1,2 @@ +class Book < ActiveRecord::Base +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 0000000000..49198a7d97 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ActiveRecord::Base +end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb new file mode 100644 index 0000000000..2085730c72 --- /dev/null +++ b/app/views/home/index.html.erb @@ -0,0 +1,2 @@ +

Home#index

+

Find me in app/views/home/index.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 202677cd16..c78e931d0f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'home/index' + get 'albums/index' get 'albums/show' diff --git a/db/migrate/20151130202636_create_movies.rb b/db/migrate/20151130202636_create_movies.rb new file mode 100644 index 0000000000..3e2c635c37 --- /dev/null +++ b/db/migrate/20151130202636_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration + def change + create_table :movies do |t| + t.string :title + t.text :description + t.string :director + t.integer :ranking + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20151130202704_create_albums.rb b/db/migrate/20151130202704_create_albums.rb new file mode 100644 index 0000000000..6cb6df3862 --- /dev/null +++ b/db/migrate/20151130202704_create_albums.rb @@ -0,0 +1,12 @@ +class CreateAlbums < ActiveRecord::Migration + def change + create_table :albums do |t| + t.string :title + t.text :description + t.string :artist + t.integer :ranking + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20151130202722_create_books.rb b/db/migrate/20151130202722_create_books.rb new file mode 100644 index 0000000000..a092a1262d --- /dev/null +++ b/db/migrate/20151130202722_create_books.rb @@ -0,0 +1,12 @@ +class CreateBooks < ActiveRecord::Migration + def change + create_table :books do |t| + t.string :title + t.text :description + t.string :author + t.integer :ranking + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..124ba15c10 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,43 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20151130202722) do + + create_table "albums", force: :cascade do |t| + t.string "title" + t.text "description" + t.string "artist" + t.integer "ranking" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "books", force: :cascade do |t| + t.string "title" + t.text "description" + t.string "author" + t.integer "ranking" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.text "description" + t.string "director" + t.integer "ranking" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 9cd2a63bd51807ecab05c158eade70b6e4fb3efa Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 13:35:21 -0800 Subject: [PATCH 03/45] Adding home#index as the root, and movies, books and albums as resources for routes --- config/routes.rb | 107 ++--------------------------------------------- 1 file changed, 4 insertions(+), 103 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index c78e931d0f..241d544b6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,106 +1,7 @@ Rails.application.routes.draw do - get 'home/index' + root 'home#index' + resources :movies + resources :books + resources :albums - get 'albums/index' - - get 'albums/show' - - get 'albums/new' - - get 'albums/create' - - get 'albums/edit' - - get 'albums/update' - - get 'albums/destroy' - - get 'albums/new' - - get 'books/index' - - get 'books/show' - - get 'books/new' - - get 'books/create' - - get 'books/edit' - - get 'books/update' - - get 'books/destroy' - - get 'books/new' - - get 'movies/index' - - get 'movies/show' - - get 'movies/new' - - get 'movies/create' - - get 'movies/edit' - - get 'movies/update' - - get 'movies/destroy' - - get 'movies/new' - - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end end From 865cc69a72525ff1e21c8c14bad7d214c21cdbf3 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 13:46:54 -0800 Subject: [PATCH 04/45] Adding prelim html to application layout (header) --- app/views/layouts/application.html.erb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2d02e8fbd4..2553635501 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,17 @@ <%= csrf_meta_tags %> - -<%= yield %> - +
+
+
+

<%= link_to "Media Ranker", "/", :class => "header_title" %> + Ranking the Best of Everything +

+
+
+
+ <%= yield %> +
+
From 6adfe0a735e40cfe0d18dbbab1d5aa67d6dc59f4 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 14:09:42 -0800 Subject: [PATCH 05/45] Wrote in seed.rb so can seed the database --- db/seeds.rb | 60 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 4edb1e857e..8661806de1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,53 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) +movies = [ + { title: "Lost Day", description: "A day got lost", ranking:10, director:"Stevie Smileberg"}, + { title: "War Horse", description: "A day got lost", ranking:10, director:"Stevie Smileberg"}, + { title: "The Happening", description: "Mark Walhberg is ridiculous", ranking:1, director:"Kevin Smith"}, + { title: "All Dogs go to Heaven", description: "Dogs in heaven", ranking:20, director:"Lulu L"}, + { title: "Hellraiser", description: "A man unleashes demons into a house, and it's more funny than scary.", ranking:11, director:"Wes Craven"}, + { title: "Little Miss Sunshine", description: "A sad and happy family goes on a trip together.", ranking:5, director:"Some director"}, + { title: "Groundhog Day", description: "Bill Murray in the performance of a lifetime.", ranking:30, director:"John Hughes"}, + { title: "The Lost World", description: "Dinosaurs come back to eat everyone once again. This time on a different island.", ranking:4, director:"Steven Smileberg"}, + { title: "Apocalypto", description: "A violent romp in an ancient civilization. Hold onto your heads!", ranking:3, director:"Mel Gibson"}, + { title: "Racing Stripes", description: "I think it has Bill Murray in it.", ranking:13, director:"A director person"}, + { title: "Lost in Translation", description: "Bill Murray and Scarjo have fun, and are kind of sad. They stay in a cool hotel.", ranking:16, director:"S. Coppola"}, + { title: "X Files: The movie", description: "A huge disappointment to x-files fans across the globe.", ranking:1, director:"Lameo Mclame"}, + { title: "Peter Pan", description: "A boy, a pirate, kids, a dog who is a Nanny, irresponsible parenting", ranking:6, director:"Peter P."} +] + +movies.each do |movie| + Movie.create(movie) +end + + +books = [ + { title: "To Kill a Mockingbird", description: "Noble people do noble things, crummy people do crummy things.", ranking:19, author:"H."}, + { title: "Bookie book", description: "A fantastic book", ranking:30, author:"Cheryl Strayd"}, + { title: "All the light we cannot see", description: "Little kids during a war do stuff.", ranking:8, author:"Writey Writer"}, + { title: "Euphoria", description: "Anthropologists in a love triangle", ranking:5, author:"Lily King"}, + { title: "A list of things that didn't kill me", description: "A man in Seattle has a rough childhood.", ranking:14, author:"Jason Schmidt"}, + { title: "Fun book", description: "It's a fun book", ranking:3, author:"Some author"}, + { title: "The Bible", description: "You can read about stuff that people care about a lot.", ranking:20, author:"It's complicated"}, + { title: "Booklet book", description: "A great description of a great book.", ranking:23, author:"Authory author"}, + { title: "Salt", description: "All about the history of salt, and much much more", ranking:9, author:"Salty Salt"}, + { title: "Paper book", description: "This is a dumb book", ranking:1, author:"An author"}, + { title: "Everybody poops", description: "Let's learn about how everybody poops! Big poops, small poops, all poops.", ranking:18, author:"M.S. Poop"}, + { title: "Scary Stories", description: "A book of chilling tales. Boo!", ranking:14, author:"R.L Stein"}, + { title: "The Berenstein Bears go to Camp", description: "The bears are at it again. Mischief and fun at camp!", ranking:10, author:"Jan Berenstein"} +] + +books.each do |book| + Book.create(book) +end + +albums = [ + { title: "Pet Sounds", description: "The one by Brian Wilson that the world wasn't ready for but now people this is cool.", ranking:10, artist:"Brian Wilson"}, + { title: "Smile", description: "Brian Wilson made this one way late, in 2004, after coming back from the brink of madness", ranking:20, artist:"Brian Wilson"}, + { title: "Lost and Found", description: "Nice beats", ranking:17, artist:"Pretty Lights"}, + { title: "Music for the Holidays", description: "Another holiday album", ranking:0, artist:"Mariah Carey"}, + { title: "Music for the Morning After", description: "Emotional music.", ranking:5, artist:"Pete Yorn"}, + { title: "Song and songs", description: "Lots of great songs.", ranking:13, artist:"A brilliant artist"} +] + +albums.each do |album| + Album.create(album) +end From 5ef28c9983b9fcf5e37fed7b036029711ab5bde6 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 14:26:13 -0800 Subject: [PATCH 06/45] On home index, showing all books, albums, and movies (not limited to top ten yet). Did put in some bootstrap classes in anticipation of the future --- app/controllers/home_controller.rb | 16 ++++++++++++ app/views/home/index.html.erb | 35 ++++++++++++++++++++++++-- app/views/layouts/application.html.erb | 2 -- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 95f29929ca..d222f27b1f 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,4 +1,20 @@ class HomeController < ApplicationController + before_action :get_movies + before_action :get_books + before_action :get_albums + + def get_movies + @movies = Movie.all + end + + def get_books + @books = Book.all + end + + def get_albums + @albums = Album.all + end + def index end end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 2085730c72..70399d72f6 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,2 +1,33 @@ -

Home#index

-

Find me in app/views/home/index.html.erb

+
+
+
+
+

Top Movies

+ <% @movies.each do |movie| %> +

<%= link_to "#{movie.title}", movie_path(movie.id), action: :show %> + Ranked:<%=movie.ranking %> +

+ <% end %> + <%= link_to "View More Movies", movies_path %> +
+
+

Top Books

+ <% @books.each do |book| %> +

<%= link_to "#{book.title}", book_path(book.id), action: :show %> + Ranked:<%=book.ranking %> +

+ <% end %> + <%= link_to "View More Books", books_path %> +
+
+

Top Albums

+ <% @albums.each do |album| %> +

<%= link_to "#{album.title}", album_path(album.id), action: :show %> + Ranked:<%=album.ranking %> +

+ <% end %> + <%= link_to "View More Albums", albums_path %> +
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2553635501..06363a0e21 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,9 +15,7 @@ -
<%= yield %> -
From 644245ec5024543c6043483c71049aa36c1e1d96 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 14:33:55 -0800 Subject: [PATCH 07/45] On home index, media are limited to top ten ranked --- app/models/album.rb | 5 +++++ app/models/book.rb | 5 +++++ app/models/movie.rb | 5 +++++ app/views/home/index.html.erb | 6 +++--- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/models/album.rb b/app/models/album.rb index 46fa309e4e..030de03660 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -1,2 +1,7 @@ class Album < ActiveRecord::Base + + def self.top_ten + Album.order("ranking DESC").limit(10) + end + end diff --git a/app/models/book.rb b/app/models/book.rb index 6f68b44465..37a4d6a8a4 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -1,2 +1,7 @@ class Book < ActiveRecord::Base + + def self.top_ten + Book.order("ranking DESC").limit(10) + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 49198a7d97..dfc6e67beb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ActiveRecord::Base + + def self.top_ten + Movie.order("ranking DESC").limit(10) + end + end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 70399d72f6..f69b6e2205 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -3,7 +3,7 @@

Top Movies

- <% @movies.each do |movie| %> + <% @movies.top_ten.each do |movie| %>

<%= link_to "#{movie.title}", movie_path(movie.id), action: :show %> Ranked:<%=movie.ranking %>

@@ -12,7 +12,7 @@

Top Books

- <% @books.each do |book| %> + <% @books.top_ten.each do |book| %>

<%= link_to "#{book.title}", book_path(book.id), action: :show %> Ranked:<%=book.ranking %>

@@ -21,7 +21,7 @@

Top Albums

- <% @albums.each do |album| %> + <% @albums.top_ten.each do |album| %>

<%= link_to "#{album.title}", album_path(album.id), action: :show %> Ranked:<%=album.ranking %>

From a39ae30ac4fbc01a8bceb2d39f8afa2bbecd341e Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 14:41:13 -0800 Subject: [PATCH 08/45] Adding strong params to each of the model's controllers --- app/controllers/albums_controller.rb | 6 ++++++ app/controllers/books_controller.rb | 6 ++++++ app/controllers/movies_controller.rb | 7 +++++++ app/views/albums/show.html.erb | 8 ++++++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 43432ba755..5b14951271 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -21,4 +21,10 @@ def destroy def new end + + private + + def album_params + params.permit(album:[:title, :description, :ranking, :artist]) + end end diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index ea073f4389..d5fa33cda8 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -21,4 +21,10 @@ def destroy def new end + + private + + def book_params + params.permit(book:[:title, :description, :ranking, :author]) + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f25fe9b942..362ca07995 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,7 @@ def index end def show + @movie = Movie.find(id: params) end def new @@ -21,4 +22,10 @@ def destroy def new end + + private + + def movie_params + params.permit(movie:[:title, :description, :ranking, :director]) + end end diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 69a0f0e52f..0943a21252 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -1,2 +1,6 @@ -

Albums#show

-

Find me in app/views/albums/show.html.erb

+
+
+

< +

+
+
From 890c6b0fa289d3b3f0f1f4a2217948d900628448 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 15:25:13 -0800 Subject: [PATCH 09/45] Upvote button works on movies --- app/controllers/albums_controller.rb | 1 + app/controllers/books_controller.rb | 1 + app/controllers/movies_controller.rb | 8 +++++++- app/views/books/show.html.erb | 8 ++++++-- app/views/movies/show.html.erb | 17 +++++++++++++++-- config/routes.rb | 1 + 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 5b14951271..9abebb93ab 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -3,6 +3,7 @@ def index end def show + @album = Album.find(params[:id]) end def new diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index d5fa33cda8..c62266cb8e 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -3,6 +3,7 @@ def index end def show + @book = Book.find(params[:id]) end def new diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 362ca07995..4adcd8c073 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,8 +2,14 @@ class MoviesController < ApplicationController def index end + def upvote + @movie = Movie.find(params[:id]) + @movie.update_attribute(:ranking, @movie.ranking + 1) + redirect_to action: :show + end + def show - @movie = Movie.find(id: params) + @movie = Movie.find(params[:id]) end def new diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index e883546b3b..0943a21252 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -1,2 +1,6 @@ -

Books#show

-

Find me in app/views/books/show.html.erb

+
+
+

< +

+
+
diff --git a/app/views/movies/show.html.erb b/app/views/movies/show.html.erb index 85a9cc3280..26eb8590f9 100644 --- a/app/views/movies/show.html.erb +++ b/app/views/movies/show.html.erb @@ -1,2 +1,15 @@ -

Movies#show

-

Find me in app/views/movies/show.html.erb

+
+
+

<%= @movie.title %> + Directed by: <%= @movie.director %> +

+

Ranked:<%= @movie.ranking %>

+

<%= @movie.description %>

+
+ <%= button_to 'Upvote', movie_upvote_path(@movie.id), method: :post %> +
+
+ # CRUD links for edit, delete, plus more +
+
+
diff --git a/config/routes.rb b/config/routes.rb index 241d544b6a..2d451aca2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do root 'home#index' + post 'movies/:id/upvote' => 'movies#upvote', as: :movie_upvote resources :movies resources :books resources :albums From 481daf3196e5c05cdda86e6a381081c49866181f Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 15:27:01 -0800 Subject: [PATCH 10/45] Adding upvote action to all controllers --- app/controllers/albums_controller.rb | 6 ++++++ app/controllers/books_controller.rb | 6 ++++++ app/controllers/movies_controller.rb | 1 + 3 files changed, 13 insertions(+) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 9abebb93ab..09f40aeaa3 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -2,6 +2,12 @@ class AlbumsController < ApplicationController def index end + def upvote + @album = Album.find(params[:id]) + @album.update_attribute(:ranking, @album.ranking + 1) + redirect_to action: :show + end + def show @album = Album.find(params[:id]) end diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index c62266cb8e..e69901f2d7 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -2,6 +2,12 @@ class BooksController < ApplicationController def index end + def upvote + @book = Book.find(params[:id]) + @book.update_attribute(:ranking, @book.ranking + 1) + redirect_to action: :show + end + def show @book = Book.find(params[:id]) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4adcd8c073..239b2a05c8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,6 +14,7 @@ def show def new end + def create end From 1a6d66254e644e8131e960327bb67aad372c6115 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 15:36:12 -0800 Subject: [PATCH 11/45] Upvote works for show on all three mvcs --- app/views/albums/show.html.erb | 11 ++++++++++- app/views/books/show.html.erb | 11 ++++++++++- config/routes.rb | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 0943a21252..0ea6575ed4 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -1,6 +1,15 @@
-

< +

<%= @album.title %> + Recorded by: <%= @album.artist %>

+

Ranked:<%= @album.ranking %>

+

<%= @album.description %>

+
+ <%= button_to 'Upvote', album_upvote_path(@album.id), method: :post %> +
+
+ # CRUD links for edit, delete, plus more +
diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index 0943a21252..d7be47d3f9 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -1,6 +1,15 @@
-

< +

<%= @book.title %> + Written by: <%= @book.author %>

+

Ranked:<%= @book.ranking %>

+

<%= @book.description %>

+
+ <%= button_to 'Upvote', book_upvote_path(@book.id), method: :post %> +
+
+ # CRUD links for edit, delete, plus more +
diff --git a/config/routes.rb b/config/routes.rb index 2d451aca2a..d55362f645 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do root 'home#index' post 'movies/:id/upvote' => 'movies#upvote', as: :movie_upvote + post 'books/:id/upvote' => 'books#upvote', as: :book_upvote + post 'albums/:id/upvote' => 'albums#upvote', as: :album_upvote resources :movies resources :books resources :albums From b6f6a511c3fda8f0d78086ea351e6e0b5ca66620 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 15:53:25 -0800 Subject: [PATCH 12/45] Can now access edit pages and delete objects from show views --- app/controllers/albums_controller.rb | 3 +++ app/controllers/books_controller.rb | 3 +++ app/controllers/movies_controller.rb | 3 +++ app/views/albums/destroy.html.erb | 2 -- app/views/albums/show.html.erb | 3 ++- app/views/albums/update.html.erb | 2 -- app/views/books/destroy.html.erb | 2 -- app/views/books/show.html.erb | 3 ++- app/views/books/update.html.erb | 2 -- app/views/movies/destroy.html.erb | 2 -- app/views/movies/show.html.erb | 3 ++- app/views/movies/update.html.erb | 2 -- 12 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 app/views/albums/destroy.html.erb delete mode 100644 app/views/albums/update.html.erb delete mode 100644 app/views/books/destroy.html.erb delete mode 100644 app/views/books/update.html.erb delete mode 100644 app/views/movies/destroy.html.erb delete mode 100644 app/views/movies/update.html.erb diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 09f40aeaa3..5e834d4078 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -24,6 +24,9 @@ def update end def destroy + id = params[:id] + Album.destroy(id) + redirect_to albums_path end def new diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index e69901f2d7..8d34d03a73 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -24,6 +24,9 @@ def update end def destroy + id = params[:id] + Book.destroy(id) + redirect_to books_path end def new diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 239b2a05c8..4cbf3da6d7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -25,6 +25,9 @@ def update end def destroy + id = params[:id] + Movie.destroy(id) + redirect_to movies_path end def new diff --git a/app/views/albums/destroy.html.erb b/app/views/albums/destroy.html.erb deleted file mode 100644 index d7c151276a..0000000000 --- a/app/views/albums/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Albums#destroy

-

Find me in app/views/albums/destroy.html.erb

diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 0ea6575ed4..f7b1e8b17d 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -9,7 +9,8 @@ <%= button_to 'Upvote', album_upvote_path(@album.id), method: :post %>
- # CRUD links for edit, delete, plus more + <%= link_to "Edit #{@album.title}", edit_album_path(@album.id) %> + <%= link_to "Delete", { :controller=>"albums", action: :destroy, :id => @album.id}, method: :delete, data: { confirm: 'Are you sure?' } %>
diff --git a/app/views/albums/update.html.erb b/app/views/albums/update.html.erb deleted file mode 100644 index f0b23f0bc2..0000000000 --- a/app/views/albums/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Albums#update

-

Find me in app/views/albums/update.html.erb

diff --git a/app/views/books/destroy.html.erb b/app/views/books/destroy.html.erb deleted file mode 100644 index 75803de647..0000000000 --- a/app/views/books/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Books#destroy

-

Find me in app/views/books/destroy.html.erb

diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index d7be47d3f9..9453429cc5 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -9,7 +9,8 @@ <%= button_to 'Upvote', book_upvote_path(@book.id), method: :post %>
- # CRUD links for edit, delete, plus more + <%= link_to "Edit #{@book.title}", edit_book_path(@book.id) %> + <%= link_to "Delete", { :controller=>"books", action: :destroy, :id => @book.id}, method: :delete, data: { confirm: 'Are you sure?' } %>
diff --git a/app/views/books/update.html.erb b/app/views/books/update.html.erb deleted file mode 100644 index 4342321722..0000000000 --- a/app/views/books/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Books#update

-

Find me in app/views/books/update.html.erb

diff --git a/app/views/movies/destroy.html.erb b/app/views/movies/destroy.html.erb deleted file mode 100644 index be36dee5d5..0000000000 --- a/app/views/movies/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Movies#destroy

-

Find me in app/views/movies/destroy.html.erb

diff --git a/app/views/movies/show.html.erb b/app/views/movies/show.html.erb index 26eb8590f9..7e240959f0 100644 --- a/app/views/movies/show.html.erb +++ b/app/views/movies/show.html.erb @@ -9,7 +9,8 @@ <%= button_to 'Upvote', movie_upvote_path(@movie.id), method: :post %>
- # CRUD links for edit, delete, plus more + <%= link_to "Edit #{@movie.title}", edit_movie_path(@movie.id) %> + <%= link_to "Delete", { :controller=>"movies", action: :destroy, :id => @movie.id}, method: :delete, data: { confirm: 'Are you sure?' } %>
diff --git a/app/views/movies/update.html.erb b/app/views/movies/update.html.erb deleted file mode 100644 index 1d77c2eb73..0000000000 --- a/app/views/movies/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Movies#update

-

Find me in app/views/movies/update.html.erb

From 9a639842ef4a7cea61117dfa8ef18179fc543804 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 16:15:21 -0800 Subject: [PATCH 13/45] Crud set up on show page for an album. Buttons have classes in preparation for bootstrap --- app/views/albums/show.html.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index f7b1e8b17d..69c92b5dc3 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -6,11 +6,16 @@

Ranked:<%= @album.ranking %>

<%= @album.description %>

- <%= button_to 'Upvote', album_upvote_path(@album.id), method: :post %> + <%= button_to "Upvote", album_upvote_path(@album.id), method: :post, class: "btn btn-primary" %>
- <%= link_to "Edit #{@album.title}", edit_album_path(@album.id) %> - <%= link_to "Delete", { :controller=>"albums", action: :destroy, :id => @album.id}, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to "Edit #{@album.title}", edit_album_path(@album.id), class: "btn btn-default" %> + <%= link_to "Delete", { :controller=>"albums", action: :destroy, :id => @album.id}, method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger" %> + <%= link_to "View All Albums", albums_path, class: "btn btn-default" %> + <%= link_to "View All Media", root_path, class: "btn btn-default" %>
+ + + From a2f1e19ce657f95b428ca13c865652cc9e2fece7 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 16:23:38 -0800 Subject: [PATCH 14/45] All three models have links with bootstrap classes on their show pages (bootstrap still has not been added so they don't look like anything yet) --- app/views/books/show.html.erb | 10 +++++++--- app/views/movies/show.html.erb | 8 +++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index 9453429cc5..eb744c0e31 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -6,11 +6,15 @@

Ranked:<%= @book.ranking %>

<%= @book.description %>

- <%= button_to 'Upvote', book_upvote_path(@book.id), method: :post %> + <%= button_to 'Upvote', book_upvote_path(@book.id), method: :post, class: "btn btn-primary" %>
- <%= link_to "Edit #{@book.title}", edit_book_path(@book.id) %> - <%= link_to "Delete", { :controller=>"books", action: :destroy, :id => @book.id}, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to "Edit #{@book.title}", edit_book_path(@book.id), class: "btn btn-default" %> + <%= link_to "Delete", { :controller=>"books", action: :destroy, :id => @book.id}, method: :delete, data: { confirm: 'Are you sure?' } , class: "btn btn-danger" %> + <%= link_to "View All Books", books_path, class: "btn btn-default" %> + <%= link_to "View All Media", root_path, class: "btn btn-default" %>
+ + diff --git a/app/views/movies/show.html.erb b/app/views/movies/show.html.erb index 7e240959f0..bd4c5a70dd 100644 --- a/app/views/movies/show.html.erb +++ b/app/views/movies/show.html.erb @@ -6,11 +6,13 @@

Ranked:<%= @movie.ranking %>

<%= @movie.description %>

- <%= button_to 'Upvote', movie_upvote_path(@movie.id), method: :post %> + <%= button_to 'Upvote', movie_upvote_path(@movie.id), method: :post, class: "btn btn-primary" %>
- <%= link_to "Edit #{@movie.title}", edit_movie_path(@movie.id) %> - <%= link_to "Delete", { :controller=>"movies", action: :destroy, :id => @movie.id}, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to "Edit #{@movie.title}", edit_movie_path(@movie.id), class: "btn btn-default" %> + <%= link_to "Delete", { :controller=>"movies", action: :destroy, :id => @movie.id}, method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger" %> + <%= link_to "View All Movies", movies_path, class: "btn btn-default" %> + <%= link_to "View All Media", root_path, class: "btn btn-default" %>
From 7044e70ab4935c7303449ecac0e802b68090602f Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 16:48:51 -0800 Subject: [PATCH 15/45] Adding /movies /books/ /albums indices --- app/controllers/albums_controller.rb | 2 ++ app/controllers/books_controller.rb | 1 + app/controllers/movies_controller.rb | 1 + app/models/album.rb | 4 ++++ app/models/book.rb | 4 ++++ app/models/movie.rb | 4 ++++ app/views/albums/index.html.erb | 30 ++++++++++++++++++++++++++-- app/views/books/index.html.erb | 30 ++++++++++++++++++++++++++-- app/views/movies/index.html.erb | 30 ++++++++++++++++++++++++++-- 9 files changed, 100 insertions(+), 6 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 5e834d4078..46d7607591 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -1,5 +1,7 @@ class AlbumsController < ApplicationController + def index + @albums = Album.all end def upvote diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 8d34d03a73..89e9e42591 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -1,5 +1,6 @@ class BooksController < ApplicationController def index + @books = Book.all end def upvote diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4cbf3da6d7..31134e4952 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,6 @@ class MoviesController < ApplicationController def index + @movies = Movie.all end def upvote diff --git a/app/models/album.rb b/app/models/album.rb index 030de03660..ff522dddda 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -4,4 +4,8 @@ def self.top_ten Album.order("ranking DESC").limit(10) end + def self.by_ranking + Album.order("ranking DESC") + end + end diff --git a/app/models/book.rb b/app/models/book.rb index 37a4d6a8a4..8b5023f13b 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -4,4 +4,8 @@ def self.top_ten Book.order("ranking DESC").limit(10) end + def self.by_ranking + Book.order("ranking DESC") + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index dfc6e67beb..4010eacb2f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,8 @@ def self.top_ten Movie.order("ranking DESC").limit(10) end + def self.by_ranking + Movie.order("ranking DESC") + end + end diff --git a/app/views/albums/index.html.erb b/app/views/albums/index.html.erb index 820280646e..2fa5fae4da 100644 --- a/app/views/albums/index.html.erb +++ b/app/views/albums/index.html.erb @@ -1,2 +1,28 @@ -

Albums#index

-

Find me in app/views/albums/index.html.erb

+
+
+ + + + + + + + <% @albums.by_ranking.each do |album| %> + + + + + + <% end %> + +
RankingNameUpvote
+ Ranked:<%=album.ranking %> + + <%= link_to "#{album.title}", album_path(album.id), action: :show %> + + <%= button_to "Upvote", album_upvote_path(album.id), method: :post, class: "btn btn-default" %> +
+ <%= link_to "View All Media", root_path, class: "btn btn-default" %> + <%= link_to "Add an Album", new_album_path, class: "btn btn-default" %> +
+
diff --git a/app/views/books/index.html.erb b/app/views/books/index.html.erb index f8376a7ff1..aeb38bc990 100644 --- a/app/views/books/index.html.erb +++ b/app/views/books/index.html.erb @@ -1,2 +1,28 @@ -

Books#index

-

Find me in app/views/books/index.html.erb

+
+
+ + + + + + + + <% @books.by_ranking.each do |book| %> + + + + + + <% end %> + +
RankingNameUpvote
+ Ranked:<%=book.ranking %> + + <%= link_to "#{book.title}", book_path(book.id), action: :show %> + + <%= button_to "Upvote", book_upvote_path(book.id), method: :post, class: "btn btn-default" %> +
+ <%= link_to "View All Media", root_path, class: "btn btn-default" %> + <%= link_to "Add a Book", new_book_path, class: "btn btn-default" %> +
+
diff --git a/app/views/movies/index.html.erb b/app/views/movies/index.html.erb index 3c7486d0ff..8a71dd27be 100644 --- a/app/views/movies/index.html.erb +++ b/app/views/movies/index.html.erb @@ -1,2 +1,28 @@ -

Movies#index

-

Find me in app/views/movies/index.html.erb

+
+
+ + + + + + + + <% @movies.by_ranking.each do |movie| %> + + + + + + <% end %> + +
RankingNameUpvote
+ Ranked:<%=movie.ranking %> + + <%= link_to "#{movie.title}", movie_path(movie.id), action: :show %> + + <%= button_to "Upvote", movie_upvote_path(movie.id), method: :post, class: "btn btn-default" %> +
+ <%= link_to "View All Media", root_path, class: "btn btn-default" %> + <%= link_to "Add a Movie", new_movie_path, class: "btn btn-default" %> +
+
From 8510d06354544dcef2bea3f88b26d0e2a622373b Mon Sep 17 00:00:00 2001 From: Dreedle Date: Mon, 30 Nov 2015 16:58:15 -0800 Subject: [PATCH 16/45] In the midst of working on new form for albums --- app/controllers/albums_controller.rb | 2 ++ app/controllers/books_controller.rb | 2 ++ app/controllers/movies_controller.rb | 1 + app/views/albums/new.html.erb | 48 ++++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 46d7607591..f8bc8e5494 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -15,7 +15,9 @@ def show end def new + @album = Album.new end + def create end diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 89e9e42591..37a420a682 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -14,7 +14,9 @@ def show end def new + @book = Book.new end + def create end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 31134e4952..464455fbca 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,6 +14,7 @@ def show end def new + @movie = Movie.new end def create diff --git a/app/views/albums/new.html.erb b/app/views/albums/new.html.erb index dcbdbdae0f..14d0d8a32b 100644 --- a/app/views/albums/new.html.erb +++ b/app/views/albums/new.html.erb @@ -1,2 +1,46 @@ -

Albums#new

-

Find me in app/views/albums/new.html.erb

+
+
+

New Album

+ <%= form_for @album, :html => {:role => "form"} do |f| %> +
+ <%= f.label :name, "title" %> + <%= f.text_field :name, :class => "form-control" %> +
+ +
+ <%= f.label :address, "address" %> + <%= f.text_field :address, :class => "form-control" %> +
+ +
+ <%= f.label :city, "city" %> + <%= f.text_field :city, :class => "form-control" %> +
+ +
+ <%= f.label :county, "county" %> + <%= f.text_field :county, :class => "form-control" %> +
+ +
+ <%= f.label :state, "state" %> + <%= f.text_field :state, :class => "form-control" %> +
+ +
+ <%= f.label :zip, "zip" %> + <%= f.text_field :zip, :class => "form-control" %> +
+ +
+ <%= f.submit %> +
+ <% end %> + +
+ <%= f.submit %> +
+ +<% end %> +
+
From 154f907ef7583a947333abe5c4a3fbb99db2f3c3 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 11:03:14 -0800 Subject: [PATCH 17/45] Adding rspec and spec files for all models and controllers --- .rspec | 2 + Gemfile | 1 + Gemfile.lock | 19 ++++ spec/controllers/albums_controller_spec.rb | 5 + .../application_controller_spec.rb | 5 + spec/controllers/books_controller_spec.rb | 5 + spec/controllers/home_controller_spec.rb | 5 + spec/controllers/movies_controller_spec.rb | 5 + spec/models/album_spec.rb | 5 + spec/models/book_spec.rb | 5 + spec/models/movie_spec.rb | 5 + spec/rails_helper.rb | 57 ++++++++++++ spec/spec_helper.rb | 92 +++++++++++++++++++ 13 files changed, 211 insertions(+) create mode 100644 .rspec create mode 100644 spec/controllers/albums_controller_spec.rb create mode 100644 spec/controllers/application_controller_spec.rb create mode 100644 spec/controllers/books_controller_spec.rb create mode 100644 spec/controllers/home_controller_spec.rb create mode 100644 spec/controllers/movies_controller_spec.rb create mode 100644 spec/models/album_spec.rb create mode 100644 spec/models/book_spec.rb create mode 100644 spec/models/movie_spec.rb create mode 100644 spec/rails_helper.rb create mode 100644 spec/spec_helper.rb diff --git a/.rspec b/.rspec new file mode 100644 index 0000000000..83e16f8044 --- /dev/null +++ b/.rspec @@ -0,0 +1,2 @@ +--color +--require spec_helper diff --git a/Gemfile b/Gemfile index e2ef2f15ae..b6b881f2e8 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,7 @@ group :development, :test do gem 'sqlite3' gem 'better_errors' gem 'binding_of_caller' + gem 'rspec-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 4c65e3377b..b9398b3099 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,6 +55,7 @@ GEM execjs coffee-script-source (1.10.0) debug_inspector (0.0.2) + diff-lcs (1.2.5) erubis (2.7.0) execjs (2.6.0) globalid (0.3.6) @@ -113,6 +114,23 @@ GEM thor (>= 0.18.1, < 2.0) rake (10.4.2) rdoc (4.2.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-rails (3.4.0) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) ruby-graphviz (1.2.2) sass (3.4.19) sass-rails (5.0.4) @@ -161,6 +179,7 @@ DEPENDENCIES jquery-rails rails (= 4.2.5) rails-erd + rspec-rails sass-rails (~> 5.0) sdoc (~> 0.4.0) spring diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb new file mode 100644 index 0000000000..f7363dc9fd --- /dev/null +++ b/spec/controllers/albums_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe AlbumsController, type: :controller do + +end diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb new file mode 100644 index 0000000000..beb53a5d2c --- /dev/null +++ b/spec/controllers/application_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ApplicationController, type: :controller do + +end diff --git a/spec/controllers/books_controller_spec.rb b/spec/controllers/books_controller_spec.rb new file mode 100644 index 0000000000..2f312b5006 --- /dev/null +++ b/spec/controllers/books_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe BooksController, type: :controller do + +end diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb new file mode 100644 index 0000000000..e672b25e4d --- /dev/null +++ b/spec/controllers/home_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe HomeController, type: :controller do + +end diff --git a/spec/controllers/movies_controller_spec.rb b/spec/controllers/movies_controller_spec.rb new file mode 100644 index 0000000000..c993ac89ad --- /dev/null +++ b/spec/controllers/movies_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MoviesController, type: :controller do + +end diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb new file mode 100644 index 0000000000..e6f22e40d3 --- /dev/null +++ b/spec/models/album_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Album, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/book_spec.rb b/spec/models/book_spec.rb new file mode 100644 index 0000000000..8bfa48d277 --- /dev/null +++ b/spec/models/book_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Book, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/movie_spec.rb b/spec/models/movie_spec.rb new file mode 100644 index 0000000000..4b6d8e7cac --- /dev/null +++ b/spec/models/movie_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Movie, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb new file mode 100644 index 0000000000..6f1ab14638 --- /dev/null +++ b/spec/rails_helper.rb @@ -0,0 +1,57 @@ +# This file is copied to spec/ when you run 'rails generate rspec:install' +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +# Prevent database truncation if the environment is production +abort("The Rails environment is running in production mode!") if Rails.env.production? +require 'spec_helper' +require 'rspec/rails' +# Add additional requires below this line. Rails is not loaded until this point! + +# Requires supporting ruby files with custom matchers and macros, etc, in +# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are +# run as spec files by default. This means that files in spec/support that end +# in _spec.rb will both be required and run as specs, causing the specs to be +# run twice. It is recommended that you do not name files matching this glob to +# end with _spec.rb. You can configure this pattern with the --pattern +# option on the command line or in ~/.rspec, .rspec or `.rspec-local`. +# +# The following line is provided for convenience purposes. It has the downside +# of increasing the boot-up time by auto-requiring all files in the support +# directory. Alternatively, in the individual `*_spec.rb` files, manually +# require only the support files necessary. +# +# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } + +# Checks for pending migration and applies them before tests are run. +# If you are not using ActiveRecord, you can remove this line. +ActiveRecord::Migration.maintain_test_schema! + +RSpec.configure do |config| + # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures + config.fixture_path = "#{::Rails.root}/spec/fixtures" + + # If you're not using ActiveRecord, or you'd prefer not to run each of your + # examples within a transaction, remove the following line or assign false + # instead of true. + config.use_transactional_fixtures = true + + # RSpec Rails can automatically mix in different behaviours to your tests + # based on their file location, for example enabling you to call `get` and + # `post` in specs under `spec/controllers`. + # + # You can disable this behaviour by removing the line below, and instead + # explicitly tag your specs with their type, e.g.: + # + # RSpec.describe UsersController, :type => :controller do + # # ... + # end + # + # The different available types are documented in the features, such as in + # https://relishapp.com/rspec/rspec-rails/docs + config.infer_spec_type_from_file_location! + + # Filter lines from Rails gems in backtraces. + config.filter_rails_from_backtrace! + # arbitrary gems may also be filtered via: + # config.filter_gems_from_backtrace("gem name") +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000000..61e27385c3 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,92 @@ +# This file was generated by the `rails generate rspec:install` command. Conventionally, all +# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. +# The generated `.rspec` file contains `--require spec_helper` which will cause +# this file to always be loaded, without a need to explicitly require it in any +# files. +# +# Given that it is always loaded, you are encouraged to keep this file as +# light-weight as possible. Requiring heavyweight dependencies from this file +# will add to the boot time of your test suite on EVERY test run, even for an +# individual file that may not need all of that loaded. Instead, consider making +# a separate helper file that requires the additional dependencies and performs +# the additional setup, and require it from the spec files that actually need +# it. +# +# The `.rspec` file also contains a few flags that are not defaults but that +# users commonly want. +# +# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration +RSpec.configure do |config| + # rspec-expectations config goes here. You can use an alternate + # assertion/expectation library such as wrong or the stdlib/minitest + # assertions if you prefer. + config.expect_with :rspec do |expectations| + # This option will default to `true` in RSpec 4. It makes the `description` + # and `failure_message` of custom matchers include text for helper methods + # defined using `chain`, e.g.: + # be_bigger_than(2).and_smaller_than(4).description + # # => "be bigger than 2 and smaller than 4" + # ...rather than: + # # => "be bigger than 2" + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end + + # rspec-mocks config goes here. You can use an alternate test double + # library (such as bogus or mocha) by changing the `mock_with` option here. + config.mock_with :rspec do |mocks| + # Prevents you from mocking or stubbing a method that does not exist on + # a real object. This is generally recommended, and will default to + # `true` in RSpec 4. + mocks.verify_partial_doubles = true + end + +# The settings below are suggested to provide a good initial experience +# with RSpec, but feel free to customize to your heart's content. +=begin + # These two settings work together to allow you to limit a spec run + # to individual examples or groups you care about by tagging them with + # `:focus` metadata. When nothing is tagged with `:focus`, all examples + # get run. + config.filter_run :focus + config.run_all_when_everything_filtered = true + + # Allows RSpec to persist some state between runs in order to support + # the `--only-failures` and `--next-failure` CLI options. We recommend + # you configure your source control system to ignore this file. + config.example_status_persistence_file_path = "spec/examples.txt" + + # Limits the available syntax to the non-monkey patched syntax that is + # recommended. For more details, see: + # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/ + # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ + # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode + config.disable_monkey_patching! + + # Many RSpec users commonly either run the entire suite or an individual + # file, and it's useful to allow more verbose output when running an + # individual spec file. + if config.files_to_run.one? + # Use the documentation formatter for detailed output, + # unless a formatter has already been configured + # (e.g. via a command-line flag). + config.default_formatter = 'doc' + end + + # Print the 10 slowest examples and example groups at the + # end of the spec run, to help surface which specs are running + # particularly slow. + config.profile_examples = 10 + + # Run specs in random order to surface order dependencies. If you find an + # order dependency and want to debug it, you can fix the order by providing + # the seed, which is printed after each run. + # --seed 1234 + config.order = :random + + # Seed global randomization in this process using the `--seed` CLI option. + # Setting this allows you to use `--seed` to deterministically reproduce + # test failures related to randomization by passing the same `--seed` value + # as the one that triggered the failure. + Kernel.srand config.seed +=end +end From 326f7effec18fdd10209c1f5c0a5d6200eee7245 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 11:07:09 -0800 Subject: [PATCH 18/45] Adding validations to each model --- app/models/album.rb | 4 ++++ app/models/book.rb | 4 ++++ app/models/movie.rb | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/app/models/album.rb b/app/models/album.rb index ff522dddda..bd5002b3a0 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -1,4 +1,8 @@ class Album < ActiveRecord::Base + validates :title, presence: true + validates :description, presence: true + validates :artist, presence: true + validates :ranking, presence: true def self.top_ten Album.order("ranking DESC").limit(10) diff --git a/app/models/book.rb b/app/models/book.rb index 8b5023f13b..e9230eaa4e 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -1,4 +1,8 @@ class Book < ActiveRecord::Base + validates :title, presence: true + validates :description, presence: true + validates :author, presence: true + validates :ranking, presence: true def self.top_ten Book.order("ranking DESC").limit(10) diff --git a/app/models/movie.rb b/app/models/movie.rb index 4010eacb2f..8b97ec1e5d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,8 @@ class Movie < ActiveRecord::Base + validates :title, presence: true + validates :description, presence: true + validates :director, presence: true + validates :ranking, presence: true def self.top_ten Movie.order("ranking DESC").limit(10) From f0dfb7eabe2f2c83462999fcb1cb463328c542e2 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 11:31:20 -0800 Subject: [PATCH 19/45] Adding some spec tests for album models --- spec/models/album_spec.rb | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb index e6f22e40d3..aee83d75c0 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -1,5 +1,26 @@ require 'rails_helper' RSpec.describe Album, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + describe ".validates" do + it "must have a title" do + expect(Album.new(title: nil)).to_not be_valid + end + + it "must have a description" do + expect(Album.new(description: nil)).to be_invalid + end + + it "must have an artist" do + expect(Album.new(artist: nil)).to_not be_valid + end + + it "must have a ranking" do + expect(Album.new(ranking: nil)).to_not be_valid + end + + it "must have a ranking of zero on creation" do + expect(Album.new(ranking: 1)).to_not be_valid + expect(Album.new(ranking: 0)).to be_valid + end + end end From 1d1aacf79e1095a5c14230347926b5accc17a0b2 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 13:45:32 -0800 Subject: [PATCH 20/45] Can add a new album an redirect to show --- app/controllers/albums_controller.rb | 8 +++-- app/controllers/books_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/views/albums/new.html.erb | 45 ++++++---------------------- 4 files changed, 18 insertions(+), 39 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index f8bc8e5494..505b7ebd2b 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -19,6 +19,11 @@ def new end def create + @album = Album.create(title: album_params[:album][:title], + description: album_params[:album][:description], + artist: album_params[:album][:artist], + ranking: 0) + redirect_to album_path(@album.id) end def edit @@ -33,9 +38,6 @@ def destroy redirect_to albums_path end - def new - end - private def album_params diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 37a420a682..3c829e1a5d 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -18,6 +18,8 @@ def new end def create + Book.create(book_params[:book]) + redirect_to action: :index end def edit diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 464455fbca..80432c7d21 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,6 +18,8 @@ def new end def create + Movie.create(movie_params[:movie]) + redirect_to action: :index end def edit diff --git a/app/views/albums/new.html.erb b/app/views/albums/new.html.erb index 14d0d8a32b..e34fa0fd00 100644 --- a/app/views/albums/new.html.erb +++ b/app/views/albums/new.html.erb @@ -1,46 +1,19 @@

New Album

- <%= form_for @album, :html => {:role => "form"} do |f| %> + <%= form_for @album do |f| %>
- <%= f.label :name, "title" %> - <%= f.text_field :name, :class => "form-control" %> -
- -
- <%= f.label :address, "address" %> - <%= f.text_field :address, :class => "form-control" %> -
- -
- <%= f.label :city, "city" %> - <%= f.text_field :city, :class => "form-control" %> -
- -
- <%= f.label :county, "county" %> - <%= f.text_field :county, :class => "form-control" %> -
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> -
- <%= f.label :state, "state" %> - <%= f.text_field :state, :class => "form-control" %> -
+ <%= f.label :artist, "Artist" %> + <%= f.text_field :artist, :class => "form-control" %> -
- <%= f.label :zip, "zip" %> - <%= f.text_field :zip, :class => "form-control" %> -
- -
- <%= f.submit %> + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %>
<% end %> - -
- <%= f.submit %> -
- -<% end %>
From f0f145f2f5a76071fba209f829260044cde444c9 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 13:49:33 -0800 Subject: [PATCH 21/45] Can make a new object of each of the three models --- app/controllers/books_controller.rb | 9 +++++---- app/controllers/movies_controller.rb | 9 +++++---- app/views/books/new.html.erb | 21 +++++++++++++++++++-- app/views/movies/new.html.erb | 21 +++++++++++++++++++-- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 3c829e1a5d..5a23a60b12 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -18,8 +18,11 @@ def new end def create - Book.create(book_params[:book]) - redirect_to action: :index + @book = Book.create(title: book_params[:book][:title], + description: book_params[:book][:description], + author: book_params[:book][:author], + ranking: 0) + redirect_to book_path(@book.id) end def edit @@ -34,8 +37,6 @@ def destroy redirect_to books_path end - def new - end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 80432c7d21..056d098fe4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,8 +18,11 @@ def new end def create - Movie.create(movie_params[:movie]) - redirect_to action: :index + @movie = Movie.create(title: movie_params[:movie][:title], + description: movie_params[:movie][:description], + director: movie_params[:movie][:director], + ranking: 0) + redirect_to movie_path(@movie.id) end def edit @@ -34,8 +37,6 @@ def destroy redirect_to movies_path end - def new - end private diff --git a/app/views/books/new.html.erb b/app/views/books/new.html.erb index 47996564a0..c43f89fa33 100644 --- a/app/views/books/new.html.erb +++ b/app/views/books/new.html.erb @@ -1,2 +1,19 @@ -

Books#new

-

Find me in app/views/books/new.html.erb

+
+
+

New Book

+ <%= form_for @book do |f| %> +
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> + + <%= f.label :author, "Author" %> + <%= f.text_field :author, :class => "form-control" %> + + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %> +
+ <% end %> +
+
diff --git a/app/views/movies/new.html.erb b/app/views/movies/new.html.erb index ca5da028ec..4b13fbc74f 100644 --- a/app/views/movies/new.html.erb +++ b/app/views/movies/new.html.erb @@ -1,2 +1,19 @@ -

Movies#new

-

Find me in app/views/movies/new.html.erb

+
+
+

New Movie

+ <%= form_for @movie do |f| %> +
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> + + <%= f.label :director, "Director" %> + <%= f.text_field :director, :class => "form-control" %> + + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %> +
+ <% end %> +
+
From ba9f55fe6ce15a90100ada8329d484916e1eab21 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 14:02:25 -0800 Subject: [PATCH 22/45] Can edit any one of the models --- app/controllers/albums_controller.rb | 6 ++++++ app/controllers/books_controller.rb | 9 +++++++++ app/controllers/movies_controller.rb | 7 +++++++ app/views/albums/create.html.erb | 2 -- app/views/albums/edit.html.erb | 21 +++++++++++++++++++-- app/views/albums/show.html.erb | 2 +- app/views/books/create.html.erb | 2 -- app/views/books/edit.html.erb | 21 +++++++++++++++++++-- app/views/books/show.html.erb | 2 +- app/views/movies/create.html.erb | 2 -- app/views/movies/edit.html.erb | 21 +++++++++++++++++++-- app/views/movies/show.html.erb | 2 +- 12 files changed, 82 insertions(+), 15 deletions(-) delete mode 100644 app/views/albums/create.html.erb delete mode 100644 app/views/books/create.html.erb delete mode 100644 app/views/movies/create.html.erb diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 505b7ebd2b..db0996e8b2 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -27,9 +27,15 @@ def create end def edit + id = params[:id] + @album = Album.find(id) end def update + id = params[:id] + @album = Album.find(id) + @album.update(album_params[:album]) + redirect_to album_path(@album.id) end def destroy diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 5a23a60b12..71b3486dc7 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -26,11 +26,20 @@ def create end def edit + id = params[:id] + @book = Book.find(id) end def update + id = params[:id] + @book = Book.find(id) + @book.update(book_params[:book]) + redirect_to book_path(@book.id) end + + + def destroy id = params[:id] Book.destroy(id) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 056d098fe4..743431fbcb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -26,11 +26,18 @@ def create end def edit + id = params[:id] + @movie = Movie.find(id) end def update + id = params[:id] + @movie = Movie.find(id) + @movie.update(movie_params[:movie]) + redirect_to movie_path(@movie.id) end + def destroy id = params[:id] Movie.destroy(id) diff --git a/app/views/albums/create.html.erb b/app/views/albums/create.html.erb deleted file mode 100644 index ae7adc53cd..0000000000 --- a/app/views/albums/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Albums#create

-

Find me in app/views/albums/create.html.erb

diff --git a/app/views/albums/edit.html.erb b/app/views/albums/edit.html.erb index 0378dcfda1..ed4fc1bb2d 100644 --- a/app/views/albums/edit.html.erb +++ b/app/views/albums/edit.html.erb @@ -1,2 +1,19 @@ -

Albums#edit

-

Find me in app/views/albums/edit.html.erb

+
+
+

Edit Album

+ <%= form_for @album do |f| %> +
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> + + <%= f.label :artist, "Artist" %> + <%= f.text_field :artist, :class => "form-control" %> + + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %> +
+ <% end %> +
+
diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 69c92b5dc3..75de21d771 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -3,7 +3,7 @@

<%= @album.title %> Recorded by: <%= @album.artist %>

-

Ranked:<%= @album.ranking %>

+

Ranked: <%= @album.ranking %>

<%= @album.description %>

<%= button_to "Upvote", album_upvote_path(@album.id), method: :post, class: "btn btn-primary" %> diff --git a/app/views/books/create.html.erb b/app/views/books/create.html.erb deleted file mode 100644 index 82309de0b2..0000000000 --- a/app/views/books/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Books#create

-

Find me in app/views/books/create.html.erb

diff --git a/app/views/books/edit.html.erb b/app/views/books/edit.html.erb index caa37608f9..37ba204203 100644 --- a/app/views/books/edit.html.erb +++ b/app/views/books/edit.html.erb @@ -1,2 +1,19 @@ -

Books#edit

-

Find me in app/views/books/edit.html.erb

+
+
+

Edit Book

+ <%= form_for @book do |f| %> +
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> + + <%= f.label :author, "Author" %> + <%= f.text_field :author, :class => "form-control" %> + + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %> +
+ <% end %> +
+
diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index eb744c0e31..408c2efaaf 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -3,7 +3,7 @@

<%= @book.title %> Written by: <%= @book.author %>

-

Ranked:<%= @book.ranking %>

+

Ranked: <%= @book.ranking %>

<%= @book.description %>

<%= button_to 'Upvote', book_upvote_path(@book.id), method: :post, class: "btn btn-primary" %> diff --git a/app/views/movies/create.html.erb b/app/views/movies/create.html.erb deleted file mode 100644 index af70ce57b6..0000000000 --- a/app/views/movies/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Movies#create

-

Find me in app/views/movies/create.html.erb

diff --git a/app/views/movies/edit.html.erb b/app/views/movies/edit.html.erb index 1eef71aad9..241397cb7a 100644 --- a/app/views/movies/edit.html.erb +++ b/app/views/movies/edit.html.erb @@ -1,2 +1,19 @@ -

Movies#edit

-

Find me in app/views/movies/edit.html.erb

+
+
+

Edit Movie

+ <%= form_for @movie do |f| %> +
+ <%= f.label :title, "Name" %> + <%= f.text_field :title, :class => "form-control" %> + + <%= f.label :director, "Director" %> + <%= f.text_field :director, :class => "form-control" %> + + <%= f.label :description, "Description" %> + <%= f.text_area :description, :class => "form-control" %> +
+ <%= f.submit :class => "btn btn-default" %> +
+ <% end %> +
+
diff --git a/app/views/movies/show.html.erb b/app/views/movies/show.html.erb index bd4c5a70dd..42dd6b5306 100644 --- a/app/views/movies/show.html.erb +++ b/app/views/movies/show.html.erb @@ -3,7 +3,7 @@

<%= @movie.title %> Directed by: <%= @movie.director %>

-

Ranked:<%= @movie.ranking %>

+

Ranked: <%= @movie.ranking %>

<%= @movie.description %>

<%= button_to 'Upvote', movie_upvote_path(@movie.id), method: :post, class: "btn btn-primary" %> From 52af3686444b3a3d6ec0b265be6e700dfd70b656 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 14:11:00 -0800 Subject: [PATCH 23/45] Only title and ranking are validated in model --- app/models/album.rb | 2 -- app/models/book.rb | 2 -- app/models/movie.rb | 2 -- spec/models/album_spec.rb | 12 ------------ 4 files changed, 18 deletions(-) diff --git a/app/models/album.rb b/app/models/album.rb index bd5002b3a0..4fe93caefe 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -1,7 +1,5 @@ class Album < ActiveRecord::Base validates :title, presence: true - validates :description, presence: true - validates :artist, presence: true validates :ranking, presence: true def self.top_ten diff --git a/app/models/book.rb b/app/models/book.rb index e9230eaa4e..2bb35b72a3 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -1,7 +1,5 @@ class Book < ActiveRecord::Base validates :title, presence: true - validates :description, presence: true - validates :author, presence: true validates :ranking, presence: true def self.top_ten diff --git a/app/models/movie.rb b/app/models/movie.rb index 8b97ec1e5d..f1c930e482 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,5 @@ class Movie < ActiveRecord::Base validates :title, presence: true - validates :description, presence: true - validates :director, presence: true validates :ranking, presence: true def self.top_ten diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb index aee83d75c0..2acbfdf561 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -6,18 +6,6 @@ expect(Album.new(title: nil)).to_not be_valid end - it "must have a description" do - expect(Album.new(description: nil)).to be_invalid - end - - it "must have an artist" do - expect(Album.new(artist: nil)).to_not be_valid - end - - it "must have a ranking" do - expect(Album.new(ranking: nil)).to_not be_valid - end - it "must have a ranking of zero on creation" do expect(Album.new(ranking: 1)).to_not be_valid expect(Album.new(ranking: 0)).to be_valid From 674ec6a83cfd903c89462ea288b3a17fa7d62c72 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 14:35:19 -0800 Subject: [PATCH 24/45] Made it so that the value of ranking must be zero on creation, for album --- app/models/album.rb | 1 + spec/models/album_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/album.rb b/app/models/album.rb index 4fe93caefe..1a7b32b767 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -1,5 +1,6 @@ class Album < ActiveRecord::Base validates :title, presence: true + validates :ranking, presence: true, numericality: {equal_to: 0}, on: :create validates :ranking, presence: true def self.top_ten diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb index 2acbfdf561..bfdfe0c0b5 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -7,8 +7,8 @@ end it "must have a ranking of zero on creation" do - expect(Album.new(ranking: 1)).to_not be_valid - expect(Album.new(ranking: 0)).to be_valid + expect(Album.new(title: "t", ranking: 1)).to_not be_valid + expect(Album.new(title: "t", ranking: 0)).to be_valid end end end From d82dbaae5a75f1f30e1cc8b3f3af095266f14c89 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 14:36:14 -0800 Subject: [PATCH 25/45] Adding validations for ranking to book and movie --- app/models/book.rb | 1 + app/models/movie.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/models/book.rb b/app/models/book.rb index 2bb35b72a3..c4df02aaaf 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -1,5 +1,6 @@ class Book < ActiveRecord::Base validates :title, presence: true + validates :ranking, presence: true, numericality: {equal_to: 0}, on: :create validates :ranking, presence: true def self.top_ten diff --git a/app/models/movie.rb b/app/models/movie.rb index f1c930e482..ee8df1dbef 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,9 @@ class Movie < ActiveRecord::Base validates :title, presence: true + validates :ranking, presence: true, numericality: {equal_to: 0}, on: :create validates :ranking, presence: true + def self.top_ten Movie.order("ranking DESC").limit(10) end From d9ea6b0f0f229a8c7f170d282aa0b810571b29d5 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 15:59:03 -0800 Subject: [PATCH 26/45] Have rspec tests for getting each of the views for album --- spec/controllers/albums_controller_spec.rb | 64 ++++++++++++++++++++++ spec/models/album_spec.rb | 19 +++++++ 2 files changed, 83 insertions(+) diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb index f7363dc9fd..3bb99ddc59 100644 --- a/spec/controllers/albums_controller_spec.rb +++ b/spec/controllers/albums_controller_spec.rb @@ -1,5 +1,69 @@ require 'rails_helper' RSpec.describe AlbumsController, type: :controller do + describe "GET 'index'" do + it "is successful" do + get :index + expect(response).to have_http_status 200 + end + end + describe "GET 'new'" do + it "renders new view" do + get :new + expect(subject).to render_template :new + end + end + + describe "GET 'edit'" do + let (:edit_album) do + Album.create(title:"a", artist: "b", description: "c", ranking: 0 ) + end + + it "renders edit view" do + get :edit, id: edit_album.id + expect(subject).to render_template :edit + end + end + + + describe "GET 'show'" do + let(:show_album) do + Album.create(title:"a", artist: "b", description: "c", ranking: 0 ) + end + + it "renders the show view" do + get :show, id: show_album.id + expect(subject).to render_template :show + end + end + # + # describe "POST 'create'" do + # let(:good_params) do + # { + # post: { + # body: "Something something something" + # } + # } + # end + # + # let (:bad_params) do + # { + # post: {} + # } + # end + # + # it "redirects to index page" do + # post :create, good_params + # + # # Success case to index page + # expect(subject).to redirect_to posts_path + # end + # + # it "renders new template on error" do + # # Error case to show errors on form + # post :create, bad_params + # expect(subject).to render_template :new + # end + # end end diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb index bfdfe0c0b5..b2279e7d10 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -11,4 +11,23 @@ expect(Album.new(title: "t", ranking: 0)).to be_valid end end + + # describe "top_ten" do + # it "there are albums here" do + # expect(Album.all.length).to_not eq(0) + # end + # + # it "returns just ten records" do + # expect(Album.top_ten.length).to eq(10) + # end + # + # it "returns the highest ranked first" do + # expect(Album.top_ten.first.ranking).to eq(Album.maximum(:ranking)) + # end + # + # it "returns the lowest ranked last" do + # expect(Album.top_ten.last.ranking).to eq(Album.minimum(:ranking)) + # end + # end + end From a0c2335dd70b5c499f484f06344447c623a0255d Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 16:05:16 -0800 Subject: [PATCH 27/45] JK wave 1 wasn't done. Just made it so that album returns to new form if new album is not saved --- app/controllers/albums_controller.rb | 6 +++++- spec/controllers/albums_controller_spec.rb | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index db0996e8b2..a984e31d25 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -23,7 +23,11 @@ def create description: album_params[:album][:description], artist: album_params[:album][:artist], ranking: 0) - redirect_to album_path(@album.id) + if @album.save + redirect_to album_path(@album.id) + else + render "new" + end end def edit diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb index 3bb99ddc59..6075c6fdde 100644 --- a/spec/controllers/albums_controller_spec.rb +++ b/spec/controllers/albums_controller_spec.rb @@ -37,7 +37,12 @@ expect(subject).to render_template :show end end - # + + + describe 'upvote' do + + end + # describe "POST 'create'" do # let(:good_params) do # { From 5c2a96720786521178a6d7adfba1bedad7eb8e91 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 16:08:17 -0800 Subject: [PATCH 28/45] Made it so all objects, if not saved from new form, go back to the new form --- app/controllers/books_controller.rb | 6 +++++- app/controllers/movies_controller.rb | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 71b3486dc7..8f9cf7c184 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -22,7 +22,11 @@ def create description: book_params[:book][:description], author: book_params[:book][:author], ranking: 0) - redirect_to book_path(@book.id) + if @book.save + redirect_to book_path(@book.id) + else + render "new" + end end def edit diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 743431fbcb..a930958db8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -22,7 +22,11 @@ def create description: movie_params[:movie][:description], director: movie_params[:movie][:director], ranking: 0) - redirect_to movie_path(@movie.id) + if @movie.save + redirect_to movie_path(@movie.id) + else + render "new" + end end def edit From b512930c5910fd38f2a73745b2cd648f85b71238 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 16:13:46 -0800 Subject: [PATCH 29/45] After changing behavior on failed form submissions, I think wave 1 is finally done --- app/controllers/albums_controller.rb | 7 +++++-- app/controllers/books_controller.rb | 7 +++++-- app/controllers/movies_controller.rb | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index a984e31d25..1614e9132f 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -38,8 +38,11 @@ def edit def update id = params[:id] @album = Album.find(id) - @album.update(album_params[:album]) - redirect_to album_path(@album.id) + if @album.update(album_params[:album]) + redirect_to album_path(@album.id) + else + render "edit" + end end def destroy diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb index 8f9cf7c184..f9f9e258ab 100644 --- a/app/controllers/books_controller.rb +++ b/app/controllers/books_controller.rb @@ -37,8 +37,11 @@ def edit def update id = params[:id] @book = Book.find(id) - @book.update(book_params[:book]) - redirect_to book_path(@book.id) + if @book.update(book_params[:book]) + redirect_to book_path(@book.id) + else + render "edit" + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a930958db8..150374cf0a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -37,8 +37,11 @@ def edit def update id = params[:id] @movie = Movie.find(id) - @movie.update(movie_params[:movie]) - redirect_to movie_path(@movie.id) + if @movie.update(movie_params[:movie]) + redirect_to movie_path(@movie.id) + else + render "edit" + end end From 1f0d599d37ff6e4645ae595037360e5809729767 Mon Sep 17 00:00:00 2001 From: Dreedle Date: Tue, 1 Dec 2015 16:24:54 -0800 Subject: [PATCH 30/45] Adding simplecov --- Gemfile | 1 + Gemfile.lock | 7 + coverage/.last_run.json | 5 + coverage/.resultset.json | 292 +++ coverage/.resultset.json.lock | 0 coverage/assets/0.10.0/application.css | 799 ++++++ coverage/assets/0.10.0/application.js | 1707 ++++++++++++ coverage/assets/0.10.0/colorbox/border.png | Bin 0 -> 163 bytes coverage/assets/0.10.0/colorbox/controls.png | Bin 0 -> 2033 bytes coverage/assets/0.10.0/colorbox/loading.gif | Bin 0 -> 9427 bytes .../0.10.0/colorbox/loading_background.png | Bin 0 -> 166 bytes coverage/assets/0.10.0/favicon_green.png | Bin 0 -> 1009 bytes coverage/assets/0.10.0/favicon_red.png | Bin 0 -> 1009 bytes coverage/assets/0.10.0/favicon_yellow.png | Bin 0 -> 1009 bytes coverage/assets/0.10.0/loading.gif | Bin 0 -> 7247 bytes coverage/assets/0.10.0/magnify.png | Bin 0 -> 1301 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes coverage/index.html | 2305 +++++++++++++++++ spec/spec_helper.rb | 2 + 31 files changed, 5118 insertions(+) create mode 100644 coverage/.last_run.json create mode 100644 coverage/.resultset.json create mode 100644 coverage/.resultset.json.lock create mode 100644 coverage/assets/0.10.0/application.css create mode 100644 coverage/assets/0.10.0/application.js create mode 100644 coverage/assets/0.10.0/colorbox/border.png create mode 100644 coverage/assets/0.10.0/colorbox/controls.png create mode 100644 coverage/assets/0.10.0/colorbox/loading.gif create mode 100644 coverage/assets/0.10.0/colorbox/loading_background.png create mode 100644 coverage/assets/0.10.0/favicon_green.png create mode 100644 coverage/assets/0.10.0/favicon_red.png create mode 100644 coverage/assets/0.10.0/favicon_yellow.png create mode 100644 coverage/assets/0.10.0/loading.gif create mode 100644 coverage/assets/0.10.0/magnify.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png create mode 100644 coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png create mode 100644 coverage/index.html diff --git a/Gemfile b/Gemfile index b6b881f2e8..ad6f24f696 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ group :development, :test do gem 'better_errors' gem 'binding_of_caller' gem 'rspec-rails' + gem 'simplecov' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index b9398b3099..87c305553d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM coffee-script-source (1.10.0) debug_inspector (0.0.2) diff-lcs (1.2.5) + docile (1.1.5) erubis (2.7.0) execjs (2.6.0) globalid (0.3.6) @@ -142,6 +143,11 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + simplecov (0.11.0) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) spring (1.5.0) sprockets (3.4.1) rack (> 1, < 3) @@ -182,6 +188,7 @@ DEPENDENCIES rspec-rails sass-rails (~> 5.0) sdoc (~> 0.4.0) + simplecov spring sqlite3 turbolinks diff --git a/coverage/.last_run.json b/coverage/.last_run.json new file mode 100644 index 0000000000..b297678d8e --- /dev/null +++ b/coverage/.last_run.json @@ -0,0 +1,5 @@ +{ + "result": { + "covered_percent": 51.45 + } +} diff --git a/coverage/.resultset.json b/coverage/.resultset.json new file mode 100644 index 0000000000..40dd4f4a14 --- /dev/null +++ b/coverage/.resultset.json @@ -0,0 +1,292 @@ +{ + "RSpec": { + "coverage": { + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/helpers/albums_helper.rb": [ + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/helpers/application_helper.rb": [ + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/helpers/books_helper.rb": [ + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/helpers/home_helper.rb": [ + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/helpers/movies_helper.rb": [ + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/controllers/albums_controller.rb": [ + 1, + null, + 1, + 1, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + 1, + 1, + null, + null, + 1, + 1, + null, + null, + 1, + 0, + null, + null, + null, + 0, + 0, + null, + 0, + null, + null, + null, + 1, + 1, + 1, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/controllers/application_controller.rb": [ + 1, + null, + null, + 1, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/controllers/books_controller.rb": [ + 1, + 1, + 0, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + null, + 0, + 0, + null, + 0, + null, + null, + null, + 1, + 0, + 0, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + null, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/controllers/home_controller.rb": [ + 1, + 1, + 1, + 1, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/controllers/movies_controller.rb": [ + 1, + 1, + 0, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + null, + 0, + 0, + null, + 0, + null, + null, + null, + 1, + 0, + 0, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + null, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/models/album.rb": [ + 1, + 1, + 1, + 1, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/models/book.rb": [ + 1, + 1, + 1, + 1, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + null + ], + "/Users/Audrey/Google Drive/Ada/project_forks/MediaRanker/app/models/movie.rb": [ + 1, + 1, + 1, + 1, + null, + null, + 1, + 0, + null, + null, + 1, + 0, + null, + null, + null + ] + }, + "timestamp": 1449015542 + } +} diff --git a/coverage/.resultset.json.lock b/coverage/.resultset.json.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/coverage/assets/0.10.0/application.css b/coverage/assets/0.10.0/application.css new file mode 100644 index 0000000000..d86560434d --- /dev/null +++ b/coverage/assets/0.10.0/application.css @@ -0,0 +1,799 @@ +/* ----------------------------------------------------------------------- + + + Blueprint CSS Framework 0.9 + http://blueprintcss.org + + * Copyright (c) 2007-Present. See LICENSE for more info. + * See README for instructions on how to use Blueprint. + * For credits and origins, see AUTHORS. + * This is a compressed file. See the sources in the 'src' directory. + +----------------------------------------------------------------------- */ + +/* reset.css */ + +html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} +article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;} +body {line-height:1.5;} +table {border-collapse:separate;border-spacing:0;} +caption, th, td {text-align:left;font-weight:normal;} +table, td, th {vertical-align:middle;} +blockquote:before, blockquote:after, q:before, q:after {content:"";} +blockquote, q {quotes:"" "";} +a img {border:none;} + +/* typography.css */ +html {font-size:100.01%;} +body {font-size:82%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} +h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} +h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} +h2 {font-size:2em;margin-bottom:0.75em;} +h3 {font-size:1.5em;line-height:1;margin-bottom:1em;} +h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} +h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} +h6 {font-size:1em;font-weight:bold;} +h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} +p {margin:0 0 1.5em;} +p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;} +p img.right {float:right;margin:1.5em 0 1.5em 1.5em;} +a:focus, a:hover {color:#000;} +a {color:#009;text-decoration:underline;} +blockquote {margin:1.5em;color:#666;font-style:italic;} +strong {font-weight:bold;} +em, dfn {font-style:italic;} +dfn {font-weight:bold;} +sup, sub {line-height:0;} +abbr, acronym {border-bottom:1px dotted #666;} +address {margin:0 0 1.5em;font-style:italic;} +del {color:#666;} +pre {margin:1.5em 0;white-space:pre;} +pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} +li ul, li ol {margin:0;} +ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;} +ul {list-style-type:disc;} +ol {list-style-type:decimal;} +dl {margin:0 0 1.5em 0;} +dl dt {font-weight:bold;} +dd {margin-left:1.5em;} +table {margin-bottom:1.4em;width:100%;} +th {font-weight:bold;} +thead th {background:#c3d9ff;} +th, td, caption {padding:4px 10px 4px 5px;} +tr.even td {background:#efefef;} +tfoot {font-style:italic;} +caption {background:#eee;} +.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} +.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} +.hide {display:none;} +.quiet {color:#666;} +.loud {color:#000;} +.highlight {background:#ff0;} +.added {background:#060;color:#fff;} +.removed {background:#900;color:#fff;} +.first {margin-left:0;padding-left:0;} +.last {margin-right:0;padding-right:0;} +.top {margin-top:0;padding-top:0;} +.bottom {margin-bottom:0;padding-bottom:0;} + +/* forms.css */ +label {font-weight:bold;} +fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} +legend {font-weight:bold;font-size:1.2em;} +input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;} +input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;} +input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} +input.text, input.title {width:300px;padding:5px;} +input.title {font-size:1.5em;} +textarea {width:390px;height:250px;padding:5px;} +input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;} +form.inline {line-height:3;} +form.inline p {margin-bottom:0;} +.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;} +.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} +.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} +.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} +.error a {color:#8a1f11;} +.notice a {color:#514721;} +.success a {color:#264409;} +.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;} +hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;} +hr.space {background:#fff;color:#fff;visibility:hidden;} +.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} +.clearfix, .container {display:block;} +.clear {clear:both;} +/* +github.com style (c) Vasily Polovnyov +*/ + + +pre code { +} + +pre .comment, +pre .template_comment, +pre .diff .header, +pre .javadoc { + color: #998; + font-style: italic +} + +pre .keyword, +pre .css .rule .keyword, +pre .winutils, +pre .javascript .title, +pre .lisp .title { + color: #000; + font-weight: bold +} + +pre .number, +pre .hexcolor { + color: #458 +} + + +pre .string, +pre .tag .value, +pre .phpdoc, +pre .tex .formula { + color: #d14 +} + +pre .subst { + color: #712; +} + +pre .constant, +pre .title, +pre .id { + color: #900; + font-weight: bold +} + +pre .javascript .title, +pre .lisp .title, +pre .subst { + font-weight: normal +} + +pre .class .title, +pre .haskell .label, +pre .tex .command { + color: #458; + font-weight: bold +} + +pre .tag, +pre .tag .title, +pre .rules .property, +pre .django .tag .keyword { + color: #000080; + font-weight: normal +} + +pre .attribute, +pre .variable, +pre .instancevar, +pre .lisp .body { + color: #008080 +} + +pre .regexp { + color: #009926 +} + +pre .class { + color: #458; + font-weight: bold +} + +pre .symbol, +pre .ruby .symbol .string, +pre .ruby .symbol .keyword, +pre .ruby .symbol .keymethods, +pre .lisp .keyword, +pre .tex .special, +pre .input_number { + color: #990073 +} + +pre .builtin, +pre .built_in, +pre .lisp .title { + color: #0086b3 +} + +pre .preprocessor, +pre .pi, +pre .doctype, +pre .shebang, +pre .cdata { + color: #999; + font-weight: bold +} + +pre .deletion { + background: #fdd +} + +pre .addition { + background: #dfd +} + +pre .diff .change { + background: #0086b3 +} + +pre .chunk { + color: #aaa +} + +pre .tex .formula { + opacity: 0.5; +} +/* + * jQuery UI CSS Framework @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ + +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } +/* + ColorBox Core Style: + The following CSS is consistent between example themes and should not be altered. +*/ +#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} +#cboxOverlay{position:fixed; width:100%; height:100%;} +#cboxMiddleLeft, #cboxBottomLeft{clear:left;} +#cboxContent{position:relative;} +#cboxLoadedContent{overflow:auto;} +#cboxTitle{margin:0;} +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} +#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} +.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;} +.cboxIframe{width:100%; height:100%; display:block; border:0;} +#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;} + +/* + User Style: + Change the following styles to modify the appearance of ColorBox. They are + ordered & tabbed in a way that represents the nesting of the generated HTML. +*/ +#cboxOverlay{background:#000;} +#colorbox{} + #cboxTopLeft{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat 0 0;} + #cboxTopCenter{height:14px; background:url(colorbox/border.png) repeat-x top left;} + #cboxTopRight{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat -36px 0;} + #cboxBottomLeft{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat 0 -32px;} + #cboxBottomCenter{height:43px; background:url(colorbox/border.png) repeat-x bottom left;} + #cboxBottomRight{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat -36px -32px;} + #cboxMiddleLeft{width:14px; background:url(colorbox/controls.png) repeat-y -175px 0;} + #cboxMiddleRight{width:14px; background:url(colorbox/controls.png) repeat-y -211px 0;} + #cboxContent{background:#fff; overflow:visible;} + .cboxIframe{background:#fff;} + #cboxError{padding:50px; border:1px solid #ccc;} + #cboxLoadedContent{margin-bottom:5px;} + #cboxLoadingOverlay{background:url(colorbox/loading_background.png) no-repeat center center;} + #cboxLoadingGraphic{background:url(colorbox/loading.gif) no-repeat center center;} + #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;} + #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;} + + #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(colorbox/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;} + #cboxPrevious{left:0px; background-position: -51px -25px;} + #cboxPrevious:hover{background-position:-51px 0px;} + #cboxNext{left:27px; background-position:-75px -25px;} + #cboxNext:hover{background-position:-75px 0px;} + #cboxClose{right:0; background-position:-100px -25px;} + #cboxClose:hover{background-position:-100px 0px;} + + .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;} + .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;} + .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;} + .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;} +#loading { + position: fixed; + left: 40%; + top: 50%; } + +a { + color: #333333; + text-decoration: none; } + a:hover { + color: black; + text-decoration: underline; } + +body { + font-family: "Lucida Grande", Helvetica, "Helvetica Neue", Arial, sans-serif; + padding: 12px; + background-color: #333333; } + +h1, h2, h3, h4 { + color: #1c2324; + margin: 0; + padding: 0; + margin-bottom: 12px; } + +table { + width: 100%; } + +#content { + clear: left; + background-color: white; + border: 2px solid #dddddd; + border-top: 8px solid #dddddd; + padding: 18px; + -webkit-border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + -moz-border-radius-topright: 5px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; } + +.dataTables_filter, .dataTables_info { + padding: 2px 6px; } + +abbr.timeago { + text-decoration: none; + border: none; + font-weight: bold; } + +.timestamp { + float: right; + color: #dddddd; } + +.group_tabs { + list-style: none; + float: left; + margin: 0; + padding: 0; } + .group_tabs li { + display: inline; + float: left; } + .group_tabs li a { + font-family: Helvetica, Arial, sans-serif; + display: block; + float: left; + text-decoration: none; + padding: 4px 8px; + background-color: #aaaaaa; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dddddd), to(#aaaaaa)); + background: -moz-linear-gradient(#dddddd, #aaaaaa); + background: linear-gradient(#dddddd, #aaaaaa); + text-shadow: #e5e5e5 1px 1px 0px; + border-bottom: none; + color: #333333; + font-weight: bold; + margin-right: 8px; + border-top: 1px solid #efefef; + -webkit-border-top-left-radius: 2px; + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topleft: 2px; + -moz-border-radius-topright: 2px; + border-top-left-radius: 2px; + border-top-right-radius: 2px; } + .group_tabs li a:hover { + background-color: #cccccc; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#eeeeee), to(#aaaaaa)); + background: -moz-linear-gradient(#eeeeee, #aaaaaa); + background: linear-gradient(#eeeeee, #aaaaaa); } + .group_tabs li a:active { + padding-top: 5px; + padding-bottom: 3px; } + .group_tabs li.active a { + color: black; + text-shadow: white 1px 1px 0px; + background-color: #dddddd; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(white), to(#dddddd)); + background: -moz-linear-gradient(white, #dddddd); + background: linear-gradient(white, #dddddd); } + +.file_list { + margin-bottom: 18px; } + +a.src_link { + background: url("./magnify.png") no-repeat left 50%; + padding-left: 18px; } + +tr, td { + margin: 0; + padding: 0; } + +th { + white-space: nowrap; } + th.ui-state-default { + cursor: pointer; } + th span.ui-icon { + float: left; } + +td { + padding: 4px 8px; } + td.strong { + font-weight: bold; } + +.source_table h3, .source_table h4 { + padding: 0; + margin: 0; + margin-bottom: 4px; } +.source_table .header { + padding: 10px; } +.source_table pre { + margin: 0; + padding: 0; + white-space: normal; + color: black; + font-family: "Monaco", "Inconsolata", "Consolas", monospace; } +.source_table code { + color: black; + font-family: "Monaco", "Inconsolata", "Consolas", monospace; } +.source_table pre { + background-color: #333333; } + .source_table pre ol { + margin: 0px; + padding: 0px; + margin-left: 45px; + font-size: 12px; + color: white; } + .source_table pre li { + margin: 0px; + padding: 2px 6px; + border-left: 5px solid white; } + .source_table pre li code { + white-space: pre; + white-space: pre-wrap; } + .source_table pre .hits { + float: right; + margin-left: 10px; + padding: 2px 4px; + background-color: #444444; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#222222), to(#666666)); + background: -moz-linear-gradient(#222222, #666666); + background: linear-gradient(#222222, #666666); + color: white; + font-family: Helvetica, "Helvetica Neue", Arial, sans-serif; + font-size: 10px; + font-weight: bold; + text-align: center; + border-radius: 6px; } + +#footer { + color: #dddddd; + font-size: 12px; + font-weight: bold; + margin-top: 12px; + text-align: right; } + #footer a { + color: #eeeeee; + text-decoration: underline; } + #footer a:hover { + color: white; + text-decoration: none; } + +.green { + color: #009900; } + +.red { + color: #990000; } + +.yellow { + color: #ddaa00; } + +.source_table .covered { + border-color: #009900; } +.source_table .missed { + border-color: #990000; } +.source_table .never { + border-color: black; } +.source_table .skipped { + border-color: #ffcc00; } +.source_table .covered:nth-child(odd) { + background-color: #cdf2cd; } +.source_table .covered:nth-child(even) { + background-color: #dbf2db; } +.source_table .missed:nth-child(odd) { + background-color: #f7c0c0; } +.source_table .missed:nth-child(even) { + background-color: #f7cfcf; } +.source_table .never:nth-child(odd) { + background-color: #efefef; } +.source_table .never:nth-child(even) { + background-color: #f4f4f4; } +.source_table .skipped:nth-child(odd) { + background-color: #fbf0c0; } +.source_table .skipped:nth-child(even) { + background-color: #fbffcf; } + + + diff --git a/coverage/assets/0.10.0/application.js b/coverage/assets/0.10.0/application.js new file mode 100644 index 0000000000..fe65d88219 --- /dev/null +++ b/coverage/assets/0.10.0/application.js @@ -0,0 +1,1707 @@ +/*! + * jQuery JavaScript Library v1.6.2 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu Jun 30 14:16:56 2011 -0400 + */ + +(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i. +shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j +)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); +var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/"}while(x.length||y.length){var u=t().splice(0,1)[0];v+=l(w.substr(q,u.offset-q));q=u.offset;if(u.event=="start"){v+=r(u.node);s.push(u.node)}else{if(u.event=="stop"){var p=s.length;do{p--;var o=s[p];v+=("")}while(o!=u.node);s.splice(p,1);while(p'+l(K[0])+""}else{M+=l(K[0])}O=N.lR.lastIndex;K=N.lR.exec(L)}M+=l(L.substr(O,L.length-O));return M}function J(r,L){if(L.sL&&d[L.sL]){var K=f(L.sL,r);s+=K.keyword_count;return K.value}else{return E(r,L)}}function H(L,r){var K=L.cN?'':"";if(L.rB){p+=K;L.buffer=""}else{if(L.eB){p+=l(r)+K;L.buffer=""}else{p+=K;L.buffer=r}}B.push(L);A+=L.r}function D(N,K,P){var Q=B[B.length-1];if(P){p+=J(Q.buffer+N,Q);return false}var L=y(K,Q);if(L){p+=J(Q.buffer+N,Q);H(L,K);return L.rB}var r=v(B.length-1,K);if(r){var M=Q.cN?"":"";if(Q.rE){p+=J(Q.buffer+N,Q)+M}else{if(Q.eE){p+=J(Q.buffer+N,Q)+M+l(K)}else{p+=J(Q.buffer+N+K,Q)+M}}while(r>1){M=B[B.length-2].cN?"":"";p+=M;r--;B.length--}var O=B[B.length-1];B.length--;B[B.length-1].buffer="";if(O.starts){H(O.starts,"")}return Q.rE}if(w(K,Q)){throw"Illegal"}}var G=d[I];var B=[G.dM];var A=0;var s=0;var p="";try{var u=0;G.dM.buffer="";do{var x=q(C,u);var t=D(x[0],x[1],x[2]);u+=x[0].length;if(!t){u+=x[1].length}}while(!x[2]);if(B.length>1){throw"Illegal"}return{language:I,r:A,keyword_count:s,value:p}}catch(F){if(F=="Illegal"){return{language:null,r:0,keyword_count:0,value:l(C)}}else{throw F}}}function h(){function o(t,s,u){if(t.compiled){return}if(!u){t.bR=c(s,t.b?t.b:"\\B|\\b");if(!t.e&&!t.eW){t.e="\\B|\\b"}if(t.e){t.eR=c(s,t.e)}}if(t.i){t.iR=c(s,t.i)}if(t.r==undefined){t.r=1}if(t.k){t.lR=c(s,t.l||hljs.IR,true)}for(var r in t.k){if(!t.k.hasOwnProperty(r)){continue}if(t.k[r] instanceof Object){t.kG=t.k}else{t.kG={keyword:t.k}}break}if(!t.c){t.c=[]}t.compiled=true;for(var q=0;qx.keyword_count+x.r){x=u}if(u.keyword_count+u.r>w.keyword_count+w.r){x=w;w=u}}}var s=t.className;if(!s.match(w.language)){s=s?(s+" "+w.language):w.language}var o=b(t);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=k(o,b(q),A)}if(y){w.value=w.value.replace(/^((<[^>]+>|\t)+)/gm,function(B,E,D,C){return E.replace(/\t/g,y)})}if(p){w.value=w.value.replace(/\n/g,"
")}if(/MSIE [678]/.test(navigator.userAgent)&&t.tagName=="CODE"&&t.parentNode.tagName=="PRE"){var q=t.parentNode;var v=document.createElement("div");v.innerHTML="
"+w.value+"
";t=v.firstChild.firstChild;v.firstChild.cN=q.cN;q.parentNode.replaceChild(v.firstChild,q)}else{t.innerHTML=w.value}t.className=s;t.dataset={};t.dataset.result={language:w.language,kw:w.keyword_count,re:w.r};if(x&&x.language){t.dataset.second_best={language:x.language,kw:x.keyword_count,re:x.r}}}function j(){if(j.called){return}j.called=true;e();var q=document.getElementsByTagName("pre");for(var o=0;o|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\.",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.inherit=function(o,r){var q={};for(var p in o){q[p]=o[p]}if(r){for(var p in r){q[p]=r[p]}}return q}}();hljs.LANGUAGES.ruby=function(){var g="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var a="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var n={keyword:{and:1,"false":1,then:1,defined:1,module:1,"in":1,"return":1,redo:1,"if":1,BEGIN:1,retry:1,end:1,"for":1,"true":1,self:1,when:1,next:1,until:1,"do":1,begin:1,unless:1,END:1,rescue:1,nil:1,"else":1,"break":1,undef:1,not:1,"super":1,"class":1,"case":1,require:1,yield:1,alias:1,"while":1,ensure:1,elsif:1,or:1,def:1},keymethods:{__id__:1,__send__:1,abort:1,abs:1,"all?":1,allocate:1,ancestors:1,"any?":1,arity:1,assoc:1,at:1,at_exit:1,autoload:1,"autoload?":1,"between?":1,binding:1,binmode:1,"block_given?":1,call:1,callcc:1,caller:1,capitalize:1,"capitalize!":1,casecmp:1,"catch":1,ceil:1,center:1,chomp:1,"chomp!":1,chop:1,"chop!":1,chr:1,"class":1,class_eval:1,"class_variable_defined?":1,class_variables:1,clear:1,clone:1,close:1,close_read:1,close_write:1,"closed?":1,coerce:1,collect:1,"collect!":1,compact:1,"compact!":1,concat:1,"const_defined?":1,const_get:1,const_missing:1,const_set:1,constants:1,count:1,crypt:1,"default":1,default_proc:1,"delete":1,"delete!":1,delete_at:1,delete_if:1,detect:1,display:1,div:1,divmod:1,downcase:1,"downcase!":1,downto:1,dump:1,dup:1,each:1,each_byte:1,each_index:1,each_key:1,each_line:1,each_pair:1,each_value:1,each_with_index:1,"empty?":1,entries:1,eof:1,"eof?":1,"eql?":1,"equal?":1,"eval":1,exec:1,exit:1,"exit!":1,extend:1,fail:1,fcntl:1,fetch:1,fileno:1,fill:1,find:1,find_all:1,first:1,flatten:1,"flatten!":1,floor:1,flush:1,for_fd:1,foreach:1,fork:1,format:1,freeze:1,"frozen?":1,fsync:1,getc:1,gets:1,global_variables:1,grep:1,gsub:1,"gsub!":1,"has_key?":1,"has_value?":1,hash:1,hex:1,id:1,include:1,"include?":1,included_modules:1,index:1,indexes:1,indices:1,induced_from:1,inject:1,insert:1,inspect:1,instance_eval:1,instance_method:1,instance_methods:1,"instance_of?":1,"instance_variable_defined?":1,instance_variable_get:1,instance_variable_set:1,instance_variables:1,"integer?":1,intern:1,invert:1,ioctl:1,"is_a?":1,isatty:1,"iterator?":1,join:1,"key?":1,keys:1,"kind_of?":1,lambda:1,last:1,length:1,lineno:1,ljust:1,load:1,local_variables:1,loop:1,lstrip:1,"lstrip!":1,map:1,"map!":1,match:1,max:1,"member?":1,merge:1,"merge!":1,method:1,"method_defined?":1,method_missing:1,methods:1,min:1,module_eval:1,modulo:1,name:1,nesting:1,"new":1,next:1,"next!":1,"nil?":1,nitems:1,"nonzero?":1,object_id:1,oct:1,open:1,pack:1,partition:1,pid:1,pipe:1,pop:1,popen:1,pos:1,prec:1,prec_f:1,prec_i:1,print:1,printf:1,private_class_method:1,private_instance_methods:1,"private_method_defined?":1,private_methods:1,proc:1,protected_instance_methods:1,"protected_method_defined?":1,protected_methods:1,public_class_method:1,public_instance_methods:1,"public_method_defined?":1,public_methods:1,push:1,putc:1,puts:1,quo:1,raise:1,rand:1,rassoc:1,read:1,read_nonblock:1,readchar:1,readline:1,readlines:1,readpartial:1,rehash:1,reject:1,"reject!":1,remainder:1,reopen:1,replace:1,require:1,"respond_to?":1,reverse:1,"reverse!":1,reverse_each:1,rewind:1,rindex:1,rjust:1,round:1,rstrip:1,"rstrip!":1,scan:1,seek:1,select:1,send:1,set_trace_func:1,shift:1,singleton_method_added:1,singleton_methods:1,size:1,sleep:1,slice:1,"slice!":1,sort:1,"sort!":1,sort_by:1,split:1,sprintf:1,squeeze:1,"squeeze!":1,srand:1,stat:1,step:1,store:1,strip:1,"strip!":1,sub:1,"sub!":1,succ:1,"succ!":1,sum:1,superclass:1,swapcase:1,"swapcase!":1,sync:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,taint:1,"tainted?":1,tell:1,test:1,"throw":1,times:1,to_a:1,to_ary:1,to_f:1,to_hash:1,to_i:1,to_int:1,to_io:1,to_proc:1,to_s:1,to_str:1,to_sym:1,tr:1,"tr!":1,tr_s:1,"tr_s!":1,trace_var:1,transpose:1,trap:1,truncate:1,"tty?":1,type:1,ungetc:1,uniq:1,"uniq!":1,unpack:1,unshift:1,untaint:1,untrace_var:1,upcase:1,"upcase!":1,update:1,upto:1,"value?":1,values:1,values_at:1,warn:1,write:1,write_nonblock:1,"zero?":1,zip:1}};var h={cN:"yardoctag",b:"@[A-Za-z]+"};var d={cN:"comment",b:"#",e:"$",c:[h]};var c={cN:"comment",b:"^\\=begin",e:"^\\=end",c:[h],r:10};var b={cN:"comment",b:"^__END__",e:"\\n$"};var u={cN:"subst",b:"#\\{",e:"}",l:g,k:n};var p=[hljs.BE,u];var s={cN:"string",b:"'",e:"'",c:p,r:0};var r={cN:"string",b:'"',e:'"',c:p,r:0};var q={cN:"string",b:"%[qw]?\\(",e:"\\)",c:p,r:10};var o={cN:"string",b:"%[qw]?\\[",e:"\\]",c:p,r:10};var m={cN:"string",b:"%[qw]?{",e:"}",c:p,r:10};var l={cN:"string",b:"%[qw]?<",e:">",c:p,r:10};var k={cN:"string",b:"%[qw]?/",e:"/",c:p,r:10};var j={cN:"string",b:"%[qw]?%",e:"%",c:p,r:10};var i={cN:"string",b:"%[qw]?-",e:"-",c:p,r:10};var t={cN:"string",b:"%[qw]?\\|",e:"\\|",c:p,r:10};var e={cN:"function",b:"\\bdef\\s+",e:" |$|;",l:g,k:n,c:[{cN:"title",b:a,l:g,k:n},{cN:"params",b:"\\(",e:"\\)",l:g,k:n},d,c,b]};var f={cN:"identifier",b:g,l:g,k:n,r:0};var v=[d,c,b,s,r,q,o,m,l,k,j,i,t,{cN:"class",b:"\\b(class|module)\\b",e:"$|;",k:{"class":1,module:1},c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+hljs.IR+"::)?"+hljs.IR}]},d,c,b]},e,{cN:"constant",b:"(::)?([A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[s,r,q,o,m,l,k,j,i,t,f],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},f,{b:"("+hljs.RSR+")\\s*",c:[d,c,b,{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[hljs.BE]}],r:0}];u.c=v;e.c[1].c=v;return{dM:{l:g,k:n,c:v}}}(); +/*! + Colorbox v1.5.13 - 2014-08-04 + jQuery lightbox and modal window plugin + (c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox + license: http://www.opensource.org/licenses/mit-license.php + */ + +(function ($, document, window) { + var + // Default settings object. + // See http://jacklmoore.com/colorbox for details. + defaults = { + // data sources + html: false, + photo: false, + iframe: false, + inline: false, + + // behavior and appearance + transition: "elastic", + speed: 300, + fadeOut: 300, + width: false, + initialWidth: "600", + innerWidth: false, + maxWidth: false, + height: false, + initialHeight: "450", + innerHeight: false, + maxHeight: false, + scalePhotos: true, + scrolling: true, + opacity: 0.9, + preloading: true, + className: false, + overlayClose: true, + escKey: true, + arrowKey: true, + top: false, + bottom: false, + left: false, + right: false, + fixed: false, + data: undefined, + closeButton: true, + fastIframe: true, + open: false, + reposition: true, + loop: true, + slideshow: false, + slideshowAuto: true, + slideshowSpeed: 2500, + slideshowStart: "start slideshow", + slideshowStop: "stop slideshow", + photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i, + + // alternate image paths for high-res displays + retinaImage: false, + retinaUrl: false, + retinaSuffix: '@2x.$1', + + // internationalization + current: "image {current} of {total}", + previous: "previous", + next: "next", + close: "close", + xhrError: "This content failed to load.", + imgError: "This image failed to load.", + + // accessbility + returnFocus: true, + trapFocus: true, + + // callbacks + onOpen: false, + onLoad: false, + onComplete: false, + onCleanup: false, + onClosed: false, + + rel: function() { + return this.rel; + }, + href: function() { + // using this.href would give the absolute url, when the href may have been inteded as a selector (e.g. '#container') + return $(this).attr('href'); + }, + title: function() { + return this.title; + } + }, + + // Abstracting the HTML and event identifiers for easy rebranding + colorbox = 'colorbox', + prefix = 'cbox', + boxElement = prefix + 'Element', + + // Events + event_open = prefix + '_open', + event_load = prefix + '_load', + event_complete = prefix + '_complete', + event_cleanup = prefix + '_cleanup', + event_closed = prefix + '_closed', + event_purge = prefix + '_purge', + + // Cached jQuery Object Variables + $overlay, + $box, + $wrap, + $content, + $topBorder, + $leftBorder, + $rightBorder, + $bottomBorder, + $related, + $window, + $loaded, + $loadingBay, + $loadingOverlay, + $title, + $current, + $slideshow, + $next, + $prev, + $close, + $groupControls, + $events = $(''), // $({}) would be prefered, but there is an issue with jQuery 1.4.2 + + // Variables for cached values or use across multiple functions + settings, + interfaceHeight, + interfaceWidth, + loadedHeight, + loadedWidth, + index, + photo, + open, + active, + closing, + loadingTimer, + publicMethod, + div = "div", + requests = 0, + previousCSS = {}, + init; + + // **************** + // HELPER FUNCTIONS + // **************** + + // Convenience function for creating new jQuery objects + function $tag(tag, id, css) { + var element = document.createElement(tag); + + if (id) { + element.id = prefix + id; + } + + if (css) { + element.style.cssText = css; + } + + return $(element); + } + + // Get the window height using innerHeight when available to avoid an issue with iOS + // http://bugs.jquery.com/ticket/6724 + function winheight() { + return window.innerHeight ? window.innerHeight : $(window).height(); + } + + function Settings(element, options) { + if (options !== Object(options)) { + options = {}; + } + + this.cache = {}; + this.el = element; + + this.value = function(key) { + var dataAttr; + + if (this.cache[key] === undefined) { + dataAttr = $(this.el).attr('data-cbox-'+key); + + if (dataAttr !== undefined) { + this.cache[key] = dataAttr; + } else if (options[key] !== undefined) { + this.cache[key] = options[key]; + } else if (defaults[key] !== undefined) { + this.cache[key] = defaults[key]; + } + } + + return this.cache[key]; + }; + + this.get = function(key) { + var value = this.value(key); + return $.isFunction(value) ? value.call(this.el, this) : value; + }; + } + + // Determine the next and previous members in a group. + function getIndex(increment) { + var + max = $related.length, + newIndex = (index + increment) % max; + + return (newIndex < 0) ? max + newIndex : newIndex; + } + + // Convert '%' and 'px' values to integers + function setSize(size, dimension) { + return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10)); + } + + // Checks an href to see if it is a photo. + // There is a force photo option (photo: true) for hrefs that cannot be matched by the regex. + function isImage(settings, url) { + return settings.get('photo') || settings.get('photoRegex').test(url); + } + + function retinaUrl(settings, url) { + return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url; + } + + function trapFocus(e) { + if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) { + e.stopPropagation(); + $box.focus(); + } + } + + function setClass(str) { + if (setClass.str !== str) { + $box.add($overlay).removeClass(setClass.str).addClass(str); + setClass.str = str; + } + } + + function getRelated(rel) { + index = 0; + + if (rel && rel !== false && rel !== 'nofollow') { + $related = $('.' + boxElement).filter(function () { + var options = $.data(this, colorbox); + var settings = new Settings(this, options); + return (settings.get('rel') === rel); + }); + index = $related.index(settings.el); + + // Check direct calls to Colorbox. + if (index === -1) { + $related = $related.add(settings.el); + index = $related.length - 1; + } + } else { + $related = $(settings.el); + } + } + + function trigger(event) { + // for external use + $(document).trigger(event); + // for internal use + $events.triggerHandler(event); + } + + var slideshow = (function(){ + var active, + className = prefix + "Slideshow_", + click = "click." + prefix, + timeOut; + + function clear () { + clearTimeout(timeOut); + } + + function set() { + if (settings.get('loop') || $related[index + 1]) { + clear(); + timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed')); + } + } + + function start() { + $slideshow + .html(settings.get('slideshowStop')) + .unbind(click) + .one(click, stop); + + $events + .bind(event_complete, set) + .bind(event_load, clear); + + $box.removeClass(className + "off").addClass(className + "on"); + } + + function stop() { + clear(); + + $events + .unbind(event_complete, set) + .unbind(event_load, clear); + + $slideshow + .html(settings.get('slideshowStart')) + .unbind(click) + .one(click, function () { + publicMethod.next(); + start(); + }); + + $box.removeClass(className + "on").addClass(className + "off"); + } + + function reset() { + active = false; + $slideshow.hide(); + clear(); + $events + .unbind(event_complete, set) + .unbind(event_load, clear); + $box.removeClass(className + "off " + className + "on"); + } + + return function(){ + if (active) { + if (!settings.get('slideshow')) { + $events.unbind(event_cleanup, reset); + reset(); + } + } else { + if (settings.get('slideshow') && $related[1]) { + active = true; + $events.one(event_cleanup, reset); + if (settings.get('slideshowAuto')) { + start(); + } else { + stop(); + } + $slideshow.show(); + } + } + }; + + }()); + + + function launch(element) { + var options; + + if (!closing) { + + options = $(element).data(colorbox); + + settings = new Settings(element, options); + + getRelated(settings.get('rel')); + + if (!open) { + open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. + + setClass(settings.get('className')); + + // Show colorbox so the sizes can be calculated in older versions of jQuery + $box.css({visibility:'hidden', display:'block', opacity:''}); + + $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden'); + $content.css({width:'', height:''}).append($loaded); + + // Cache values needed for size calculations + interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height(); + interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); + loadedHeight = $loaded.outerHeight(true); + loadedWidth = $loaded.outerWidth(true); + + // Opens inital empty Colorbox prior to content being loaded. + var initialWidth = setSize(settings.get('initialWidth'), 'x'); + var initialHeight = setSize(settings.get('initialHeight'), 'y'); + var maxWidth = settings.get('maxWidth'); + var maxHeight = settings.get('maxHeight'); + + settings.w = (maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth; + settings.h = (maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight; + + $loaded.css({width:'', height:settings.h}); + publicMethod.position(); + + trigger(event_open); + settings.get('onOpen'); + + $groupControls.add($title).hide(); + + $box.focus(); + + if (settings.get('trapFocus')) { + // Confine focus to the modal + // Uses event capturing that is not supported in IE8- + if (document.addEventListener) { + + document.addEventListener('focus', trapFocus, true); + + $events.one(event_closed, function () { + document.removeEventListener('focus', trapFocus, true); + }); + } + } + + // Return focus on closing + if (settings.get('returnFocus')) { + $events.one(event_closed, function () { + $(settings.el).focus(); + }); + } + } + + var opacity = parseFloat(settings.get('opacity')); + $overlay.css({ + opacity: opacity === opacity ? opacity : '', + cursor: settings.get('overlayClose') ? 'pointer' : '', + visibility: 'visible' + }).show(); + + if (settings.get('closeButton')) { + $close.html(settings.get('close')).appendTo($content); + } else { + $close.appendTo('
'); // replace with .detach() when dropping jQuery < 1.4 + } + + load(); + } + } + + // Colorbox's markup needs to be added to the DOM prior to being called + // so that the browser will go ahead and load the CSS background images. + function appendHTML() { + if (!$box && document.body) { + init = false; + $window = $(window); + $box = $tag(div).attr({ + id: colorbox, + 'class': $.support.opacity === false ? prefix + 'IE' : '', // class for optional IE8 & lower targeted CSS. + role: 'dialog', + tabindex: '-1' + }).hide(); + $overlay = $tag(div, "Overlay").hide(); + $loadingOverlay = $([$tag(div, "LoadingOverlay")[0],$tag(div, "LoadingGraphic")[0]]); + $wrap = $tag(div, "Wrapper"); + $content = $tag(div, "Content").append( + $title = $tag(div, "Title"), + $current = $tag(div, "Current"), + $prev = $('
diff --git a/app/views/books/edit.html.erb b/app/views/books/edit.html.erb index 37ba204203..7c63471946 100644 --- a/app/views/books/edit.html.erb +++ b/app/views/books/edit.html.erb @@ -12,7 +12,7 @@ <%= f.label :description, "Description" %> <%= f.text_area :description, :class => "form-control" %>
- <%= f.submit :class => "btn btn-default" %> + <%= f.submit "Save", :class => "btn btn-default" %>
<% end %>
diff --git a/app/views/movies/edit.html.erb b/app/views/movies/edit.html.erb index 241397cb7a..a89cf4147c 100644 --- a/app/views/movies/edit.html.erb +++ b/app/views/movies/edit.html.erb @@ -12,7 +12,7 @@ <%= f.label :description, "Description" %> <%= f.text_area :description, :class => "form-control" %>
- <%= f.submit :class => "btn btn-default" %> + <%= f.submit "Save", :class => "btn btn-default" %>
<% end %> From f5a6099fe0d89cbc5dd877e902917ea98af8252c Mon Sep 17 00:00:00 2001 From: Dreedle Date: Wed, 2 Dec 2015 13:58:30 -0800 Subject: [PATCH 33/45] Wave 3 appears to be finished before wave 2 (since added bootstrap classes earlier) --- app/assets/stylesheets/application.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index fbf0886be3..490e71fcdf 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,6 +2,10 @@ @import "bootstrap-sprockets"; @import "bootstrap"; +form .btn-primary { + margin-bottom: 10px; +} + .page-header { background: url("bookowl.jpg"); background-repeat: no-repeat; From e3e7c48363beab9a2a8919795483f8218058277e Mon Sep 17 00:00:00 2001 From: Dreedle Date: Wed, 2 Dec 2015 14:13:10 -0800 Subject: [PATCH 34/45] finished 'upvote' test for album controller --- coverage/.last_run.json | 2 +- coverage/.resultset.json | 8 +-- coverage/index.html | 52 +++++++-------- spec/controllers/albums_controller_spec.rb | 77 +++++++++++++--------- 4 files changed, 77 insertions(+), 62 deletions(-) diff --git a/coverage/.last_run.json b/coverage/.last_run.json index b297678d8e..a0cb828518 100644 --- a/coverage/.last_run.json +++ b/coverage/.last_run.json @@ -1,5 +1,5 @@ { "result": { - "covered_percent": 51.45 + "covered_percent": 53.62 } } diff --git a/coverage/.resultset.json b/coverage/.resultset.json index 40dd4f4a14..bacac375e4 100644 --- a/coverage/.resultset.json +++ b/coverage/.resultset.json @@ -29,9 +29,9 @@ null, null, 1, - 0, - 0, - 0, + 2, + 2, + 2, null, null, 1, @@ -287,6 +287,6 @@ null ] }, - "timestamp": 1449015542 + "timestamp": 1449094229 } } diff --git a/coverage/index.html b/coverage/index.html index c81847a46d..334b354b0a 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -14,18 +14,18 @@ loading