From c1cfdfcd73c322b2bed89a4ceaab86a4f969a0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa?= <aitor.garcia@gmail.com>
Date: Sun, 18 Apr 2010 21:45:02 +0200
Subject: [PATCH] Reused timeline

---
 app/views/municipios/evolution.html.erb | 29 ++++++++-----------------
 app/views/municipios/show.html.erb      | 12 +---------
 app/views/shared/_timeline.html.erb     | 11 ++++++++++
 3 files changed, 21 insertions(+), 31 deletions(-)
 create mode 100644 app/views/shared/_timeline.html.erb

diff --git a/app/views/municipios/evolution.html.erb b/app/views/municipios/evolution.html.erb
index 6ea8ac1..a3ffcbc 100644
--- a/app/views/municipios/evolution.html.erb
+++ b/app/views/municipios/evolution.html.erb
@@ -2,17 +2,9 @@
   <%= link_to @muni.nombre, city_card_path(@muni) %>
 <% end %>
 
-<h2><%= @muni.province_name %></h2>
+<h2><%= @muni.nombre %></h2>
 
-<hr/>
-<% (1985..2009).each do |year| %>
-  <%= link_to year, city_card_by_year_path(@muni, year) %>
-<% end %>
-<hr/>
-<%= @muni.codigo_ine %>
-<%= @muni.nombre %>
-
-<hr/> 
+<%= render :partial => 'shared/timeline', :locals => { :muni => @muni } %>
 
 <script type="text/javascript" charset="utf-8">
   var states = [1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009];
@@ -95,15 +87,12 @@
 <h2>Población</h2>
 <div id="holder_evolution_population"></div>
 
-
-
-<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-<hr/>
-
+<%# 
 <ul>
-  <% munis = Municipio.find_all_by_provincia(@muni.provincia) %>
-  <%= munis.size %> municipios here
-  <% for muni in munis %>
-    <li><%= link_to muni.nombre, city_card_path(muni) %></li>
-  <% end %>
+  < munis = Municipio.find_all_by_provincia(@muni.provincia) >
+  < munis.size > municipios here
+  < for muni in munis >
+    <li>< link_to muni.nombre, city_card_path(muni) ></li>
+  < end >
 </ul>
+%>
diff --git a/app/views/municipios/show.html.erb b/app/views/municipios/show.html.erb
index bab829b..b42d144 100644
--- a/app/views/municipios/show.html.erb
+++ b/app/views/municipios/show.html.erb
@@ -2,17 +2,7 @@
   <%= link_to @muni.nombre, city_card_path(@muni) %> EN <%= @year %>
 <% end %>
 
-<!-- timeline -->
-<div class="timeline">
-  <p class="years_nav years_prev" id="mycarousel-prev"><a href="#">&larr; años anteriores</a></p>
-  <p class="years_nav years_next" id="mycarousel-next"><a href="#">años siguientes &rarr;</a></p>
-  <ul id="budget_timeline" class="timeline_years">
-    <% (1985..2009).each do |year| %> 
-      <li <%= (year == @year) ? "class='actual_year'": '' %>><%= link_to year, city_card_by_year_path(@muni, year) %></li>
-    <% end %>
-  </ul>
-</div>
-<!-- /timeline -->
+<%= render :partial => 'shared/timeline', :locals => { :muni => @muni } %>
 
 <p class="show_evolution"><%= link_to "&larr; Evolución &rarr;", city_evolution_path(@muni), :class=>"btn" %></p>
 
diff --git a/app/views/shared/_timeline.html.erb b/app/views/shared/_timeline.html.erb
new file mode 100644
index 0000000..d907296
--- /dev/null
+++ b/app/views/shared/_timeline.html.erb
@@ -0,0 +1,11 @@
+<!-- timeline -->
+<div class="timeline">
+  <p class="years_nav years_prev" id="mycarousel-prev"><a href="#">&larr; años anteriores</a></p>
+  <p class="years_nav years_next" id="mycarousel-next"><a href="#">años siguientes &rarr;</a></p>
+  <ul id="budget_timeline" class="timeline_years">
+    <% (1985..2009).each do |year| %> 
+      <li <%= (year == @year) ? "class='actual_year'": '' %>><%= link_to year, city_card_by_year_path(muni, year) %></li>
+    <% end %>
+  </ul>
+</div>
+<!-- /timeline -->
\ No newline at end of file