From 22b672811c693e69633ab56c29264db4d49dbe58 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 6 Feb 2015 15:37:28 -0500 Subject: [PATCH] Cleanup unused/seldom-used css selectors --- CRM/Report/Form.php | 4 +- css/civicrm.css | 162 ++---------------- templates/CRM/Admin/Form/Setting/Smtp.tpl | 2 +- templates/CRM/Admin/Page/Navigation.tpl | 2 +- templates/CRM/Admin/Page/Options.tpl | 2 +- .../CRM/Admin/Page/ParticipantStatusType.tpl | 4 +- templates/CRM/Case/Form/Activity.tpl | 2 +- .../CRM/Contact/Page/DedupeException.tpl | 2 +- templates/CRM/Contact/Page/View/Summary.js | 2 +- .../Form/AdditionalInfo/Premium.tpl | 2 +- .../CRM/Contribute/Form/ManagePremiums.tpl | 4 +- templates/CRM/Core/Form/RecurringEntity.tpl | 2 +- templates/CRM/Custom/Form/Field.tpl | 22 +-- templates/CRM/Custom/Page/CustomDataView.tpl | 3 - .../Form/ManageEvent/ConfirmRepeatMode.tpl | 2 +- templates/CRM/Form/attachment.tpl | 4 +- templates/CRM/Price/Form/Field.tpl | 4 +- templates/CRM/Report/Form/Actions.tpl | 18 +- templates/CRM/common/dedupe.tpl | 2 +- 19 files changed, 58 insertions(+), 187 deletions(-) diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 10ebe04f10..9404468a65 100644 --- 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 9528658e8e..8f74c0f516 100644 --- 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 ceb2ac8579..99cbc6f888 100644 --- a/templates/CRM/Admin/Form/Setting/Smtp.tpl +++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl @@ -91,7 +91,7 @@
{include file="CRM/common/formButtons.tpl"} -   +      {$form._qf_Smtp_refresh_test.html}
diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl index 6a1d0076fd..cc0f3f753e 100644 --- a/templates/CRM/Admin/Page/Navigation.tpl +++ b/templates/CRM/Admin/Page/Navigation.tpl @@ -33,7 +33,7 @@
{ts}Add Menu Item{/ts}     -
-
+
{literal} diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl index 5b463bfced..2fe060c2fd 100644 --- a/templates/CRM/Custom/Form/Field.tpl +++ b/templates/CRM/Custom/Form/Field.tpl @@ -165,12 +165,12 @@ function custom_option_html_type( ) { {$form.in_selector.html} {help id="id-in_selector"} {/if} - + {$form.text_length.label} {$form.text_length.html} - + {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *} @@ -196,31 +196,31 @@ function custom_option_html_type( ) { {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"} - = 4 && $form.data_type.value.1.0 neq 'CheckBox' || $form.data_type.value.1.0 neq 'Radio' )}class="hide-block"{/if}> + = 4 && $form.data_type.value.1.0 neq 'CheckBox' || $form.data_type.value.1.0 neq 'Radio' )}class="hiddenElement"{/if}> - + - + - + - + - + - + @@ -232,11 +232,11 @@ function custom_option_html_type( ) { {/if} - + - + diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl index 68eb1df237..7a609634f8 100644 --- a/templates/CRM/Custom/Page/CustomDataView.tpl +++ b/templates/CRM/Custom/Page/CustomDataView.tpl @@ -42,9 +42,6 @@ {/if} {assign var="showEdit" value=0} - - - + @@ -97,7 +97,7 @@ {/if} {if $currentAttachmentInfo} - +
{$form.options_per_line.label} {$form.options_per_line.html|crmAddClass:two}
{$form.start_date_years.label} {$form.start_date_years.html} {ts}years prior to current date.{/ts}
{$form.end_date_years.label} {$form.end_date_years.html} {ts}years after the current date.{/ts}
{$form.date_format.label} {$form.date_format.html}   {$form.time_format.label}  {$form.time_format.html}
{$form.note_rows.label} {$form.note_rows.html}
{$form.note_columns.label} {$form.note_columns.html}
{$form.note_length.label} {$form.note_length.html} {ts}Leave blank for unlimited. This limit is not implemented by all browsers and rich text editors.{/ts}
{$form.default_value.label} {$form.default_value.html}
  {ts}If you want to provide a default value for this field, enter it here. For date fields, format is YYYY-MM-DD.{/ts}
diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 3d7a6b40e6..d92c99a48b 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *} -
+
{ts}How would you like this change to affect other entities in the repetition set?{/ts}

diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl index cabc14ceb7..7fc9cfbd7c 100644 --- 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} -
{$form.attachFile_1.label} {$form.$attachName.html} {$form.$attachDesc.html}
{ts}Current Attachment(s){/ts} diff --git a/templates/CRM/Price/Form/Field.tpl b/templates/CRM/Price/Form/Field.tpl index 9481df4e3a..82d5f6cc4c 100644 --- a/templates/CRM/Price/Form/Field.tpl +++ b/templates/CRM/Price/Form/Field.tpl @@ -90,7 +90,7 @@
-
+
@@ -130,7 +130,7 @@ {if $action eq 1} {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *} -
{ include file="CRM/Price/Form/OptionFields.tpl"}
+
{ include file="CRM/Price/Form/OptionFields.tpl"}
{/if}
{$form.price.label} *
diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl index 3213dffd4d..eaf1a07e82 100644 --- a/templates/CRM/Report/Form/Actions.tpl +++ b/templates/CRM/Report/Form/Actions.tpl @@ -90,16 +90,14 @@ {literal} {/literal} {/if} {* NO print section ends *} diff --git a/templates/CRM/common/dedupe.tpl b/templates/CRM/common/dedupe.tpl index 1336459465..a637231ab9 100644 --- a/templates/CRM/common/dedupe.tpl +++ b/templates/CRM/common/dedupe.tpl @@ -1,5 +1,5 @@ {* common dupe contacts processing *} - + {literal}