aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-09-25 14:47:52 +0200
committerMichel Etienne2012-09-25 14:47:52 +0200
commit42ce765c5d4fec2f33453fca90862ec647770e86 (patch)
tree636495861dce7fbed78fec134cb7c3821accfbea
parent5e12dffa7546a466fc8f599e6756eceb7506a17c (diff)
downloadchouette-core-42ce765c5d4fec2f33453fca90862ec647770e86.tar.bz2
add warning entry on import/export/validation index screens
-rw-r--r--app/assets/images/logoMEDDE.jpgbin13842 -> 9767 bytes
-rw-r--r--app/views/exports/index.html.erb2
-rw-r--r--app/views/file_validations/index.html.erb2
-rw-r--r--app/views/imports/index.html.erb2
-rw-r--r--config/locales/exports.yml2
-rw-r--r--config/locales/file_validations.yml2
-rw-r--r--config/locales/imports.yml2
7 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/images/logoMEDDE.jpg b/app/assets/images/logoMEDDE.jpg
index 51e0a3a44..06d4a2a1f 100644
--- a/app/assets/images/logoMEDDE.jpg
+++ b/app/assets/images/logoMEDDE.jpg
Binary files differ
diff --git a/app/views/exports/index.html.erb b/app/views/exports/index.html.erb
index 25db2e1ba..b7847b70e 100644
--- a/app/views/exports/index.html.erb
+++ b/app/views/exports/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="page_info">
<span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @exports %>
</div>
diff --git a/app/views/file_validations/index.html.erb b/app/views/file_validations/index.html.erb
index e1416fa96..2e0cefbe8 100644
--- a/app/views/file_validations/index.html.erb
+++ b/app/views/file_validations/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="pagination">
<div class="page_info">
<%= page_entries_info @file_validations %>
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb
index 7e0d366a3..8469fbd7b 100644
--- a/app/views/imports/index.html.erb
+++ b/app/views/imports/index.html.erb
@@ -1,5 +1,5 @@
<%= title_tag t('.title') %>
-
+<div class="warning"><%= t('.warning') %> </div>
<div class="page_info">
<span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @imports %>
</div>
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index fa7fdfb8e..80468f96e 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -10,6 +10,7 @@ en:
all: All
index:
title: Exports
+ warning: ""
show:
report: Report
statuses:
@@ -82,6 +83,7 @@ fr:
all: Toutes
index:
title: Exports
+ warning: ""
show:
report: Rapport
statuses:
diff --git a/config/locales/file_validations.yml b/config/locales/file_validations.yml
index 50645dee9..96c2d60e8 100644
--- a/config/locales/file_validations.yml
+++ b/config/locales/file_validations.yml
@@ -2,6 +2,7 @@ en:
file_validations:
index:
title: Neptune Validation
+ warning: ""
edit:
title: "Edit the Validation"
show:
@@ -259,6 +260,7 @@ fr:
file_validations:
index:
title: Validation Neptune
+ warning: ""
edit:
title: "Editer la validation"
show:
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index ebf463886..c76377713 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -8,6 +8,7 @@ en:
title: New import
index:
title: Imports
+ warning: ""
show:
report: Report
statuses:
@@ -103,6 +104,7 @@ fr:
title: Nouvel import
index:
title: Imports
+ warning: ""
show:
report: Rapport
statuses: