CRM-14696 - make sold out options a bit easier to see by making the entire option...

----------------------------------------
* CRM-14696:
  https://issues.civicrm.org/jira/browse/CRM-14696

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 0ac93479df064a96335d8aafb8c971ac1bd475f9..a1bc87c119983425f402fd9a68fc5c06b6968d3f 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -332,7 +332,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
         if (in_array($optionKey, $freezeOptions)) {
           $element->freeze();
           // CRM-14696 - Improve display for sold out price set options
-          $element->setLabel($label . '&nbsp;<span class="sold-out-option">' . ts('Sold out') . '</span>');
+          $element->setLabel($label . '&nbsp;<span class="sold-out-option">(' . ts('Sold out') . ')</span>');
         }
 
         //CRM-10117
@@ -404,7 +404,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           if (in_array($opId, $freezeOptions)) {
             $choice[$opId]->freeze();
             // CRM-14696 - Improve display for sold out price set options
-            $choice[$opId]->setText($choice[$opId]->getText() . '&nbsp; <span class="sold-out-option">(' . ts('Sold out') . ')</span>');
+            $choice[$opId]->setText('<span class="sold-out-option">' . $choice[$opId]->getText() . '&nbsp;(' . ts('Sold out') . ')</span>');
           }
         }
         if (!empty($qf->_membershipBlock) && $field->name == 'contribution_amount') {
@@ -470,8 +470,8 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
             $allowedOptions[] = $opt['id'];
           }
           // CRM-14696 - Improve display for sold out price set options
-          else {
-            $opt['label'] = $opt['label'] . '&nbsp;<span class="sold-out-option">(' . ts('Sold out') . ')</span>';
+          else {            
+            $opt['label'] = $opt['label'] . ' (' . ts('Sold out') . ')';
           }
                                        
           $selectOption[$opt['id']] = $opt['label'];
@@ -527,7 +527,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           if (in_array($opId, $freezeOptions)) {
             $check[$opId]->freeze();
             // CRM-14696 - Improve display for sold out price set options
-            $check[$opId]->setText($check[$opId]->getText() . '&nbsp;<span class="sold-out-option">(' . ts('Sold out') . ')</span>');
+            $check[$opId]->setText('<span class="sold-out-option">' . $check[$opId]->getText() . '&nbsp;(' . ts('Sold out') . ')</span>');
           }
         }
         $element = &$qf->addGroup($check, $elementName, $label);

diff --git a/css/civicrm.css b/css/civicrm.css
index 485ed2aeaf42b7abb0611acbf2a6f3b363121bb8..6d4f7c0dbbd185335d64ef13e24d3ca6888c9cfc 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -4282,8 +4282,10 @@ span.crm-status-icon {
   max-width: 100%;
 }
 
-#crm-container.crm-public .label {
+#crm-container.crm-public .label,
+#crm-container.crm-public .price-field-amount {
   padding-top: 6px;
+  font-size: 15px;
 }
 
 .crm-container.crm-public .select2-container,
@@ -4466,8 +4468,12 @@ span.crm-status-icon {
   display: none;
 }
 
-#crm-container .price_set-section .sold-out-option {
-  font-style: italic;
+#crm-container .sold-out-option,
+#crm-container .price-set-row span.sold-out-option .crm-price-amount-label,
+#crm-container .price-set-row span.sold-out-option .crm-price-amount-amount {
+  font-style: italic !important;
+  font-weight: normal !important;
+  color: #666 !important;
 }
 #crm-container .crm-extensions-upgrade {
   background: #ffb;