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.

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

Enrique Pardo y Victor H. Bazan #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -107,6 +108,7 @@ GEM

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
coffee-rails (~> 3.1.1)
Expand Down
Binary file added app/assets/images/Avatar-1-ld.png
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/epardo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/controllers/planet_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ def contact
def ejemplo
end

def author
end

end
1 change: 1 addition & 0 deletions app/views/planet/author.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>Authors</h1><p> Víctor Hugo Bazán Milla <br>Enrique Pardo Vázquez-Bruno<div id='vhbazan'><ul> <li> Nombre: <b><%= "Víctor Hugo Bazán Milla" %></b> <%= image_tag('Avatar-1-ld.png', :height => '120', :width => '95') %></li> <li> Dirección Postal: <b><%= "C/. Santiago Cordero 2-A, 2º C, 28029-Madrid" %></b> </li> <li> Dirección electrónica: <b><%= link_to('[email protected]', 'mailto:[email protected]') %></b> </li></ul><br><li><b>Especialidades Técnicas:</b><ol><b>Sistemas Operativos: </b> Windows 7/VISTA/XP/2000/NT/98, LINUX, UNIX, Mac O.S.</ol><ol><b>Lenguajes de Programación:</b> Java, C, HTML, XML, PHP, ASP, ASPX, .NET, Ruby, Ruby On Rails </ol><ol><b> Apps. móviles: </b>iOS (Objective-C), Android (Java) </ol><ol> <b>Bases de Datos:</b> Ms. SQL, Oracle, MySql. </ol><ol><b>Software: </b> Eclipse, Adobe Photoshop, Dreamweaver, phpDesigner, XCode, StartUML, IBM Rotational Works. </ol><ol><b>Idiomas:</b> Inglés: Avanzado. </ol></li><li><b>Experiencia Laboral:</b> <ol> <b> Administrador de Redes y Sistemas </b> Junio 2007 - Actualidad<br> <%=link_to('Escuela Técnica Superior de Arquitectura (U.P.M.)', 'http://www.aq.upm.es') %> - <i> Centro de Cálculo </i></ol> <ol> <b> Desarrollador de Aplicaciones Web </b> June 2006 – Junio 2007<br><%=link_to('Universidad Politécnica de Madrid','http://www.upm.es') %> - <i> Vicerrectorado de Relaciones Internacionales </i></ol> <ol> <b> Técnico Senior en Microinformática </b> June 2000 – Diciembre 2005 <br><%=link_to('Escuela Técnica Superior de Ing. de Telecomunicaciones', 'http://www.etsit.upm.es') %> - <i> Gabinete de Informática y Comunicaciones </i></ol></li></div><div id='epardo'><ul> <li> Nombre: <b><%= "Enrique Pardo Vázquez-Bruno" %></b> <%= image_tag('epardo.jpg', :height => '120', :width => '110') %></li> <li> Dirección Postal: <b><%= "Avenida de La Gavia 14, Portal 7, 2ºC 28051 Madrid" %></b> </li> <li> Dirección electrónica: <b><%= link_to('[email protected]', 'mailto:[email protected]') %></b> </li></ul><li><b>Experiencia Laboral:</b> <ol> Junio 2008 - Actualidad - <b> Programador </b><br> <%=link_to('Jazztel', 'http://www.jazztel.com') %></ol> <ol> Junio 2007 - Junio 2008 - <b> Programador PHP </b><br> <%=link_to('Getinsa', 'http://www.getinsa.com') %></ol> <ol> Mayo 2006 - junio 2007 - <b> Programador Web</b><br> <%=link_to('idealista.com', 'http://www.idealista.com') %></ol></li><br></div><br>
Expand Down
2 changes: 2 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

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