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

4 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/stylesheets/file_validations.css.scss b/app/assets/stylesheets/file_validations.css.scss
index 250561177..187c74b3c 100644
--- a/app/assets/stylesheets/file_validations.css.scss
+++ b/app/assets/stylesheets/file_validations.css.scss
@@ -99,7 +99,8 @@
 }
 }
 
-#workspace.file_validations.new #workspace.file_validations.create {
+#workspace.file_validations.new, #workspace.file_validations.create 
+{
     padding: 0;
     margin-top: -0.3em;
     margin-bottom: 1em;
diff --git a/app/assets/stylesheets/routes.css.scss b/app/assets/stylesheets/routes.css.scss
index bbf2576b3..756ddadfa 100644
--- a/app/assets/stylesheets/routes.css.scss
+++ b/app/assets/stylesheets/routes.css.scss
@@ -41,7 +41,7 @@
     }
 }
 
-#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create,, #workspace.routes.update
+#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create, #workspace.routes.update
 {
     #route_color{ width: 100px;
                  color: white;
diff --git a/app/models/file_validation.rb b/app/models/file_validation.rb
index a4c76ebf0..e09a48113 100644
--- a/app/models/file_validation.rb
+++ b/app/models/file_validation.rb
@@ -74,9 +74,11 @@ class FileValidation < ActiveRecord::Base
 
   after_validation :extract_file_type, :on => :create
   def extract_file_type
-    if !resources.original_filename.nil?
-      self.file_type = resources.original_filename.rpartition(".").last
-      self.file_name = resources.original_filename
+    if ! resources.nil? 
+      if !resources.original_filename.nil?
+        self.file_type = resources.original_filename.rpartition(".").last
+        self.file_name = resources.original_filename
+      end
     end
   end
 
diff --git a/app/views/test_sheet/1_2.html b/app/views/test_sheet/1_2.html
index dae76e7aa..ff1b8ad93 100644
--- a/app/views/test_sheet/1_2.html
+++ b/app/views/test_sheet/1_2.html
@@ -140,10 +140,13 @@ du point de contr&ocirc;le N&deg; 1.2</span></p>
   6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
   font-family:"Tahoma","sans-serif"'>La v&eacute;rification de la conformit&eacute; XSD
   permet de valider, entre autre :</span></p>
-  <p class=MsoNormal style='margin-top:14.0pt;margin-right:0cm;margin-bottom:
-  0cm;margin-left:36.0pt;margin-bottom:.0001pt;text-indent:-18.0pt'><span
+  <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
+  style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
+  l'encodage est bien ISO-8859-1</span></p>
+  <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
   style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  </span></span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>que
+  </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
   les balises utilis&eacute;es sont bien connues (d&eacute;finies dans l'XSD)</span></p>
   <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
   style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;