Moved files to their final path

jmelis · Mar 26, 2011 · 505da96 · 505da96
1 parent 7fada3f
commit 505da96
Show file tree

Hide file tree

Showing 48 changed files with 2 additions and 4 deletions.
diff --git 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 → public/images/start-bg.png b/web/images/start-bg.png → public/images/start-bg.png
diff --git a/web/images/webcam.swf → public/images/webcam.swf b/web/images/webcam.swf → public/images/webcam.swf
diff --git a/web/javascripts/application.js → public/javascripts/application.js b/web/javascripts/application.js → public/javascripts/application.js
diff --git a/web/javascripts/arduino.js → public/javascripts/arduino.js b/web/javascripts/arduino.js → public/javascripts/arduino.js
diff --git a/web/javascripts/jquery-ui.js → public/javascripts/jquery-ui.js b/web/javascripts/jquery-ui.js → public/javascripts/jquery-ui.js
diff --git a/web/javascripts/jquery.min.js → public/javascripts/jquery.min.js b/web/javascripts/jquery.min.js → public/javascripts/jquery.min.js
diff --git a/web/javascripts/jquery.timers.js → public/javascripts/jquery.timers.js b/web/javascripts/jquery.timers.js → public/javascripts/jquery.timers.js
diff --git a/web/javascripts/jquery.ui.core.js → public/javascripts/jquery.ui.core.js b/web/javascripts/jquery.ui.core.js → public/javascripts/jquery.ui.core.js
diff --git a/web/javascripts/jquery.ui.progressbar.js → public/javascripts/jquery.ui.progressbar.js b/web/javascripts/jquery.ui.progressbar.js → public/javascripts/jquery.ui.progressbar.js
diff --git a/web/javascripts/jquery.ui.widget.js → public/javascripts/jquery.ui.widget.js b/web/javascripts/jquery.ui.widget.js → public/javascripts/jquery.ui.widget.js
diff --git a/...s/SF_Burlington_Script_Italic-webfont.eot → ...s/SF_Burlington_Script_Italic-webfont.eot b/...s/SF_Burlington_Script_Italic-webfont.eot → ...s/SF_Burlington_Script_Italic-webfont.eot
diff --git a/...s/SF_Burlington_Script_Italic-webfont.svg → ...s/SF_Burlington_Script_Italic-webfont.svg b/...s/SF_Burlington_Script_Italic-webfont.svg → ...s/SF_Burlington_Script_Italic-webfont.svg
diff --git a/...s/SF_Burlington_Script_Italic-webfont.ttf → ...s/SF_Burlington_Script_Italic-webfont.ttf b/...s/SF_Burlington_Script_Italic-webfont.ttf → ...s/SF_Burlington_Script_Italic-webfont.ttf
diff --git a/.../SF_Burlington_Script_Italic-webfont.woff → .../SF_Burlington_Script_Italic-webfont.woff b/.../SF_Burlington_Script_Italic-webfont.woff → .../SF_Burlington_Script_Italic-webfont.woff
diff --git a/web/stylesheets/button-start-off.png → public/stylesheets/button-start-off.png b/web/stylesheets/button-start-off.png → public/stylesheets/button-start-off.png
diff --git a/web/stylesheets/button-start-on.png → public/stylesheets/button-start-on.png b/web/stylesheets/button-start-on.png → public/stylesheets/button-start-on.png
diff --git a/web/stylesheets/fermat.css → public/stylesheets/fermat.css b/web/stylesheets/fermat.css → public/stylesheets/fermat.css
diff --git a/...ets/images/ui-bg_flat_0_aaaaaa_40x100.png → ...ets/images/ui-bg_flat_0_aaaaaa_40x100.png b/...ets/images/ui-bg_flat_0_aaaaaa_40x100.png → ...ets/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/...ts/images/ui-bg_flat_75_fefefe_40x100.png → ...ts/images/ui-bg_flat_75_fefefe_40x100.png b/...ts/images/ui-bg_flat_75_fefefe_40x100.png → ...ts/images/ui-bg_flat_75_fefefe_40x100.png
diff --git a/...ts/images/ui-bg_glass_55_fbf9ee_1x400.png → ...ts/images/ui-bg_glass_55_fbf9ee_1x400.png b/...ts/images/ui-bg_glass_55_fbf9ee_1x400.png → ...ts/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/...ts/images/ui-bg_glass_65_ffffff_1x400.png → ...ts/images/ui-bg_glass_65_ffffff_1x400.png b/...ts/images/ui-bg_glass_65_ffffff_1x400.png → ...ts/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/...ts/images/ui-bg_glass_75_dadada_1x400.png → ...ts/images/ui-bg_glass_75_dadada_1x400.png b/...ts/images/ui-bg_glass_75_dadada_1x400.png → ...ts/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/...ts/images/ui-bg_glass_75_e6e6e6_1x400.png → ...ts/images/ui-bg_glass_75_e6e6e6_1x400.png b/...ts/images/ui-bg_glass_75_e6e6e6_1x400.png → ...ts/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/.../ui-bg_highlight-hard_75_cc0057_1x100.png → .../ui-bg_highlight-hard_75_cc0057_1x100.png b/.../ui-bg_highlight-hard_75_cc0057_1x100.png → .../ui-bg_highlight-hard_75_cc0057_1x100.png
diff --git a/...ages/ui-bg_inset-soft_95_fef1ec_1x100.png → ...ages/ui-bg_inset-soft_95_fef1ec_1x100.png b/...ages/ui-bg_inset-soft_95_fef1ec_1x100.png → ...ages/ui-bg_inset-soft_95_fef1ec_1x100.png
diff --git a/...sheets/images/ui-icons_222222_256x240.png → ...sheets/images/ui-icons_222222_256x240.png b/...sheets/images/ui-icons_222222_256x240.png → ...sheets/images/ui-icons_222222_256x240.png
diff --git a/...sheets/images/ui-icons_2e83ff_256x240.png → ...sheets/images/ui-icons_2e83ff_256x240.png b/...sheets/images/ui-icons_2e83ff_256x240.png → ...sheets/images/ui-icons_2e83ff_256x240.png
diff --git a/...sheets/images/ui-icons_454545_256x240.png → ...sheets/images/ui-icons_454545_256x240.png b/...sheets/images/ui-icons_454545_256x240.png → ...sheets/images/ui-icons_454545_256x240.png
diff --git a/...sheets/images/ui-icons_888888_256x240.png → ...sheets/images/ui-icons_888888_256x240.png b/...sheets/images/ui-icons_888888_256x240.png → ...sheets/images/ui-icons_888888_256x240.png
diff --git a/...sheets/images/ui-icons_cd0a0a_256x240.png → ...sheets/images/ui-icons_cd0a0a_256x240.png b/...sheets/images/ui-icons_cd0a0a_256x240.png → ...sheets/images/ui-icons_cd0a0a_256x240.png
diff --git a/web/stylesheets/jquery-ui.css → public/stylesheets/jquery-ui.css b/web/stylesheets/jquery-ui.css → public/stylesheets/jquery-ui.css
diff --git a/web/stylesheets/pergamino.png → public/stylesheets/pergamino.png b/web/stylesheets/pergamino.png → public/stylesheets/pergamino.png
diff --git a/web/stylesheets/window-bg.png → public/stylesheets/window-bg.png b/web/stylesheets/window-bg.png → public/stylesheets/window-bg.png
diff --git a/web/stylesheets/window-bottom.png → public/stylesheets/window-bottom.png b/web/stylesheets/window-bottom.png → public/stylesheets/window-bottom.png
diff --git a/web/stylesheets/window-top.png → public/stylesheets/window-top.png b/web/stylesheets/window-top.png → public/stylesheets/window-top.png
diff --git a/web/questions/ACERTIJO_3.ggb → questions/ACERTIJO_3.ggb b/web/questions/ACERTIJO_3.ggb → questions/ACERTIJO_3.ggb
diff --git a/web/questions/ACERTIJO_3CONTEXTO.ggb → questions/ACERTIJO_3CONTEXTO.ggb b/web/questions/ACERTIJO_3CONTEXTO.ggb → questions/ACERTIJO_3CONTEXTO.ggb
diff --git a/web/questions/acertijo2.ggb → questions/acertijo2.ggb b/web/questions/acertijo2.ggb → questions/acertijo2.ggb
diff --git a/web/questions/acertijo2contexto.ggb → questions/acertijo2contexto.ggb b/web/questions/acertijo2contexto.ggb → questions/acertijo2contexto.ggb
diff --git a/web/questions/acertijo2escalado.ggb → questions/acertijo2escalado.ggb b/web/questions/acertijo2escalado.ggb → questions/acertijo2escalado.ggb
diff --git a/web/questions/geogebra.jar → questions/geogebra.jar b/web/questions/geogebra.jar → questions/geogebra.jar
diff --git a/web/questions/geogebra_cas.jar → questions/geogebra_cas.jar b/web/questions/geogebra_cas.jar → questions/geogebra_cas.jar
diff --git a/web/questions/geogebra_export.jar → questions/geogebra_export.jar b/web/questions/geogebra_export.jar → questions/geogebra_export.jar
diff --git a/web/questions/geogebra_gui.jar → questions/geogebra_gui.jar b/web/questions/geogebra_gui.jar → questions/geogebra_gui.jar
diff --git a/web/questions/geogebra_main.jar → questions/geogebra_main.jar b/web/questions/geogebra_main.jar → questions/geogebra_main.jar
diff --git a/web/questions/geogebra_properties.jar → questions/geogebra_properties.jar b/web/questions/geogebra_properties.jar → questions/geogebra_properties.jar
diff --git a/web/fermat.html → templates/fermat.html b/web/fermat.html → templates/fermat.html