Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ejercicio 1 de Pablo Alonso Rodríguez y Victor Manuel Cano Fernández #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ejercicio 1 de Pablo Alonso Rodríguez y Victor Manuel Cano Fernández #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e554acc
Creada accion author. Añadidas barras de enlaces. Eliminado index.htm…
Nov 28, 2011
67d3ba8
Casi terminado. Falta rematar la informacion de los curriculums y aju…
Nov 28, 2011
9103c34
Fix del autor
Dec 1, 2011
ccd9905
fix commit
Dec 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 4 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -114,5 +117,6 @@ DEPENDENCIES
rails (= 3.1.3)
sass-rails (~> 3.1.5)
sqlite3
therubyracer
turn (= 0.8.2)
uglifier (>= 1.0.3)
Binary file added app/assets/images/pablo.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/vmcano.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/controllers/planet_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ def contact
def ejemplo
end

# GET /planet/author
def author
end

end
8 changes: 7 additions & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@
<%= csrf_meta_tags %>
</head>
<body>
<div id="#topLinksBar">
<%= link_to('Home', planet_index_path) + " | " + link_to('Contact', planet_contact_path) + " | " + link_to('Ejemplo', planet_ejemplo_path) + " | " + link_to('Author', planet_author_path) %>
</div>

<%= yield %>

<div id="#bottomLinksBar">
<%= link_to('Home', planet_index_path) + " | " + link_to('Contact', planet_contact_path) + " | " + link_to('Ejemplo', planet_ejemplo_path) + " | " + link_to('Author', planet_author_path) %>
</div>
</body>
</html>
</html>
42 changes: 42 additions & 0 deletions app/views/planet/author.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<h1>Authors</h1>
<h2 class="author_name">Pablo Alonso Rodr&iacute;guez</h2>
<%= image_tag('pablo.jpg') %>
<p class="author_email">Email: [email protected] o [email protected]</p>
<p class="author_address">Direcci&oacute;n postal: C\ Mes&oacute;n de Paredes 52, 3A. 28012 Madrid</p>
<p class="author_curriculum">
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. <br/>
Experiencia profesional:<br>
<ul>
<li>Beca en el Grupo de Tecnologías del Habla del DIE-UPM: Mejora de una práctica especial del Laboratorio
de Sistemas Electrónicos Digitales sobre el control de dispositivos domóticos con android.
</li>
</ul>
Otros aspectos a mencionar:<br/>
<ul>
<li>Titulo B2 de alemán por la Escuela Oficial de Idiomas</li>
<li>Beca excelencia realizada en el curso 2007/2008 por las notas de bachillerato</li>
<li>Segundo premio de primero de la Escuela, durante el citado curso 2007/2008</li>
</ul>
</p>

<h2 class="author_name">Víctor Manuel Cano Fernández</h2>
<%= image_tag('vmcano.jpg') %>
<p class="author_email">Email: [email protected] o [email protected]</p>
<p class="author_address">Direcci&oacute;n postal: C\ Rafael Lucenqui, 6, 2ºB, 06004 Badajoz</p>
<p class="author_curriculum">
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. <br/>
Experiencia profesional:<br>
<ul>
<li>Gestor de la red del CMU Mendel (2010 - Actualidad)
</li>
</ul>
Otros aspectos a mencionar:<br/>
<ul>
<li>Nivel medio de inglés.</li>
<li>Conocimiento de diversos lenguajes de programación: Java, C, Objective-C, Ruby...</li>
<li>Beca Excelencia (curso 2007/2008).</li>
<li>Jornadas sobre Empleo y Tecnología SATELEC (2008 y 2010).</li>
<li>Monitor de Actividades Complementarias (2005 - 2007).</li>
</ul>
</p>
2 changes: 2 additions & 0 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 public/index.html → public/index.html.old
View file
Open in desktop
File renamed without changes.