jquemada · mattiapei · Dec 15, 2011 · Dec 15, 2011
diff --git a/README b/README
@@ -1,3 +1,10 @@
+Reminder: Hemos subido esta practica al tiempo al moodle.
+
+Saludos
+
+Robert Fabian
+Mattia Peirano
+
 == Welcome to Rails
 
 Rails is a web-application framework that includes everything needed to create

diff --git a/app/assets/images/mattia.jpeg b/app/assets/images/mattia.jpeg
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
@@ -5,6 +5,5 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery-ui
 //= require jquery_ujs
 //= require_tree .
diff --git a/app/assets/javascripts/images/buttons.gif b/app/assets/javascripts/images/buttons.gif
diff --git a/app/assets/javascripts/images/toolbar.gif b/app/assets/javascripts/images/toolbar.gif
diff --git a/app/assets/javascripts/jquery.cleditor.min.js b/app/assets/javascripts/jquery.cleditor.min.js
diff --git a/app/assets/javascripts/trips.js.coffee b/app/assets/javascripts/trips.js.coffee
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -3,6 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require vendor
  *= require_tree . 
 */
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/jquery.cleditor.css b/app/assets/stylesheets/jquery.cleditor.css
diff --git a/app/assets/stylesheets/trips.css.scss b/app/assets/stylesheets/trips.css.scss
diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb
@@ -8,5 +8,8 @@ def contact
 # GET /planet/ejemplo
   def ejemplo
   end
+
+  def author
+  end
 
 end
diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb
diff --git a/app/models/trip.rb b/app/models/trip.rb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,22 +3,8 @@
 <head> 
   <title>Planet</title>
   <%= stylesheet_link_tag    "application" %>
-
   <%= javascript_include_tag "application" %>
-
   <%= csrf_meta_tags %>
-
-
-  <script type="text/javascript">
-    $(function() {
-      $( "#trip_description" ).cleditor();
-      $( "#trip_date" ).datepicker({
-         changeMonth: true,
-         changeYear: true
-       });
-    });
-  </script>
-
 </head>
 <body id="planet"> 
   <div id="banner"> 
@@ -30,11 +16,13 @@
       <%= 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 "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> 
 </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/trips/_form.html.erb b/app/views/trips/_form.html.erb
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
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