ging · aromerob · Mar 24, 2012 · Mar 24, 2012 · Mar 25, 2012 · Mar 25, 2012
diff --git a/app/assets/images/1.jpg b/app/assets/images/1.jpg
diff --git a/app/assets/images/auto1.jpeg b/app/assets/images/auto1.jpeg
diff --git a/app/assets/images/auto2.jpg b/app/assets/images/auto2.jpg
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,3 +11,13 @@
  *= require_self
  *= require_tree .
 */
+
+
+#container{}
+#enla1{}
+#enla1 a{color:blue;}
+#cuerpo{}
+#enla2{}
+#enla2 a{color:blue;}
+
+
diff --git a/app/assets/stylesheets/author.css.scss b/app/assets/stylesheets/author.css.scss
@@ -0,0 +1,4 @@
+#espa{background-color:green;color:green;}
+.autor1{}
+#espacio{background-color:blue;color:blue;}
+.autor2{}
diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb
@@ -7,5 +7,9 @@ def contact
 
   def ejemplo
   end
+
+  def author
+  end
+
 
 end
diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb
@@ -1,4 +1,15 @@
 class TypesController < ApplicationController
+
+ # GET /types/ordered_index
+  # GET /types.json
+  def ordered_index
+    @types = Type.find(:all, :order => :name) 
+    respond_to do |format|
+      format.html # ordered_index.html.erb
+      format.json { render json: @types }
+   end
+  end
+
   # GET /types
   # GET /types.json
   def index

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,8 +7,18 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
+<div id='container'>
+<div id='enla1'>
+<%= link_to('Index', planet_index_path) + " " + link_to('Contact', planet_contact_path) + " " + link_to('Ejemplo', planet_ejemplo_path) + " " + link_to('Authors', planet_author_path) + " " + link_to('Index', types_path) + " " + link_to('ordered_index', types_ordered_index_path)%>
+</div>
 
+<div id='cuerpo'>
 <%= yield %>
+</div>
 
+<div id='enla2'>
+<%= link_to('Index', planet_index_path) + " " + link_to('Contact', planet_contact_path) + " " + link_to('Ejemplo', planet_ejemplo_path) + " " + link_to('Authors', planet_author_path) + " " + link_to('Index', types_path) + " " + link_to('ordered_index', types_ordered_index_path)%>
+</div>
+</div>
 </body>
 </html>
diff --git a/app/views/planet/author.css b/app/views/planet/author.css
@@ -0,0 +1,4 @@
+
+.autor1{color:red;clear:both;float:left; margin:300;background-color:#fc0;text-align:center;}
+.autor2{float:right;margin-left:600;background-color:#0cf;padding: 5px}
+.container{ margin-left:30;}
diff --git a/app/views/planet/author.html.erb b/app/views/planet/author.html.erb
@@ -0,0 +1,43 @@
+<html>
+<head>
+<!--<link rel='stylesheet' type='text/css' href='author.css'>-->
+ <!--<%= stylesheet_link_tag    "author", :media => "author" %>-->
+</head>
+<body>
+<div class='container'>
+<div id='cabecera'> <h1> Autores </h1></div>
+<div id='espa'><p>sepa</p>
+</div>
+<div class='autor1'>
+<form>
+<p>Nombre: <input type="text" name='nombre' size='25' value="Arturo Romero Blanco"></input></p><BR>
+<p>Direccion postal: <input type="text" name='post' size='25' value='C/Holanda,6'></input></p><BR>
+<p>Direccion electronica: <input type="text" name='elec' size='25' value='[email protected]'></input></p><BR>
+
+<%= image_tag('auto1.jpeg') %>
+
+<p> Curriculum:</p>
+<textarea name="cur" rows=5 cols=73>
+Estudiante de  Ingenieria de telecomunicaciones y actualmente cursando SWCM
+</textarea>
+</form>
+</div><br>
+<div id='espacio'>
+<p>separacion</p>
+</div><br>
+<div class='autor2'>
+<form>
+<p>Nombre: <input type="text" name='nombre' size='25' value="David Maroto Sadau"></input></p><BR>
+<p>Direccion postal: <input type="text" name='post' size='25' value='C/Realeza,25'></input></p><BR>
+<p>Direccion electronica: <input type="text" name='elec' size='25' value='[email protected]'></input></p><BR>
+
+<%= image_tag('auto2.jpg') %>
+
+<p> Curriculum:</p>
+<textarea name="cur" rows=5 cols=73>
+Estudiante de  Ingenieria de telecomunicaciones y actualmente cursando SWCM
+</textarea>
+</div>
+</div>
+</body>
+</html>
diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb
@@ -1,25 +1,33 @@
 <h1>Listing types</h1>
 
+
 <table>
+
   <tr>
     <th>Name</th>
     <th>Description</th>
     <th></th>
     <th></th>
     <th></th>
   </tr>
-
 <% @types.each do |type| %>
   <tr>
     <td><%= type.name %></td>
     <td><%= type.description %></td>
+    <td></td>
     <td><%= link_to 'Show', type %></td>
     <td><%= link_to 'Edit', edit_type_path(type) %></td>
     <td><%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %></td>
+    <td></td>
+    <td><%= type.updated_at%></td>
   </tr>
+
 <% end %>
+
 </table>
 
+
 <br />
 
 <%= link_to 'New Type', new_type_path %>
+
diff --git a/app/views/types/ordered_index.html.erb b/app/views/types/ordered_index.html.erb
@@ -0,0 +1,26 @@
+<h1>Ordering types</h1>
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Description</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @types.each do |type| %>
+  <tr>
+    <td><%= type.name %></td>
+    <td><%= type.description %></td>
+    <td><%= link_to 'Show', type %></td>
+    <td><%= link_to 'Edit', edit_type_path(type) %></td>
+    <td><%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Type', new_type_path %>
+
diff --git a/app/views/types/show.html.erb b/app/views/types/show.html.erb
@@ -10,6 +10,6 @@
   <%= @type.description %>
 </p>
 
-
+<%= @type.updated_at%><br>
 <%= link_to 'Edit', edit_type_path(@type) %> |
 <%= link_to 'Back', types_path %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,12 +1,20 @@
 Planet::Application.routes.draw do
-  resources :types
+
+ get "types/ordered_index"
+ resources :types
+
+
 
   get "planet/index"
 
   get "planet/contact"
 
   get "planet/ejemplo"
 
+  get "planet/author"
+
+
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb
@@ -11,4 +11,14 @@ class PlanetControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should get ejemplo" do
+    get :ejemplo
+    assert_response :success
+  end
+
+  test "should get author" do
+    get :author
+    assert_response :success
+  end
+
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,9 @@ def contact @@
       def ejemplo
       end
+      def author
+      end
     end