From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 17 Jul 2017 20:15:30 +0000 (+1200)
Subject: Merge pull request #10649 from seamuslee001/CRM-20860
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=60050425316acb3726305d1c34908074cde124c7;hp=61e0a17d5ce150103579a312bfd34f38f7b0c064;p=civicrm-core.git

Merge pull request #10649 from seamuslee001/CRM-20860

CRM-20860 Add in ability to create field type of password from metadata
---

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 8fb7be9b9e..99a091d64f 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -1524,6 +1524,9 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
       case 'EntityRef':
         return $this->addEntityRef($name, $label, $props, $required);
 
+      case 'Password':
+        return $this->add('password', $name, $label, $props, $required);
+
       // Check datatypes of fields
       // case 'Int':
       //case 'Float':
diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index d67f82b478..d1be3d7bcc 100644
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -179,7 +179,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
     $class = $element->getAttribute('class');
     $type = $element->getType();
     if (!$class) {
-      if ($type == 'text') {
+      if ($type == 'text' || $type == 'password') {
         $size = $element->getAttribute('size');
         if (!empty($size)) {
           $class = CRM_Utils_Array::value($size, self::$_sizeMapper);
diff --git a/css/civicrm.css b/css/civicrm.css
index 4ae64c8630..e4f2395424 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -271,7 +271,8 @@ input.crm-form-entityref {
 }
 .crm-container input.crm-form-text,
 .crm-container .crm-icon-picker-button,
-.crm-container input.dateplugin {
+.crm-container input.dateplugin,
+.crm-container input.crm-form-password {
   border: 1px solid #999;
   vertical-align: middle;
   padding: 1px 2px;
@@ -285,7 +286,9 @@ input.crm-form-entityref {
 .crm-container input.crm-form-text[disabled],
 .crm-container input.dateplugin[disabled],
 .crm-container select.crm-form-select[disabled],
-.crm-container input.crm-form-text[readonly] {
+.crm-container input.crm-form-text[readonly],
+.crm-container input.crm-form-password[disabled],
+.crm-container input.crm-form-password[readonly] {
   background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #ddd), color-stop(15%, #f2f2f2));
   background-image: -webkit-linear-gradient(top, #ddd 1%, #f2f2f2 15%);
   background-image: -moz-linear-gradient(top, #ddd 1%, #f2f2f2 15%);
@@ -294,7 +297,8 @@ input.crm-form-entityref {
 
 .crm-container input.crm-form-text[disabled],
 .crm-container input.dateplugin[disabled],
-.crm-container select.crm-form-select[disabled] {
+.crm-container select.crm-form-select[disabled],
+.crm-container input.crm-form-password[disabled] {
   color: #a9a9a9;
 }