Add Where link

rubyconfuruguay · Oct 17, 2011 · ea4fca6 · ea4fca6
1 parent eda8d37
commit ea4fca6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/public/website-2011.css b/public/website-2011.css
@@ -573,6 +573,7 @@ footer p {
 }
 #where_and_hostels .hotel {
   background-color: rgba(255,217,127,.1);
+  height: 200px;
   border-radius: 5px;
   -moz-border-radius: 5px;
   padding: 0 0 10px 0;

diff --git a/views/en/layout.haml b/views/en/layout.haml
@@ -27,12 +27,12 @@
                 - else
                   = link_to name, "/#{code}"
         %li= link_to "Speakers",     "/#{language}/speakers"
+        %li= link_to "Where",        "/#{language}/where"
         %li= link_to "Registration", "https://eventioz.com/events/rubyconf-uruguay-2011/registrations/new"
       -#
         %li= link_to "Call for Papers", "https://spreadsheets.google.com/spreadsheet/viewform?formkey=dGU4OVFBRFFVLWNkLTFFazF5OFNDbmc6MQ"
         %li= link_to "Events",       "/#{language}/events"
         %li= link_to "Audience",     "/#{language}#audience"
-        %li= link_to "Where",        "/#{language}/where"
         %li= link_to "Agenda",       "/#{language}/agenda"
 
     %header

diff --git a/views/en/where.haml b/views/en/where.haml
@@ -24,7 +24,7 @@
       %p (598) 2902 0045
       %a{:href => 'http://www.hoteleuropa.com.uy'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.895928,-56.190047&spn=0.020204,0.03768&z=14&iwloc=0004903a19d7f09aeafab'} See Map
-
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -50,6 +50,7 @@
       %a{:href => 'http://www.lancasterhotel.com.uy/'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.899166,-56.19421&spn=0.040125,0.077162&z=14&iwloc=000490b2e2ff45df857c2'} See Map
 
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -71,6 +72,7 @@
       %a{:href => 'http://www.balmoral.com.uy'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.898251,-56.190047&spn=0.020204,0.03768&z=14&iwloc=00049039c953f8aafcbf1'} See Map
 
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -100,6 +102,7 @@
       %a{:href => 'http://www.ibishotel.com/gb/hotel-3539-ibis-montevideo/index.shtml'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.902827,-56.178589&spn=0.038364,0.077162&z=14&iwloc=000490b31a0ab272702e6'} See Map
 
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -117,6 +120,7 @@
       %a{:href => 'http://www.lafayette.com.uy'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.900856,-56.19421&spn=0.034211,0.077162&z=14&iwloc=00049061bfc54aa5c77fe'} See Map
 
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -146,6 +150,7 @@
       %a{:href => 'http://www.radisson.com/montevideouy'} Website
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.896034,-56.190047&spn=0.020204,0.03768&z=14&iwloc=0004903a1df4cee9535d8'} See Map
 
+  -#
     %div.rates
       %h5 Rates
       %ul

diff --git a/views/es/layout.haml b/views/es/layout.haml
@@ -26,8 +26,9 @@
                   %span= name
                 - else
                   = link_to name, "/#{code}"
-        %li= link_to "Oradores",     "/#{language}/speakers"
-        %li= link_to "Inscripción", "https://eventioz.com/events/rubyconf-uruguay-2011/registrations/new"
+        %li= link_to "Oradores",      "/#{language}/speakers"
+        %li= link_to "Dónde",         "/#{language}/where"
+        %li= link_to "Inscripción",   "https://eventioz.com/events/rubyconf-uruguay-2011/registrations/new"
 
     %header
       %h1= link_to "RubyConf Uruguay", "/#{language}", :rel => "home"

diff --git a/views/es/where.haml b/views/es/where.haml
@@ -14,8 +14,6 @@
 
   %h3 Hoteles
 
-  %p Aquí hay una lista de hoteles en los que hemos conseguido un precio promocional para los asistentes al evento. Para acceder a estos precios, deben ponerse en contacto con #{email "Alejandra Fernández", "afernandez@exitoopc.com"} de la empresa organizadora de eventos "Exito" para que ella gestione su reserva.
-
   %div.hotel.clearFix
     %h4{:class => 'three_stars'} Hotel Europa
 
@@ -25,6 +23,7 @@
       %a{:href => 'http://www.hoteleuropa.com.uy'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.895928,-56.190047&spn=0.020204,0.03768&z=14&iwloc=0004903a19d7f09aeafab'} Ver mapa
 
+  -#
     %div.rates
       %h5 Tarifas
       %ul
@@ -49,7 +48,7 @@
       %p (598) 2902 1054
       %a{:href => 'http://www.lancasterhotel.com.uy/'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.899166,-56.19421&spn=0.040125,0.077162&z=14&iwloc=000490b2e2ff45df857c2'} See Map
-
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -70,7 +69,7 @@
       %p (598) 2902 2393
       %a{:href => 'http://www.balmoral.com.uy'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.898251,-56.190047&spn=0.020204,0.03768&z=14&iwloc=00049039c953f8aafcbf1'} Ver mapa
-
+  -#
     %div.rates
       %h5 Tarifas
       %ul
@@ -99,7 +98,7 @@
       %p (598) 2413 7000
       %a{:href => 'http://www.ibishotel.com/gb/hotel-3539-ibis-montevideo/index.shtml'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.902827,-56.178589&spn=0.038364,0.077162&z=14&iwloc=000490b31a0ab272702e6'} Ver mapa
-
+  -#
     %div.rates
       %h5 Rates
       %ul
@@ -116,7 +115,7 @@
       %p (598) 2902 4646
       %a{:href => 'http://www.lafayette.com.uy'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&source=embed&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.900856,-56.19421&spn=0.034211,0.077162&z=14&iwloc=00049061bfc54aa5c77fe'} Ver mapa
-
+  -#
     %div.rates
       %h5 Tarifas
       %ul
@@ -145,7 +144,7 @@
       %p (598) 2902 0111
       %a{:href => 'http://www.radisson.com/montevideouy'} Sitio web
       %a{:class => 'link-to-google-map', :href => 'http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=114189880581873191413.00049039c94fc2d39375a&ll=-34.896034,-56.190047&spn=0.020204,0.03768&z=14&iwloc=0004903a1df4cee9535d8'} Ver mapa
-
+  -#
     %div.rates
       %h5 Tarifas
       %ul