Merge branch 'develop'

Asqatasun · Apr 23, 2014 · 9d52b60 · 9d52b60
2 parents 568643a + 0d32966
commit 9d52b60
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/data/contrast-finder-module.html b/data/contrast-finder-module.html
@@ -1,4 +1,4 @@
-<html lang="en">
+<html>
   <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <link rel="stylesheet" href="css/bootstrap.min.css">
@@ -72,13 +72,13 @@
           </div>
 
           <div id="cf-link-to-solutions" class="cf-block cf-link-to-solutions-disabled">
-            <strong><a id="submit" class="btn btn-gray btn-lg" href="" target="_blank" role="button" title="Find valid colors (brings you to Tanaguru Contrast-Finder website in a new tab)"><span data-l10n-id="find-link"></span>
+            <strong><a id="submit" class="btn btn-gray btn-lg disabled" href="" target="_blank" role="button" title="Find valid colors (brings you to Tanaguru Contrast-Finder website in a new tab)"><span data-l10n-id="find-link"></span>
 	    </a></strong>
           </div>
         </div>
 
         <div id="link-cf-website">
-	  <div class="main cf-message-padding">        
+	  <div class="cf-message-padding">        
             <div class="bs-callout bs-callout-info info-message" id="invalid-ratio">
 	      <span data-l10n-id="level-aa"></span></br>
 	      <span data-l10n-id="text-size"></span>

diff --git a/data/css/contrast-finder-addon.css b/data/css/contrast-finder-addon.css
@@ -68,6 +68,7 @@ a {
     border-color: #656565;
     text-align: left;
     margin-bottom: 10px;
+    margin-right: 6px;
 }
 
 .bs-callout-danger {
@@ -105,6 +106,7 @@ a {
 #submit {
     margin-top: 10px;
     width: 100%;
+    white-space: normal;
 }
 
 .my-fieldset legend {

diff --git a/data/js/form.js b/data/js/form.js
@@ -53,7 +53,7 @@ addon.port.on("click-components", function(tabResult) {
 
     var openUrl = "http://contrast-finder.tanaguru.com/result.html?foreground=%23"
 	+ foreground.textContent.replace("#", "") + "&background=%23" + background.textContent.replace("#", "")
-	+ "&isBackgroundTested=" + backgroundIsTested + "&ratio= "
+	+ "&isBackgroundTested=" + backgroundIsTested + "&ratio="
 	+ ratio + "&algo=HSV";
 
     submit.href = openUrl;    
@@ -77,8 +77,7 @@ function initializeHtmlElements() {
     document.getElementById("invalid-ratio").style.display = "none";
     document.getElementById("channel-alpha").style.display = "none";
     document.getElementById("valid-ratio").style.display = "none";
-    var languageReference = document.getElementById("language-reference").textContent;
-    if (languageReference == "Avant plan") {
+    if (document.getElementById("language-reference").textContent == "Avant plan") {
 	submit.title = "Trouver des couleurs valides (vous emmenera sur Tanaguru Contrast-Finder dans un nouvel onglet)";
     }
 }

diff --git a/lib/main.js b/lib/main.js
@@ -23,6 +23,7 @@ var sidebar = require("sdk/ui/sidebar").Sidebar({
     title: 'Tanaguru Contrast Finder',
     url: data.url("contrast-finder-module.html"),
     onAttach: function (worker) {
+	worker.port.emit("lang");
 	var tabWorker = null;
 	workers.push(worker);
 	tabs.on("open", function() {