-
-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21947 from colemanw/cssRules
SearchKit - Conditional style rules for rows/cells
- Loading branch information
Showing
16 changed files
with
358 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminCssRules.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| (function(angular, $, _) { | ||
| "use strict"; | ||
|
|
||
| angular.module('crmSearchAdmin').component('searchAdminCssRules', { | ||
| bindings: { | ||
| item: '<', | ||
| default: '<', | ||
| label: '@', | ||
| }, | ||
| require: { | ||
| crmSearchAdmin: '^crmSearchAdmin' | ||
| }, | ||
| templateUrl: '~/crmSearchAdmin/displays/common/searchAdminCssRules.html', | ||
| controller: function($scope, $element, searchMeta) { | ||
| var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'), | ||
| ctrl = this; | ||
|
|
||
| this.getField = searchMeta.getField; | ||
|
|
||
| this.styles = _.transform(_.cloneDeep(CRM.crmSearchAdmin.styles), function(styles, style) { | ||
| if (style.key !== 'default' && style.key !== 'secondary') { | ||
| styles['bg-' + style.key] = style.value; | ||
| } | ||
| }, {}); | ||
| this.styles.disabled = ts('Disabled'); | ||
| this.styles['font-bold'] = ts('Bold'); | ||
| this.styles['font-italic'] = ts('Italic'); | ||
| this.styles.strikethrough = ts('Strikethrough'); | ||
|
|
||
| this.fields = function() { | ||
| return {results: ctrl.crmSearchAdmin.getAllFields(':name', ['Field', 'Custom', 'Extra'])}; | ||
| }; | ||
|
|
||
| this.$onInit = function() { | ||
| $element.on('hidden.bs.dropdown', function() { | ||
| $scope.$apply(function() { | ||
| ctrl.menuOpen = false; | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| this.onSelectField = function(clause) { | ||
| if (clause[1]) { | ||
| clause[2] = '='; | ||
| clause.length = 3; | ||
| } else { | ||
| clause.length = 1; | ||
| } | ||
| }; | ||
|
|
||
| this.addClause = function(style) { | ||
| var clause = [style]; | ||
| if (ctrl.default && ctrl.getField(ctrl.default)) { | ||
| clause.push(ctrl.default, '='); | ||
| } | ||
| this.item.cssRules = this.item.cssRules || []; | ||
| this.item.cssRules.push(clause); | ||
| }; | ||
|
|
||
| this.showMore = function() { | ||
| return !this.item.cssRules || !this.item.cssRules.length || _.last(this.item.cssRules)[1]; | ||
| }; | ||
|
|
||
|
|
||
|
|
||
| } | ||
| }); | ||
|
|
||
| })(angular, CRM.$, CRM._); |
48 changes: 48 additions & 0 deletions
48
ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminCssRules.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <div class="form-inline" ng-repeat="clause in $ctrl.item.cssRules"> | ||
| <label>{{:: $ctrl.label }}</label> | ||
| <div class="input-group"> | ||
| <input type="text" class="form-control" ng-if="!$ctrl.styles[clause[0]]" placeholder="{{:: ts('CSS class') }}" ng-model="clause[0]" ng-model-options="{updateOn: 'blur'}"> | ||
| <div class="input-group-btn" style="{{ $ctrl.styles[clause[0]] ? '' : 'width:27px' }}"> | ||
| <button type="button" ng-click="$ctrl.menuOpen = true" ng-if="$ctrl.styles[clause[0]]" class="btn btn-sm dropdown-toggle crm-search-admin-combo-button {{ clause[0].replace('bg-', 'btn-') }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| {{ $ctrl.styles[clause[0]] }} | ||
| </button> | ||
| <button type="button" ng-click="$ctrl.menuOpen = true" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| <span class="sr-only">{{:: $ctrl.label }}</span> <span class="caret"></span> | ||
| </button> | ||
| <ul class="dropdown-menu dropdown-menu-right" ng-if="$ctrl.menuOpen"> | ||
| <li ng-repeat="(key, label) in $ctrl.styles"> | ||
| <a href class="{{:: key }}" ng-click="clause[0] = key">{{:: label }}</a> | ||
| </li> | ||
| <li class="divider" role="separator"></li> | ||
| <li> | ||
| <a href ng-click="clause[0] = ''">{{:: ts('Other') }}</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <label>{{:: ts('If') }}</label> | ||
| <input class="form-control collapsible-optgroups" ng-model="clause[1]" crm-ui-select="::{data: $ctrl.fields, allowClear: true, placeholder: ts('Always')}" ng-change="$ctrl.onSelectField(clause)" /> | ||
| <!-- TODO: Support operators other than '=' as clause[2] --> | ||
| <label ng-if="clause[1]">{{:: ts('Is') }}</label> | ||
| <crm-search-input ng-if="clause[1]" ng-model="clause[3]" field="$ctrl.getField(clause[1])" option-key="'name'" op="clause[1]" format="$ctrl.format" class="form-group"></crm-search-input> | ||
| <button type="button" class="btn-xs btn-danger-outline" ng-click="$ctrl.item.cssRules.splice($index);" title="{{:: ts('Remove style') }}"> | ||
| <i class="crm-i fa-ban"></i> | ||
| </button> | ||
| </div> | ||
| <div class="form-inline" ng-if="$ctrl.showMore()" title="{{:: ts('Set background color or text style based on a field value') }}"> | ||
| <label>{{:: $ctrl.label }}</label> | ||
| <div class="btn-group"> | ||
| <button type="button" ng-click="$ctrl.menuOpen = true" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| <span>{{ $ctrl.item.cssRules && $ctrl.item.cssRules.length ? ts('Add') : ts('None') }}</span> <span class="caret"></span> | ||
| </button> | ||
| <ul class="dropdown-menu" ng-if="$ctrl.menuOpen"> | ||
| <li ng-repeat="(key, label) in $ctrl.styles"> | ||
| <a href class="{{:: key }}" ng-click="$ctrl.addClause(key)">{{:: label }}</a> | ||
| </li> | ||
| <li class="divider" role="separator"></li> | ||
| <li> | ||
| <a href ng-click="$ctrl.addClause('')">{{:: ts('Other') }}</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGridItems.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayListItems.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.