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

25 files changed, 298 insertions, 529 deletions

diff --git a/app/assets/images/icons/checked.png b/app/assets/images/icons/checked.png
new file mode 100644
index 000000000..ab7c378c0
--- /dev/null
+++ b/app/assets/images/icons/checked.png
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
new file mode 100644
index 000000000..b0655b5e0
--- /dev/null
+++ b/app/assets/stylesheets/common.css.scss
@@ -0,0 +1,70 @@
+@mixin div_for_object { 
+    margin-bottom: 20px;
+
+    .color {
+        width: 64px;
+        height: 64px;
+        float: left;
+        margin-right: 10px;
+    }
+
+    img {
+        float: left;
+        margin-right: 10px;
+    }
+
+    img.preview {
+        width: 90px;
+        height: 70px;
+    }
+
+    a { 
+        display:block;
+        text-decoration: underline;
+        margin: 5px 0px 0px 0px;
+    }
+
+    .info {
+        font-size: 10px;
+        color: #777;
+        font-weight: normal;
+        line-height: 14px;
+        margin-top: 5px;
+
+        a {
+            display:inline;
+            color: #777;
+        }
+
+        .actions {
+            margin-top: 14px;
+            a {
+                color: #666;
+                padding-left: 12px;
+            }
+
+            a.edit {
+                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
+            }
+            a.remove {
+                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
+            }
+        }
+
+        p {
+            margin:0;
+        }
+    }
+}
+
+@mixin content_to_clear {
+    content: " ";  
+    display: block; 
+    height: 0; 
+    clear: both;
+    visibility: hidden;
+}
+
+@mixin after_div_for_object {
+    @include content_to_clear;
+}
diff --git a/app/assets/stylesheets/companies.css.scss b/app/assets/stylesheets/companies.css.scss
index 563a25798..7e490841a 100644
--- a/app/assets/stylesheets/companies.css.scss
+++ b/app/assets/stylesheets/companies.css.scss
@@ -1,76 +1,7 @@
 // Place all the styles related to the lines controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin div_for_object { 
-    margin-bottom: 20px;
-
-    .color {
-        width: 64px;
-        height: 64px;
-        float: left;
-        margin-right: 10px;
-    }
-
-    img {
-        float: left;
-        margin-right: 10px;
-    }
-
-    img.preview {
-        width: 90px;
-        height: 70px;
-    }
-
-    a { 
-        display:block;
-        text-decoration: underline;
-        margin: 5px 0px 0px 0px;
-    }
-
-    .info {
-        font-size: 10px;
-        color: #777;
-        font-weight: normal;
-        line-height: 14px;
-        margin-top: 5px;
-
-        a {
-            display:inline;
-            color: #777;
-        }
-
-        .actions {
-            margin-top: 14px;
-            a {
-                color: #666;
-                padding-left: 12px;
-            }
-
-            a.edit {
-                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
-            }
-            a.remove {
-                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
-            }
-        }
-
-        p {
-            margin:0;
-        }
-    }
-}
-
-@mixin content_to_clear {
-    content: " ";  
-    display: block; 
-    height: 0; 
-    clear: both;
-    visibility: hidden;
-}
-
-@mixin after_div_for_object {
-    @include content_to_clear;
-}
+@import "common";
 
 #workspace.companies.index
 {
@@ -97,18 +28,10 @@
     }
 }
 
-
-
-#workspace .order {
-    float: right;
-    padding: 15px 0;
-    font-size: 0.8em;
-    
-    a { text-decoration: underline; }
-    
-    a.current {
-      font-weight: bold;
-      text-decoration: none;
+#workspace.companies.show
+{
+    .summary p label {
+        font-weight: bold;
     }
 }
 
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index d65167cfa..335c5b61b 100644
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -34,4 +34,4 @@ $text_color: #222;
     float: right;
     width: 600px;
     height: 400px;
-}
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/lines.css.scss b/app/assets/stylesheets/lines.css.scss
index 5562c4e4b..6c136af7c 100644
--- a/app/assets/stylesheets/lines.css.scss
+++ b/app/assets/stylesheets/lines.css.scss
@@ -1,76 +1,7 @@
 // Place all the styles related to the lines controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin div_for_object { 
-    margin-bottom: 20px;
-
-    .color {
-        width: 64px;
-        height: 64px;
-        float: left;
-        margin-right: 10px;
-    }
-
-    img {
-        float: left;
-        margin-right: 10px;
-    }
-
-    img.preview {
-        width: 90px;
-        height: 70px;
-    }
-
-    a { 
-        display:block;
-        text-decoration: underline;
-        margin: 5px 0px 0px 0px;
-    }
-
-    .info {
-        font-size: 10px;
-        color: #777;
-        font-weight: normal;
-        line-height: 14px;
-        margin-top: 5px;
-
-        a {
-            display:inline;
-            color: #777;
-        }
-
-        .actions {
-            margin-top: 14px;
-            a {
-                color: #666;
-                padding-left: 12px;
-            }
-
-            a.edit {
-                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
-            }
-            a.remove {
-                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
-            }
-        }
-
-        p {
-            margin:0;
-        }
-    }
-}
-
-@mixin content_to_clear {
-    content: " ";  
-    display: block; 
-    height: 0; 
-    clear: both;
-    visibility: hidden;
-}
-
-@mixin after_div_for_object {
-    @include content_to_clear;
-}
+@import "common";
 
 #workspace.lines.index
 {
@@ -127,21 +58,11 @@
     .line_color{ color: white;
                  font-weight: bold;
                  padding: 0 5px 0 5px;}
-}        
-
 
-#workspace .order {
-    float: right;
-    padding: 15px 0;
-    font-size: 0.8em;
-    
-    a { text-decoration: underline; }
-    
-    a.current {
-      font-weight: bold;
-      text-decoration: none;
+    .summary p label {
+        font-weight: bold;
     }
-}
+}        
 
 
 
diff --git a/app/assets/stylesheets/networks.css.scss b/app/assets/stylesheets/networks.css.scss
index c05752623..da43b41f8 100644
--- a/app/assets/stylesheets/networks.css.scss
+++ b/app/assets/stylesheets/networks.css.scss
@@ -1,76 +1,7 @@
 // Place all the styles related to the lines controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin div_for_object { 
-    margin-bottom: 20px;
-
-    .color {
-        width: 64px;
-        height: 64px;
-        float: left;
-        margin-right: 10px;
-    }
-
-    img {
-        float: left;
-        margin-right: 10px;
-    }
-
-    img.preview {
-        width: 90px;
-        height: 70px;
-    }
-
-    a { 
-        display:block;
-        text-decoration: underline;
-        margin: 5px 0px 0px 0px;
-    }
-
-    .info {
-        font-size: 10px;
-        color: #777;
-        font-weight: normal;
-        line-height: 14px;
-        margin-top: 5px;
-
-        a {
-            display:inline;
-            color: #777;
-        }
-
-        .actions {
-            margin-top: 14px;
-            a {
-                color: #666;
-                padding-left: 12px;
-            }
-
-            a.edit {
-                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
-            }
-            a.remove {
-                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
-            }
-        }
-
-        p {
-            margin:0;
-        }
-    }
-}
-
-@mixin content_to_clear {
-    content: " ";  
-    display: block; 
-    height: 0; 
-    clear: both;
-    visibility: hidden;
-}
-
-@mixin after_div_for_object {
-    @include content_to_clear;
-}
+@import "common";
 
 #workspace.networks.index
 {
@@ -97,17 +28,10 @@
     }
 }
 
-
-#workspace .order {
-    float: right;
-    padding: 15px 0;
-    font-size: 0.8em;
-    
-    a { text-decoration: underline; }
-    
-    a.current {
-      font-weight: bold;
-      text-decoration: none;
+#workspace.networks.show
+{
+    .summary p label {
+        font-weight: bold;
     }
 }
 
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss
index 1f1624dd7..691fddaa2 100644
--- a/app/assets/stylesheets/stop_areas.css.scss
+++ b/app/assets/stylesheets/stop_areas.css.scss
@@ -1,81 +1,7 @@
 // Place all the styles related to the lines controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin div_for_object { 
-    margin-bottom: 20px;
-
-    .color {
-        width: 64px;
-        height: 64px;
-        float: left;
-        margin-right: 10px;
-    }
-
-    img {
-        float: left;
-        margin-right: 10px;
-    }
-
-    img.preview {
-        width: 90px;
-        height: 70px;
-    }
-
-    a { 
-        display:block;
-        text-decoration: underline;
-        margin: 5px 0px 0px 0px;
-    }
-
-    .info {
-        font-size: 10px;
-        color: #777;
-        font-weight: normal;
-        line-height: 14px;
-        margin-top: 5px;
-
-        a {
-            display:inline;
-            color: #777;
-        }
-
-        .line{
-            border: 1px solid #999; 
-            padding: 2px;
-        }                       
-
-        .actions {
-            margin-top: 14px;
-            a {
-                color: #666;
-                padding-left: 12px;
-            }
-
-            a.edit {
-                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
-            }
-            a.remove {
-                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
-            }
-        }
-
-        p {
-            margin:0;
-        }
-    }
-}
-
-@mixin content_to_clear {
-    content: " ";  
-    display: block; 
-    height: 0; 
-    clear: both;
-    visibility: hidden;
-}
-
-@mixin after_div_for_object {
-    @include content_to_clear;
-}
+@import "common";
 
 #workspace.stop_areas.index
 {
@@ -113,17 +39,14 @@
     }
 }
 
+#workspace.stop_areas.show
+{
+    .geo_data {
+       padding-left:15px;
+    }
 
-#workspace .order {
-    float: right;
-    padding: 15px 0;
-    font-size: 0.8em;
-    
-    a { text-decoration: underline; }
-    
-    a.current {
-      font-weight: bold;
-      text-decoration: none;
+    .summary p label {
+        font-weight: bold;
     }
 }
 
diff --git a/app/assets/stylesheets/time_tables.css.scss b/app/assets/stylesheets/time_tables.css.scss
index e6fb6cec3..c9f4638d1 100644
--- a/app/assets/stylesheets/time_tables.css.scss
+++ b/app/assets/stylesheets/time_tables.css.scss
@@ -1,76 +1,7 @@
 // Place all the styles related to the lines controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin div_for_object { 
-    margin-bottom: 20px;
-
-    .color {
-        width: 64px;
-        height: 64px;
-        float: left;
-        margin-right: 10px;
-    }
-
-    img {
-        float: left;
-        margin-right: 10px;
-    }
-
-    img.preview {
-        width: 90px;
-        height: 70px;
-    }
-
-    a { 
-        display:block;
-        text-decoration: underline;
-        margin: 5px 0px 0px 0px;
-    }
-
-    .info {
-        font-size: 10px;
-        color: #777;
-        font-weight: normal;
-        line-height: 14px;
-        margin-top: 5px;
-
-        a {
-            display:inline;
-            color: #777;
-        }
-
-        .actions {
-            margin-top: 14px;
-            a {
-                color: #666;
-                padding-left: 12px;
-            }
-
-            a.edit {
-                background: url(image-path('user_interface/ui/edit-small.png')) no-repeat 0% 50%;
-            }
-            a.remove {
-                background: url(image-path('user_interface/ui/remove-small.png')) no-repeat 0% 50%;
-            }
-        }
-
-        p {
-            margin:0;
-        }
-    }
-}
-
-@mixin content_to_clear {
-    content: " ";  
-    display: block; 
-    height: 0; 
-    clear: both;
-    visibility: hidden;
-}
-
-@mixin after_div_for_object {
-    @include content_to_clear;
-}
+@import "common";
 
 #workspace.time_tables.index
 {
@@ -97,17 +28,21 @@
     }
 }
 
-
-#workspace .order {
-    float: right;
-    padding: 15px 0;
-    font-size: 0.8em;
-    
-    a { text-decoration: underline; }
-    
-    a.current {
-      font-weight: bold;
-      text-decoration: none;
-    }
-}
+#workspace.time_tables.show
+{
+    .day_type { 
+      border-style:solid;
+      border-width:1px;
+      }
+      .period {
+        padding-left:50px;
+      }
+      .date {
+        padding-left:50px;
+      }
+
+    .summary p label {
+        font-weight: bold;
+    }
+}        
 
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 77055853d..7c73553a8 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -30,13 +30,13 @@ class StopAreasController < ChouetteController
     end
   end
   
-  # def edit
-  #   stop_area.position ||= stop_area.default_position
+  def edit
+    #stop_area.position ||= stop_area.default_position
 
-  #   @map = StopAreaMap.new stop_area
-  #   @map.editable = true
-  #   edit!
-  # end
+    @map = StopAreaMap.new referential, stop_area
+    @map.editable = true
+    edit!
+  end
 
   protected
 
diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb
index e0735e0a4..b5a339e87 100644
--- a/app/maps/stop_area_map.rb
+++ b/app/maps/stop_area_map.rb
@@ -18,22 +18,23 @@ class StopAreaMap < ApplicationMap
       page << map.add_layer(google_hybrid) 
       page << map.add_layer(google_satellite) 
 
-      page.assign "edit_stop_area_layer", kml_layer( polymorphic_path( [referential, stop_area], :format => :kml, :default => editable?), :style_map => StyleMap::StopAreasStyleMap.new.style_map)
+      page.assign "edit_stop_area_layer", kml_layer( polymorphic_path( [referential, stop_area], :format => :kml, :default => editable?), :style_map => StyleMap::EditStopAreaStyleMap.new.style_map)
       page << map.add_layer(:edit_stop_area_layer)
 
-#       if editable?
-#         # TODO virer ce code inline
-#         page << <<EOF
-#         edit_stop_area_layer.events.on({ 
-#                           'afterfeaturemodified': function(event) { 
-#                             geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
-#                             $('#potimart_stop_area_position').val(geometry.y + ',' + geometry.x);
-#                            }
-#                         });
-# EOF
-#         page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_stop_area_layer, :mode => 8, :autoActivate => true))
-
-#       end
+     if editable?
+        # TODO virer ce code inline
+        page << <<EOF
+        edit_stop_area_layer.events.on({ 
+                          'afterfeaturemodified': function(event) { 
+                            geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
+                            $('#stop_area_longitude').val(geometry.x);
+                            $('#stop_area_latitude').val(geometry.y);
+                           }
+                        });
+EOF
+        page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_stop_area_layer, :mode => 8, :autoActivate => true))
+
+      end
 
       page << map.zoom_to_extent(bounds) if bounds
       #page << map.set_center(center.to_google.to_openlayers, 16, false, true)
diff --git a/app/maps/style_map/edit_stop_area_style_map.rb b/app/maps/style_map/edit_stop_area_style_map.rb
index 5b340cef9..7095cb2f3 100644
--- a/app/maps/style_map/edit_stop_area_style_map.rb
+++ b/app/maps/style_map/edit_stop_area_style_map.rb
@@ -1,12 +1,9 @@
 class StyleMap::EditStopAreaStyleMap < StyleMap::GenericStyleMap
   
-  attr_accessor :styles, :display_label, :context, :terminus
-  alias_method :terminus?, :terminus
+  attr_accessor :styles, :display_label
 
-  def initialize(display_label = false, terminus = false, context = {}, styles = {})
+  def initialize(display_label = false, styles = {})
     @display_label = display_label
-    @terminus = terminus
-    @context = context
     @styles = styles
   end
 
@@ -25,12 +22,8 @@ class StyleMap::EditStopAreaStyleMap < StyleMap::GenericStyleMap
       :strokeColor => "black",
       :strokeOpacity => 1,
       :strokeWidth => 2,
-      :display => "${display}"
-    }.tap do |style_basic|
-      style_basic.merge! :fontSize =>"11px", 
-      :pointRadius => 16, 
-      :externalGraphic => "/images/stop_area_hover.png" if terminus?
-    end
+      :display => true
+    }   
     
     if styles["default"].present?
       style.merge styles["default"] 
@@ -54,12 +47,9 @@ class StyleMap::EditStopAreaStyleMap < StyleMap::GenericStyleMap
       :strokeColor => "black",
       :strokeOpacity => 1,
       :strokeWidth => 2,
-      :display => "${display}"
-    }.tap do |style_basic|
-      style_basic.merge! :fontSize =>"11px", 
-      :pointRadius => 16, 
-      :externalGraphic => "/images/stop_area_hover.png" if terminus?
-    end
+      :display => true
+    }
+
     if styles["select"].present?
       select_style.merge styles["select"]
     else
@@ -69,7 +59,8 @@ class StyleMap::EditStopAreaStyleMap < StyleMap::GenericStyleMap
   
   def context
     context = { 
-      :label => :"function(feature) { if(feature.layer.map.getZoom() > 15) { return feature.attributes.name;} else {return '';}}"
+      :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ", 
+      :areaType => :" function(feature) { console.log(feature); return feature.attributes.stop_area_type.toLowerCase();} "
     }
   end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 630898405..28ed19e1f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,7 +16,7 @@
     <div id="header">
       <div class="infos">               
         <div class="logo"> 
-          <%= image_tag "logo_chouette.png" %>
+          <%= link_to image_tag("logo_chouette.png"), referentials_path %>
         </div>
         <div class="title"> 
           <% if @referential.present? %>
diff --git a/app/views/stop_areas/edit.html.erb b/app/views/stop_areas/edit.html.erb
index 10d937050..be09d94e0 100644
--- a/app/views/stop_areas/edit.html.erb
+++ b/app/views/stop_areas/edit.html.erb
@@ -1,3 +1,5 @@
 <%= title_tag t('stop_areas.edit.title', :stop_area => @stop_area.name ) %>
 
+<%= @map.to_html.html_safe %>
+
 <%= render "form" %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index d4585b31b..27ce46880 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -35,6 +35,39 @@
       <label><%= @stop_area.human_attribute_name("type") %>: </label>
       <%= t("area_types.label.#{@stop_area.type}") %>
     </p>
+    <p><%= t('stop_areas.show.geographic_data') %></p>
+    <% if @stop_area.projectiontype == nil && @stop_area.longlattype == nil %>
+	    <span class='geo_data'><%= t('stop_areas.show.no_geographic_data') %></span>
+    <% else %>
+	    <% if @stop_area.projectiontype != nil %>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("projectiontype") %>: </span>
+	      <%= @stop_area.projectiontype %>
+	    </p>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("x") %>: </span>
+	      <%= @stop_area.x %>
+	    </p>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("y") %>: </span>
+	      <%= @stop_area.y %>
+	    </p>
+	    <% end %>
+	    <% if @stop_area.longlattype != nil %>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("longlattype") %>: </span>
+	      <%= @stop_area.longlattype %>
+	    </p>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("longitude") %>: </span>
+	      <%= @stop_area.longitude %>
+	    </p>
+	    <p>
+	      <span class='geo_data'><%= @stop_area.human_attribute_name("latitude") %>: </span>
+	      <%= @stop_area.latitude %>
+	    </p>
+	    <% end %>
+    <% end %>
     <p>
       <label><%= @stop_area.human_attribute_name("objectid") %>: </label>
       <%= @stop_area.objectid %>
@@ -47,23 +80,6 @@
       <label><%= @stop_area.human_attribute_name("creator_id") %>: </label>
       <%= @stop_area.creator_id %>
     </p>
-    <p><%= t('stop_areas.show.geographic_data') %></p>
-    <p>
-      <label><%= @stop_area.human_attribute_name("x") %>: </label>
-      <%= @stop_area.x %>
-    </p>
-    <p>
-      <label><%= @stop_area.human_attribute_name("y") %>: </label>
-      <%= @stop_area.y %>
-    </p>
-    <p>
-      <label><%= @stop_area.human_attribute_name("longitude") %>: </label>
-      <%= @stop_area.longitude %>
-    </p>
-    <p>
-      <label><%= @stop_area.human_attribute_name("latitude") %>: </label>
-      <%= @stop_area.latitude %>
-    </p>
     
     
   </div>
diff --git a/app/views/time_tables/_date.erb b/app/views/time_tables/_date.erb
index 4430efd33..7f127ff93 100644
--- a/app/views/time_tables/_date.erb
+++ b/app/views/time_tables/_date.erb
@@ -1,3 +1,3 @@
 <%= div_for(date) do %>
-  <%= date.date %>
+  <span class='date'><%= date.date %></span>
 <% end %>
diff --git a/app/views/time_tables/_period.erb b/app/views/time_tables/_period.erb
index a8be8c73a..8e9dda7b4 100644
--- a/app/views/time_tables/_period.erb
+++ b/app/views/time_tables/_period.erb
@@ -1,3 +1,3 @@
 <%= div_for(period) do %>
-  <%= period.period_start %> - <%= period.period_end %>
+  <span class='period'><%= period.period_start %> - <%= period.period_end %></span>
 <% end %>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index a03c9e570..d556d88e7 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -11,38 +11,89 @@
       <label><%= @time_table.human_attribute_name("version") %>: </label>
       <%= @time_table.version %>
     </p>
+    <!-- 
     <p>
-      <label><%= @time_table.human_attribute_name("objectid") %>: </label>
-      <%= @time_table.objectid %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("monday") %>: </label>
-      <%= @time_table.monday %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("tuesday") %>: </label>
-      <%= @time_table.tuesday %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("wednesday") %>: </label>
-      <%= @time_table.wednesday %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("thursday") %>: </label>
-      <%= @time_table.thursday %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("friday") %>: </label>
-      <%= @time_table.friday %>
-    </p>
-    <p>
-      <label><%= @time_table.human_attribute_name("saturday") %>: </label>
-      <%= @time_table.saturday %>
+      <label><%= @time_table.human_attribute_name("day_types") %>:&nbsp;&nbsp;</label>
+      <% if @time_table.monday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("monday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.tuesday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("tuesday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.wednesday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("wednesday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.thursday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("thursday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.friday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("friday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.saturday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("saturday") %>&nbsp;&nbsp;</label>
+      <% if @time_table.sunday %> 
+      	<%= image_tag "icons/checked.png" %>
+      <% else %>	
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+      <% end %>	
+      <label><%= @time_table.human_attribute_name("sunday") %></label>
     </p>
+    -->
     <p>
-      <label><%= @time_table.human_attribute_name("sunday") %>: </label>
-      <%= @time_table.sunday %>
+      <label><%= @time_table.human_attribute_name("day_types") %>:&nbsp;&nbsp;</label>
+      <% if @time_table.intdaytypes == 0 %>
+        <label><%= @time_table.human_attribute_name("none") %></label>
+      <% else %>  
+	      <% if @time_table.monday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("monday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.tuesday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("tuesday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.wednesday %> 
+	        <span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("wednesday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.thursday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("thursday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.friday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("friday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.saturday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("saturday") %>&nbsp;</span>
+	      <% end %>	
+	      
+	      <% if @time_table.sunday %> 
+	      	<span class='day_type'>&nbsp;<%= @time_table.human_attribute_name("sunday") %>&nbsp;</span>
+	      <% end %>	
+      <% end %>	
+      
     </p>
+    
   </div>
   <div>
   	<p>
@@ -56,7 +107,20 @@
   	</p>
   	<%= render :partial => "date", :collection => @time_table.dates %>
   </div>
-    
+  <div>
+    <p>
+      <label><%= @time_table.human_attribute_name("objectid") %>: </label>
+      <%= @time_table.objectid %>
+    </p>
+    <p>
+      <label><%= @time_table.human_attribute_name("creation_time") %>: </label>
+      <%= @time_table.creation_time %>
+    </p>
+    <p>
+      <label><%= @time_table.human_attribute_name("creator_id") %>: </label>
+      <%= @time_table.creator_id %>
+    </p>
+  </div>
 </div>
 
 <% content_for :sidebar do %>
diff --git a/config/database.yml b/config/database.yml
index a3e357d3a..71ad6f9b1 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,30 +1,13 @@
-# SQLite version 3.x
-#   gem 'activerecord-jdbcsqlite3-adapter'
-#
-# Configure Using Gemfile
-# gem 'activerecord-jdbcsqlite3-adapter'
-#
 development:
   adapter: jdbcpostgresql
-  database: chouette_dev
+  database: chouette2_dev
   encoding: utf8
   username: chouette
   password: chouette
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: jdbcpostgresql
-  database: chouette_test
+  database: chouette2_test
   encoding: utf8
   username: chouette
   password: chouette
-
-production:
-  adapter: jdbcpostgresql
-  database: chouette2
-  encoding: utf8
-  host: localhost
-  username: chouette
-  password: chouette    
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 9ae7bf744..bc1254ac9 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -15,6 +15,7 @@ en:
     show:
       title: Stop %{stop_area}
       geographic_data: Geographic data 
+      no_geographic_data: None
     index:
       title: Stop areas
       name_or_country_code: Name or Country code
@@ -34,8 +35,10 @@ en:
         street_name: Street name
         country_code: INSEE code
         fare_code: Fare code
+        projectiontype: Projection type
         x: x-position
         y: y-position
+        longlattype: Projection type
         longitude: Longitude
         latitude: Latitude
         objectid: Neptune identifier
@@ -65,6 +68,7 @@ fr:
     show:
       title: Arrêt %{stop_area}
       geographic_data: Données géographiques 
+      no_geographic_data: Aucune
     index:
       name_or_country_code: Nom ou Code Postal
       title: Arrêts
@@ -85,8 +89,10 @@ fr:
         street_name: Nom de la rue
         country_code: Code INSEE
         fare_code: Zone tarifaire
+        projectiontype: Projection
         x: Position X
         y: Position Y
+        longlattype: Projection
         longitude: Longitude
         latitude: Latitude
         object_id: Identifiant Neptune
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index f0333e4f0..003d86f2e 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -24,6 +24,8 @@ en:
       time_table:
         comment: Comment
         version: Version
+        day_types: Day types
+        none: none
         monday: Monday
         tuesday: Tuesday
         wednesday: Wednesday
@@ -37,8 +39,8 @@ en:
         creator_id: Created by 
         dates: Application dates
         periods: Application periods
-        period_start: From
-        period_end: to
+        periodstart: From
+        periodend: to
   formtastic:
     hints:
       time_table:
@@ -59,7 +61,7 @@ fr:
     show:
       title: Calendrier %{time_table}
     index:
-      comment: Commentaire
+      comment: Description
       title: calendriers
       selection: Sélection
       selection_all: Tous
@@ -68,8 +70,10 @@ fr:
       time_table: Calendrier
     attributes:
       time_table:
-        comment: Commentaire
+        comment: Description
         version: Version
+        day_types: "Jours d'application"
+        none: aucun
         monday: Lundi
         tuesday: Mardi
         wednesday: Mercredi
@@ -77,14 +81,14 @@ fr:
         friday: Vendredi
         saturday: Samedi
         sunday: Dimanche
-        object_id: Identifiant Neptune
+        objectid: Identifiant Neptune
         object_version: Version
         creation_time: Créé le
         creator_id: Créé par
         dates: "Dates d'application"
         periods: "Périodes d'application"
-        period_start: Du 
-        period_end: au
+        periodstart: Du 
+        periodend: au
 
   formtastic:
     hints:
diff --git a/doc/functional/boardingposition.png b/doc/functional/boardingposition.png
new file mode 100644
index 000000000..f3ffe75d9
--- /dev/null
+++ b/doc/functional/boardingposition.png
diff --git a/doc/functional/commercialstoppoint.png b/doc/functional/commercialstoppoint.png
new file mode 100644
index 000000000..2c87dc31a
--- /dev/null
+++ b/doc/functional/commercialstoppoint.png
diff --git a/doc/functional/quay.png b/doc/functional/quay.png
new file mode 100644
index 000000000..a2bd8e954
--- /dev/null
+++ b/doc/functional/quay.png
diff --git a/doc/functional/stop_areas.textile b/doc/functional/stop_areas.textile
index b0e1bfbd2..f527798fe 100644
--- a/doc/functional/stop_areas.textile
+++ b/doc/functional/stop_areas.textile
@@ -20,7 +20,7 @@ Enfin, CHOUETTE vous offre la possibilit&eacute; de regrouper les lieux d'arr&ec
 Ainsi on obtient les possibilit&eacute;s de regroupements suivants:
 * un arr&ecirc;t physique regroupe plusieurs arr&ecirc;ts itin&eacute;raire.
 * un arr&ecirc;t commercial regroupe plusieurs arr&ecirc;ts physiques (quai, embarquement).
-* une p&ocirc;le d'&eacute;change regroupe plusieurs arr&ecirc;ts commerciaux. 
+* un p&ocirc;le d'&eacute;change regroupe plusieurs arr&ecirc;ts commerciaux. 
 
 Pour ne pas aboutir &agrave; un syst&egrave;me trop complexe, les r&egrave;gles suivantes sont pos&eacute;es:
 * un p&ocirc;le d'&eacute;change peut contenir des arr&ecirc;ts commerciaux et/ou des p&ocirc;les d'&eacute;changes (qui ne peuvent pas en contenir d'autres).
@@ -36,6 +36,12 @@ Ainsi dans CHOUETTE:
 h3. Attributs
 
 - Type d'arr&ecirc;t := cat&eacute;gorie de l'arr&ecirc;t
+
+* !boardingposition.png! point d'embarquement
+* !quay.png! quai
+* !commercialstoppoint.png! arr&ecirc;t commercial
+* !stopplace.png! p&ocirc;le d'&eacute;change
+
 - Nom := nom de l'arr&ecirc;t 
 - Commentaire := zone de texte libre
 - Point d'int&eacute;r&ecirc;t le plus proche := nom du lieu desservi par l'arr&ecirc;t
diff --git a/doc/functional/stopplace.png b/doc/functional/stopplace.png
new file mode 100644
index 000000000..b5058573e
--- /dev/null
+++ b/doc/functional/stopplace.png