Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

4 files changed, 35 insertions, 5 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 7dc939756..8308116f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GIT
 
 GIT
   remote: git://sim.dryade.priv/user_interface
-  revision: b8fbfaa4b0aa3946223d9f9313af21ab2f10f341
+  revision: 55a84bcc7d88c3962cb43eda817bbfa780e4365c
   specs:
     user_interface (0.0.1)
       rails (> 3.1.0)
diff --git a/app/assets/stylesheets/referentials.css.scss b/app/assets/stylesheets/referentials.css.scss
index 2d916232f..53200bf56 100644
--- a/app/assets/stylesheets/referentials.css.scss
+++ b/app/assets/stylesheets/referentials.css.scss
@@ -1,7 +1,33 @@
 // Place all the styles related to the referentials controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+@import "common";
 
+#workspace.referentials.index
+{
+    .referentials:after { 
+        @include after_div_for_object;  
+    }
+
+    .referentials {
+        margin-top: 20px;
+    }
+
+    .referentials:after {
+        @include content_to_clear;
+    }
+    
+    .referential {
+        @include div_for_object;
+
+        /* to create multi-column index */
+        width: 350px;
+        float: left;
+        padding-right: 10px;
+        position: relative;
+
+    }
+}
 #workspace.referentials.show
 {
     .summary p label {
@@ -62,4 +88,4 @@ ul.logos {
         display: inline;
         margin: 0 3px;
     }
-}
\ No newline at end of file
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 417f677c3..c15bcf13f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -35,9 +35,11 @@
             <li><%= link_to "Aide", help_path, :class =>("current" if help_page?) %></li>
             <li><%= link_to "Tests de validation", test_sheet_path+"1_1", :class =>("current" if test_sheet_page?) %></li>
           <% elsif ! selected_referential? %>
-            <li><%= link_to Referential.model_name.human(:count=>2), referentials_path, :class => ("current" if current_page?(referentials_path) || current_page?(root_url)) %></li>
-            <li><%= tab_link_to FileValidation.model_name.human(:count=>2), file_validations_path %></li>
-            <li class="admin"><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
+            <% if  user_signed_in? %>
+              <li><%= link_to Referential.model_name.human(:count=>2), referentials_path, :class => ("current" if current_page?(referentials_path) || current_page?(root_url)) %></li>
+              <li><%= tab_link_to FileValidation.model_name.human(:count=>2), file_validations_path %></li>
+              <li class="admin"><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
+            <% end %>
           <% else %>
             <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li>
             <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li>
diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb
index 528c7b13b..a9d990b11 100644
--- a/app/views/referentials/index.html.erb
+++ b/app/views/referentials/index.html.erb
@@ -1,6 +1,8 @@
 <%= title_tag Referential.model_name.human.pluralize %> 
 
+<div class="referentials">
 <%= render :partial => "referential", :collection => @referentials %>
+</div>
 
 <% content_for :sidebar do %>
 <ul class="actions">