diff --git a/Rakefile b/Rakefile index d90f991d..e2fdef51 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require File.expand_path('../config/application', __FILE__) -Qrammer::Application.load_tasks +Qwaiter::Application.load_tasks diff --git a/app/assets/images/frames/smartphone.svg b/app/assets/images/frames/smartphone.svg index 278de7bd..46211083 100644 --- a/app/assets/images/frames/smartphone.svg +++ b/app/assets/images/frames/smartphone.svg @@ -19,7 +19,7 @@ style="fill-rule:evenodd" inkscape:version="0.48.2 r9819" sodipodi:docname="smartphone.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/frames/smartphone.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/frames/smartphone.png" inkscape:export-xdpi="82.529999" inkscape:export-ydpi="82.529999"> pm diff --git a/app/assets/images/frames/tablet.svg b/app/assets/images/frames/tablet.svg index e8ca69eb..e42bcba5 100644 --- a/app/assets/images/frames/tablet.svg +++ b/app/assets/images/frames/tablet.svg @@ -491,7 +491,7 @@ y="-774" rx="61" ry="61" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/frames/tablet.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/frames/tablet.png" inkscape:export-xdpi="72.491959" inkscape:export-ydpi="72.491959" /> diff --git a/app/assets/images/icons/list.svg b/app/assets/images/icons/list.svg index 93b2fac6..bcd24df0 100644 --- a/app/assets/images/icons/list.svg +++ b/app/assets/images/icons/list.svg @@ -16,7 +16,7 @@ version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="list.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/list.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png" inkscape:export-xdpi="21.549999" inkscape:export-ydpi="21.549999"> diff --git a/app/assets/images/icons/section-table.svg b/app/assets/images/icons/section-table.svg index bf1d8301..c6722898 100644 --- a/app/assets/images/icons/section-table.svg +++ b/app/assets/images/icons/section-table.svg @@ -15,7 +15,7 @@ version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="section-table.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/section-table.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/section-table.png" inkscape:export-xdpi="11.09" inkscape:export-ydpi="11.09"> <g id="g4471" transform="translate(206,179.2193)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/qr.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/qr.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"> <rect @@ -2324,7 +2324,7 @@ y="514.93365" id="text4793" sodipodi:linespacing="125%" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/scan-logo.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/scan-logo.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"><tspan sodipodi:role="line" diff --git a/app/assets/images/textures/wood7.svg b/app/assets/images/textures/wood7.svg index cfcb8b4e..bfecfbe0 100644 --- a/app/assets/images/textures/wood7.svg +++ b/app/assets/images/textures/wood7.svg @@ -21,7 +21,7 @@ id="svg2" inkscape:version="0.48.2 r9819" sodipodi:docname="wood7.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/textures/wood7.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/textures/wood7.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"><metadata id="metadata13557"><rdf:RDF><cc:Work diff --git a/config.ru b/config.ru index 41614483..85b31bdf 100644 --- a/config.ru +++ b/config.ru @@ -3,4 +3,4 @@ require ::File.expand_path('../config/environment', __FILE__) #require 'faye' #use Faye::RackAdapter, :mount => '/faye', :timeout => 25 -run Qrammer::Application +run Qwaiter::Application diff --git a/config/application.rb b/config/application.rb index 418e7b30..9a8dd25e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -16,7 +16,7 @@ if defined?(Bundler) # Bundler.require(:default, :assets, Rails.env) end -module Qrammer +module Qwaiter class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers diff --git a/config/deploy.rb b/config/deploy.rb index e94a9cb2..787b56e7 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -6,7 +6,7 @@ load 'deploy/assets' #require "rvm/capistrano" set :application, "qwaiter" -set :repository, "root@uflows.com:/var/git/qrammer_rails.git" +set :repository, "root@uflows.com:/var/git/qwaiter.git" set :scm, :git #set :revision, '89700f36e9' diff --git a/config/environment.rb b/config/environment.rb index 441ca86e..af47b461 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -Qrammer::Application.initialize! +Qwaiter::Application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index 37a8b8eb..8eea23c4 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,4 +1,4 @@ -Qrammer::Application.configure do +Qwaiter::Application.configure do # Settings specified here will take precedence over those in config/application.rb # In the development environment your application's code is reloaded on diff --git a/config/environments/production.rb b/config/environments/production.rb index 9f95c286..fd6ff40c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,4 @@ -Qrammer::Application.configure do +Qwaiter::Application.configure do # Settings specified here will take precedence over those in config/application.rb # Code is not reloaded between requests diff --git a/config/environments/test.rb b/config/environments/test.rb index b77e0240..30759687 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -Qrammer::Application.configure do +Qwaiter::Application.configure do # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index cebe047e..9a488576 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Qrammer::Application.config.secret_token = 'a2d0002614aa5e1a04dd5f57c3a239765ee47df0f5e3214adf41c4893b84a95cd805f650f5edb321f2474adf6bb01a625b911d34a3c879815281d7e1db4415c8' +Qwaiter::Application.config.secret_token = 'a2d0002614aa5e1a04dd5f57c3a239765ee47df0f5e3214adf41c4893b84a95cd805f650f5edb321f2474adf6bb01a625b911d34a3c879815281d7e1db4415c8' diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 63454c3b..ffb1535a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,8 +1,8 @@ # Be sure to restart your server when you modify this file. -Qrammer::Application.config.session_store :cookie_store, key: '_qrammer_session' +Qwaiter::Application.config.session_store :cookie_store, key: '_qwaiter_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information # (create the session table with "rails generate session_migration") -# Qrammer::Application.config.session_store :active_record_store +# Qwaiter::Application.config.session_store :active_record_store diff --git a/config/routes.rb b/config/routes.rb index 2e4ea2ab..55e373d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -Qrammer::Application.routes.draw do +Qwaiter::Application.routes.draw do devise_for :users devise_for :suppliers devise_for :administrators diff --git a/notes.js.coffee b/notes.js.coffee index d9e2af52..5aec0fdc 100644 --- a/notes.js.coffee +++ b/notes.js.coffee @@ -14,7 +14,7 @@ row = $('<tr></tr>').appendTo(tbody) row.append('<td>'+info.product.name+'</td>') row.append('<td>'+info.number+'</td>') - row.append('<td>'+Qrammer.currency(info.product.price * info.number)+'</td>') + row.append('<td>'+Qwaiter.currency(info.product.price * info.number)+'</td>') body.appendTo(wrapper)