From a573ac67bbb3338fa8939fee6262d0002c58c4a3 Mon Sep 17 00:00:00 2001 From: August Date: Mon, 30 May 2011 00:35:34 -0400 Subject: [PATCH] Well it's after midnight and here I am...porting apps to Rails 3.1 again... --- Gemfile | 20 +++---- .../assets}/images/elements/date.png | Bin .../images/elements/filetype-icons.jpg | Bin .../assets}/images/elements/slider.png | Bin .../assets}/images/elements/time.png | Bin .../assets}/images/layout/C/bg_lg.png | Bin .../assets}/images/layout/C/bg_sm.png | Bin .../assets}/images/layout/C/header_bg.png | Bin .../assets}/images/layout/C/sidebar_light.png | Bin .../assets}/images/layout/C/submit_bar_bg.png | Bin .../assets}/images/layout/LG_baseline.png | Bin .../assets}/images/layout/LG_bluebg.png | Bin .../images/layout/MS/iconlist_inactive.png | Bin .../assets}/images/layout/MS/inner.png | Bin .../assets}/images/layout/MS/outer.png | Bin .../assets}/images/layout/TM/TM_bg.png | Bin .../images/layout/TM/TM_logobutton.png | Bin .../assets}/images/layout/TM/TM_secline.png | Bin .../images/layout/TM/button_TM_states.png | Bin .../images/layout/button_back_states.png | Bin .../images/layout/button_date_states.png | Bin .../images/layout/button_disclosure.png | Bin .../images/layout/button_feed_states.png | Bin .../images/layout/button_norm_states.png | Bin .../images/layout/button_time_states.png | Bin .../images/layout/forms/textfield_bg.png | Bin .../assets}/images/layout/pagebg.gif | Bin .../assets}/images/layout/sv_left_bg.png | Bin {public => app/assets}/images/ph/ph.png | Bin .../assets}/javascripts/application.js | 10 ++++ {public => app/assets}/javascripts/html5.js | 0 .../javascripts/jquery-ui-timepicker-addon.js | 0 .../assets}/javascripts/jquery-ui.js | 0 .../assets}/javascripts/jquery-ui.min.js | 0 {public => app/assets}/javascripts/jquery.js | 0 .../assets}/javascripts/jquery.min.js | 0 {public => app/assets}/javascripts/rails.js | 0 .../assets}/javascripts/rangeinput.js | 0 {public => app/assets}/stylesheets/.gitkeep | 0 app/assets/stylesheets/application.css | 7 +++ {public => app/assets}/stylesheets/base.css | 50 +++++++++--------- .../assets}/stylesheets/datetime.css | 0 .../images/ui-bg_flat_55_999999_40x100.png | Bin .../images/ui-bg_flat_75_aaaaaa_40x100.png | Bin .../images/ui-bg_glass_45_0078ae_1x400.png | Bin .../images/ui-bg_glass_55_f8da4e_1x400.png | Bin .../images/ui-bg_glass_75_79c9ec_1x400.png | Bin .../ui-bg_gloss-wave_45_e14f1c_500x100.png | Bin .../ui-bg_gloss-wave_50_6eac2c_500x100.png | Bin .../ui-bg_gloss-wave_75_2191c0_500x100.png | Bin .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin .../images/ui-icons_0078ae_256x240.png | Bin .../images/ui-icons_056b93_256x240.png | Bin .../images/ui-icons_d8e7f3_256x240.png | Bin .../images/ui-icons_e0fdff_256x240.png | Bin .../images/ui-icons_f5e175_256x240.png | Bin .../images/ui-icons_f7a50d_256x240.png | Bin .../images/ui-icons_fcd113_256x240.png | Bin .../stylesheets/jquery-ui-1.8.5.custom.css | 0 .../assets}/stylesheets/scaffold.css | 0 app/views/layouts/application.html.erb | 10 ++-- config/application.rb | 3 ++ config/boot.rb | 13 ++--- config/environments/development.rb | 1 - config/environments/production.rb | 4 ++ 65 files changed, 69 insertions(+), 49 deletions(-) rename {public => app/assets}/images/elements/date.png (100%) rename {public => app/assets}/images/elements/filetype-icons.jpg (100%) rename {public => app/assets}/images/elements/slider.png (100%) rename {public => app/assets}/images/elements/time.png (100%) rename {public => app/assets}/images/layout/C/bg_lg.png (100%) rename {public => app/assets}/images/layout/C/bg_sm.png (100%) rename {public => app/assets}/images/layout/C/header_bg.png (100%) rename {public => app/assets}/images/layout/C/sidebar_light.png (100%) rename {public => app/assets}/images/layout/C/submit_bar_bg.png (100%) rename {public => app/assets}/images/layout/LG_baseline.png (100%) rename {public => app/assets}/images/layout/LG_bluebg.png (100%) rename {public => app/assets}/images/layout/MS/iconlist_inactive.png (100%) rename {public => app/assets}/images/layout/MS/inner.png (100%) rename {public => app/assets}/images/layout/MS/outer.png (100%) rename {public => app/assets}/images/layout/TM/TM_bg.png (100%) rename {public => app/assets}/images/layout/TM/TM_logobutton.png (100%) rename {public => app/assets}/images/layout/TM/TM_secline.png (100%) rename {public => app/assets}/images/layout/TM/button_TM_states.png (100%) rename {public => app/assets}/images/layout/button_back_states.png (100%) rename {public => app/assets}/images/layout/button_date_states.png (100%) rename {public => app/assets}/images/layout/button_disclosure.png (100%) rename {public => app/assets}/images/layout/button_feed_states.png (100%) rename {public => app/assets}/images/layout/button_norm_states.png (100%) rename {public => app/assets}/images/layout/button_time_states.png (100%) rename {public => app/assets}/images/layout/forms/textfield_bg.png (100%) rename {public => app/assets}/images/layout/pagebg.gif (100%) rename {public => app/assets}/images/layout/sv_left_bg.png (100%) rename {public => app/assets}/images/ph/ph.png (100%) rename {public => app/assets}/javascripts/application.js (54%) rename {public => app/assets}/javascripts/html5.js (100%) rename {public => app/assets}/javascripts/jquery-ui-timepicker-addon.js (100%) rename {public => app/assets}/javascripts/jquery-ui.js (100%) rename {public => app/assets}/javascripts/jquery-ui.min.js (100%) rename {public => app/assets}/javascripts/jquery.js (100%) rename {public => app/assets}/javascripts/jquery.min.js (100%) rename {public => app/assets}/javascripts/rails.js (100%) rename {public => app/assets}/javascripts/rangeinput.js (100%) rename {public => app/assets}/stylesheets/.gitkeep (100%) create mode 100644 app/assets/stylesheets/application.css rename {public => app/assets}/stylesheets/base.css (91%) rename {public => app/assets}/stylesheets/datetime.css (100%) rename {public => app/assets}/stylesheets/images/ui-bg_flat_55_999999_40x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_0078ae_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_056b93_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_d8e7f3_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_e0fdff_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_f5e175_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_f7a50d_256x240.png (100%) rename {public => app/assets}/stylesheets/images/ui-icons_fcd113_256x240.png (100%) rename {public => app/assets}/stylesheets/jquery-ui-1.8.5.custom.css (100%) rename {public => app/assets}/stylesheets/scaffold.css (100%) diff --git a/Gemfile b/Gemfile index d4b183381..28241bc21 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,15 @@ # Edit this Gemfile to bundle your application's dependencies. -source 'http://gemcutter.org' +source 'http://rubygems.org' -gem "rails", "3.0.7" - -## Bundle edge rails: -# gem "rails", :git => "git://github.com/rails/rails.git" +gem "rails", "3.1.0.rc1" +gem "mysql2", "0.3.2" +# Rails 3.1 - Asset Pipeline +gem 'json' +gem 'sass' +gem 'coffee-script' +gem 'uglifier' +# Rails 3.1 - JavaScript +gem 'jquery-rails' # ActiveRecord requires a database adapter. gem 'sqlite3-ruby', :require => 'sqlite3' @@ -12,13 +17,10 @@ gem 'sqlite3-ruby', :require => 'sqlite3' #RMagick is used for image resizing and processing gem "rmagick", ">= 2.12.2" -# We use jquery -gem "jquery-rails" - # Ruby 1.9.2 doesn't include unit testing by default gem 'test-unit' ## Bundle gems used only in certain environments: group :test do gem "test_benchmark", :require => 'test_benchmark' -end +end \ No newline at end of file diff --git a/public/images/elements/date.png b/app/assets/images/elements/date.png similarity index 100% rename from public/images/elements/date.png rename to app/assets/images/elements/date.png diff --git a/public/images/elements/filetype-icons.jpg b/app/assets/images/elements/filetype-icons.jpg similarity index 100% rename from public/images/elements/filetype-icons.jpg rename to app/assets/images/elements/filetype-icons.jpg diff --git a/public/images/elements/slider.png b/app/assets/images/elements/slider.png similarity index 100% rename from public/images/elements/slider.png rename to app/assets/images/elements/slider.png diff --git a/public/images/elements/time.png b/app/assets/images/elements/time.png similarity index 100% rename from public/images/elements/time.png rename to app/assets/images/elements/time.png diff --git a/public/images/layout/C/bg_lg.png b/app/assets/images/layout/C/bg_lg.png similarity index 100% rename from public/images/layout/C/bg_lg.png rename to app/assets/images/layout/C/bg_lg.png diff --git a/public/images/layout/C/bg_sm.png b/app/assets/images/layout/C/bg_sm.png similarity index 100% rename from public/images/layout/C/bg_sm.png rename to app/assets/images/layout/C/bg_sm.png diff --git a/public/images/layout/C/header_bg.png b/app/assets/images/layout/C/header_bg.png similarity index 100% rename from public/images/layout/C/header_bg.png rename to app/assets/images/layout/C/header_bg.png diff --git a/public/images/layout/C/sidebar_light.png b/app/assets/images/layout/C/sidebar_light.png similarity index 100% rename from public/images/layout/C/sidebar_light.png rename to app/assets/images/layout/C/sidebar_light.png diff --git a/public/images/layout/C/submit_bar_bg.png b/app/assets/images/layout/C/submit_bar_bg.png similarity index 100% rename from public/images/layout/C/submit_bar_bg.png rename to app/assets/images/layout/C/submit_bar_bg.png diff --git a/public/images/layout/LG_baseline.png b/app/assets/images/layout/LG_baseline.png similarity index 100% rename from public/images/layout/LG_baseline.png rename to app/assets/images/layout/LG_baseline.png diff --git a/public/images/layout/LG_bluebg.png b/app/assets/images/layout/LG_bluebg.png similarity index 100% rename from public/images/layout/LG_bluebg.png rename to app/assets/images/layout/LG_bluebg.png diff --git a/public/images/layout/MS/iconlist_inactive.png b/app/assets/images/layout/MS/iconlist_inactive.png similarity index 100% rename from public/images/layout/MS/iconlist_inactive.png rename to app/assets/images/layout/MS/iconlist_inactive.png diff --git a/public/images/layout/MS/inner.png b/app/assets/images/layout/MS/inner.png similarity index 100% rename from public/images/layout/MS/inner.png rename to app/assets/images/layout/MS/inner.png diff --git a/public/images/layout/MS/outer.png b/app/assets/images/layout/MS/outer.png similarity index 100% rename from public/images/layout/MS/outer.png rename to app/assets/images/layout/MS/outer.png diff --git a/public/images/layout/TM/TM_bg.png b/app/assets/images/layout/TM/TM_bg.png similarity index 100% rename from public/images/layout/TM/TM_bg.png rename to app/assets/images/layout/TM/TM_bg.png diff --git a/public/images/layout/TM/TM_logobutton.png b/app/assets/images/layout/TM/TM_logobutton.png similarity index 100% rename from public/images/layout/TM/TM_logobutton.png rename to app/assets/images/layout/TM/TM_logobutton.png diff --git a/public/images/layout/TM/TM_secline.png b/app/assets/images/layout/TM/TM_secline.png similarity index 100% rename from public/images/layout/TM/TM_secline.png rename to app/assets/images/layout/TM/TM_secline.png diff --git a/public/images/layout/TM/button_TM_states.png b/app/assets/images/layout/TM/button_TM_states.png similarity index 100% rename from public/images/layout/TM/button_TM_states.png rename to app/assets/images/layout/TM/button_TM_states.png diff --git a/public/images/layout/button_back_states.png b/app/assets/images/layout/button_back_states.png similarity index 100% rename from public/images/layout/button_back_states.png rename to app/assets/images/layout/button_back_states.png diff --git a/public/images/layout/button_date_states.png b/app/assets/images/layout/button_date_states.png similarity index 100% rename from public/images/layout/button_date_states.png rename to app/assets/images/layout/button_date_states.png diff --git a/public/images/layout/button_disclosure.png b/app/assets/images/layout/button_disclosure.png similarity index 100% rename from public/images/layout/button_disclosure.png rename to app/assets/images/layout/button_disclosure.png diff --git a/public/images/layout/button_feed_states.png b/app/assets/images/layout/button_feed_states.png similarity index 100% rename from public/images/layout/button_feed_states.png rename to app/assets/images/layout/button_feed_states.png diff --git a/public/images/layout/button_norm_states.png b/app/assets/images/layout/button_norm_states.png similarity index 100% rename from public/images/layout/button_norm_states.png rename to app/assets/images/layout/button_norm_states.png diff --git a/public/images/layout/button_time_states.png b/app/assets/images/layout/button_time_states.png similarity index 100% rename from public/images/layout/button_time_states.png rename to app/assets/images/layout/button_time_states.png diff --git a/public/images/layout/forms/textfield_bg.png b/app/assets/images/layout/forms/textfield_bg.png similarity index 100% rename from public/images/layout/forms/textfield_bg.png rename to app/assets/images/layout/forms/textfield_bg.png diff --git a/public/images/layout/pagebg.gif b/app/assets/images/layout/pagebg.gif similarity index 100% rename from public/images/layout/pagebg.gif rename to app/assets/images/layout/pagebg.gif diff --git a/public/images/layout/sv_left_bg.png b/app/assets/images/layout/sv_left_bg.png similarity index 100% rename from public/images/layout/sv_left_bg.png rename to app/assets/images/layout/sv_left_bg.png diff --git a/public/images/ph/ph.png b/app/assets/images/ph/ph.png similarity index 100% rename from public/images/ph/ph.png rename to app/assets/images/ph/ph.png diff --git a/public/javascripts/application.js b/app/assets/javascripts/application.js similarity index 54% rename from public/javascripts/application.js rename to app/assets/javascripts/application.js index 2197cb481..fae73ea2f 100644 --- a/public/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,3 +1,13 @@ +// This is a manifest file that'll be compiled into including all the files listed below. +// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// be included in the compiled file accessible from http://example.com/assets/application.js +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +//= require jquery +//= require jquery_ujs +//= require_tree . + // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults diff --git a/public/javascripts/html5.js b/app/assets/javascripts/html5.js similarity index 100% rename from public/javascripts/html5.js rename to app/assets/javascripts/html5.js diff --git a/public/javascripts/jquery-ui-timepicker-addon.js b/app/assets/javascripts/jquery-ui-timepicker-addon.js similarity index 100% rename from public/javascripts/jquery-ui-timepicker-addon.js rename to app/assets/javascripts/jquery-ui-timepicker-addon.js diff --git a/public/javascripts/jquery-ui.js b/app/assets/javascripts/jquery-ui.js similarity index 100% rename from public/javascripts/jquery-ui.js rename to app/assets/javascripts/jquery-ui.js diff --git a/public/javascripts/jquery-ui.min.js b/app/assets/javascripts/jquery-ui.min.js similarity index 100% rename from public/javascripts/jquery-ui.min.js rename to app/assets/javascripts/jquery-ui.min.js diff --git a/public/javascripts/jquery.js b/app/assets/javascripts/jquery.js similarity index 100% rename from public/javascripts/jquery.js rename to app/assets/javascripts/jquery.js diff --git a/public/javascripts/jquery.min.js b/app/assets/javascripts/jquery.min.js similarity index 100% rename from public/javascripts/jquery.min.js rename to app/assets/javascripts/jquery.min.js diff --git a/public/javascripts/rails.js b/app/assets/javascripts/rails.js similarity index 100% rename from public/javascripts/rails.js rename to app/assets/javascripts/rails.js diff --git a/public/javascripts/rangeinput.js b/app/assets/javascripts/rangeinput.js similarity index 100% rename from public/javascripts/rangeinput.js rename to app/assets/javascripts/rangeinput.js diff --git a/public/stylesheets/.gitkeep b/app/assets/stylesheets/.gitkeep similarity index 100% rename from public/stylesheets/.gitkeep rename to app/assets/stylesheets/.gitkeep diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..fc25b5723 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,7 @@ +/* + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. + *= require_self + *= require_tree . +*/ \ No newline at end of file diff --git a/public/stylesheets/base.css b/app/assets/stylesheets/base.css similarity index 91% rename from public/stylesheets/base.css rename to app/assets/stylesheets/base.css index 3d7d39aee..2d74fc52c 100644 --- a/public/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -13,7 +13,7 @@ /* Frame and Resets */ /*##########################################################################*/ -html{color:#000;background:#eee url(../images/layout/pagebg.gif) center center repeat; font-family:"Lucida Grande",Arial,sans-serif;} +html{color:#000;background:#eee url(../assets/layout/pagebg.gif) center center repeat; font-family:"Lucida Grande",Arial,sans-serif;} body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;font-size:100%;} body { min-width:800px; } table{border-collapse:collapse;border-spacing:0;} @@ -63,21 +63,21 @@ h5 { font-size:1.3em; } /*########## BASIC LAYOUT ##########*/ .C-full { display:block; margin-bottom:18px; box-shadow: #ababab 0 3px 2px; -moz-box-shadow: 0 3px 2px #ababab; -webkit-box-shadow: #ababab 0 3px 2px; } -.C-full header { display:block; background:#FFF url(../images/layout/C/header_bg.png) bottom left repeat-x; padding:12px 14px; padding-bottom:5px; border:solid 1px #ababab; border-bottom:0px; border-top-left-radius:8px; -moz-border-radius-topleft:8px; border-top-right-radius:8px; -moz-border-radius-topright:8px; } +.C-full header { display:block; background:#FFF url(../assets/layout/C/header_bg.png) bottom left repeat-x; padding:12px 14px; padding-bottom:5px; border:solid 1px #ababab; border-bottom:0px; border-top-left-radius:8px; -moz-border-radius-topleft:8px; border-top-right-radius:8px; -moz-border-radius-topright:8px; } .C-full header h1 { color:#666; font-size:1.8em; letter-spacing:-0.05em; text-shadow:0 1px #eee; padding-top:9px; } .C-cont { padding-left:204px; border-bottom:solid 1px #ababab; border-left:solid 1px #ababab; border-right:solid 1px #ababab; } .C-cont article, .C-cont aside { position:relative; float:left; } .C-full article { padding:0px; width:100%; } /* padding inside of this div should be determined by the contained content, not by a wrapper div defined here! */ -.C-full aside { background:url(../images/layout/C/sidebar_light.png) top right no-repeat; min-height:300px; width:184px; padding: 0 10px; right:204px; margin-left:-100%; } +.C-full aside { background:url(../assets/layout/C/sidebar_light.png) top right no-repeat; min-height:300px; width:184px; padding: 0 10px; right:204px; margin-left:-100%; } .C-header_back { float:left; margin-left:-37px; padding-top:12px; margin-right:8px; } /* This is an optional floated area for the back button that appears to the left of the header. */ .C-header_right { float:right; padding-top:8px; margin-left:20px; } /* this is an optional floated area that appears to the right of the header */ /* for each variant, overwrite the padding-left for C-cont and change the background image to fit the right faux columns */ /* SMALL VARIANT (most things, esp. browsing content in feeds) */ -.C-full.sm .C-cont { background:#FFF url(../images/layout/C/bg_sm.png) top left repeat-y; } +.C-full.sm .C-cont { background:#FFF url(../assets/layout/C/bg_sm.png) top left repeat-y; } .C-full.sm aside { } /* LARGE VARIANT (Add Content with live preview screen) */ -.C-full.lg .C-cont { background:#FFF url(../images/layout/C/bg_lg.png) top left repeat-y; padding-left:318px; } +.C-full.lg .C-cont { background:#FFF url(../assets/layout/C/bg_lg.png) top left repeat-y; padding-left:318px; } .C-full.lg aside { width:298px; right:318px; } /* NO-SIDEBAR VARIANT (Basic New/Edit Forms) */ .C-full.no .C-cont { background:#FFF; padding-left:0px; } @@ -89,7 +89,7 @@ h5 { font-size:1.3em; } /*##########################################################################*/ /*########## DEFAULT BUTTON LINK: BLUE NORMAL ##########*/ -a.button, form .submit_bar input, .handle, .dticon { box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0;height:22px; font-weight:bold; color:#FFF; letter-spacing:-0.07em;text-shadow:0 -1px #003366;font-size:0.8em;margin-right:6px;text-decoration:none; background:url(../images/layout/button_norm_states.png) top left repeat-x; border:solid 1px #003366; border-radius:4px; -moz-border-radius:4px; } +a.button, form .submit_bar input, .handle, .dticon { box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0;height:22px; font-weight:bold; color:#FFF; letter-spacing:-0.07em;text-shadow:0 -1px #003366;font-size:0.8em;margin-right:6px;text-decoration:none; background:url(../assets/layout/button_norm_states.png) top left repeat-x; border:solid 1px #003366; border-radius:4px; -moz-border-radius:4px; } a.button, form .submit_bar input { float:left; cursor:pointer; padding:4px 20px 0px 20px; } form .submit_bar input { height:auto; padding:4px 20px; } a.button:hover, form .submit_bar input:hover, a.button.time:hover, a.button.date:hover { background-position:100% -26px; color:#000033; text-shadow:0 -1px #eee; border:solid 1px #2f84da; } @@ -100,11 +100,11 @@ form .submit_bar input:active { height:auto; padding:6px 20px 4px 20px; } /* Special Rules: */ .C-header_right a.button { margin-right:0px; margin-left:6px; } a.button.time, a.button.date { display:inline-block; padding:0px; float:none; cursor:pointer; text-decoration:none; margin-left:5px; vertical-align:top; } -a.button.time {width:26px; height:26px; background:url(../images/layout/button_time_states.png) top left no-repeat; } -a.button.date {width:26px; height:26px; background:url(../images/layout/button_date_states.png) top left no-repeat;} +a.button.time {width:26px; height:26px; background:url(../assets/layout/button_time_states.png) top left no-repeat; } +a.button.date {width:26px; height:26px; background:url(../assets/layout/button_date_states.png) top left no-repeat;} /*########## BLUE BACK BUTTON ##########*/ -a.back {background:transparent url(../images/layout/button_back_states.png) no-repeat scroll top left; font-size:0.7em; box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0; border:0; border-right:solid 1px #396bab; border-top-left-radius:4px; -moz-border-radius-topleft:4px; border-top-right-radius:4px; -moz-border-radius-topright:4px; height:18px; padding:4px 12px 0px 20px; } +a.back {background:transparent url(../assets/layout/button_back_states.png) no-repeat scroll top left; font-size:0.7em; box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0; border:0; border-right:solid 1px #396bab; border-top-left-radius:4px; -moz-border-radius-topleft:4px; border-top-right-radius:4px; -moz-border-radius-topright:4px; height:18px; padding:4px 12px 0px 20px; } a.back:hover {background-position:0% -22px; border:0; border-right:solid 1px #53abe7; box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0; } a.back:active {background-position:0% 100%; border:0; border-right:solid 1px #999; box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0; height:16px; padding:6px 12px 0px 20px; } @@ -114,8 +114,8 @@ ul.feedbuttons li { display:inline;list-style:none; clear:both; } ul.feedbuttons li a.button { position:relative; background:none; text-shadow:0 0 0; color:#666; font-size:0.6em; border:0; height:19px; width:140px; padding:6px 22px 0px 32px; -moz-border-radius:0px; } ul.feedbuttons li a.button:hover { color:#000; background:#dce6ee; border-radius:0px; -moz-border-radius:0px; } ul.feedbuttons li a.button span.count { width:22px; text-align:center; position:absolute; font-size:0.9em; text-shadow:0 0 0; padding:3px 0px; top:4px; left:3px; border-radius:100px; -moz-border-radius:100px; -webkit-border-radius:100px; background:#666; color:#FFF; } -ul.feedbuttons li a.button span.disclosure { width:10px; height:10px; text-align:center; position:absolute; background:url(../images/layout/button_disclosure.png) center center no-repeat; display:block; top:8px; right:10px; } -ul.feedbuttons li.selected a.button { color:#FFF; background:transparent url(../images/layout/button_feed_states.png) center right no-repeat; text-shadow:0 1px #000; border-radius:0px; -moz-border-radius:0px; border-top-left-radius:6px; -moz-border-radius-topleft:6px; border-bottom-left-radius:6px; -moz-border-radius-bottomleft:6px; } +ul.feedbuttons li a.button span.disclosure { width:10px; height:10px; text-align:center; position:absolute; background:url(../assets/layout/button_disclosure.png) center center no-repeat; display:block; top:8px; right:10px; } +ul.feedbuttons li.selected a.button { color:#FFF; background:transparent url(../assets/layout/button_feed_states.png) center right no-repeat; text-shadow:0 1px #000; border-radius:0px; -moz-border-radius:0px; border-top-left-radius:6px; -moz-border-radius-topleft:6px; border-bottom-left-radius:6px; -moz-border-radius-bottomleft:6px; } ul.feedbuttons li.selected a.button span { color:#333; background:#FFF; } ul.feedbuttons li a.button:active { box-shadow:0 0 0; -webkit-box-shadow: 0 0 0; -moz-box-shadow:0 0 0; } @@ -140,9 +140,9 @@ div.type-file, div.type-folder { margin-left:auto; margin-right:auto; text-align div.type-folder img { border:0px !important; } div.type-img img { border:solid 1px #666; } div.type-file img { border:0px !important; } -div.f_icon { background:url(../images/icons/foldericon.png) center center no-repeat; width:50px; height:39px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } -div.pdf_icon { background:url(../images/icons/pdficon.png) center center no-repeat; width:44px; height:45px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } -div.img_icon { background:url(../images/icons/imageicon.png) center center no-repeat; width:46px; height:44px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } +div.f_icon { background:url(../assets/icons/foldericon.png) center center no-repeat; width:50px; height:39px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } +div.pdf_icon { background:url(../assets/icons/pdficon.png) center center no-repeat; width:44px; height:45px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } +div.img_icon { background:url(../assets/icons/imageicon.png) center center no-repeat; width:46px; height:44px; margin:75px 0px 0px 110px; position:absolute; z-index:5; } /*##########################################################################*/ @@ -154,12 +154,12 @@ form .fields { padding-left:20px; } /* this is the container of ALL fields on a form .field { clear:both; vertical-align:middle; } form .field label { padding-top:7px; margin-bottom:12px; font-family:"Myriad Pro", Helvetica, Arial, sans-serif; width:110px; float:left; color:#666; font-size:1em; letter-spacing:-0em; text-align:right; padding-right:10px; } form .field .inputs, form .field .fieldbox { float:left; margin-bottom:12px; } /* .inputs is the basic treatment for text fields and boxes */ -form .field .inputs input, form .field .fieldbox input { width:600px; padding:2px; background:#fefefe url(../images/layout/forms/textfield_bg.png) top left repeat-x; border:solid 1px #999; } -form .field .inputs textarea { width:600px; height:100px; padding:2px; background:#fefefe url(../images/layout/forms/textfield_bg.png) top left repeat-x; border:solid 1px #999; } +form .field .inputs input, form .field .fieldbox input { width:600px; padding:2px; background:#fefefe url(../assets/layout/forms/textfield_bg.png) top left repeat-x; border:solid 1px #999; } +form .field .inputs textarea { width:600px; height:100px; padding:2px; background:#fefefe url(../assets/layout/forms/textfield_bg.png) top left repeat-x; border:solid 1px #999; } form .field .inputs input.alert { border:solid 2px #cc3333; } /* this is useful for calling attention to certain fields that may have failed validation; should be coupled with an inline validation message */ form .field .fieldbox { border:solid 1px #ccc; padding:4px 6px; border-radius:6px; -moz-border-radius:6px; } /* this is a special element to replace a .inputs div */ form .datetime input { padding-top:3px !important; padding-bottom:3px !important; } -form .submit_bar { background:#FFF url(../images/layout/C/submit_bar_bg.png) top left repeat-x; margin-top:30px; padding:16px 20px; text-align:right; } +form .submit_bar { background:#FFF url(../assets/layout/C/submit_bar_bg.png) top left repeat-x; margin-top:30px; padding:16px 20px; text-align:right; } /* Special Rules */ .C-full.no .C-cont form .fields { padding:22px 0px; } @@ -171,11 +171,11 @@ form .submit_bar { background:#FFF url(../images/layout/C/submit_bar_bg.png) top .MS-frame { } .MS-frame header h1 { display:block; color:#666; margin-left:30px; font-size:1.8em; text-shadow:0 1px #FFF; letter-spacing:-0.05em; margin-bottom:4px; } -.MS-frame .MS-outer { background:url(../images/layout/MS/outer.png) repeat; padding:6px; border-radius:20px; -moz-border-radius:20px; margin-bottom:22px; } -.MS-frame article { display:block; background:url(../images/layout/MS/inner.png) repeat; border-radius:14px; -moz-border-radius:14px; padding:17px; } +.MS-frame .MS-outer { background:url(../assets/layout/MS/outer.png) repeat; padding:6px; border-radius:20px; -moz-border-radius:20px; margin-bottom:22px; } +.MS-frame article { display:block; background:url(../assets/layout/MS/inner.png) repeat; border-radius:14px; -moz-border-radius:14px; padding:17px; } .MS-frame article ul.iconlist { margin:0px -6px; } .MS-frame article ul.iconlist li { margin:0px 6px; } -.MS-frame article ul.iconlist li a { color:#FFF; text-decoration:none; border-radius:8px; -moz-border-radius:8px; background:url(../images/layout/MS/iconlist_inactive.png) repeat; border:solid 1px #999; opacity:0.5; } +.MS-frame article ul.iconlist li a { color:#FFF; text-decoration:none; border-radius:8px; -moz-border-radius:8px; background:url(../assets/layout/MS/iconlist_inactive.png) repeat; border:solid 1px #999; opacity:0.5; } .MS-frame article ul.iconlist li a:hover { opacity:1; } .MS-frame article ul.iconlist li a h2 { font-size:1.5em; color:#FFF !important; } @@ -193,8 +193,8 @@ form .submit_bar { background:#FFF url(../images/layout/C/submit_bar_bg.png) top /*##########################################################################*/ /*########## STRUCTURE ##########*/ -#TM { position:absolute; z-index:50; width:100%; top:0px; left:0px; background:url(../images/layout/TM/TM_bg.png) top left repeat; } -a#TM-logobutton { z-index:100; width:96px; height:88px; background:url(../images/layout/TM/TM_logobutton.png) top left no-repeat; background-position:0px 0px; border:0px; display:block; position:absolute; top:0px; left:0px; } +#TM { position:absolute; z-index:50; width:100%; top:0px; left:0px; background:url(../assets/layout/TM/TM_bg.png) top left repeat; } +a#TM-logobutton { z-index:100; width:96px; height:88px; background:url(../assets/layout/TM/TM_logobutton.png) top left no-repeat; background-position:0px 0px; border:0px; display:block; position:absolute; top:0px; left:0px; } a#TM-logobutton:hover { background-position:-96px 0px; } table.TM-sec { height:69px; float:left; margin:0px; padding:0 4px; } .TM-sectop { height:41px; } @@ -202,18 +202,18 @@ table.TM-sec { height:69px; float:left; margin:0px; padding:0 4px; } tr.TM-sectop td, tr.TM-secbot td { vertical-align:top; padding:0px 6px; } tr.TM-sectop td { padding:3px 2px 5px 2px; } .TM-secbot h1 { color:#666; font-size:0.6em; font-weight:400; text-shadow:0 0.05em #FFF; padding-top:5px; padding-left:3px; text-transform:uppercase; letter-spacing:0.3em; text-align:center; } -.TM-secline-left, .TM-secline-right { background:url(../images/layout/TM/TM_secline.png) top left no-repeat; width:2px; height:69px; padding:0px !important; } +.TM-secline-left, .TM-secline-right { background:url(../assets/layout/TM/TM_secline.png) top left no-repeat; width:2px; height:69px; padding:0px !important; } .TM-secline-right { background-position:-2px 0px; } /*########## CASCADE OF BUTTON STYLES FOR MENU ITEMS ##########*/ #TM ul.buttons li {display:inline;list-style:none;} -#TM ul.buttons li a.button {background:transparent url(../images/layout/TM/button_TM_states.png) top left repeat-x; box-shadow:0 0 0; -moz-box-shadow:0 0 0; -webkit-box-shadow:0 0 0; color:#666;text-shadow:0 1px #eee;letter-spacing:0em;font-size:0.8em;margin:0px 2px; height:24px; padding:7px 20px 0px 20px; font-weight:bold; border:solid 1px #999; border-radius:6px; -moz-border-radius:6px; } +#TM ul.buttons li a.button {background:transparent url(../assets/layout/TM/button_TM_states.png) top left repeat-x; box-shadow:0 0 0; -moz-box-shadow:0 0 0; -webkit-box-shadow:0 0 0; color:#666;text-shadow:0 1px #eee;letter-spacing:0em;font-size:0.8em;margin:0px 2px; height:24px; padding:7px 20px 0px 20px; font-weight:bold; border:solid 1px #999; border-radius:6px; -moz-border-radius:6px; } #TM ul.buttons li a.button:hover {color:#000033; text-shadow:0 1px #eee; background-position:100% -31px; border:solid 1px #2f84da; } #TM ul.buttons li a.button:active { color:#333;text-shadow:0 1px #eee; background-position:100% -62px; border:solid 1px #000; box-shadow:inset 0 0px 6px #000; -webkit-box-shadow:inset 0 0px 6px #000; -moz-box-shadow:inset 0 0px 6px #000; height:21px; padding:9px 20px 0px 20px; } #TM ul.buttons li.selected a.button { box-shadow:inset 0 0px 6px #000; -webkit-box-shadow:inset 0 0px 10px #000; -moz-box-shadow:inset 0 0px 6px #000; text-decoration:none;text-shadow:0 -1px #333; color:#FFF; background-position:100% 100%; border:solid 1px #333; } /*########## LOGIN (LG) ##########*/ -#LG-inner { float:left; width:153px; height:69px; padding:0px 28px 0px 104px; background:url(../images/layout/LG_bluebg.png) top left no-repeat; } +#LG-inner { float:left; width:153px; height:69px; padding:0px 28px 0px 104px; background:url(../assets/layout/LG_bluebg.png) top left no-repeat; } #LG-inner div.TM-sectop p { color:#FFF; font-size:0.8em; text-shadow:0 -0.2em #000; padding-top:10px; } #LG-inner div.TM-sectop p a { color:#FFF; } #LG-inner div.TM-secbot p { color:#666; font-size:0.7em; text-shadow:0 0.05em #FFF; padding-top:5px; } diff --git a/public/stylesheets/datetime.css b/app/assets/stylesheets/datetime.css similarity index 100% rename from public/stylesheets/datetime.css rename to app/assets/stylesheets/datetime.css diff --git a/public/stylesheets/images/ui-bg_flat_55_999999_40x100.png b/app/assets/stylesheets/images/ui-bg_flat_55_999999_40x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_flat_55_999999_40x100.png rename to app/assets/stylesheets/images/ui-bg_flat_55_999999_40x100.png diff --git a/public/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png b/app/assets/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png rename to app/assets/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png diff --git a/public/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png b/app/assets/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png rename to app/assets/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png b/app/assets/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png rename to app/assets/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png b/app/assets/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png rename to app/assets/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png diff --git a/public/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png b/app/assets/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png rename to app/assets/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png diff --git a/public/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png b/app/assets/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png rename to app/assets/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png diff --git a/public/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/app/assets/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png rename to app/assets/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png diff --git a/public/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/app/assets/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to app/assets/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/public/stylesheets/images/ui-icons_0078ae_256x240.png b/app/assets/stylesheets/images/ui-icons_0078ae_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_0078ae_256x240.png rename to app/assets/stylesheets/images/ui-icons_0078ae_256x240.png diff --git a/public/stylesheets/images/ui-icons_056b93_256x240.png b/app/assets/stylesheets/images/ui-icons_056b93_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_056b93_256x240.png rename to app/assets/stylesheets/images/ui-icons_056b93_256x240.png diff --git a/public/stylesheets/images/ui-icons_d8e7f3_256x240.png b/app/assets/stylesheets/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_d8e7f3_256x240.png rename to app/assets/stylesheets/images/ui-icons_d8e7f3_256x240.png diff --git a/public/stylesheets/images/ui-icons_e0fdff_256x240.png b/app/assets/stylesheets/images/ui-icons_e0fdff_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_e0fdff_256x240.png rename to app/assets/stylesheets/images/ui-icons_e0fdff_256x240.png diff --git a/public/stylesheets/images/ui-icons_f5e175_256x240.png b/app/assets/stylesheets/images/ui-icons_f5e175_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_f5e175_256x240.png rename to app/assets/stylesheets/images/ui-icons_f5e175_256x240.png diff --git a/public/stylesheets/images/ui-icons_f7a50d_256x240.png b/app/assets/stylesheets/images/ui-icons_f7a50d_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_f7a50d_256x240.png rename to app/assets/stylesheets/images/ui-icons_f7a50d_256x240.png diff --git a/public/stylesheets/images/ui-icons_fcd113_256x240.png b/app/assets/stylesheets/images/ui-icons_fcd113_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_fcd113_256x240.png rename to app/assets/stylesheets/images/ui-icons_fcd113_256x240.png diff --git a/public/stylesheets/jquery-ui-1.8.5.custom.css b/app/assets/stylesheets/jquery-ui-1.8.5.custom.css similarity index 100% rename from public/stylesheets/jquery-ui-1.8.5.custom.css rename to app/assets/stylesheets/jquery-ui-1.8.5.custom.css diff --git a/public/stylesheets/scaffold.css b/app/assets/stylesheets/scaffold.css similarity index 100% rename from public/stylesheets/scaffold.css rename to app/assets/stylesheets/scaffold.css diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8967a729b..79f73d210 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,11 +3,13 @@ <%= controller.action_name.titleize %> - <%= controller.controller_name.titleize %> - Concerto Signage Panel - <%= stylesheet_link_tag 'base' %> - <%= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %> - <%= stylesheet_link_tag 'datetime' %> + <%#= stylesheet_link_tag 'base' %> + <%#= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %> + <%#= stylesheet_link_tag 'datetime' %> - <%= javascript_include_tag :defaults %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tag %> <%= render :partial => 'elements/head' %> <%= render :partial => 'elements/javascript' %> diff --git a/config/application.rb b/config/application.rb index c4ec177ca..fd6f64482 100644 --- a/config/application.rb +++ b/config/application.rb @@ -38,5 +38,8 @@ class Application < Rails::Application # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] + + # Enable the asset pipeline + config.assets.enabled = true end end diff --git a/config/boot.rb b/config/boot.rb index c164fadf4..8331c00dd 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,13 +1,6 @@ require 'rubygems' # Set up gems listed in the Gemfile. -gemfile = File.expand_path('../../Gemfile', __FILE__) -begin - ENV['BUNDLE_GEMFILE'] = gemfile - require 'bundler' - Bundler.setup -rescue Bundler::GemNotFound => e - STDERR.puts e.message - STDERR.puts "Try running `bundle install`." - exit! -end if File.exist?(gemfile) \ No newline at end of file +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) \ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index dba005b20..82bc7d221 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,6 @@ # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send diff --git a/config/environments/production.rb b/config/environments/production.rb index 1d4cac843..83735883d 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -46,4 +46,8 @@ # Send deprecation notices to registered listeners config.active_support.deprecation = :notify + + # Compress both stylesheets and JavaScripts + config.assets.js_compressor = :uglifier + config.assets.css_compressor = :scss end