From 00d8aca2cfb28ed48419b62d93839ad5d181f463 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 5 Oct 2009 15:45:39 -0400
Subject: [PATCH] Bug 512332: Identity panel text layout is wrong, r=gavin

---
 mobile/chrome/content/browser.js  | 2 +-
 mobile/chrome/content/browser.xul | 2 +-
 mobile/themes/hildon/browser.css  | 5 +++++
 mobile/themes/wince/browser.css   | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 967e577f5858..8facbbea54a4 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1756,7 +1756,7 @@ IdentityHandler.prototype = {
 
       // Build an appropriate supplemental block out of whatever location data we have
       if (iData.city)
-        supplemental += iData.city + "\n";
+        supplemental += iData.city + " ";
       if (iData.state && iData.country)
         supplemental += this._stringBundle.getFormattedString("identity.identified.state_and_country",
                                                               [iData.state, iData.country]);
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 3d5a1e4adfd6..11e5c7d8767b 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -275,7 +275,7 @@
             <label id="identity-popup-connectedToLabel2" flex="1">&identity.unverifiedsite2;</label>
             <description id="identity-popup-content-host" flex="1"/>
           </hbox>
-          <hbox flex="1">
+          <hbox id="identity-popup-runBy-box">
             <label id="identity-popup-runByLabel" value="&identity.runBy2;"/>
             <description id="identity-popup-content-owner"/>
             <description id="identity-popup-content-supplemental"/>
diff --git a/mobile/themes/hildon/browser.css b/mobile/themes/hildon/browser.css
index 4186fd4c2eef..d433cb30e37a 100644
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@@ -768,6 +768,11 @@ findbar .findbar-closebutton {
   -moz-padding-start: 1mm; /* core spacing */
 }
 
+/* let the text flow into a second row, if needed */
+#identity-popup-runBy-box {
+  display: block;
+}
+
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-connectedToLabel,
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-runByLabel,
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-content-host,
diff --git a/mobile/themes/wince/browser.css b/mobile/themes/wince/browser.css
index a4f3e537ef46..8cc2d4bedd4a 100644
--- a/mobile/themes/wince/browser.css
+++ b/mobile/themes/wince/browser.css
@@ -491,6 +491,11 @@ findbar {
   -moz-padding-start: 1.1mm; /* core spacing */
 }
 
+/* let the text flow into a second row, if needed */
+#identity-popup-runBy-box {
+  display: block;
+}
+
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-connectedToLabel,
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-runByLabel,
 #identity-popup-content-box.unknownIdentity > hbox > #identity-popup-content-host,