From 5de285378d834b583ad15c579656dbfd64ba0338 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sun, 27 Jul 2014 02:06:54 +0200
Subject: [PATCH] =?UTF-8?q?La=20page=20trouve=20ton=20Gull=20est=20mieux?=
 =?UTF-8?q?=20pr=C3=A9sent=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/all.css.sass |  1 -
 app/views/lugs/index.html.haml      |  6 +++---
 app/views/lugs/show.html.haml       | 22 +++++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass
index d1e51e40..b36fe49a 100644
--- a/app/assets/stylesheets/all.css.sass
+++ b/app/assets/stylesheets/all.css.sass
@@ -150,7 +150,6 @@ main
       font-size: larger
       line-height: 1.1em
       font-weight: bolder
-      vertical-align: middle
       background-color: #9CC5EE
       @include box-shadow(2px 2px 2px gray)
   select, option
diff --git a/app/views/lugs/index.html.haml b/app/views/lugs/index.html.haml
index f82fa8e5..bfe8128e 100644
--- a/app/views/lugs/index.html.haml
+++ b/app/views/lugs/index.html.haml
@@ -13,6 +13,8 @@
     - @lugs.each do |lug|
       %tr
         %td
+          - if lug.url =~ /^http/
+            = image_tag lug.url+'/favicon.ico', alt: '', class: :favicon
           = lug.name
         %td
           = lug.city
@@ -21,10 +23,8 @@
         %td
           = lug.related_region
         %td
-          - if lug.url =~ /^http/
-            = image_tag lug.url+'/favicon.ico', alt: '', class: :favicon
           = link_to lug.url, lug.url
         %td
-          = link_to t('show'), lug_url(lug, q: params[:q]), class: :view_link
+          = link_to t('show'), lug_url(lug, q: params[:q], page: params[:page]), class: :view_link
 
 = paginate @lugs
diff --git a/app/views/lugs/show.html.haml b/app/views/lugs/show.html.haml
index 22faab04..e205afc9 100644
--- a/app/views/lugs/show.html.haml
+++ b/app/views/lugs/show.html.haml
@@ -6,19 +6,23 @@
     %h3
       = image_tag @lug.url+'/favicon.ico', alt: '', class: :favicon
       = @lug.name
-  %dt= Lug.human_attribute_name :city
-  %dd= @lug.city
-  %dt= Lug.human_attribute_name :department
-  %dd= @lug.department
-  %dt= Lug.human_attribute_name :related_region
-  %dd= @lug.related_region
-  %dt= Lug.human_attribute_name :url
-  %dd= link_to @lug.url, @lug.url
+  - if @lug.city.present?
+    %dt= Lug.human_attribute_name :city
+    %dd= @lug.city
+  - if @lug.department.present?
+    %dt= Lug.human_attribute_name :department
+    %dd= @lug.department
+  - if @lug.related_region.present?
+    %dt= Lug.human_attribute_name :related_region
+    %dd= @lug.related_region
+  - if @lug.url.present?
+    %dt= Lug.human_attribute_name :url
+    %dd= link_to @lug.url, @lug.url
 
 %iframe(src="#{@lug.url}" width='1000' height='400' frameborder='none'
   allowTransparency='true')
 
 %nav
-  = link_to lugs_path(q: params[:q]), class: :back do
+  = link_to lugs_path(q: params[:q], page: params[:page]), class: :back do
     %em.fa.fa-arrow-left
     = Lug.model_name.human.pluralize