jquemada · mattiapei · Dec 18, 2011 · Dec 19, 2011
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README b/README
diff --git a/Rakefile b/Rakefile
diff --git a/app/assets/images/arbol1.png b/app/assets/images/arbol1.png
diff --git a/app/assets/images/arbol2.png b/app/assets/images/arbol2.png
diff --git a/app/assets/images/bruselas-m.png b/app/assets/images/bruselas-m.png
diff --git a/app/assets/images/florencia.png b/app/assets/images/florencia.png
diff --git a/app/assets/images/llanes.png b/app/assets/images/llanes.png
diff --git a/app/assets/images/logo3.png b/app/assets/images/logo3.png
diff --git a/app/assets/images/mattia.jpeg b/app/assets/images/mattia.jpeg
diff --git a/app/assets/images/pedriza.png b/app/assets/images/pedriza.png
diff --git a/app/assets/images/pedriza2-m.png b/app/assets/images/pedriza2-m.png
diff --git a/app/assets/images/pergamo.png b/app/assets/images/pergamo.png
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/assets/images/reichstag.png b/app/assets/images/reichstag.png
diff --git a/app/assets/images/robert.jpeg b/app/assets/images/robert.jpeg
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/planet.js.coffee b/app/assets/javascripts/planet.js.coffee
diff --git a/app/assets/javascripts/selecteds.js.coffee b/app/assets/javascripts/selecteds.js.coffee
diff --git a/app/assets/javascripts/sites.js.coffee b/app/assets/javascripts/sites.js.coffee
diff --git a/app/assets/javascripts/trips.js.coffee b/app/assets/javascripts/trips.js.coffee
diff --git a/app/assets/javascripts/types.js.coffee b/app/assets/javascripts/types.js.coffee
diff --git a/app/assets/javascripts/viajes.js.coffee b/app/assets/javascripts/viajes.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/authors.css b/app/assets/stylesheets/authors.css
@@ -0,0 +1,21 @@
+.data {
+    border: 2px solid #444466;
+    padding: 10px;
+    margin: 10px;
+}
+.data img {
+    float: right;
+}
+
+p.spacer {
+    clear: both;
+}
+
+.cv {
+	border: 1px solid #444466;
+	margin-right: 500px ;
+}
+
+.title {
+	font-weight: bold;
+}
diff --git a/app/assets/stylesheets/planet.css b/app/assets/stylesheets/planet.css
diff --git a/app/assets/stylesheets/planet.css.scss b/app/assets/stylesheets/planet.css.scss
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
diff --git a/app/assets/stylesheets/selecteds.css.scss b/app/assets/stylesheets/selecteds.css.scss
diff --git a/app/assets/stylesheets/sites.css.scss b/app/assets/stylesheets/sites.css.scss
diff --git a/app/assets/stylesheets/trips.css.scss b/app/assets/stylesheets/trips.css.scss
diff --git a/app/assets/stylesheets/types.css.scss b/app/assets/stylesheets/types.css.scss
diff --git a/app/assets/stylesheets/viajes.css.scss b/app/assets/stylesheets/viajes.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the viajes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb
diff --git a/app/controllers/selecteds_controller.rb b/app/controllers/selecteds_controller.rb
diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
@@ -1,8 +1,15 @@
 class SitesController < ApplicationController
+
   # GET /sites
   # GET /sites.json
   def index
-
+
+      if Viaje.nil? or Viaje.find(:all).empty?
+        @pos = 1
+    else
+        @pos = Viaje.maximum('position') + 1
+    end
+
     if params[:type_id].nil? or params[:type_id].empty?
       @sites = Site.all
     else

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb
diff --git a/app/controllers/viajes_controller.rb b/app/controllers/viajes_controller.rb
@@ -0,0 +1,85 @@
+class ViajesController < ApplicationController
+
+  # GET /viajes
+  # GET /viajes.json
+  def index
+
+      @viajes = Viaje.order(params[:position])      
+
+      respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @viajes }
+    end
+  end
+
+  # GET /viajes/1
+  # GET /viajes/1.json
+  def show
+    @viaje = Viaje.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @viaje }
+    end
+  end
+
+  # GET /viajes/new
+  # GET /viajes/new.json
+  def new
+    @viaje = Viaje.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @viaje }
+    end
+  end
+
+  # GET /viajes/1/edit
+  def edit
+    @viaje = Viaje.find(params[:id])
+  end
+
+  # POST /viajes
+  # POST /viajes.json
+  def create
+    @viaje = Viaje.new(params[:viaje])
+
+    respond_to do |format|
+      if @viaje.save
+        format.html { redirect_to @viaje, notice: 'Viaje was successfully created.' }
+        format.json { render json: @viaje, status: :created, location: @viaje }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @viaje.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /viajes/1
+  # PUT /viajes/1.json
+  def update
+    @viaje = Viaje.find(params[:id])
+
+    respond_to do |format|
+      if @viaje.update_attributes(params[:viaje])
+        format.html { redirect_to @viaje, notice: 'Viaje was successfully updated.' }
+        format.json { head :ok }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @viaje.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /viajes/1
+  # DELETE /viajes/1.json
+  def destroy
+    @viaje = Viaje.find(params[:id])
+    @viaje.destroy
+
+    respond_to do |format|
+      format.html { redirect_to viajes_url }
+      format.json { head :ok }
+    end
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/planet_helper.rb b/app/helpers/planet_helper.rb
diff --git a/app/helpers/selecteds_helper.rb b/app/helpers/selecteds_helper.rb
diff --git a/app/helpers/sites_helper.rb b/app/helpers/sites_helper.rb
diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb
diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb
diff --git a/app/helpers/viajes_helper.rb b/app/helpers/viajes_helper.rb
@@ -0,0 +1,2 @@
+module ViajesHelper
+end
diff --git a/app/mailers/.gitkeep b/app/mailers/.gitkeep
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
diff --git a/app/models/selected.rb b/app/models/selected.rb
diff --git a/app/models/site.rb b/app/models/site.rb
@@ -1,4 +1,5 @@
 class Site < ActiveRecord::Base
     belongs_to :type
     has_many   :selected
+    has_many   :viajes
 end
diff --git a/app/models/trip.rb b/app/models/trip.rb
diff --git a/app/models/type.rb b/app/models/type.rb
diff --git a/app/models/viaje.rb b/app/models/viaje.rb
@@ -0,0 +1,3 @@
+class Viaje < ActiveRecord::Base
+	belongs_to	:site
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -23,11 +23,16 @@
       <%= link_to "Home", planet_index_path %><br /> 
       <%= link_to "Tipos",  types_path %><br /> 
       <%= link_to "Sitios", sites_path %><br /> 
-      <%= link_to "Viajes", trips_path %><br /> 
+      <%= link_to "Trip", trips_path %><br /> 
+      <%= link_to "Viajes", viajes_path %><br /> 
+      <%= link_to "Autores", planet_author_path %><br /> 
       <%= link_to "Contact", planet_contact_path %>
     </div> 
     <div id="main"> 
+     <%= link_to('Home', planet_index_path) + " | " + link_to('Ejemplo', planet_ejemplo_path) + " | " + link_to('Autores', planet_author_path) + " | " + link_to('Contact', planet_contact_path) %><br />
       <%= yield %>
+	  <br /><%= link_to('Home', planet_index_path) + " | " + link_to('Ejemplo', planet_ejemplo_path) + " | " + link_to('Autores', planet_author_path) + " | " + link_to('Contact', planet_contact_path) %><br />
+    </div> 
     </div> 
   </div> 
 </body> 

diff --git a/app/views/planet/author.html.erb b/app/views/planet/author.html.erb
@@ -0,0 +1 @@
+<h1>Authors</h1><div class="data">	<%= image_tag('robert.jpeg', :size => "216x144") %>	<p><span class="title">Name:</span> Robert Fabian </p>	<p><span class="title">Address:</span> Madrid, c/Carboneras 3 </p>	<p><span class="title">Email:</span> [email protected] </p>	    <p><span class="title">CV:</span></p>	<div class="cv">		 <ul>		 	<li>Nombre: Robert Fabian</li>		 	<li>Pais: Polonia</li>		 	<li>Fecha nacimiento: 4 Marzo 1988</li>		 	<li>Universidad de origen: AGH en Cracovia</li>		 </ul>	</div> <!--cv-->	<p class="spacer"></p></div><div class="data">	<%= image_tag('mattia.jpeg', :size => "216x144") %>	<p><span class="title">Name:</span> Mattia Peirano </p>	<p><span class="title">Address:</span> Madrid, c/Luceros 4 </p>	<p><span class="title">Email:</span> [email protected] </p>    <p><span class="title">CV:</span></p>	<div class="cv">			<ul>		 	<li>Nombre: Mattia Peirano</li>		 	<li>Pais: Italia</li>		 	<li>Fecha nacimiento: 14 Febrero 1988</li>		 	<li>Universidad de origen: Politecnico di Torino</li>		 </ul>	</div> <!--cv-->    <p class="spacer"></p></div>

diff --git a/app/views/planet/contact.html.erb b/app/views/planet/contact.html.erb
diff --git a/app/views/planet/ejemplo.html.erb b/app/views/planet/ejemplo.html.erb
diff --git a/app/views/planet/index.html.erb b/app/views/planet/index.html.erb
diff --git a/app/views/selecteds/_form.html.erb b/app/views/selecteds/_form.html.erb
diff --git a/app/views/selecteds/create.js.erb b/app/views/selecteds/create.js.erb
diff --git a/app/views/selecteds/edit.html.erb b/app/views/selecteds/edit.html.erb
diff --git a/app/views/selecteds/index.html.erb b/app/views/selecteds/index.html.erb
diff --git a/app/views/selecteds/new.html.erb b/app/views/selecteds/new.html.erb
diff --git a/app/views/selecteds/show.html.erb b/app/views/selecteds/show.html.erb
diff --git a/app/views/sites/_form.html.erb b/app/views/sites/_form.html.erb
diff --git a/app/views/sites/edit.html.erb b/app/views/sites/edit.html.erb
diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb
@@ -20,6 +20,7 @@
       <td class="list_actions"> 
         <%= link_to 'Show', site %><br/>
         <%= link_to 'Edit', edit_site_path(site) %><br/>
+        <%= button_to 'Add to viaje', :controller => "viajes", :action => 'create', :method => "post", "viaje"=>{"site_id"=>site.id, "position"=>@pos} %> <br/>
         <%= link_to 'Destroy', site, 
                     :confirm => 'Are you sure?',
                     :method => :delete %>

diff --git a/app/views/sites/new.html.erb b/app/views/sites/new.html.erb
diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
diff --git a/app/views/types/_form.html.erb b/app/views/types/_form.html.erb
diff --git a/app/views/types/edit.html.erb b/app/views/types/edit.html.erb
diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb
diff --git a/app/views/types/new.html.erb b/app/views/types/new.html.erb
diff --git a/app/views/types/show.html.erb b/app/views/types/show.html.erb
diff --git a/app/views/viajes/_form.html.erb b/app/views/viajes/_form.html.erb
@@ -0,0 +1,22 @@
+<%= form_for(@viaje) do |f| %>
+  <% if @viaje.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@viaje.errors.count, "error") %> prohibited this viaje from being saved:</h2>
+
+      <ul>
+      <% @viaje.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+
+  <div class="field">
+    <%= f.label :position %><br />
+    <%= f.number_field :position %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
diff --git a/app/views/viajes/edit.html.erb b/app/views/viajes/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing viaje</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @viaje %> |
+<%= link_to 'Back', viajes_path %>
diff --git a/app/views/viajes/index.html.erb b/app/views/viajes/index.html.erb
@@ -0,0 +1,40 @@
+<div id="site_list"> 
+<h1>Listing viajes</h1>
+
+<table>
+   <tr class="<%= cycle('list_line_odd', 'list_line_even') %>"> 
+    <th>Image</th>
+    <th>Site and description</th>
+    <th>Position</th>
+    <th></th>
+  </tr>
+
+<% @viajes.order(:position).each do |viaje| %>
+  <tr class="<%= cycle('list_line_odd', 'list_line_even') %>"> 
+    <td> 
+        <%= link_to image_tag(viaje.site.image_url, :class => 'list_image'), viaje.site %>
+    </td> 
+    <td class="list_description"> 
+        <dl> 
+          <dt><%= link_to viaje.site.name if viaje.site %></dt> 
+          <dd><%= truncate(strip_tags(viaje.site.description),
+                 :length => 80) %></dd>
+        </dl> 
+    </td>
+    <td>	
+    	<%= viaje.position %>
+    </td>
+    <td class="list_actions"> 
+
+    	<%= link_to 'Show', viaje.site %> <br/>
+    	<%= link_to 'Edit Position', edit_viaje_path(viaje) %> <br/>
+    	<%= link_to 'Destroy', viaje, confirm: 'Are you sure?', method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>
+</div>
+
+<br />
+
+<!-- <%= link_to 'New Viaje', new_viaje_path %> -->
diff --git a/app/views/viajes/new.html.erb b/app/views/viajes/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New viaje</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', viajes_path %>
diff --git a/app/views/viajes/show.html.erb b/app/views/viajes/show.html.erb
@@ -0,0 +1,15 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Site:</b>
+  <%= @viaje.site.name if @viaje.site %>
+</p>
+
+<p>
+  <b>Position:</b>
+  <%= @viaje.position %>
+</p>
+
+
+<%= link_to 'Edit', edit_viaje_path(@viaje) %> |
+<%= link_to 'Back', viajes_path %>
diff --git a/config.ru b/config.ru
diff --git a/config/application.rb b/config/application.rb
@@ -44,5 +44,6 @@ class Application < Rails::Application
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/database.yml b/config/database.yml
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,7 @@
 Planet::Application.routes.draw do
 
+  resources :viajes
+
   resources :selecteds
 
   resources :trips
@@ -10,13 +12,19 @@
 
   resources :types do
     resources :sites
+  end  
+
+  resources :sites do 
+    resources :viajes
   end
 
   get "planet/index"
 
   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/db/migrate/20111121171513_create_types.rb b/db/migrate/20111121171513_create_types.rb
diff --git a/db/migrate/20111127165324_create_sites.rb b/db/migrate/20111127165324_create_sites.rb
diff --git a/db/migrate/20111208154738_create_trips.rb b/db/migrate/20111208154738_create_trips.rb
diff --git a/db/migrate/20111211202305_create_selecteds.rb b/db/migrate/20111211202305_create_selecteds.rb
diff --git a/db/migrate/20111215135441_create_viajes.rb b/db/migrate/20111215135441_create_viajes.rb
@@ -0,0 +1,10 @@
+class CreateViajes < ActiveRecord::Migration
+  def change
+    create_table :viajes do |t|
+      t.integer :site_id
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111211202305) do
+ActiveRecord::Schema.define(:version => 20111215135441) do
 
   create_table "selecteds", :force => true do |t|
     t.integer  "trip_id"
@@ -48,4 +48,11 @@
     t.datetime "updated_at"
   end
 
+  create_table "viajes", :force => true do |t|
+    t.integer  "site_id"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
diff --git a/lib/assets/.gitkeep b/lib/assets/.gitkeep
diff --git a/lib/tasks/.gitkeep b/lib/tasks/.gitkeep
diff --git a/log/.gitkeep b/log/.gitkeep
diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/test/fixtures/.gitkeep b/test/fixtures/.gitkeep
diff --git a/test/fixtures/selecteds.yml b/test/fixtures/selecteds.yml
diff --git a/test/fixtures/sites.yml b/test/fixtures/sites.yml
diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml
diff --git a/test/fixtures/types.yml b/test/fixtures/types.yml
diff --git a/test/fixtures/viajes.yml b/test/fixtures/viajes.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  site_id: 1
+  position: 1
+
+two:
+  site_id: 1
+  position: 1
diff --git a/test/functional/.gitkeep b/test/functional/.gitkeep
diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb
diff --git a/test/functional/selecteds_controller_test.rb b/test/functional/selecteds_controller_test.rb
diff --git a/test/functional/sites_controller_test.rb b/test/functional/sites_controller_test.rb
diff --git a/test/functional/trips_controller_test.rb b/test/functional/trips_controller_test.rb
diff --git a/test/functional/types_controller_test.rb b/test/functional/types_controller_test.rb
diff --git a/test/functional/viajes_controller_test.rb b/test/functional/viajes_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ViajesControllerTest < ActionController::TestCase
+  setup do
+    @viaje = viajes(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:viajes)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create viaje" do
+    assert_difference('Viaje.count') do
+      post :create, viaje: @viaje.attributes
+    end
+
+    assert_redirected_to viaje_path(assigns(:viaje))
+  end
+
+  test "should show viaje" do
+    get :show, id: @viaje.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @viaje.to_param
+    assert_response :success
+  end
+
+  test "should update viaje" do
+    put :update, id: @viaje.to_param, viaje: @viaje.attributes
+    assert_redirected_to viaje_path(assigns(:viaje))
+  end
+
+  test "should destroy viaje" do
+    assert_difference('Viaje.count', -1) do
+      delete :destroy, id: @viaje.to_param
+    end
+
+    assert_redirected_to viajes_path
+  end
+end
diff --git a/test/integration/.gitkeep b/test/integration/.gitkeep
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
diff --git a/test/unit/.gitkeep b/test/unit/.gitkeep
diff --git a/test/unit/helpers/planet_helper_test.rb b/test/unit/helpers/planet_helper_test.rb
diff --git a/test/unit/helpers/selecteds_helper_test.rb b/test/unit/helpers/selecteds_helper_test.rb
diff --git a/test/unit/helpers/sites_helper_test.rb b/test/unit/helpers/sites_helper_test.rb
diff --git a/test/unit/helpers/trips_helper_test.rb b/test/unit/helpers/trips_helper_test.rb
diff --git a/test/unit/helpers/types_helper_test.rb b/test/unit/helpers/types_helper_test.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<h1>Authors</h1><div class="data"> <%= image_tag('robert.jpeg', :size => "216x144") %> <p><span class="title">Name:</span> Robert Fabian </p> <p><span class="title">Address:</span> Madrid, c/Carboneras 3 </p> <p><span class="title">Email:</span> [email protected] </p> <p><span class="title">CV:</span></p> <div class="cv"> <ul> <li>Nombre: Robert Fabian</li> <li>Pais: Polonia</li> <li>Fecha nacimiento: 4 Marzo 1988</li> <li>Universidad de origen: AGH en Cracovia</li> </ul> </div> <!--cv--> <p class="spacer"></p></div><div class="data"> <%= image_tag('mattia.jpeg', :size => "216x144") %> <p><span class="title">Name:</span> Mattia Peirano </p> <p><span class="title">Address:</span> Madrid, c/Luceros 4 </p> <p><span class="title">Email:</span> [email protected] </p> <p><span class="title">CV:</span></p> <div class="cv"> <ul> <li>Nombre: Mattia Peirano</li> <li>Pais: Italia</li> <li>Fecha nacimiento: 14 Febrero 1988</li> <li>Universidad de origen: Politecnico di Torino</li> </ul> </div> <!--cv--> <p class="spacer"></p></div>
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,5 +44,6 @@ class Application < Rails::Application @@
         # Version of your assets, change this if you want to expire all your assets
         config.assets.version = '1.0'
       end
     end