From 505da96be447c43f4bce5d43250d34412881e35e Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Sat, 26 Mar 2011 19:22:48 +0100 Subject: [PATCH] Moved files to their final path --- fermat.rb | 6 ++---- {web => public}/images/start-bg.png | Bin {web => public}/images/webcam.swf | Bin {web => public}/javascripts/application.js | 0 {web => public}/javascripts/arduino.js | 0 {web => public}/javascripts/jquery-ui.js | 0 {web => public}/javascripts/jquery.min.js | 0 {web => public}/javascripts/jquery.timers.js | 0 {web => public}/javascripts/jquery.ui.core.js | 0 .../javascripts/jquery.ui.progressbar.js | 0 {web => public}/javascripts/jquery.ui.widget.js | 0 .../SF_Burlington_Script_Italic-webfont.eot | Bin .../SF_Burlington_Script_Italic-webfont.svg | 0 .../SF_Burlington_Script_Italic-webfont.ttf | Bin .../SF_Burlington_Script_Italic-webfont.woff | Bin {web => public}/stylesheets/button-start-off.png | Bin {web => public}/stylesheets/button-start-on.png | Bin {web => public}/stylesheets/fermat.css | 0 .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_fefefe_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_highlight-hard_75_cc0057_1x100.png | Bin .../images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin .../stylesheets/images/ui-icons_222222_256x240.png | Bin .../stylesheets/images/ui-icons_2e83ff_256x240.png | Bin .../stylesheets/images/ui-icons_454545_256x240.png | Bin .../stylesheets/images/ui-icons_888888_256x240.png | Bin .../stylesheets/images/ui-icons_cd0a0a_256x240.png | Bin {web => public}/stylesheets/jquery-ui.css | 0 {web => public}/stylesheets/pergamino.png | Bin {web => public}/stylesheets/window-bg.png | Bin {web => public}/stylesheets/window-bottom.png | Bin {web => public}/stylesheets/window-top.png | Bin {web/questions => questions}/ACERTIJO_3.ggb | Bin {web/questions => questions}/ACERTIJO_3CONTEXTO.ggb | Bin {web/questions => questions}/acertijo2.ggb | Bin {web/questions => questions}/acertijo2contexto.ggb | Bin {web/questions => questions}/acertijo2escalado.ggb | Bin {web/questions => questions}/geogebra.jar | Bin {web/questions => questions}/geogebra_cas.jar | Bin {web/questions => questions}/geogebra_export.jar | Bin {web/questions => questions}/geogebra_gui.jar | Bin {web/questions => questions}/geogebra_main.jar | Bin .../questions => questions}/geogebra_properties.jar | Bin {web => templates}/fermat.html | 0 48 files changed, 2 insertions(+), 4 deletions(-) rename {web => public}/images/start-bg.png (100%) rename {web => public}/images/webcam.swf (100%) rename {web => public}/javascripts/application.js (100%) rename {web => public}/javascripts/arduino.js (100%) rename {web => public}/javascripts/jquery-ui.js (100%) rename {web => public}/javascripts/jquery.min.js (100%) rename {web => public}/javascripts/jquery.timers.js (100%) rename {web => public}/javascripts/jquery.ui.core.js (100%) rename {web => public}/javascripts/jquery.ui.progressbar.js (100%) rename {web => public}/javascripts/jquery.ui.widget.js (100%) rename {web => public}/stylesheets/SF_Burlington_Script_Italic-webfont.eot (100%) rename {web => public}/stylesheets/SF_Burlington_Script_Italic-webfont.svg (100%) rename {web => public}/stylesheets/SF_Burlington_Script_Italic-webfont.ttf (100%) rename {web => public}/stylesheets/SF_Burlington_Script_Italic-webfont.woff (100%) rename {web => public}/stylesheets/button-start-off.png (100%) rename {web => public}/stylesheets/button-start-on.png (100%) rename {web => public}/stylesheets/fermat.css (100%) rename {web => public}/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {web => public}/stylesheets/images/ui-bg_flat_75_fefefe_40x100.png (100%) rename {web => public}/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {web => public}/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {web => public}/stylesheets/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {web => public}/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {web => public}/stylesheets/images/ui-bg_highlight-hard_75_cc0057_1x100.png (100%) rename {web => public}/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png (100%) rename {web => public}/stylesheets/images/ui-icons_222222_256x240.png (100%) rename {web => public}/stylesheets/images/ui-icons_2e83ff_256x240.png (100%) rename {web => public}/stylesheets/images/ui-icons_454545_256x240.png (100%) rename {web => public}/stylesheets/images/ui-icons_888888_256x240.png (100%) rename {web => public}/stylesheets/images/ui-icons_cd0a0a_256x240.png (100%) rename {web => public}/stylesheets/jquery-ui.css (100%) rename {web => public}/stylesheets/pergamino.png (100%) rename {web => public}/stylesheets/window-bg.png (100%) rename {web => public}/stylesheets/window-bottom.png (100%) rename {web => public}/stylesheets/window-top.png (100%) rename {web/questions => questions}/ACERTIJO_3.ggb (100%) rename {web/questions => questions}/ACERTIJO_3CONTEXTO.ggb (100%) rename {web/questions => questions}/acertijo2.ggb (100%) rename {web/questions => questions}/acertijo2contexto.ggb (100%) rename {web/questions => questions}/acertijo2escalado.ggb (100%) rename {web/questions => questions}/geogebra.jar (100%) rename {web/questions => questions}/geogebra_cas.jar (100%) rename {web/questions => questions}/geogebra_export.jar (100%) rename {web/questions => questions}/geogebra_gui.jar (100%) rename {web/questions => questions}/geogebra_main.jar (100%) rename {web/questions => questions}/geogebra_properties.jar (100%) rename {web => templates}/fermat.html (100%) diff --git a/fermat.rb b/fermat.rb index 2d34674..133bd67 100644 --- a/fermat.rb +++ b/fermat.rb @@ -6,18 +6,16 @@ arduino = Arduino.new -set :public, 'web' - mime_type :ttf, "application/octet-stream" mime_type :woff, "application/octet-stream" mime_type :ggb, "application/octet-stream" get '/' do - File.read(File.dirname(__FILE__)+'/web/fermat.html') + File.read(File.dirname(__FILE__)+'/templates/fermat.html') end get '/questions/:question' do - File.read(File.dirname(__FILE__) + '/web/questions/' + params[:question]) + File.read(File.dirname(__FILE__) + '/questions/' + params[:question]) end # Arduino API diff --git a/web/images/start-bg.png b/public/images/start-bg.png similarity index 100% rename from web/images/start-bg.png rename to public/images/start-bg.png diff --git a/web/images/webcam.swf b/public/images/webcam.swf similarity index 100% rename from web/images/webcam.swf rename to public/images/webcam.swf diff --git a/web/javascripts/application.js b/public/javascripts/application.js similarity index 100% rename from web/javascripts/application.js rename to public/javascripts/application.js diff --git a/web/javascripts/arduino.js b/public/javascripts/arduino.js similarity index 100% rename from web/javascripts/arduino.js rename to public/javascripts/arduino.js diff --git a/web/javascripts/jquery-ui.js b/public/javascripts/jquery-ui.js similarity index 100% rename from web/javascripts/jquery-ui.js rename to public/javascripts/jquery-ui.js diff --git a/web/javascripts/jquery.min.js b/public/javascripts/jquery.min.js similarity index 100% rename from web/javascripts/jquery.min.js rename to public/javascripts/jquery.min.js diff --git a/web/javascripts/jquery.timers.js b/public/javascripts/jquery.timers.js similarity index 100% rename from web/javascripts/jquery.timers.js rename to public/javascripts/jquery.timers.js diff --git a/web/javascripts/jquery.ui.core.js b/public/javascripts/jquery.ui.core.js similarity index 100% rename from web/javascripts/jquery.ui.core.js rename to public/javascripts/jquery.ui.core.js diff --git a/web/javascripts/jquery.ui.progressbar.js b/public/javascripts/jquery.ui.progressbar.js similarity index 100% rename from web/javascripts/jquery.ui.progressbar.js rename to public/javascripts/jquery.ui.progressbar.js diff --git a/web/javascripts/jquery.ui.widget.js b/public/javascripts/jquery.ui.widget.js similarity index 100% rename from web/javascripts/jquery.ui.widget.js rename to public/javascripts/jquery.ui.widget.js diff --git a/web/stylesheets/SF_Burlington_Script_Italic-webfont.eot b/public/stylesheets/SF_Burlington_Script_Italic-webfont.eot similarity index 100% rename from web/stylesheets/SF_Burlington_Script_Italic-webfont.eot rename to public/stylesheets/SF_Burlington_Script_Italic-webfont.eot diff --git a/web/stylesheets/SF_Burlington_Script_Italic-webfont.svg b/public/stylesheets/SF_Burlington_Script_Italic-webfont.svg similarity index 100% rename from web/stylesheets/SF_Burlington_Script_Italic-webfont.svg rename to public/stylesheets/SF_Burlington_Script_Italic-webfont.svg diff --git a/web/stylesheets/SF_Burlington_Script_Italic-webfont.ttf b/public/stylesheets/SF_Burlington_Script_Italic-webfont.ttf similarity index 100% rename from web/stylesheets/SF_Burlington_Script_Italic-webfont.ttf rename to public/stylesheets/SF_Burlington_Script_Italic-webfont.ttf diff --git a/web/stylesheets/SF_Burlington_Script_Italic-webfont.woff b/public/stylesheets/SF_Burlington_Script_Italic-webfont.woff similarity index 100% rename from web/stylesheets/SF_Burlington_Script_Italic-webfont.woff rename to public/stylesheets/SF_Burlington_Script_Italic-webfont.woff diff --git a/web/stylesheets/button-start-off.png b/public/stylesheets/button-start-off.png similarity index 100% rename from web/stylesheets/button-start-off.png rename to public/stylesheets/button-start-off.png diff --git a/web/stylesheets/button-start-on.png b/public/stylesheets/button-start-on.png similarity index 100% rename from web/stylesheets/button-start-on.png rename to public/stylesheets/button-start-on.png diff --git a/web/stylesheets/fermat.css b/public/stylesheets/fermat.css similarity index 100% rename from web/stylesheets/fermat.css rename to public/stylesheets/fermat.css diff --git a/web/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from web/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png rename to public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/web/stylesheets/images/ui-bg_flat_75_fefefe_40x100.png b/public/stylesheets/images/ui-bg_flat_75_fefefe_40x100.png similarity index 100% rename from web/stylesheets/images/ui-bg_flat_75_fefefe_40x100.png rename to public/stylesheets/images/ui-bg_flat_75_fefefe_40x100.png diff --git a/web/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from web/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png rename to public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/web/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png b/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from web/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png rename to public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/web/stylesheets/images/ui-bg_glass_75_dadada_1x400.png b/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from web/stylesheets/images/ui-bg_glass_75_dadada_1x400.png rename to public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png diff --git a/web/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from web/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png rename to public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/web/stylesheets/images/ui-bg_highlight-hard_75_cc0057_1x100.png b/public/stylesheets/images/ui-bg_highlight-hard_75_cc0057_1x100.png similarity index 100% rename from web/stylesheets/images/ui-bg_highlight-hard_75_cc0057_1x100.png rename to public/stylesheets/images/ui-bg_highlight-hard_75_cc0057_1x100.png diff --git a/web/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png similarity index 100% rename from web/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png rename to public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png diff --git a/web/stylesheets/images/ui-icons_222222_256x240.png b/public/stylesheets/images/ui-icons_222222_256x240.png similarity index 100% rename from web/stylesheets/images/ui-icons_222222_256x240.png rename to public/stylesheets/images/ui-icons_222222_256x240.png diff --git a/web/stylesheets/images/ui-icons_2e83ff_256x240.png b/public/stylesheets/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from web/stylesheets/images/ui-icons_2e83ff_256x240.png rename to public/stylesheets/images/ui-icons_2e83ff_256x240.png diff --git a/web/stylesheets/images/ui-icons_454545_256x240.png b/public/stylesheets/images/ui-icons_454545_256x240.png similarity index 100% rename from web/stylesheets/images/ui-icons_454545_256x240.png rename to public/stylesheets/images/ui-icons_454545_256x240.png diff --git a/web/stylesheets/images/ui-icons_888888_256x240.png b/public/stylesheets/images/ui-icons_888888_256x240.png similarity index 100% rename from web/stylesheets/images/ui-icons_888888_256x240.png rename to public/stylesheets/images/ui-icons_888888_256x240.png diff --git a/web/stylesheets/images/ui-icons_cd0a0a_256x240.png b/public/stylesheets/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from web/stylesheets/images/ui-icons_cd0a0a_256x240.png rename to public/stylesheets/images/ui-icons_cd0a0a_256x240.png diff --git a/web/stylesheets/jquery-ui.css b/public/stylesheets/jquery-ui.css similarity index 100% rename from web/stylesheets/jquery-ui.css rename to public/stylesheets/jquery-ui.css diff --git a/web/stylesheets/pergamino.png b/public/stylesheets/pergamino.png similarity index 100% rename from web/stylesheets/pergamino.png rename to public/stylesheets/pergamino.png diff --git a/web/stylesheets/window-bg.png b/public/stylesheets/window-bg.png similarity index 100% rename from web/stylesheets/window-bg.png rename to public/stylesheets/window-bg.png diff --git a/web/stylesheets/window-bottom.png b/public/stylesheets/window-bottom.png similarity index 100% rename from web/stylesheets/window-bottom.png rename to public/stylesheets/window-bottom.png diff --git a/web/stylesheets/window-top.png b/public/stylesheets/window-top.png similarity index 100% rename from web/stylesheets/window-top.png rename to public/stylesheets/window-top.png diff --git a/web/questions/ACERTIJO_3.ggb b/questions/ACERTIJO_3.ggb similarity index 100% rename from web/questions/ACERTIJO_3.ggb rename to questions/ACERTIJO_3.ggb diff --git a/web/questions/ACERTIJO_3CONTEXTO.ggb b/questions/ACERTIJO_3CONTEXTO.ggb similarity index 100% rename from web/questions/ACERTIJO_3CONTEXTO.ggb rename to questions/ACERTIJO_3CONTEXTO.ggb diff --git a/web/questions/acertijo2.ggb b/questions/acertijo2.ggb similarity index 100% rename from web/questions/acertijo2.ggb rename to questions/acertijo2.ggb diff --git a/web/questions/acertijo2contexto.ggb b/questions/acertijo2contexto.ggb similarity index 100% rename from web/questions/acertijo2contexto.ggb rename to questions/acertijo2contexto.ggb diff --git a/web/questions/acertijo2escalado.ggb b/questions/acertijo2escalado.ggb similarity index 100% rename from web/questions/acertijo2escalado.ggb rename to questions/acertijo2escalado.ggb diff --git a/web/questions/geogebra.jar b/questions/geogebra.jar similarity index 100% rename from web/questions/geogebra.jar rename to questions/geogebra.jar diff --git a/web/questions/geogebra_cas.jar b/questions/geogebra_cas.jar similarity index 100% rename from web/questions/geogebra_cas.jar rename to questions/geogebra_cas.jar diff --git a/web/questions/geogebra_export.jar b/questions/geogebra_export.jar similarity index 100% rename from web/questions/geogebra_export.jar rename to questions/geogebra_export.jar diff --git a/web/questions/geogebra_gui.jar b/questions/geogebra_gui.jar similarity index 100% rename from web/questions/geogebra_gui.jar rename to questions/geogebra_gui.jar diff --git a/web/questions/geogebra_main.jar b/questions/geogebra_main.jar similarity index 100% rename from web/questions/geogebra_main.jar rename to questions/geogebra_main.jar diff --git a/web/questions/geogebra_properties.jar b/questions/geogebra_properties.jar similarity index 100% rename from web/questions/geogebra_properties.jar rename to questions/geogebra_properties.jar diff --git a/web/fermat.html b/templates/fermat.html similarity index 100% rename from web/fermat.html rename to templates/fermat.html