diff --git a/Gemfile b/Gemfile index 3e9bf61..476190a 100644 --- a/Gemfile +++ b/Gemfile @@ -34,3 +34,7 @@ group :test do # Pretty printed test output gem 'turn', '0.8.2', :require => false end + +#Gema para motor de java script + +gem 'therubyracer' diff --git a/Gemfile.lock b/Gemfile.lock index 264e4f9..d449902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,7 @@ GEM railties (~> 3.0) thor (~> 0.14) json (1.6.1) + libv8 (3.3.10.4) mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -93,6 +94,8 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.4) + therubyracer (0.9.9) + libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) @@ -114,5 +117,6 @@ DEPENDENCIES rails (= 3.1.3) sass-rails (~> 3.1.5) sqlite3 + therubyracer turn (= 0.8.2) uglifier (>= 1.0.3) diff --git a/app/assets/images/pablo.jpg b/app/assets/images/pablo.jpg new file mode 100644 index 0000000..2f971c1 Binary files /dev/null and b/app/assets/images/pablo.jpg differ diff --git a/app/assets/images/vmcano.jpg b/app/assets/images/vmcano.jpg new file mode 100644 index 0000000..4ca5de6 Binary files /dev/null and b/app/assets/images/vmcano.jpg differ diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb index 97d6b5a..cf00dc5 100644 --- a/app/controllers/planet_controller.rb +++ b/app/controllers/planet_controller.rb @@ -9,4 +9,8 @@ def contact def ejemplo end +# GET /planet/author + def author + end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 64eb443..1c2314b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,14 @@ <%= csrf_meta_tags %> + <%= yield %> + - + \ No newline at end of file diff --git a/app/views/planet/author.html.erb b/app/views/planet/author.html.erb new file mode 100644 index 0000000..0f3d3ef --- /dev/null +++ b/app/views/planet/author.html.erb @@ -0,0 +1,42 @@ +

Authors

+

Pablo Alonso Rodríguez

+<%= image_tag('pablo.jpg') %> +

Email: palonsoro@gmail.com o p.alonsor@alumnos.upm.es

+

Dirección postal: C\ Mesón de Paredes 52, 3A. 28012 Madrid

+

+ Soy un estudiante de la ETSIT-UPM con interés en electrónica y, sobre todo, en informática, en + especial en el area de desarrollo de aplicaciones, bien sea para escritorio, móvil o web.
+ Experiencia profesional:
+

+ Otros aspectos a mencionar:
+ +

+ +

Víctor Manuel Cano Fernández

+<%= image_tag('vmcano.jpg') %> +

Email: victor.cano.fernandez@alumnos.upm.es o vmcano@hotmail.com

+

Dirección postal: C\ Rafael Lucenqui, 6, 2ºB, 06004 Badajoz

+

+ Estudiante de Ingeniería de Telecomunicación. En la actualidad me encuantro en 5º curso, en la especialidad de Telemática, intensificación Redes y Servicios de Comunicaciones.
+ Experiencia profesional:
+

+ Otros aspectos a mencionar:
+ +

diff --git a/config/routes.rb b/config/routes.rb index 76abd71..27b616a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,8 @@ get "planet/contact" get "planet/ejemplo" # Se añade una nueva ruta a la acción ejemplo + + get "planet/author" # The priority is based upon order of creation: # first created -> highest priority. diff --git a/public/index.html b/public/index.html.old similarity index 100% rename from public/index.html rename to public/index.html.old