CRM-13966 - select2 style tweaks

diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php
index d6b47e9503291a9042b889787da5e58147ea8d39..fa56341936146bc0e7c938d0e776d5d92e2d266c 100644 (file)
--- a/CRM/Contact/Form/Edit/Address.php
+++ b/CRM/Contact/Form/Edit/Address.php
@@ -66,20 +66,14 @@ class CRM_Contact_Form_Edit_Address {
     $form->applyFilter('__ALL__', 'trim');
 
     $js = array();
-    if ( !$inlineEdit ) {
-    $js = array('onChange' => 'checkLocation( this.id );');
+    if (!$inlineEdit) {
+      $js = array('onChange' => 'checkLocation( this.id );');
     }
 
-    $form->addElement('select',
-      "address[$blockId][location_type_id]",
-      ts('Location Type'),
-      array(
-        '' => ts('- select -')) + CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'),
-        $js
-    );
+    $form->addSelect("address[$blockId][location_type_id]", array('data-api-entity' => 'address', 'class' => 'six') + $js);
 
-    if ( !$inlineEdit ) {
-    $js = array('id' => 'Address_' . $blockId . '_IsPrimary', 'onClick' => 'singleSelect( this.id );');
+    if (!$inlineEdit) {
+      $js = array('id' => 'Address_' . $blockId . '_IsPrimary', 'onClick' => 'singleSelect( this.id );');
     }
     else {
       //make location type required for inline edit

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 878f42c96c553856729b34b328362ee245cee1aa..d7a6c833d43540034ed67f7c3632433946244f49 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -371,7 +371,7 @@ class CRM_Contact_Form_Search_Criteria {
     CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap);
 
     // extend addresses with proximity search
-    $form->addElement('text', 'prox_distance', ts('Find contacts within'));
+    $form->addElement('text', 'prox_distance', ts('Find contacts within'), array('class' => 'six'));
     $form->addElement('select', 'prox_distance_unit', NULL, array('miles' => ts('Miles'), 'kilos' => ts('Kilometers')));
 
     // is there another form rule that does decimals besides money ? ...

diff --git a/css/civicrm.css b/css/civicrm.css
index ae41b77a42561498964180007d668d2e14eba65d..5421b6a593e0043f7c27acb598a417e976b37de5 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2438,7 +2438,8 @@ div.grippie {
 }
 
 .crm-container .button .icon,
-.crm-container .crm-button .icon {
+.crm-container .crm-button .icon,
+.crm-accordion-header .icon {
   background-image: url("../i/icons/jquery-ui-FFFFFF.png");
 }
 .crm-container .button:hover .icon,
@@ -2619,10 +2620,13 @@ div.grippie {
 .crm-container .crm-hover-button {
   display: inline-block;
   border: 1px solid transparent;
+  opacity: .7;
+}
+.crm-container .crm-accordion-header a.crm-hover-button {
+  opacity: 1;
 }
 .crm-container .crm-hover-button:hover,
 .crm-container .crm-hover-button:active {
-  background: #ccc;
   background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(1, #ccc));
   background-image: -webkit-linear-gradient(center bottom, #eee 0%, #ccc 100%);
   background-image: -moz-linear-gradient(center bottom, #eee 0%, #ccc 100%);
@@ -2630,6 +2634,7 @@ div.grippie {
   background-image: linear-gradient(top, #eee 0%, #ccc 100%);
   border: 1px solid #AAAAAA;
   border-radius: 4px;
+  opacity: 1;
 }
 .crm-container .crm-hover-button .icon {
   margin-left: 3px;
@@ -2741,20 +2746,6 @@ div.grippie {
   background-color: #2E3471;
 }
 
-.crm-container .crm-accordion-header a.crm-close-accordion {
-  font-weight: normal !important;
-  float: right;
-  color: #FFF !important;
-}
-
-.crm-container .crm-accordion-header a.crm-close-accordion span {
-  visibility: hidden;
-}
-
-.crm-container .crm-accordion-header a.crm-close-accordion:hover span {
-  visibility: visible;
-}
-
 .crm-container .crm-master-accordion-header.crm-accordion-header:hover,
 .crm-container .crm-collapsible .collapsible-title:hover {
   background-color: transparent;

diff --git a/templates/CRM/Contact/Form/Inline/Address.tpl b/templates/CRM/Contact/Form/Inline/Address.tpl
index 2a08dff6c618e167d551e70c781f770b914d68ae..82a95651eaa0ae14ac7783321e794acc574b5677 100644 (file)
--- a/templates/CRM/Contact/Form/Inline/Address.tpl
+++ b/templates/CRM/Contact/Form/Inline/Address.tpl
@@ -83,7 +83,7 @@
       cj('.crm-inline-edit.address').each(function() {
         if (ok && cj(this).data('location-type-id') == lt) {
           var label = cj('option:selected', ele).text();
-          ele.val('');
+          ele.select2('val', '');
           ele.crmError(label + "{/literal} {ts escape='js'}has already been assigned to another address. Please select another location for this address.{/ts}"{literal});
           ok = false;
         }

diff --git a/templates/CRM/Contact/Form/Inline/Email.tpl b/templates/CRM/Contact/Form/Inline/Email.tpl
index 4a4c800e07ef57ec1143d025fded220a37d998e1..f7c77e99657428f981088473301ff2e7dfe4db83 100644 (file)
--- a/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -70,14 +70,6 @@
     cj(function($) {
       // check first primary radio
       $('#Email_1_IsPrimary').prop('checked', true );
-
-      // error handling / show hideen elements duing form validation
-      $('tr[id^="Email_Block_"]' ).each( function() {
-          if( $(this).find('td:first span').length > 0 ) {
-            $(this).removeClass('hiddenElement');
-          }
-      });
     });
-
 </script>
 {/literal}

diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index a989d150f4a6989670a1e07566aa93d1f684fd5e..1d1a981333b38cbcba846c0ace837d00dcdad5a0 100644 (file)
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -91,7 +91,7 @@ cj(function($) {
     var body = $('.crm-accordion-body.' + id);
     if (header.length > 0 && body.length > 0 && !body.html()) {
       body.html('<div class="crm-loading-element"><span class="loading-text">{/literal}{ts escape='js'}Loading{/ts}{literal}...</span></div>');
-      header.append('{/literal}<a href="#" class="crm-close-accordion" title="{ts escape='js'}Remove from search criteria{/ts}"><span>{ts escape='js'}Reset{/ts}</span> &nbsp;<img src="{$config->resourceBase}i/close.png" /></a>{literal}');
+      header.append('{/literal}<a href="#" class="crm-close-accordion crm-hover-button css_right" title="{ts escape='js'}Remove from search criteria{/ts}"><span class="icon close-icon"></span></a>{literal}');
       header.addClass('active');
       CRM.loadPage(url, {target: body, block: false});
     }

diff --git a/templates/CRM/Contact/Form/Search/Builder.js b/templates/CRM/Contact/Form/Search/Builder.js
index 8319feca54212f799f03e0222aa28925baa2b43a..fedc9fb6c7caf3425b049ba1fd94c309dde9c29a 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Builder.js
+++ b/templates/CRM/Contact/Form/Search/Builder.js
@@ -62,7 +62,7 @@
     $('.crm-search-value select', row).remove();
     $('input[id^=value]', row)
       .hide()
-      .after('<select class="form-select required" ' + multiSelect + '><option value="">' + ts('Loading') + '...</option></select>');
+      .after('<select class="crm-form-' + multiSelect.substr(0, 5) + 'select required" ' + multiSelect + '><option value="">' + ts('Loading') + '...</option></select>');
     
     fetchOptions(row, field);
   }

diff --git a/templates/CRM/Contact/Form/Search/table.tpl b/templates/CRM/Contact/Form/Search/table.tpl
index 87b60a50bed6947f39d55a270d8d0ec8d2c3dda9..17a1ab096da040271ec3e2014cd58bc502d3bf5f 100644 (file)
--- a/templates/CRM/Contact/Form/Search/table.tpl
+++ b/templates/CRM/Contact/Form/Search/table.tpl
@@ -41,7 +41,7 @@
                 {$form.value[$x][$i].html|crmAddClass:'required'}
               </span>
               {if $i gt 0 or $x gt 1}
-                &nbsp;&nbsp;<a href="#" class="crm-reset-builder-row" title="{ts}Remove this row{/ts}"><img src="{$config->resourceBase}i/close.png" class="action-icon" alt="X" /></a>
+                &nbsp;<a href="#" class="crm-reset-builder-row crm-hover-button" title="{ts}Remove this row{/ts}"><span class="icon close-icon"></span></a>
               {/if}
             </td>
           </tr>

diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index c7a7cd42dfee3d3fcec68f948f1d106bf55e721c..5f5f97baedb8dae62dddee9da25006774489180f 100644 (file)
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -36,7 +36,7 @@
           $('form', o).validate(CRM.validate.params);
           ajaxFormParams.data = data;
           $('form', o).ajaxForm(ajaxFormParams);
-          o.trigger('crmFormLoad');
+          o.trigger('crmLoad').trigger('crmFormLoad');
         });
     }
   };