diff --git a/Gemfile.lock b/Gemfile.lock index 264e4f9..52c7e9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,6 +93,7 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.4) + sqlite3 (1.3.4-x86-mingw32) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) @@ -107,6 +108,7 @@ GEM PLATFORMS ruby + x86-mingw32 DEPENDENCIES coffee-rails (~> 3.1.1) diff --git a/app/assets/images/foto_daniel.jpg b/app/assets/images/foto_daniel.jpg new file mode 100644 index 0000000..1810cd9 Binary files /dev/null and b/app/assets/images/foto_daniel.jpg differ diff --git a/app/assets/images/foto_david b/app/assets/images/foto_david new file mode 100644 index 0000000..afefb61 Binary files /dev/null and b/app/assets/images/foto_david differ diff --git a/app/assets/images/foto_david.jpg b/app/assets/images/foto_david.jpg new file mode 100644 index 0000000..afefb61 Binary files /dev/null and b/app/assets/images/foto_david.jpg differ diff --git a/app/assets/stylesheets/planet.css.scss b/app/assets/stylesheets/planet.css.scss index e00ff17..3c496dc 100644 --- a/app/assets/stylesheets/planet.css.scss +++ b/app/assets/stylesheets/planet.css.scss @@ -1,3 +1,52 @@ // Place all the styles related to the Planet controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.nombre{ +font-family: Comic Sans MS; +font-weight: bold; +} + +.curriculum{ +padding-left: 10px; +} + +.foto_daniel{ +position:relative; +top:300px; +left:-420px; +} + +.foto_david{ +position:relative; +top:140px; +left:-420px; +} + +#alumno_daniel{ +float: left; +} + +#alumno_david{ +float: left; +margin-left:150px; +} + +li{ +padding-top:10px; +} + +.wrapper { +min-height: 100%; +height: auto; +height: 100%; +margin: 0 auto -4em; +} + +.pie_pagina, .push{ +height: 4em; +} + +html, body { +height: 100%; +} diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb index 97d6b5a..d0d6312 100644 --- a/app/controllers/planet_controller.rb +++ b/app/controllers/planet_controller.rb @@ -8,5 +8,9 @@ def contact # GET /planet/ejemplo 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..0c10bd1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,17 @@ + +<%= link_to('Home', planet_index_path) + ' | ' + link_to('Contact', planet_contact_path) + ' | ' + link_to('Ejemplo', planet_ejemplo_path) + ' | ' + link_to('Author', planet_author_path) %> + <%= yield %> + + +
+<%= link_to('Home', planet_index_path) + ' | ' + link_to('Contact', planet_contact_path) + ' | ' + link_to('Ejemplo', planet_ejemplo_path) + ' | ' + link_to('Author', planet_author_path) %> +
+ + diff --git a/app/views/planet/author.html.erb b/app/views/planet/author.html.erb new file mode 100644 index 0000000..7d2e76b --- /dev/null +++ b/app/views/planet/author.html.erb @@ -0,0 +1 @@ +

Autores

Somos Daniel Carpintero Morales y David García Regodón. Nuestros datos son:
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 76abd71..125c3d9 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" # Se añade una nueva ruta a la acción author # The priority is based upon order of creation: # first created -> highest priority. diff --git a/public/resource/curriculum_daniel.pdf b/public/resource/curriculum_daniel.pdf new file mode 100644 index 0000000..edc62ca Binary files /dev/null and b/public/resource/curriculum_daniel.pdf differ diff --git a/public/resource/curriculum_david.pdf b/public/resource/curriculum_david.pdf new file mode 100644 index 0000000..2741b66 Binary files /dev/null and b/public/resource/curriculum_david.pdf differ