set conformance for line network and company screens with fields specifications

4 files changed, 30 insertions, 2 deletions

diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb
index e81bc7ce8..3476e5031 100644
--- a/app/views/networks/_form.erb
+++ b/app/views/networks/_form.erb
@@ -7,6 +7,14 @@
     <%= form.input :description %>              
     <%= form.input :source_name %>              
     <%= form.input :source_identifier %>              
+    <% if @network.new_record? %>
+      <%= form.input :objectid %>  
+    <% else %>
+      <li>
+      <label><%= @network.human_attribute_name("objectid") %>: </label>
+      <%= @network.objectid %>
+      </li>
+    <% end %>
   <% end %>
 
   <%= form.buttons do %>
diff --git a/app/views/networks/_network.erb b/app/views/networks/_network.erb
index 4adf6896b..f3a0b597e 100644
--- a/app/views/networks/_network.erb
+++ b/app/views/networks/_network.erb
@@ -1,6 +1,9 @@
 <%= div_for(network) do %>
   <%= link_to network.name, [@referential, network] %>
   <div class="info">
-
+    <div class="actions">  
+      <%= link_to t("actions.edit"), edit_referential_network_path(@referential, network), :class => "edit" %> |
+      <%= link_to t("actions.destroy"), referential_network_path(@referential, network), :method => :delete, :confirm =>  t('networks.actions.destroy_confirm'), :class => "remove" %>
+    </div>
   </div>
 <% end %>
diff --git a/app/views/networks/index.html.erb b/app/views/networks/index.html.erb
index 3743a1865..96e4f8b0b 100644
--- a/app/views/networks/index.html.erb
+++ b/app/views/networks/index.html.erb
@@ -1,6 +1,19 @@
 <%= title_tag t('networks.index.title') %> 
 
-<%= render :partial => "network", :collection => @networks %>
+<%= search_form_for @q, :url => referential_networks_path(@referential), :html => {:method => :get} do |f| %>
+  <%= f.label :name_cont, "#{t('.name')} :" %>
+  <%= f.text_field :name_cont %>
+
+  <%= f.submit t('actions.search') %> <%= t("or") %>
+  <%= link_to t("cancel"), referential_networks_path(@referential) %>
+<% end %>
+
+<%#= will_paginate @networks %>
+<div class="networks paginated_content">
+  <%= render :partial => "network", :collection => @networks %>
+</div>
+<%= will_paginate @networks %>
+
 
 <% content_for :sidebar do %>
 <ul class="actions">
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 489978f49..bd96938c5 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -31,6 +31,10 @@
       <label><%= Chouette::Network.human_attribute_name("source_identifier") %>: </label>
       <%= @network.source_identifier %>
     </p>
+    <p>
+      <label><%= Chouette::Network.human_attribute_name("objectid") %>: </label>
+      <%= @network.objectid %>
+    </p>
   </div>
 </div>