From 07f214ef84a99e59d08d02fde0ca3c17e87c5343 Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Mon, 12 Nov 2012 16:48:41 +1000 Subject: [PATCH] modified: Rakefile modified: app/controllers/media_controller.rb modified: config.ru modified: config/application.rb modified: config/environment.rb modified: config/environments/development.rb modified: config/environments/production.rb modified: config/environments/test.rb modified: config/initializers/secret_token.rb modified: config/initializers/session_store.rb modified: config/settings.rb modified: lib/modules/cache.rb modified: lib/tasks/qubar-beginagain-task.rake -- renamed Qubar abbreviation to more generic Baw (bio-acoustic workbench) modified: config/routes.rb -- added an angular catch all route that redirects to master view unless a html request for assets, or a api call. Closes 48. modified: app/assets/stylesheets/base.css.scss modified: app/assets/stylesheets/layout.css.scss modified: app/assets/stylesheets/projects.css.scss -- fixed a couple of css bugs --- app/assets/stylesheets/base.css.scss | 9 ++++++--- app/assets/stylesheets/layout.css.scss | 2 +- app/assets/stylesheets/projects.css.scss | 4 ++-- app/controllers/media_controller.rb | 2 +- lib/modules/cache.rb | 10 +++++----- lib/tasks/qubar-beginagain-task.rake | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index 1802292b..0bb17fa9 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -23,7 +23,7 @@ $master-complementary: #4A2B66 #73305F #34346A; $standard-padding-horizontal: 0.5em; $standard-padding-vertical: 0.25em; -$standrd-padding: $standard-padding-vertical $standard-padding-horizontal; +$standard-padding: $standard-padding-vertical $standard-padding-horizontal; /* @@ -51,15 +51,18 @@ $standrd-padding: $standard-padding-vertical $standard-padding-horiz } .ui-show { - @extend .standard-transition; + //@extend .standard-transition; + } .ui-hide { opacity: 0; - @extend .standard-transition; + //@extend .standard-transition; + display: none; } + /* * * Styles diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index adba4d1d..ed3253b4 100644 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -31,7 +31,7 @@ a { color: nth($master-dark-2, 1);; } - &:hover{ + &:hover { text-decoration: none; color: nth($master-highlight, 1); } diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 7863b0e4..2cc9dbaf 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -9,12 +9,12 @@ & div{ vertical-align: top; display: inline-block; - padding: $standrd-padding; + padding: $standard-padding; } & img{ - padding: $standrd-padding; + padding: $standard-padding; display: inline-block; } diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 087cd26d..31cfa046 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -5,7 +5,7 @@ class MediaController < ApplicationController def index # index page for media files - #@testing = QubarSite::Application.config.media_file_config + #@testing = BawSite::Application.config.media_file_config end def item diff --git a/lib/modules/cache.rb b/lib/modules/cache.rb index 63f688b0..d97b088e 100644 --- a/lib/modules/cache.rb +++ b/lib/modules/cache.rb @@ -15,7 +15,7 @@ def self.original_audio_file(modify_parameters = {}) # get all the storage paths for original audio def self.original_audio_storage_paths() - storage_paths = QubarSite::Application.config.media_file_config.original_audio_paths + storage_paths = BawSite::Application.config.media_file_config.original_audio_paths storage_paths end @@ -29,17 +29,17 @@ def self.cached_audio_file(modify_parameters = {}) # get all the storage paths for cached audio def self.cached_audio_storage_paths() - storage_paths = QubarSite::Application.config.media_file_config.cached_audio_paths + storage_paths = BawSite::Application.config.media_file_config.cached_audio_paths storage_paths end def self. cached_audio_defaults() - cache_defaults = QubarSite::Application.config.media_file_config.cached_audio_defaults + cache_defaults = BawSite::Application.config.media_file_config.cached_audio_defaults cache_defaults end def self. cached_spectrogram_defaults() - cache_defaults = QubarSite::Application.config.media_file_config.cached_spectrogram_defaults + cache_defaults = BawSite::Application.config.media_file_config.cached_spectrogram_defaults cache_defaults end @@ -55,7 +55,7 @@ def self.cached_spectrogram_file(modify_parameters = {}) # get all the storage paths for cached spectrograms def self.cached_spectrogram_storage_paths() - storage_paths = QubarSite::Application.config.media_file_config.cached_spectrogram_paths + storage_paths = BawSite::Application.config.media_file_config.cached_spectrogram_paths storage_paths end diff --git a/lib/tasks/qubar-beginagain-task.rake b/lib/tasks/qubar-beginagain-task.rake index aa1de7e5..d17aabef 100644 --- a/lib/tasks/qubar-beginagain-task.rake +++ b/lib/tasks/qubar-beginagain-task.rake @@ -6,5 +6,5 @@ namespace :db do end desc "Drop, create, migrate then seed the development database" - task :qubarbeginagain => %w(environment db:development_environment_only db:drop db:create db:migrate db:seed) + task :bawbeginagain => %w(environment db:development_environment_only db:drop db:create db:migrate db:seed) end \ No newline at end of file