diff -r 000000000000 -r 6474c204b198 security/manager/pki/resources/content/certpicker.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/pki/resources/content/certpicker.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+
+var dialogParams;
+var itemCount = 0;
+
+function onLoad()
+{
+  dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+
+  var selectElement = document.getElementById("nicknames");
+  itemCount = dialogParams.GetInt(0);
+
+  var selIndex = dialogParams.GetInt(1);
+  if (selIndex < 0)
+    selIndex = 0;
+  
+  for (var i=0; i < itemCount; i++) {
+      var menuItemNode = document.createElement("menuitem");
+      var nick = dialogParams.GetString(i);
+      menuItemNode.setAttribute("value", i);
+      menuItemNode.setAttribute("label", nick); // this is displayed
+      selectElement.firstChild.appendChild(menuItemNode);
+      
+      if (selIndex == i) {
+        selectElement.selectedItem = menuItemNode;
+      }
+  }
+
+  dialogParams.SetInt(0,0); // set cancel return value
+  setDetails();
+}
+
+function setDetails()
+{
+  var selItem = document.getElementById("nicknames").value;
+  if (!selItem.length)
+    return;
+
+  var index = parseInt(selItem);
+  var details = dialogParams.GetString(index+itemCount);
+  document.getElementById("details").value = details;
+}
+
+function onCertSelected()
+{
+  setDetails();
+}
+
+function doOK()
+{
+  dialogParams.SetInt(0,1);
+  var index = parseInt(document.getElementById("nicknames").value);
+  dialogParams.SetInt(1, index);
+  return true;
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(0,0);
+  return true;
+}