Bug 1013904 - Text not selectable in in-content prefs. r=jaws.

2014-05-30 20:32:29 +03:00 · 2014-05-30 20:32:29 +03:00 · 4819996837
--- a/browser/components/preferences/in-content/advanced.js
+++ b/browser/components/preferences/in-content/advanced.js
@ -302,7 +302,7 @@ var gAdvancedPane = {
      ])
    };

-    actualSizeLabel.value = prefStrBundle.getString("actualDiskCacheSizeCalculated");
+    actualSizeLabel.textContent = prefStrBundle.getString("actualDiskCacheSizeCalculated");

    var cacheService =
      Components.classes["@mozilla.org/netwerk/cache-storage-service;1"]
@ -321,7 +321,7 @@ var gAdvancedPane = {
          var sizeStrings = DownloadUtils.convertByteUnits(deviceInfo.totalSize);
          var prefStrBundle = document.getElementById("bundlePreferences");
          var sizeStr = prefStrBundle.getFormattedString("actualAppCacheSize", sizeStrings);
-          actualSizeLabel.value = sizeStr;
+          actualSizeLabel.textContent = sizeStr;
        }
        // Do not enumerate entries
        return false;
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@ -131,8 +131,7 @@
      hidden="true"
      data-category="paneAdvanced">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneAdvanced.title;"/>
+  <label class="header-name">&paneAdvanced.title;</label>
 </hbox>

 <tabbox id="advancedPrefs"
@ -159,7 +158,7 @@
    <tabpanel id="generalPanel" orient="vertical">
      <!-- Accessibility -->
      <groupbox id="accessibilityGroup" align="start">
-        <caption label="&accessibility.label;"/>
+        <caption><label>&accessibility.label;</label></caption>

        <checkbox id="useCursorNavigation"
                  label="&useCursorNavigation.label;"
@ -176,7 +175,7 @@
      </groupbox>
      <!-- Browsing -->
      <groupbox id="browsingGroup" align="start">
-        <caption label="&browsing.label;"/>
+        <caption><label>&browsing.label;</label></caption>

        <checkbox id="useAutoScroll"
                  label="&useAutoScroll.label;"
@ -200,7 +199,7 @@
 #ifdef HAVE_SHELL_SERVICE
      <!-- System Defaults -->
      <groupbox id="systemDefaultsGroup" orient="vertical">
-        <caption label="&systemDefaults.label;"/>
+        <caption><label>&systemDefaults.label;</label></caption>

        <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
                  label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;"
@ -211,8 +210,7 @@
                    label="&setDefault.label;" accesskey="&setDefault.accesskey;"
                    oncommand="gAdvancedPane.setDefaultBrowser();"
                    preference="pref.general.disable_button.default_browser"/>
-            <label id="isDefaultLabel"
-                   value="&isDefault.label;"/>
+            <label id="isDefaultLabel">&isDefault.label;</label>
          </deck>
        </hbox>
      </groupbox>
@ -223,7 +221,7 @@
    <tabpanel id="dataChoicesPanel" orient="vertical">
 #ifdef MOZ_TELEMETRY_REPORTING
      <groupbox>
-        <caption label="&telemetrySection.label;"/>
+        <caption><label>&telemetrySection.label;</label></caption>
        <description>&telemetryDesc.label;</description>
        <hbox>
          <checkbox id="submitTelemetryBox"
@ -232,14 +230,13 @@
                    accesskey="&enableTelemetry.accesskey;"/>
          <spacer flex="1"/>
          <label id="telemetryLearnMore"
-                 class="text-link"
-                 value="&telemetryLearnMore.label;"/>
+                 class="text-link">&telemetryLearnMore.label;</label>
        </hbox>
      </groupbox>
 #endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
      <groupbox>
-        <caption label="&healthReportSection.label;"/>
+        <caption><label>&healthReportSection.label;</label></caption>
        <description>&healthReportDesc.label;</description>
        <hbox>
          <checkbox id="submitHealthReportBox"
@ -248,14 +245,13 @@
                    accesskey="&enableHealthReport.accesskey;"/>
          <spacer flex="1"/>
          <label id="FHRLearnMore"
-                 class="text-link"
-                 value="&healthReportLearnMore.label;"/>
+                 class="text-link">&healthReportLearnMore.label;</label>
        </hbox>
      </groupbox>
 #endif
 #ifdef MOZ_CRASHREPORTER
      <groupbox>
-        <caption label="&crashReporterSection.label;"/>
+        <caption><label>&crashReporterSection.label;</label></caption>
        <description>&crashReporterDesc.label;</description>
        <hbox>
          <checkbox id="submitCrashesBox"
@ -265,8 +261,7 @@

          <spacer flex="1"/>
          <label id="crashReporterLearnMore"
-                 class="text-link"
-                 value="&crashReporterLearnMore.label;"/>
+                 class="text-link">&crashReporterLearnMore.label;</label>
        </hbox>
      </groupbox>
 #endif
@ -278,7 +273,7 @@

      <!-- Connection -->
      <groupbox id="connectionGroup">
-        <caption label="&connection.label;"/>
+        <caption><label>&connection.label;</label></caption>

        <hbox align="center">
          <description flex="1" control="connectionSettings">&connectionDesc.label;</description>
@ -290,7 +285,7 @@

      <!-- Cache -->
      <groupbox id="cacheGroup">
-        <caption label="&httpCache.label;"/>
+        <caption><label>&httpCache.label;</label></caption>

        <hbox align="center">
          <label id="actualDiskCacheSize" flex="1"/>
@ -305,8 +300,9 @@
                  accesskey="&overrideSmartCacheSize.accesskey;"/>
        <hbox align="center" class="indent">
          <label id="useCacheBefore" control="cacheSize"
-                accesskey="&limitCacheSizeBefore.accesskey;"
-                value="&limitCacheSizeBefore.label;"/>
+                 accesskey="&limitCacheSizeBefore.accesskey;">
+            &limitCacheSizeBefore.label;
+          </label>
          <textbox id="cacheSize" type="number" size="4" max="1024"
                  preference="browser.cache.disk.capacity"
                  onsyncfrompreference="return gAdvancedPane.readCacheSize();"
@ -318,7 +314,7 @@

      <!-- Offline apps -->
      <groupbox id="offlineGroup">
-        <caption label="&offlineStorage2.label;"/>
+        <caption><label>&offlineStorage2.label;</label></caption>

        <hbox align="center">
          <label id="actualAppCacheSize" flex="1"/>
@ -361,7 +357,7 @@
    <tabpanel id="updatePanel" orient="vertical">
 #ifdef MOZ_UPDATER
      <groupbox id="updateApp">
-        <caption label="&updateApp.label;"/>
+        <caption><label>&updateApp.label;</label></caption>
        <radiogroup id="updateRadioGroup"
                    oncommand="gAdvancedPane.updateWritePrefs();">
 #ifdef XP_WIN
@ -372,7 +368,7 @@
                     accesskey="&updateAutoMetro.accesskey;"/>
              <hbox id="autoMetroIndent"
                    class="indent">
-                <label value="&updateAutoMetroWarn.label;"/>
+                <label>&updateAutoMetroWarn.label;</label>
              </hbox>
 #endif
 #endif
@ -413,7 +409,7 @@
      </groupbox>
 #endif
      <groupbox id="updateOthers">
-        <caption label="&updateOthers.label;"/>
+        <caption><label>&updateOthers.label;</label></caption>
        <checkbox id="enableSearchUpdate"
                  label="&enableSearchUpdate.label;"
                  accesskey="&enableSearchUpdate.accesskey;"
--- a/browser/components/preferences/in-content/applications.xul
+++ b/browser/components/preferences/in-content/applications.xul
@ -62,8 +62,7 @@
      hidden="true"
      data-category="paneApplications">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneApplications.title;"/>
+  <label class="header-name">&paneApplications.title;</label>
 </hbox>

 <vbox id="applicationsContent"
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@ -33,12 +33,11 @@
      hidden="true"
      data-category="paneContent">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneContent.title;"/>
+  <label class="header-name">&paneContent.title;</label>
 </hbox>

 <groupbox id="miscGroup" data-category="paneContent" hidden="true">
-  <caption label="&popups.label;"/>
+  <caption><label>&popups.label;</label></caption>

  <grid id="contentGrid">
    <columns>
@ -63,7 +62,7 @@

 <!-- Fonts and Colors -->
 <groupbox id="fontsGroup" data-category="paneContent" hidden="true">
-  <caption label="&fontsAndColors.label;"/>
+  <caption><label>&fontsAndColors.label;</label></caption>

  <grid id="fontsGrid">
    <columns>
@ -124,7 +123,7 @@

 <!-- Languages -->
 <groupbox id="languagesGroup" data-category="paneContent" hidden="true">
-  <caption label="&languages.label;"/>
+  <caption><label>&languages.label;</label></caption>

  <hbox id="languagesBox" align="center">
    <description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@ -91,18 +91,16 @@
      class="header"
      data-category="paneGeneral">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneGeneral.title;"/>
+  <label class="header-name">&paneGeneral.title;</label>
 </hbox>

 <!-- Startup -->
 <groupbox id="startupGroup" data-category="paneGeneral">
-  <caption label="&startup.label;"/>
+  <caption><label>&startup.label;</label></caption>

  <hbox align="center">
-    <label value="&startupPage.label;"
-           accesskey="&startupPage.accesskey;"
-           control="browserStartupPage"/>
+    <label accesskey="&startupPage.accesskey;"
+           control="browserStartupPage">&startupPage.label;</label>
    <menulist id="browserStartupPage"
              preference="browser.startup.page">
      <menupopup>
@ -120,9 +118,8 @@
  </hbox>
  <separator class="thin"/>
  <hbox align="center">
-    <label value="&homepage.label;"
-           accesskey="&homepage.accesskey;"
-           control="browserHomePage"/>
+    <label accesskey="&homepage.accesskey;"
+           control="browserHomePage">&homepage.label;</label>
    <textbox id="browserHomePage"
             class="padded uri-element"
             flex="1"
@ -156,7 +153,7 @@

 <!-- Downloads -->
 <groupbox id="downloadsGroup" data-category="paneGeneral">
-  <caption label="&downloads.label;"/>
+  <caption><label>&downloads.label;</label></caption>

  <radiogroup id="saveWhere"
              preference="browser.download.useDownloadDir"
@ -195,7 +192,7 @@

 <!-- Tab preferences -->
 <groupbox data-category="paneGeneral">
-    <caption label="&tabsGroup.label;"/>
+    <caption><label>&tabsGroup.label;</label></caption>
    <checkbox id="linkTargeting" label="&newWindowsAsTabs.label;"
              accesskey="&newWindowsAsTabs.accesskey;"
              preference="browser.link.open_newwindow"
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@ -88,7 +88,7 @@
                    tooltiptext="&paneGeneral.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneGeneral.title;"/>
+        <label class="category-name" flex="1">&paneGeneral.title;</label>
      </richlistitem>

      <richlistitem id="category-content"
@ -98,7 +98,7 @@
                    tooltiptext="&paneContent.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneContent.title;"/>
+        <label class="category-name" flex="1">&paneContent.title;</label>
      </richlistitem>

      <richlistitem id="category-application"
@ -108,7 +108,7 @@
                    tooltiptext="&paneApplications.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneApplications.title;"/>
+        <label class="category-name" flex="1">&paneApplications.title;</label>
      </richlistitem>

      <richlistitem id="category-privacy"
@ -118,7 +118,7 @@
                    tooltiptext="&panePrivacy.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&panePrivacy.title;"/>
+        <label class="category-name" flex="1">&panePrivacy.title;</label>
      </richlistitem>

      <richlistitem id="category-security"
@ -128,7 +128,7 @@
                    tooltiptext="&paneSecurity.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneSecurity.title;"/>
+        <label class="category-name" flex="1">&paneSecurity.title;</label>
      </richlistitem>

 #ifdef MOZ_SERVICES_SYNC
@ -139,7 +139,7 @@
                    tooltiptext="&paneSync.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneSync.title;"/>
+        <label class="category-name" flex="1">&paneSync.title;</label>
      </richlistitem>
 #endif

@ -150,7 +150,7 @@
                    tooltiptext="&paneAdvanced.title;"
                    align="center">
        <image class="category-icon"/>
-        <label class="category-name" flex="1" value="&paneAdvanced.title;"/>
+        <label class="category-name" flex="1">&paneAdvanced.title;</label>
      </richlistitem>
    </richlistbox>

--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@ -72,13 +72,12 @@
      hidden="true"
      data-category="panePrivacy">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&panePrivacy.title;"/>
+  <label class="header-name">&panePrivacy.title;</label>
 </hbox>

 <!-- Tracking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" align="start">
-  <caption label="&tracking.label;"/>
+  <caption><label>&tracking.label;</label></caption>
  <radiogroup id="doNotTrackSelection" orient="vertical"
              preference="privacy.donottrackheader.value"
              onsynctopreference="return gPrivacyPane.setTrackingPrefs()"
@ -91,13 +90,14 @@
            accesskey="&dntTrackingNopref.accesskey;" />
  </radiogroup>
  <label class="text-link" id="doNotTrackInfo"
-         href="https://www.mozilla.org/dnt"
-         value="&doNotTrackInfo.label;"/>
+         href="https://www.mozilla.org/dnt">
+    &doNotTrackInfo.label;
+  </label>
 </groupbox>

 <!-- History -->
 <groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
-  <caption label="&history.label;"/>
+  <caption><label>&history.label;</label></caption>
  <hbox align="center">
    <label id="historyModeLabel"
           control="historyMode"
@ -230,7 +230,7 @@

 <!-- Location Bar -->
 <groupbox id="locationBarGroup" data-category="panePrivacy" hidden="true">
-  <caption label="&locationBar.label;"/>
+  <caption><label>&locationBar.label;</label></caption>
  <hbox align="center">
    <label id="locationBarSuggestionLabel"
           control="locationBarSuggestion"
--- a/browser/components/preferences/in-content/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@ -37,13 +37,12 @@
      hidden="true"
      data-category="paneSecurity">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneSecurity.title;"/>
+  <label class="header-name">&paneSecurity.title;</label>
 </hbox>

 <!-- addons, forgery (phishing) UI -->
 <groupbox id="addonsPhishingGroup" data-category="paneSecurity" hidden="true">
-  <caption label="&general.label;"/>
+  <caption><label>&general.label;</label></caption>

  <hbox id="addonInstallBox">
    <checkbox id="warnAddonInstall" flex="1"
@ -70,7 +69,7 @@

 <!-- Passwords -->
 <groupbox id="passwordsGroup" orient="vertical" data-category="paneSecurity" hidden="true">
-  <caption label="&passwords.label;"/>
+  <caption><label>&passwords.label;</label></caption>

  <hbox id="savePasswordsBox">
    <checkbox id="savePasswords" flex="1"
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@ -44,7 +44,7 @@ let gSyncPane = {
  needsUpdate: function () {
    this.page = PAGE_NEEDS_UPDATE;
    let label = document.getElementById("loginError");
-    label.value = Weave.Utils.getErrorString(Weave.Status.login);
+    label.textContent = Weave.Utils.getErrorString(Weave.Status.login);
    label.className = "error";
  },

@ -180,7 +180,7 @@ let gSyncPane = {
      this.needsUpdate();
    } else {
      this.page = PAGE_HAS_ACCOUNT;
-      document.getElementById("accountName").value = Weave.Service.identity.account;
+      document.getElementById("accountName").textContent = Weave.Service.identity.account;
      document.getElementById("syncComputerName").value = Weave.Service.clientsEngine.localName;
      document.getElementById("tosPP").hidden = this._usingCustomServer;
    }
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@ -35,8 +35,7 @@
      hidden="true"
      data-category="paneSync">
  <image class="header-icon"/>
-  <label class="header-name"
-         value="&paneSync.title;"/>
+  <label class="header-name">&paneSync.title;</label>
 </hbox>

 <deck id="weavePrefsDeck" data-category="paneSync" hidden="true">
@ -48,13 +47,15 @@
    </description>
    <separator/>
    <label class="text-link"
-           onclick="event.stopPropagation(); gSyncPane.openSetup(null);"
-           value="&setupButton.label;"/>
+           onclick="event.stopPropagation(); gSyncPane.openSetup(null);">
+      &setupButton.label;
+    </label>
    <vbox id="pairDevice">
      <separator/>
      <label class="text-link"
-             onclick="event.stopPropagation(); gSyncPane.openSetup('pair');"
-             value="&pairDevice.label;"/>
+             onclick="event.stopPropagation(); gSyncPane.openSetup('pair');">
+        &pairDevice.label;
+      </label>
    </vbox>
    <spacer flex="3"/>
  </vbox>
@ -64,7 +65,7 @@
      <!-- label is set to account name -->
      <caption id="accountCaption" align="center">
        <image id="accountCaptionImage"/>
-        <label id="accountName" value=""/>
+        <label id="accountName"/>
      </caption>

      <hbox>
@ -89,12 +90,13 @@
      <hbox>
        <label id="syncAddDeviceLabel"
               class="text-link"
-               onclick="gSyncPane.openAddDevice(); return false;"
-               value="&pairDevice.label;"/>
+               onclick="gSyncPane.openAddDevice(); return false;">
+          &pairDevice.label;
+        </label>
      </hbox>

      <vbox>
-        <label value="&syncMy.label;" />
+        <label>&syncMy.label;</label>
        <richlistbox id="syncEnginesList"
                     orient="vertical"
                     onselect="if (this.selectedCount) this.clearSelection();">
@ -140,9 +142,10 @@
        </columns>
        <rows>
          <row align="center">
-            <label value="&syncDeviceName.label;"
-                   accesskey="&syncDeviceName.accesskey;"
-                   control="syncComputerName"/>
+            <label accesskey="&syncDeviceName.accesskey;"
+                   control="syncComputerName">
+              &syncDeviceName.label;
+            </label>
            <textbox id="syncComputerName"
                     onchange="gSyncUtils.changeName(this)"/>
          </row>
@ -150,59 +153,68 @@
      </grid>
      <hbox>
        <label class="text-link"
-               onclick="gSyncPane.startOver(true); return false;"
-               value="&unlinkDevice.label;"/>
+               onclick="gSyncPane.startOver(true); return false;">
+          &unlinkDevice.label;
+        </label>
      </hbox>
    </groupbox>
    <hbox id="tosPP" pack="center">
      <label class="text-link"
-             onclick="event.stopPropagation();gSyncUtils.openToS();"
-             value="&prefs.tosLink.label;"/>
+             onclick="event.stopPropagation();gSyncUtils.openToS();">
+        &prefs.tosLink.label;
+      </label>
      <label class="text-link"
-             onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();"
-             value="&prefs.ppLink.label;"/>
+             onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();">
+        &prefs.ppLink.label;
+      </label>
    </hbox>
  </vbox>

  <vbox id="needsUpdate" align="center" pack="center">
    <hbox>
-      <label id="loginError" value=""/>
+      <label id="loginError"/>
      <label class="text-link"
-             onclick="gSyncPane.updatePass(); return false;"
-             value="&updatePass.label;"/>
+             onclick="gSyncPane.updatePass(); return false;">
+        &updatePass.label;
+      </label>
      <label class="text-link"
-             onclick="gSyncPane.resetPass(); return false;"
-             value="&resetPass.label;"/>
+             onclick="gSyncPane.resetPass(); return false;">
+        &resetPass.label;
+      </label>
    </hbox>
    <label class="text-link"
-           onclick="gSyncPane.startOver(true); return false;"
-           value="&unlinkDevice.label;"/>
+           onclick="gSyncPane.startOver(true); return false;">
+      &unlinkDevice.label;
+    </label>
  </vbox>

  <!-- These panels are for the Firefox Accounts identity provider -->
  <vbox id="fxaDeterminingStatus" align="center">
    <spacer flex="1"/>
-    <label value="&determiningAcctStatus.label;"/>
+    <label>&determiningAcctStatus.label;</label>
    <spacer flex="1"/>
  </vbox>

  <vbox id="noFxaAccount">
    <label>&welcome.description;</label>
    <label class="text-link"
-            onclick="gSyncPane.signUp(); return false;"
-            value="&welcome.createAccount.label;"/>
+           onclick="gSyncPane.signUp(); return false;">
+      &welcome.createAccount.label;
+    </label>
    <label class="text-link"
-            onclick="gSyncPane.signIn(); return false;"
-            value="&welcome.signIn.label;"/>
+           onclick="gSyncPane.signIn(); return false;">
+      &welcome.signIn.label;
+    </label>
    <separator/>
    <label class="text-link"
-            onclick="gSyncPane.openOldSyncSupportPage(); return false;"
-            value="&welcome.useOldSync.label;"/>
+           onclick="gSyncPane.openOldSyncSupportPage(); return false;">
+      &welcome.useOldSync.label;
+    </label>
  </vbox>

  <vbox id="hasFxaAccount">
    <groupbox id="fxaGroup">
-      <caption label="&syncBrand.fxAccount.label;"/>
+      <caption><label>&syncBrand.fxAccount.label;</label></caption>

      <deck id="fxaLoginStatus">

@ -211,8 +223,9 @@
          <label id="fxaEmailAddress1"/>
          <vbox>
            <label class="text-link"
-                    onclick="gSyncPane.manageFirefoxAccount();"
-                    value="&manage.label;"/>
+                   onclick="gSyncPane.manageFirefoxAccount();">
+              &manage.label;
+            </label>
          </vbox>
          <spacer flex="1"/>
          <vbox>
@ -234,8 +247,9 @@
            <button oncommand="gSyncPane.verifyFirefoxAccount();"
                    label="&verify.label;"/>
            <label class="text-link"
-                    onclick="/* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false);"
-                    value="&forget.label;"/>
+                   onclick="/* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false);">
+              &forget.label;
+            </label>
          </vbox>
        </hbox>

@ -251,15 +265,16 @@
            <button oncommand="gSyncPane.reSignIn();"
                    label="&signIn.label;"/>
            <label class="text-link"
-                    onclick="gSyncPane.unlinkFirefoxAccount(true);"
-                    value="&forget.label;"/>
+                    onclick="gSyncPane.unlinkFirefoxAccount(true);">
+              &forget.label;
+            </label>
          </vbox>
        </hbox>
      </deck>
    </groupbox>

    <groupbox id="syncOptions">
-      <caption label="&syncBrand.shortName.label;"/>
+      <caption><label>&syncBrand.shortName.label;</label></caption>
      <hbox id="fxaSyncEngines">
        <vbox>
          <checkbox label="&engine.tabs.label;"
@ -296,9 +311,10 @@
      </hbox>
    </groupbox>
    <hbox align="center">
-      <label value="&syncDeviceName.label;"
-              accesskey="&syncDeviceName.accesskey;"
-              control="syncComputerName"/>
+      <label accesskey="&syncDeviceName.accesskey;"
+             control="syncComputerName">
+        &syncDeviceName.label;
+      </label>
      <textbox id="fxaSyncComputerName"
                flex="1"
                onchange="gSyncUtils.changeName(this)"/>
@ -306,11 +322,13 @@
    <spacer flex="1"/>
    <hbox id="tosPP" pack="center">
      <label class="text-link small"
-              onclick="event.stopPropagation();gSyncUtils.openToS();"
-              value="&prefs.tosLink.label;"/>
+             onclick="event.stopPropagation();gSyncUtils.openToS();">
+        &prefs.tosLink.label;
+      </label>
      <label class="text-link small"
-              onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();"
-              value="&fxaPrivacyNotice.link.label;"/>
+              onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();">
+        &fxaPrivacyNotice.link.label;
+      </label>
    </hbox>
  </vbox>
 </deck>
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@ -15,12 +15,16 @@ page {
  background-image: linear-gradient(#FFFFFF, #EDEDED 100px);
 }

+* {
+  -moz-user-select: text;
+}
+
 caption {
  -moz-appearance: none;
  margin: 0;
 }

-.caption-text {
+caption > label {
  font-size: 1.3rem;
  font-weight: bold;
  line-height: 22px;