Cleanup unused/seldom-used css selectors

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 10ebe04f108abf030066612f060852c733c397e0..9404468a656e37f84c8b60aab3a7382a0d22b4ed 100644 (file)
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -377,6 +377,8 @@ class CRM_Report_Form extends CRM_Core_Form {
   public function __construct() {
     parent::__construct();
 
+    $this->addClass('crm-report-form');
+
     // build tag filter
     if ($this->_tagFilter) {
       $this->buildTagFilter();
@@ -1124,7 +1126,7 @@ class CRM_Report_Form extends CRM_Core_Form {
 
   public function addChartOptions() {
     if (!empty($this->_charts)) {
-      $this->addElement('select', "charts", ts('Chart'), $this->_charts, array('onchange' => 'disablePrintPDFButtons(this.value);'));
+      $this->addElement('select', "charts", ts('Chart'), $this->_charts);
       $this->assign('charts', $this->_charts);
       $this->addElement('submit', $this->_chartButtonName, ts('View'));
     }

diff --git a/css/civicrm.css b/css/civicrm.css
index 9528658e8e4f1ccd83d6abaf828ed10ae848cc6d..8f74c0f516f7c9590b26e1873b03d376c18068ce 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -197,7 +197,6 @@ input.crm-form-entityref {
   height: 12em;
 }
 
-
 /* Override line-height from style.css */
 #crm-container,
 .crm-container {
@@ -217,12 +216,6 @@ input.crm-form-entityref {
   color: #3E3E3E;
 }
 
-/*
-** class for hiding the text box;
-  it is used in the OtherActivity template
-** for showing the descrition of activity type element.
-*/
-.crm-container .texttolabel,
 .crm-container .no-border {
   border-style: none;
 }
@@ -235,8 +228,7 @@ input.crm-form-entityref {
   border-bottom: 2px solid #777;
 }
 
-.crm-container div.solid-border-top,
-.crm-container .attachment-fieldset {
+.crm-container .solid-border-top {
   margin-top: 15px;
   border-top: 1px solid #696969;
 }
@@ -246,9 +238,7 @@ input.crm-form-entityref {
   height: 1em;
 }
 
-.crm-container .add-remove-link,
-.crm-container .map-link,
-.crm-container .font-small {
+.crm-container .add-remove-link {
   font-size: .9em;
 }
 
@@ -325,10 +315,6 @@ input.crm-form-entityref {
   margin-bottom: 28px;
 }
 
-.crm-container span.crm-lock-button {
-  float: right;
-}
-
 .crm-container fieldset {
   background: none;
   padding: 4px 0px;
@@ -547,11 +533,6 @@ input.crm-form-entityref {
   vertical-align: top;
 }
 
-.crm-container td.op-checkbox label {
-  font-weight: normal;
-  font-style: italic;
-}
-
 .crm-container .form-layout td.label-left,
 .crm-container .form-layout-compressed td.label-left {
   text-align: left;
@@ -582,10 +563,6 @@ input.crm-form-entityref {
   padding-top: 10px;
 }
 
-.crm-container .button-disabled {
-  color: #CFCEC3!important;
-}
-
 .crm-container .form-layout-compressed td.describe-image {
   vertical-align: top;
   padding: 0.5em 0em 0em 0em;
@@ -790,16 +767,12 @@ input.crm-form-entityref {
   padding-left: 1em;
 }
 
-/*
-** CSS for links from Drupal Blocks.
-*/
 /* Following styles are used to remove the white bullets from the Garland Theme */
 .crm-container ul li {
   background-image: none;
 }
 
-/* But allow them for the help at the top of forms
-*/
+/* But allow them for the help at the top of forms */
 .crm-container #help ul li {
   background-image: url(menu-leaf.png);
 }
@@ -855,11 +828,6 @@ input.crm-form-entityref {
   margin: 4px;
 }
 
-/* Set display: inline to over-ride drupal.css which sets label tags to display: block */
-#crm-container .notorg {
-  font-weight: normal;
-}
-
 .crm-container .font-light {
   font-weight: lighter;
 }
@@ -971,27 +939,6 @@ input.crm-form-entityref {
   border: 2px solid #999999;
 }
 
-#crm-container td.yes-no {
-  text-align: center;
-}
-
-#crm-container .horizontal-position {
-  margin-right: 30px;
-  margin-left: 30px;
-}
-
-#crm-container .horizontal-center {
-  text-align: center;
-  margin: 0 auto;
-  width: 80%;
-}
-
-#crm-container .place-left {
-  float: left;
-  margin-left: 30px;
-  margin-right: 30px;
-}
-
 #crm-container .float-left {
   float: left;
   padding: 4px 0px;
@@ -1250,10 +1197,9 @@ input.crm-form-entityref {
   margin: -24px 30px 0px 0px;
 }
 
-/*
-** Boxes of checkbox elements (e.g. Advanced Search page)
-*/
-.crm-container .listing-box {
+/* Boxes of checkbox elements (e.g. Advanced Search page) */
+.crm-container .listing-box,
+.crm-container .listing-box-tall {
   width: auto;
   max-width: 30em;
   height: 7.25em;
@@ -1265,16 +1211,10 @@ input.crm-form-entityref {
   color: black;
 }
 
-/*
-** To allow for taller boxes of groups/tags.
-*/
+/* To allow for taller boxes of groups/tags. */
 .crm-container .listing-box-tall {
-  margin: 0.25em 2.0em 0.5em 0em;
-  width: auto;
-  max-width: 30em;
+  margin: 0.25em 2.0em 0.5em 0;
   height: 15em;
-  overflow: auto;
-  border: 1px solid #999999;
 }
 
 /* Image Styles */
@@ -1283,26 +1223,6 @@ input.crm-form-entityref {
   padding: 2px 2px 2px 3px;
   margin: 2px 2px 3px 2px;
   cursor: pointer;
-  cursor: hand;
-}
-
-/*
-** Style for hiding blocks or table rows
-*/
-.crm-container .hide-block,
-.crm-container .hide-row {
-  display: none;
-}
-
-/*
-** Styles for showing blocks and table rows
-*/
-#crm-container .show-block {
-  display: block;
-}
-
-#crm-container .show-row {
-  display: table-row;
 }
 
 #crm-container input.submit-link {
@@ -1340,31 +1260,7 @@ input.crm-form-entityref {
   border: 1px solid #DDDDDD;
 }
 
-.crm-container #main {
-  height: 95%;
-  width: 95%;
-  left: 1%;
-  top: 1%;
-  position: relative;
-}
-
-#crm-container .label-pane {
-  margin: 0.25em 0em 0em;
-  padding: 0.25em;
-  background-color: #6AA8EE;
-  cursor: pointer;
-  color: #213245;
-  font-weight: bold;
-  cursor: pointer;
-}
-
-#crm-container .content-pane {
-  overflow: auto;
-}
-
-/*
-editor specific classes
-*/
+/* editor specific classes */
 #crm-container dd.editor {
   margin-top: 0.7em;
   margin-left: 0em;
@@ -1480,14 +1376,6 @@ editor specific classes
   max-width: 360px;
 }
 
-#crm-container .ui-draggable {
-  background: url("../i/draggable.png") no-repeat left 1px;
-  float: left;
-  height: 16px;
-  text-indent: -10000px;
-  width: 16px;
-}
-
 #crm-container .pcp-widgets {
   border: 1px solid #CCCCCC;
   float: right;
@@ -1614,13 +1502,6 @@ editor specific classes
   background: transparent;
 }
 
-#crm-container span.success-status {
-  margin-left: 6px;
-  background-color: #ffff99;
-  padding: .25em .5em .25em .5em;
-  border: 1px solid #696969;
-}
-
 /* Styles for Config Task List */
 #crm-container td.tasklist a {
   font-weight: bold;
@@ -2343,12 +2224,6 @@ div.grippie {
   border: 1px solid #3e3e3e;
 }
 
-.crm-container input.crm-form-submit[disabled],
-.crm-container input[type=button][disabled],
-.crm-container .crm-button[disabled] {
-    color: #999;
-}
-
 .crm-container .crm-button {
   padding: 1px;
 }
@@ -2408,6 +2283,14 @@ div.grippie {
   background-position: 0 -25px;
 }
 
+.crm-container input.crm-form-submit[disabled],
+.crm-container input[type=button][disabled],
+.crm-container .crm-button[disabled] {
+  opacity: .6;
+  cursor: default;
+  background-position: top left;
+}
+
 .crm-container .ui-dialog-buttonpane {
   background: linear-gradient(to bottom, #f2f2f2 0%,#ffffff 35%);
 }
@@ -3033,14 +2916,12 @@ div.crm-container form {
 .crm-container .paging_two_button .ui-button {
   float: left;
   cursor: pointer;
-  * cursor: hand;
 }
 
 .crm-container .paging_full_numbers .ui-button {
   padding: 2px 6px;
   margin: 0;
   cursor: pointer;
-  * cursor: hand;
 }
 
 .crm-container .dataTables_paginate .ui-button {
@@ -3166,7 +3047,7 @@ div.crm-container form {
   padding: 3px 10px;
 }
 
-.crm-container table.display td.center {
+.crm-container table td.center {
   text-align: center;
 }
 /* Fix weird color added to some datatables' sort column */
@@ -3228,12 +3109,6 @@ div.crm-container form {
   overflow: visible;
 }
 
-/* Help text in Send Mail*/
-#crm-container div.messageHelp {
-  z-index: 1;
-  position: absolute;
-  margin: 6px 0px 0px 115px;
-}
 /*chart */
 #chartData {
   overflow: auto;
@@ -3546,7 +3421,6 @@ div.m ul#civicrm-menu,
 
 /* loader autocomplete */
 
-#civicrm-menu .ui-autocomplete-loading,
 .crm-container .ui-autocomplete-loading {
   background: white url('../i/loading.gif') no-repeat right center;
 }

diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl
index ceb2ac8579e96f14d254e7756f9851d2b3741b24..99cbc6f8889e490b9b6e9d5d54f3b3710cf75477 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -91,7 +91,7 @@
         <div class="spacer"></div>
         <div class="crm-submit-buttons">
             {include file="CRM/common/formButtons.tpl"}
-            <span class="place-left">&nbsp;</span>
+            <span class="float-left">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <span class="crm-button crm-button-type-next crm-button_qf_Smtp_refresh_test">{$form._qf_Smtp_refresh_test.html}</span>
         </div>
 </div>

diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl
index 6a1d0076fd1b975184a4e0590b000af418773fd2..cc0f3f753e8cebb3ef9f061e925ae6c87ed46030 100644 (file)
--- a/templates/CRM/Admin/Page/Navigation.tpl
+++ b/templates/CRM/Admin/Page/Navigation.tpl
@@ -33,7 +33,7 @@
   <div class="crm-block crm-content-block">
     <div id="new-menu-item">
       <a href="{crmURL p="civicrm/admin/menu" q="action=add&reset=1"}" class="button" style="margin-left: 6px;"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Menu Item{/ts}</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-        <span id="reset-menu" class="success-status" style="display:none">
+        <span id="reset-menu" class="status" style="display:none">
         {capture assign=rebuildURL}{crmURL p='civicrm/admin/menu' q="reset=1"}{/capture}
           {ts 1=$rebuildURL}<a href='%1' title="Reload page"><strong>Click here</strong></a> to reload the page and see your changes in the menu bar above.{/ts}
         </span><br/><br/>

diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index 4b1dcc566f9b002c1665fbcb6a5a784599d59cea..2e98eb2d16134f7ebb898ca90ad52d9bf4510a7d 100644 (file)
--- a/templates/CRM/Admin/Page/Options.tpl
+++ b/templates/CRM/Admin/Page/Options.tpl
@@ -134,7 +134,7 @@
               <td>{$row.financial_account}</td>
             {/if}
             {if $showCounted}
-              <td class="yes-no crm-admin-options-filter">{if $row.filter eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
+              <td class="center crm-admin-options-filter">{if $row.filter eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
             {/if}
             {if $showVisibility}<td class="crm-admin-visibility_label">{$row.visibility_label}</td>{/if}
             <td class="crm-admin-options-description crm-editable" data-field="description" data-type="textarea">{$row.description}</td>

diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 696977d358427e04e3c8b519c5ecda3d88002a42..dc3bba370557dd2483a12ab2d45cc27acf4bfd3e 100644 (file)
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -49,9 +49,9 @@
           <td class="crmf-label crm-editable" data-field="label">{$row.label}</td>
           <td class="crmf-name">{$row.name} ({$row.id})</td>
           <td class="crmf-class crm-editable" data-type="select">{$row.class}</td>
-          <td class="yes-no crmf-is_reserved">{if $row.is_reserved}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Reserved{/ts}" />{/if}</td>
+          <td class="center crmf-is_reserved">{if $row.is_reserved}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Reserved{/ts}" />{/if}</td>
         <td id="row_{$row.id}_status" class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="yes-no crmf-is_counted">{if $row.is_counted} <img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
+          <td class="center crmf-is_counted">{if $row.is_counted} <img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
           <td class="crmf-weight">{$row.weight}</td>
           <td class="crmf-visibility">{$row.visibility}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>

diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index 6005641560e2fe2314d7df369887b3fc98da042b..b8cbf127e83763710d508d83886f4b8eed919fc7 100644 (file)
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -100,7 +100,7 @@
                 </tr>
 
                 {if $action eq 1 or $action eq 2}
-                  <tr class="crm-case-activity-form-block-target_contact_id hide-block" id="with-contacts-widget">
+                  <tr class="crm-case-activity-form-block-target_contact_id hiddenElement" id="with-contacts-widget">
                     <td class="label font-size10pt">{ts}With Contact{/ts}</td>
                     <td class="view-value">
                       {$form.target_contact_id.html}

diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index 74ea6904d00a5a2f08e62cb360c88e8226e75175..59327c9252f959d3776979d851231e2e1d060aee 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -44,7 +44,7 @@
 </table>
 <div class="clear"><br /></div>
 <div class="action-link">
-    <a href="{crmURL p="civicrm/contact/deduperules" q="reset=1"}" class="button"><span>{ts}Done{/ts}</span></a>
+    {crmButton p="civicrm/contact/deduperules" q="reset=1" icon="close"}{ts}Done{/ts}{/crmButton}
 </div>
 
 

diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index b864e30e15841069aae9c5c786812ffc7082ffe6..00b979f34efd4db3cae9c60d1bb896986e4d3b57 100644 (file)
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -116,7 +116,7 @@
       var errorTag = o.find('.update_oplock_ts');
       if (errorTag.length > 0) {
         $('<span>')
-          .addClass('crm-lock-button')
+          .addClass('crm-lock-button css_right')
           .appendTo(errorTag);
 
         var buttonContainer = o.find('.crm-lock-button');

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
index 527cbf7dced1ec71354696bacbf4afa9baa8e6e9..09acfe98e8d38300e0f17c625f9f336f945c0f86 100644 (file)
--- a/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
@@ -36,7 +36,7 @@
         <table class="form-layout-compressed">
     <tr class="crm-contribution-form-block-min_amount">
              <td class="label">{$form.min_amount.label}</td>
-       <td class="html-adjust">{$form.min_amount.html|crmAddClass:texttolabel|crmMoney:$currency}</td>
+       <td class="html-adjust">{$form.min_amount.html|crmAddClass:'no-border'|crmMoney:$currency}</td>
           </tr>
         </table>
         <div class="spacer"></div>

diff --git a/templates/CRM/Contribute/Form/ManagePremiums.tpl b/templates/CRM/Contribute/Form/ManagePremiums.tpl
index 0f03f637924dec437e1930aa8bd77d645b34bbd6..4c706c55fd978410a088560117c37389f1fef63e 100644 (file)
--- a/templates/CRM/Contribute/Form/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Form/ManagePremiums.tpl
@@ -65,10 +65,10 @@
     {if $thumbnailUrl}<tr class="odd-row"><td class="describe-image" colspan="2"><strong>Current Image Thumbnail</strong><br /><img src="{$thumbnailUrl}" /></td></tr>{/if}
     <tr class="crm-contribution-form-block-imageOption"><td>{$form.imageOption.image.html}</td><td>{$form.uploadFile.html}</td></tr>
   <tr class="crm-contribution-form-block-imageOption-thumbnail"><td colspan="2">{$form.imageOption.thumbnail.html}</td></tr>
-    <tr id="imageURL"{if $action eq 2}class="show-row" {else} class="hide-row" {/if}>
+    <tr id="imageURL"{if $action neq 2} class="hiddenElement"{/if}>
         <td class="label">{$form.imageUrl.label}</td><td>{$form.imageUrl.html|crmAddClass:huge}</td>
     </tr>
-    <tr id="thumbnailURL"{if $action eq 2}class="show-row" {else} class="hide-row" {/if}>
+    <tr id="thumbnailURL"{if $action neq 2} class="hiddenElement"{/if}>
         <td class="label">{$form.thumbnailUrl.label}</td><td>{$form.thumbnailUrl.html|crmAddClass:huge}</td>
     </tr>
   <tr><td colspan="2">{$form.imageOption.default_image.html}</td></tr>

diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl
index 3a225bf9cea0de78ddb9d18c7b38f8546b57b3b3..2c1e36692287330651803e4dd50256cb57e896fb 100644 (file)
--- a/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -90,7 +90,7 @@
       </div>\r
     </div>\r
 </div>\r
-<div id="preview-dialog" class="hide-block">\r
+<div id="preview-dialog" class="hiddenElement">\r
     <div id="generated_dates" class="show-block"></div>\r
 </div>\r
 {literal}\r

diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index 5b463bfced13c12bc674d0e7968313cf7356af01..2fe060c2fdb755d79df9dd7d6f02ca3880f5492f 100644 (file)
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -165,12 +165,12 @@ function custom_option_html_type( ) {
           <td class='html-adjust'>{$form.in_selector.html} {help id="id-in_selector"}</td>
        </tr>
        {/if}
-       <tr class="crm-custom-field-form-block-text_length"  id="textLength" {if !( $action eq 1 || $action eq 2 ) && ($form.data_type.value.0.0 != 0)}class="hide-block"{/if}>
+       <tr class="crm-custom-field-form-block-text_length"  id="textLength" {if !( $action eq 1 || $action eq 2 ) && ($form.data_type.value.0.0 != 0)}class="hiddenElement"{/if}>
             <td class="label">{$form.text_length.label}</td>
             <td class="html-adjust">{$form.text_length.html}</td>
         </tr>
 
-        <tr id='showoption' {if $action eq 1 or $action eq 2 }class="hide-block"{/if}>
+        <tr id='showoption' {if $action eq 1 or $action eq 2 }class="hiddenElement"{/if}>
             <td colspan="2">
             <table class="form-layout-compressed">
                 {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *}
@@ -196,31 +196,31 @@ function custom_option_html_type( ) {
         <span class="description">{ts}Filter contact search results for this field using Contact get API parameters. EXAMPLE: To list Students in group 3:{/ts} "action=get&group=3&contact_sub_type=Student" {docURL page="Using the API" resource="wiki"}</span>
             </td>
         </tr>
-        <tr  class="crm-custom-field-form-block-options_per_line" id="optionsPerLine" {if $action neq 2 && ($form.data_type.value.0.0 >= 4 && $form.data_type.value.1.0 neq 'CheckBox' || $form.data_type.value.1.0 neq 'Radio' )}class="hide-block"{/if}>
+        <tr  class="crm-custom-field-form-block-options_per_line" id="optionsPerLine" {if $action neq 2 && ($form.data_type.value.0.0 >= 4 && $form.data_type.value.1.0 neq 'CheckBox' || $form.data_type.value.1.0 neq 'Radio' )}class="hiddenElement"{/if}>
             <td class="label">{$form.options_per_line.label}</td>
             <td class="html-adjust">{$form.options_per_line.html|crmAddClass:two}</td>
         </tr>
-      <tr  class="crm-custom-field-form-block-start_date_years" id="startDateRange" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hide-block"{/if}>
+      <tr  class="crm-custom-field-form-block-start_date_years" id="startDateRange" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hiddenElement"{/if}>
             <td class="label">{$form.start_date_years.label}</td>
             <td class="html-adjust">{$form.start_date_years.html} {ts}years prior to current date.{/ts}</td>
         </tr>
-        <tr class="crm-custom-field-form-block-end_date_years" id="endDateRange" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hide-block"{/if}>
+        <tr class="crm-custom-field-form-block-end_date_years" id="endDateRange" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hiddenElement"{/if}>
             <td class="label">{$form.end_date_years.label}</td>
             <td class="html-adjust">{$form.end_date_years.html} {ts}years after the current date.{/ts}</td>
         </tr>
-        <tr  class="crm-custom-field-form-block-date_format"  id="includedDatePart" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hide-block"{/if}>
+        <tr  class="crm-custom-field-form-block-date_format"  id="includedDatePart" {if $action neq 2 && ($form.data_type.value.0.0 != 5)}class="hiddenElement"{/if}>
             <td class="label">{$form.date_format.label}</td>
             <td class="html-adjust">{$form.date_format.html}&nbsp;&nbsp;&nbsp;{$form.time_format.label}&nbsp;&nbsp;{$form.time_format.html}</td>
         </tr>
-        <tr  class="crm-custom-field-form-block-note_rows"  id="noteRows" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hide-block"{/if}>
+        <tr  class="crm-custom-field-form-block-note_rows"  id="noteRows" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hiddenElement"{/if}>
             <td class="label">{$form.note_rows.label}</td>
             <td class="html-adjust">{$form.note_rows.html}</td>
         </tr>
-      <tr class="crm-custom-field-form-block-note_columns" id="noteColumns" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hide-block"{/if}>
+      <tr class="crm-custom-field-form-block-note_columns" id="noteColumns" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hiddenElement"{/if}>
             <td class="label">{$form.note_columns.label}</td>
             <td class="html-adjust">{$form.note_columns.html}</td>
         </tr>
-        <tr class="crm-custom-field-form-block-note_length" id="noteLength" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hide-block"{/if}>
+        <tr class="crm-custom-field-form-block-note_length" id="noteLength" {if $action neq 2 && ($form.data_type.value.0.0 != 4)}class="hiddenElement"{/if}>
             <td class="label">{$form.note_length.label}</td>
             <td class="html-adjust">{$form.note_length.html} <span class="description">{ts}Leave blank for unlimited. This limit is not implemented by all browsers and rich text editors.{/ts}</span></td>
         </tr>
@@ -232,11 +232,11 @@ function custom_option_html_type( ) {
                 {/if}
             </td>
         </tr>
-        <tr class="crm-custom-field-form-block-default_value" id="hideDefault" {if $action eq 2 && ($form.data_type.value.0.0 < 4 && $form.data_type.value.1.0 NEQ 'Text')}class="hide-block"{/if}>
+        <tr class="crm-custom-field-form-block-default_value" id="hideDefault" {if $action eq 2 && ($form.data_type.value.0.0 < 4 && $form.data_type.value.1.0 NEQ 'Text')}class="hiddenElement"{/if}>
             <td title="hideDefaultValTxt" class="label">{$form.default_value.label}</td>
             <td title="hideDefaultValDef" class="html-adjust">{$form.default_value.html}</td>
         </tr>
-        <tr  class="crm-custom-field-form-block-description"  id="hideDesc" {if $action neq 4 && $action eq 2 && ($form.data_type.value.0.0 < 4 && $form.data_type.value.1.0 NEQ 'Text')}class="hide-block"{/if}>
+        <tr  class="crm-custom-field-form-block-description"  id="hideDesc" {if $action neq 4 && $action eq 2 && ($form.data_type.value.0.0 < 4 && $form.data_type.value.1.0 NEQ 'Text')}class="hiddenElement"{/if}>
             <td title="hideDescTxt" class="label">&nbsp;</td>
             <td title="hideDescDef" class="html-adjust"><span class="description">{ts}If you want to provide a default value for this field, enter it here. For date fields, format is YYYY-MM-DD.{/ts}</span></td>
         </tr>

diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl
index 68eb1df237243466344dd64423f212cd1658080d..7a609634f8921139b044290120cb660dc5cd832e 100644 (file)
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -42,9 +42,6 @@
         </tr>
       {/if}
       {assign var="showEdit" value=0}
-        <tr id="statusmessg_{$index}" class="hiddenElement">
-          <td><span class="success-status"></span></td>
-        </tr>
       <tr>
         <td id="{$cd_edit.name}_{$index}" class="section-shown form-item">
           <div class="crm-accordion-wrapper {if $cd_edit.collapse_display eq 0 or $skipTitle} {else}collapsed{/if}">

diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 3d7a6b40e68b41fde9617d78733ee941f276dc3e..d92c99a48bde59dbc8e95e3315f763505f498188 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+\r
 *}\r
 \r
-<div id="recurring-dialog" class="hide-block">\r
+<div id="recurring-dialog" class="hiddenElement">\r
     {ts}How would you like this change to affect other entities in the repetition set?{/ts}<br/><br/>\r
     <div class="show-block">\r
         <div class="recurring-dialog-inner-wrapper">\r

diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index cabc14ceb713e405f6f685001545ed798f9bcb6c..7fc9cfbd7cc111166982def792515e8aa417463b 100644 (file)
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -81,7 +81,7 @@
           {assign var=attachName value="attachFile_"|cat:$index}
           {assign var=attachDesc value="attachDesc_"|cat:$index}
           {assign var=tagElement value="tag_"|cat:$index}
-            <tr class="attachment-fieldset"><td colspan="2"></td></tr>
+            <tr class="attachment-fieldset solid-border-top"><td colspan="2"></td></tr>
             <tr>
                 <td class="label">{$form.attachFile_1.label}</td>
                 <td>{$form.$attachName.html}&nbsp;{$form.$attachDesc.html}<a href="#" class="crm-hover-button crm-clear-attachment" style="visibility: hidden;" title="{ts}Clear{/ts}"><span class="icon ui-icon-close"></span></a></td>
@@ -97,7 +97,7 @@
 
       {/if}
       {if $currentAttachmentInfo}
-        <tr class="attachment-fieldset"><td colspan="2"></td></tr>
+        <tr class="attachment-fieldset solid-border-top"><td colspan="2"></td></tr>
         <tr>
             <td class="label">{ts}Current Attachment(s){/ts}</td>
             <td class="view-value">

diff --git a/templates/CRM/Price/Form/Field.tpl b/templates/CRM/Price/Form/Field.tpl
index 9481df4e3a5a3afe4ee4965fe3af775bbaeb88b9..82d5f6cc4c795b12952e6fe9740d73f7ce3b5e66 100644 (file)
--- a/templates/CRM/Price/Form/Field.tpl
+++ b/templates/CRM/Price/Form/Field.tpl
@@ -90,7 +90,7 @@
   </table>
 
   <div class="spacer"></div>
-  <div id="price-block" {if $action eq 2 && $form.html_type.value.0 eq 'Text'} class="show-block" {else} class="hide-block" {/if}>
+  <div id="price-block" {if $action eq 2 && $form.html_type.value.0 eq 'Text'} class="show-block" {else} class="hiddenElement" {/if}>
     <table class="form-layout">
       <tr class="crm-price-field-form-block-price">
         <td class="label">{$form.price.label} <span class="crm-marker" title="{ts}This field is required.{/ts}">*</span></td>
@@ -130,7 +130,7 @@
 
 {if $action eq 1}
 {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *}
-  <div id='showoption' class="hide-block">{ include file="CRM/Price/Form/OptionFields.tpl"}</div>
+  <div id='showoption' class="hiddenElement">{ include file="CRM/Price/Form/OptionFields.tpl"}</div>
 {/if}
   <table class="form-layout">
     <tr id="optionsPerLine" class="crm-price-field-form-block-options_per_line">

diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl
index 3213dffd4d0ab7edd5799b02c5dd9819b1e101d9..eaf1a07e826261b814d0f8724a79f96dd572f28f 100644 (file)
--- a/templates/CRM/Report/Form/Actions.tpl
+++ b/templates/CRM/Report/Form/Actions.tpl
@@ -90,16 +90,14 @@
 
 {literal}
   <script type="text/javascript">
-    var flashChartType = {/literal}{if $chartType}'{$chartType}'{else}''{/if}{literal};
-    function disablePrintPDFButtons( viewtype ) {
-      if (viewtype && flashChartType != viewtype) {
-        cj('#_qf_Summary_submit_pdf').prop('disabled', true).addClass('button-disabled');
-        cj('#_qf_Summary_submit_print').prop('disabled', true).addClass('button-disabled');
-      } else {
-        cj('#_qf_Summary_submit_pdf').prop('disabled', false).removeClass('button-disabled');
-        cj('#_qf_Summary_submit_print').prop('disabled', false).removeClass('button-disabled');
-      }
-    }
+    CRM.$(function($) {
+      // Disable print/pdf output of charts
+      $('select[name=charts]', 'form.crm-report-form').change(function() {
+        var viewType = $(this).val(),
+          flashChartType = '{/literal}{if $chartType}{$chartType}{else}{/if}{literal}';
+        $('#_qf_Summary_submit_pdf, #_qf_Summary_submit_print').prop('disabled', (viewType && flashChartType != viewType));
+      });
+    });
   </script>
 {/literal}
 {/if} {* NO print section ends *}

diff --git a/templates/CRM/common/dedupe.tpl b/templates/CRM/common/dedupe.tpl
index 1336459465a7c1af0050dd7e8d93e7f5dc70fc48..a637231ab94bb2dced1032c94d379a788112ea39 100644 (file)
--- a/templates/CRM/common/dedupe.tpl
+++ b/templates/CRM/common/dedupe.tpl
@@ -1,5 +1,5 @@
 {* common dupe contacts processing *}
-<div id='processDupes' class="success-status" style="display:none;"></div>
+<div id='processDupes' style="display:none;"></div>
 {literal}
 <script type='text/javascript'>