From b801f0dc197e2627fe958702957ad1dfaf9005ac Mon Sep 17 00:00:00 2001 From: Matt Barringer Date: Fri, 11 Jan 2013 15:00:54 +0100 Subject: [PATCH] - Restructuring the assets - Worked on the schedule - Removed some gems --- Gemfile | 2 - Gemfile.lock | 7 - .../ui-bg_flat_0_aaaaaa_40x100.png | Bin .../ui-bg_flat_55_fbec88_40x100.png | Bin .../ui-bg_glass_75_d0e5f5_1x400.png | Bin .../ui-bg_glass_85_dfeffc_1x400.png | Bin .../ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin .../ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin .../{ => images}/ui-icons_217bc0_256x240.png | Bin .../{ => images}/ui-icons_2e83ff_256x240.png | Bin .../{ => images}/ui-icons_469bdd_256x240.png | Bin .../{ => images}/ui-icons_6da8d5_256x240.png | Bin .../{ => images}/ui-icons_cd0a0a_256x240.png | Bin .../{ => images}/ui-icons_d8e7f3_256x240.png | Bin .../{ => images}/ui-icons_f9bd01_256x240.png | Bin .../img}/glyphicons-halflings-white.png | Bin .../images/img}/glyphicons-halflings.png | Bin app/assets/javascripts/application.js | 74 +- app/assets/javascripts/bootstrap.min.js | 7 + app/assets/javascripts/date.format.js | 126 + app/assets/javascripts/osem.js | 69 + app/assets/javascripts/spectrum.js | 1693 + app/assets/stylesheets/application.css | 3 +- app/assets/stylesheets/bootstrap.min.css | 868 + .../stylesheets/bootstrap_and_overrides.css | 7 - .../bootstrap_and_overrides.css.less | 33 - app/assets/stylesheets/osem.css | 30 +- app/assets/stylesheets/schedule.css | 45 - app/assets/stylesheets/spectrum.css | 471 + .../admin/conference_controller.rb | 4 + app/controllers/admin/events_controller.rb | 26 +- app/controllers/admin/schedule_controller.rb | 41 +- app/controllers/admin/tracks_controller.rb | 5 +- app/controllers/application_controller.rb | 11 +- .../event_attachments_controller.rb | 21 +- app/controllers/proposal_controller.rb | 4 +- app/helpers/application_helper.rb | 4 + app/models/event.rb | 23 +- app/views/admin/events/_proposal.html.haml | 38 +- app/views/admin/schedule/_day_tab.html.haml | 26 +- app/views/admin/schedule/show.html.haml | 79 +- app/views/admin/tracks/_track_fields.html.erb | 2 +- app/views/home/index.html.haml | 21 +- app/views/layouts/admin.html.haml | 2 +- app/views/layouts/application.html.haml | 2 +- app/views/layouts/schedule.html.haml | 18 +- app/views/proposal/_form.html.haml | 13 +- ...52a187374417f72027216.js => application.js | 5 +- config/environments/development.rb | 1 - config/environments/production.rb | 1 - config/routes.rb | 1 + .../20121223115125_create_tracks_table.rb | 2 +- ...cation-29159c13c2c5ef2fb3368b9d8e2f08a4.js | 26 + ...ion-29159c13c2c5ef2fb3368b9d8e2f08a4.js.gz | Bin 0 -> 115067 bytes ...ation-9ab0f7f46e02dcd8c53c1038b1590fb3.css | 13 + ...on-9ab0f7f46e02dcd8c53c1038b1590fb3.css.gz | Bin 0 -> 24090 bytes ...ation-a5bafc9682813b77f6e8431d24eb3e48.css | 1 - ...on-a5bafc9682813b77f6e8431d24eb3e48.css.gz | Bin 22535 -> 0 bytes ...ion-d6a9b6cf72852a187374417f72027216.js.gz | Bin 103697 -> 0 bytes public/assets/application.css | 1990 +- public/assets/application.css.gz | Bin 31613 -> 24038 bytes public/assets/application.js | 30295 +--------------- public/assets/application.js.gz | Bin 229965 -> 115067 bytes ...font-8255009c90d86ee3458a13f5db9a6ed0.woff | Bin 41752 -> 0 bytes ...bfont-86a6da438b901860c3a54e21f9098bf8.eot | Bin 38708 -> 0 bytes ...bfont-89ca9bd89cea7c74302ae94f18d4ec3e.ttf | Bin 68476 -> 0 bytes ...bfont-c3f3594758768fbb43eae746d18b3b50.svg | 255 - public/assets/fontawesome-webfont.eot | Bin 27879 -> 0 bytes public/assets/fontawesome-webfont.svg | 255 - public/assets/fontawesome-webfont.ttf | Bin 60296 -> 0 bytes public/assets/fontawesome-webfont.woff | Bin 31840 -> 0 bytes ...rails-a3386665c05a2d82f711a4aaa72d247c.png | Bin 6646 -> 0 bytes public/assets/images/rails.png | Bin 6646 -> 0 bytes ...x100-7d1197a52442bc56fcad60d0390f4b32.png} | Bin ...x100-6bd1905222cab173dc4996f12b7a07cb.png} | Bin ...x400-d4e12d9ce6e2b20ae0aadf27c8dcd12c.png} | Bin ...x400-d1dabcb9501a4ed8c9bfc1b19c966022.png} | Bin ...x400-ab58fbcd66af992f067fcbc7c6488996.png} | Bin ...x100-b9ac529234515ff4971dee7e7281c14b.png} | Bin ...x100-ad5cffb7206618b1667599d7c6c24e00.png} | Bin ...x100-9f0c2e70b06a9eaec77d569b25b04d7e.png} | Bin ...x240-2f9a30594e6475d5f34e3e43d6447b41.png} | Bin ...x240-2ea4c160a75c1992daa2eeac86255b99.png} | Bin ...x240-232cd1e8416c1a5e7bbc316084708d2c.png} | Bin ...x240-d155be4d851213e810cb13fc5e009fbf.png} | Bin ...x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png} | Bin ...x240-e5dd5fb46ca349d167fbabdcb57e8f7c.png} | Bin ...x240-08305efda447dd00f0eaf5e34994bc92.png} | Bin ...lings-2851b489e8c39f8fad44fc10efb99c3e.png | Bin ...white-6cccd17a7aed91dbc0157d343c68c0d9.png | Bin .../assets/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes public/assets/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes ...ading-b7ff30d20adcf2b850f420d17048930c.gif | Bin 0 -> 3897 bytes public/assets/manifest.yml | 108 +- ...large-a1dc981da5d1712bc762f3078f201174.png | Bin 0 -> 4312 bytes ...small-6f00a05842ef93f01e648d1c80c3710f.png | Bin 0 -> 1054 bytes ..._tiny-eb905998ae5686c9eeb2693a7bc0f898.png | Bin 0 -> 581 bytes ...ssbar-bc538af0ba6ff3d792217a96651cd58a.gif | Bin 0 -> 3323 bytes public/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes public/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes public/img/loading.gif | Bin 0 -> 3897 bytes public/img/progressbar.gif | Bin 0 -> 3323 bytes public/javascripts/schedule/date.format.js | 126 + public/javascripts/schedule/jquery-1.8.3.js | 9472 +++++ .../schedule/jquery-ui-1.9.2.custom.min.js | 6 + public/javascripts/schedule/schedule.js | 178 + .../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 .../schedule/jquery-ui-1.9.2.custom.min.css | 5 + public/stylesheets/schedule/schedule.css | 195 + 123 files changed, 13587 insertions(+), 33123 deletions(-) rename app/assets/images/{ => images}/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename app/assets/images/{ => images}/ui-bg_flat_55_fbec88_40x100.png (100%) rename app/assets/images/{ => images}/ui-bg_glass_75_d0e5f5_1x400.png (100%) rename app/assets/images/{ => images}/ui-bg_glass_85_dfeffc_1x400.png (100%) rename app/assets/images/{ => images}/ui-bg_glass_95_fef1ec_1x400.png (100%) rename app/assets/images/{ => images}/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%) rename app/assets/images/{ => images}/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%) rename app/assets/images/{ => images}/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%) rename app/assets/images/{ => images}/ui-icons_217bc0_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_2e83ff_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_469bdd_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_6da8d5_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_cd0a0a_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_d8e7f3_256x240.png (100%) rename app/assets/images/{ => images}/ui-icons_f9bd01_256x240.png (100%) rename {public/assets/twitter/bootstrap => app/assets/images/img}/glyphicons-halflings-white.png (100%) rename {public/assets/twitter/bootstrap => app/assets/images/img}/glyphicons-halflings.png (100%) create mode 100644 app/assets/javascripts/bootstrap.min.js create mode 100644 app/assets/javascripts/date.format.js create mode 100644 app/assets/javascripts/osem.js create mode 100644 app/assets/javascripts/spectrum.js create mode 100644 app/assets/stylesheets/bootstrap.min.css delete mode 100644 app/assets/stylesheets/bootstrap_and_overrides.css delete mode 100644 app/assets/stylesheets/bootstrap_and_overrides.css.less delete mode 100644 app/assets/stylesheets/schedule.css create mode 100644 app/assets/stylesheets/spectrum.css rename public/assets/application-d6a9b6cf72852a187374417f72027216.js => application.js (83%) create mode 100644 public/assets/application-29159c13c2c5ef2fb3368b9d8e2f08a4.js create mode 100644 public/assets/application-29159c13c2c5ef2fb3368b9d8e2f08a4.js.gz create mode 100644 public/assets/application-9ab0f7f46e02dcd8c53c1038b1590fb3.css create mode 100644 public/assets/application-9ab0f7f46e02dcd8c53c1038b1590fb3.css.gz delete mode 100644 public/assets/application-a5bafc9682813b77f6e8431d24eb3e48.css delete mode 100644 public/assets/application-a5bafc9682813b77f6e8431d24eb3e48.css.gz delete mode 100644 public/assets/application-d6a9b6cf72852a187374417f72027216.js.gz delete mode 100755 public/assets/fontawesome-webfont-8255009c90d86ee3458a13f5db9a6ed0.woff delete mode 100755 public/assets/fontawesome-webfont-86a6da438b901860c3a54e21f9098bf8.eot delete mode 100755 public/assets/fontawesome-webfont-89ca9bd89cea7c74302ae94f18d4ec3e.ttf delete mode 100755 public/assets/fontawesome-webfont-c3f3594758768fbb43eae746d18b3b50.svg delete mode 100755 public/assets/fontawesome-webfont.eot delete mode 100755 public/assets/fontawesome-webfont.svg delete mode 100755 public/assets/fontawesome-webfont.ttf delete mode 100755 public/assets/fontawesome-webfont.woff delete mode 100644 public/assets/images/rails-a3386665c05a2d82f711a4aaa72d247c.png delete mode 100644 public/assets/images/rails.png rename public/assets/{ui-bg_flat_0_aaaaaa_40x100.png => images/ui-bg_flat_0_aaaaaa_40x100-7d1197a52442bc56fcad60d0390f4b32.png} (100%) rename public/assets/{ui-bg_flat_55_fbec88_40x100.png => images/ui-bg_flat_55_fbec88_40x100-6bd1905222cab173dc4996f12b7a07cb.png} (100%) rename public/assets/{ui-bg_glass_75_d0e5f5_1x400.png => images/ui-bg_glass_75_d0e5f5_1x400-d4e12d9ce6e2b20ae0aadf27c8dcd12c.png} (100%) rename public/assets/{ui-bg_glass_85_dfeffc_1x400.png => images/ui-bg_glass_85_dfeffc_1x400-d1dabcb9501a4ed8c9bfc1b19c966022.png} (100%) rename public/assets/{ui-bg_glass_95_fef1ec_1x400.png => images/ui-bg_glass_95_fef1ec_1x400-ab58fbcd66af992f067fcbc7c6488996.png} (100%) rename public/assets/{ui-bg_gloss-wave_55_5c9ccc_500x100.png => images/ui-bg_gloss-wave_55_5c9ccc_500x100-b9ac529234515ff4971dee7e7281c14b.png} (100%) rename public/assets/{ui-bg_inset-hard_100_f5f8f9_1x100.png => images/ui-bg_inset-hard_100_f5f8f9_1x100-ad5cffb7206618b1667599d7c6c24e00.png} (100%) rename public/assets/{ui-bg_inset-hard_100_fcfdfd_1x100.png => images/ui-bg_inset-hard_100_fcfdfd_1x100-9f0c2e70b06a9eaec77d569b25b04d7e.png} (100%) rename public/assets/{ui-icons_217bc0_256x240.png => images/ui-icons_217bc0_256x240-2f9a30594e6475d5f34e3e43d6447b41.png} (100%) rename public/assets/{ui-icons_2e83ff_256x240.png => images/ui-icons_2e83ff_256x240-2ea4c160a75c1992daa2eeac86255b99.png} (100%) rename public/assets/{ui-icons_469bdd_256x240.png => images/ui-icons_469bdd_256x240-232cd1e8416c1a5e7bbc316084708d2c.png} (100%) rename public/assets/{ui-icons_6da8d5_256x240.png => images/ui-icons_6da8d5_256x240-d155be4d851213e810cb13fc5e009fbf.png} (100%) rename public/assets/{ui-icons_cd0a0a_256x240.png => images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png} (100%) rename public/assets/{ui-icons_d8e7f3_256x240.png => images/ui-icons_d8e7f3_256x240-e5dd5fb46ca349d167fbabdcb57e8f7c.png} (100%) rename public/assets/{ui-icons_f9bd01_256x240.png => images/ui-icons_f9bd01_256x240-08305efda447dd00f0eaf5e34994bc92.png} (100%) rename public/assets/{twitter/bootstrap => img}/glyphicons-halflings-2851b489e8c39f8fad44fc10efb99c3e.png (100%) rename public/assets/{twitter/bootstrap => img}/glyphicons-halflings-white-6cccd17a7aed91dbc0157d343c68c0d9.png (100%) create mode 100644 public/assets/img/glyphicons-halflings-white.png create mode 100644 public/assets/img/glyphicons-halflings.png create mode 100644 public/assets/loading-b7ff30d20adcf2b850f420d17048930c.gif create mode 100644 public/assets/person_large-a1dc981da5d1712bc762f3078f201174.png create mode 100644 public/assets/person_small-6f00a05842ef93f01e648d1c80c3710f.png create mode 100644 public/assets/person_tiny-eb905998ae5686c9eeb2693a7bc0f898.png create mode 100644 public/assets/progressbar-bc538af0ba6ff3d792217a96651cd58a.gif create mode 100644 public/img/glyphicons-halflings-white.png create mode 100644 public/img/glyphicons-halflings.png create mode 100644 public/img/loading.gif create mode 100644 public/img/progressbar.gif create mode 100644 public/javascripts/schedule/date.format.js create mode 100644 public/javascripts/schedule/jquery-1.8.3.js create mode 100644 public/javascripts/schedule/jquery-ui-1.9.2.custom.min.js create mode 100644 public/javascripts/schedule/schedule.js create mode 100644 public/stylesheets/schedule/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 public/stylesheets/schedule/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 public/stylesheets/schedule/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 public/stylesheets/schedule/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 public/stylesheets/schedule/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 public/stylesheets/schedule/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 public/stylesheets/schedule/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 public/stylesheets/schedule/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 public/stylesheets/schedule/images/ui-icons_222222_256x240.png create mode 100644 public/stylesheets/schedule/images/ui-icons_2e83ff_256x240.png create mode 100644 public/stylesheets/schedule/images/ui-icons_454545_256x240.png create mode 100644 public/stylesheets/schedule/images/ui-icons_888888_256x240.png create mode 100644 public/stylesheets/schedule/images/ui-icons_cd0a0a_256x240.png create mode 100644 public/stylesheets/schedule/jquery-ui-1.9.2.custom.min.css create mode 100644 public/stylesheets/schedule/schedule.css diff --git a/Gemfile b/Gemfile index 4996dfc6..23dfdcc6 100644 --- a/Gemfile +++ b/Gemfile @@ -22,14 +22,12 @@ end gem 'paperclip', '~> 3.0' gem 'jquery-rails' -gem 'jquery_datepicker' gem 'jquery-fileupload-rails' gem 'devise' gem 'cancan' gem "haml" gem 'bcrypt-ruby', '~> 3.0.0' gem 'node' -gem 'twitter-bootstrap-rails' gem 'paper_trail' gem 'formtastic-bootstrap' gem 'cocoon' diff --git a/Gemfile.lock b/Gemfile.lock index 216098db..d9eb6af0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,6 @@ GEM jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery_datepicker (0.4) json (1.7.6) mail (2.4.4) i18n (>= 0.4.0) @@ -151,10 +150,6 @@ GEM polyglot polyglot (>= 0.3.1) ttfunk (1.0.3) - twitter-bootstrap-rails (2.2.0) - actionpack (>= 3.1) - execjs - railties (>= 3.1) tzinfo (0.3.35) uglifier (1.3.0) execjs (>= 0.3.0) @@ -176,7 +171,6 @@ DEPENDENCIES haml jquery-fileupload-rails jquery-rails - jquery_datepicker node paper_trail paperclip (~> 3.0) @@ -186,5 +180,4 @@ DEPENDENCIES sass-rails (~> 3.2.3) sqlite3 transitions - twitter-bootstrap-rails uglifier (>= 1.0.3) diff --git a/app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png rename to app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/app/assets/images/ui-bg_flat_55_fbec88_40x100.png b/app/assets/images/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_55_fbec88_40x100.png rename to app/assets/images/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/app/assets/images/ui-bg_glass_75_d0e5f5_1x400.png b/app/assets/images/images/ui-bg_glass_75_d0e5f5_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_75_d0e5f5_1x400.png rename to app/assets/images/images/ui-bg_glass_75_d0e5f5_1x400.png diff --git a/app/assets/images/ui-bg_glass_85_dfeffc_1x400.png b/app/assets/images/images/ui-bg_glass_85_dfeffc_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_85_dfeffc_1x400.png rename to app/assets/images/images/ui-bg_glass_85_dfeffc_1x400.png diff --git a/app/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_95_fef1ec_1x400.png rename to app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/app/assets/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/app/assets/images/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png similarity index 100% rename from app/assets/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename to app/assets/images/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png diff --git a/app/assets/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/app/assets/images/images/ui-bg_inset-hard_100_f5f8f9_1x100.png similarity index 100% rename from app/assets/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename to app/assets/images/images/ui-bg_inset-hard_100_f5f8f9_1x100.png diff --git a/app/assets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/app/assets/images/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from app/assets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to app/assets/images/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/app/assets/images/ui-icons_217bc0_256x240.png b/app/assets/images/images/ui-icons_217bc0_256x240.png similarity index 100% rename from app/assets/images/ui-icons_217bc0_256x240.png rename to app/assets/images/images/ui-icons_217bc0_256x240.png diff --git a/app/assets/images/ui-icons_2e83ff_256x240.png b/app/assets/images/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from app/assets/images/ui-icons_2e83ff_256x240.png rename to app/assets/images/images/ui-icons_2e83ff_256x240.png diff --git a/app/assets/images/ui-icons_469bdd_256x240.png b/app/assets/images/images/ui-icons_469bdd_256x240.png similarity index 100% rename from app/assets/images/ui-icons_469bdd_256x240.png rename to app/assets/images/images/ui-icons_469bdd_256x240.png diff --git a/app/assets/images/ui-icons_6da8d5_256x240.png b/app/assets/images/images/ui-icons_6da8d5_256x240.png similarity index 100% rename from app/assets/images/ui-icons_6da8d5_256x240.png rename to app/assets/images/images/ui-icons_6da8d5_256x240.png diff --git a/app/assets/images/ui-icons_cd0a0a_256x240.png b/app/assets/images/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from app/assets/images/ui-icons_cd0a0a_256x240.png rename to app/assets/images/images/ui-icons_cd0a0a_256x240.png diff --git a/app/assets/images/ui-icons_d8e7f3_256x240.png b/app/assets/images/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from app/assets/images/ui-icons_d8e7f3_256x240.png rename to app/assets/images/images/ui-icons_d8e7f3_256x240.png diff --git a/app/assets/images/ui-icons_f9bd01_256x240.png b/app/assets/images/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from app/assets/images/ui-icons_f9bd01_256x240.png rename to app/assets/images/images/ui-icons_f9bd01_256x240.png diff --git a/public/assets/twitter/bootstrap/glyphicons-halflings-white.png b/app/assets/images/img/glyphicons-halflings-white.png similarity index 100% rename from public/assets/twitter/bootstrap/glyphicons-halflings-white.png rename to app/assets/images/img/glyphicons-halflings-white.png diff --git a/public/assets/twitter/bootstrap/glyphicons-halflings.png b/app/assets/images/img/glyphicons-halflings.png similarity index 100% rename from public/assets/twitter/bootstrap/glyphicons-halflings.png rename to app/assets/images/img/glyphicons-halflings.png diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fd02cdb0..3dbfef84 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,76 +14,6 @@ //= require jquery_ujs //= require jquery-ui //= require jquery-fileupload -//= require twitter/bootstrap //= require cocoon - -$(function() { - - $('.dropdown-toggle').dropdown(); - $("#conference-start-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-end-datepicker").datepicker("option","minDate", selected) - } - }); - $("#conference-end-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-start-datepicker").datepicker("option","maxDate", selected) - $("#cfp-hard-datepicker").datepicker("option","minDate", selected) - - } - }); - - $("#cfp-hard-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-end-datepicker").datepicker("option","maxDate", selected) - $("#conference-start-datepicker").datepicker("option","maxDate", selected) - - } - }); - - $("#conference-reg-start-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-reg-end-datepicker").datepicker("option","minDate", selected) - } - }); - $("#conference-reg-end-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-reg-start-datepicker").datepicker("option","maxDate", selected) - } - }); - - $(".comment-reply-link").click(function(){ - $(".comment-reply", $(this).parent()).toggle(); - return false; - }); - - $("#event-comment-link").click(function(){ - $("#comments-div").toggle(); - return false; - }); - - $(".comment-reply").hide(); - $(".user-details-popover").popover(); - $("#comments-div").hide(); -}); - -function word_count(text, divId){ - var r = 0; - var input = text.value.replace(/\s/g,' '); - var word_array = input.split(' '); - for (var i=0; i < word_array.length; i++) { - if (word_array[i].length > 0) r++; - } - - $('#' + divId).text(r); -} \ No newline at end of file +//= require bootstrap.min +//= require osem diff --git a/app/assets/javascripts/bootstrap.min.js b/app/assets/javascripts/bootstrap.min.js new file mode 100644 index 00000000..e4679604 --- /dev/null +++ b/app/assets/javascripts/bootstrap.min.js @@ -0,0 +1,7 @@ +/** +* Bootstrap.js by @fat & @mdo +* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ +!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.focus().trigger("shown")}):b.$element.focus().trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('