Skip to content

Commit

Permalink
Updates from review
Browse files Browse the repository at this point in the history
  • Loading branch information
@aydun
aydun committed Apr 12, 2023
1 parent d371ea3 commit c2fffd4
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 56 deletions.
19 changes: 15 additions & 4 deletions ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<div class="af-markup">
<div class="help">{{:: ts('CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns, and you can customize text, amounts, types of information collected from contributors, etc.') }} </div>

<div class="help">{{:: ts('CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns, and you can customize text, amounts, types of information collected from contributors, etc.') }} </div>
</div>
<div af-fieldset="">
<af-field name="title" defn="{label: ts('Title'), input_attrs: {}, help_post: ts('Complete OR partial Contribution Page Title') }" />
<af-field name="financial_type_id" defn="{input_type: 'CheckBox', input_attrs: {}}" />
<div class="af-container af-layout-inline">
<af-field name="title" defn="{label: 'Title', input_attrs: {}, help_post: 'Complete OR partial Contribution Page Title'}" />
<af-field name="financial_type_id" defn="{input_type: 'CheckBox', input_attrs: {}}" />
</div>
<div class="btn-group pull-right">
<a class="btn btn-primary" ng-href="{{:: crmUrl('civicrm/admin/pcp', {reset: 1}) }}">
<i class="crm-i fa-plus"/>
{{:: ts('Manage Personal Campaign Pages') }}
</a>
<a class="btn btn-primary" ng-href="{{:: crmUrl('civicrm/admin/contribute/add', {reset: 1, action: 'add'}) }}">
<i class="crm-i fa-plus"/>
{{:: ts('Add Contribution Page') }}
</a>
</div>
<crm-search-display-table search-name="Manage_Contribution_Pages" display-name="Manage_Contribution_Pages_Table_1"></crm-search-display-table>
</div>
15 changes: 8 additions & 7 deletions ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.json
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{
"type": "search",
"title": "Manage Contribution Pages",
"icon": "fa-list-alt",
"server_route": "civicrm/managecp",
"permission": "administer CiviCRM",
"requires": [],
"entity_type": null,
"join_entity": null,
"title": "Manage Contribution Pages",
"description": "",
"is_dashlet": false,
"is_public": false,
"is_token": false,
"entity_type": null,
"join_entity": null,
"contact_summary": null,
"summary_contact_type": null,
"icon": "fa-list-alt",
"server_route": "civicrm/managecp",
"permission": "administer CiviCRM",
"redirect": null,
"create_submission": null,
"create_submission": false,
"navigation": null
}
104 changes: 59 additions & 45 deletions ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[
'name' => 'SavedSearch_Manage_Contribution_Pages',
'entity' => 'SavedSearch',
'cleanup' => 'unused',
'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
Expand All @@ -22,6 +22,7 @@
'title',
'id',
'is_active',
'financial_type_id:label',
],
'orderBy' => [],
'where' => [],
Expand All @@ -37,13 +38,13 @@
[
'name' => 'SavedSearch_Manage_Contribution_Pages_SearchDisplay_Manage_Contribution_Pages_Table_1',
'entity' => 'SearchDisplay',
'cleanup' => 'unused',
'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
'name' => 'Manage_Contribution_Pages_Table_1',
'label' => 'Manage Contribution Pages Table 1',
'label' => E::ts('Manage Contribution Pages Table 1'),
'saved_search_id.name' => 'Manage_Contribution_Pages',
'type' => 'table',
'settings' => [
Expand All @@ -59,6 +60,10 @@
],
'placeholder' => 5,
'sort' => [
[
'is_active',
'DESC',
],
[
'title',
'ASC',
Expand All @@ -71,13 +76,29 @@
'dataType' => 'String',
'label' => E::ts('Title'),
'sortable' => TRUE,
'cssRules' => [
[
'disabled',
'is_active',
'=',
FALSE,
],
],
],
[
'type' => 'field',
'key' => 'id',
'dataType' => 'Integer',
'label' => E::ts('ID'),
'sortable' => TRUE,
'cssRules' => [
[
'disabled',
'is_active',
'=',
FALSE,
],
],
],
[
'type' => 'field',
Expand All @@ -86,22 +107,45 @@
'label' => E::ts('Enabled?'),
'sortable' => TRUE,
'editable' => TRUE,
'cssRules' => [
[
'disabled',
'is_active',
'=',
FALSE,
],
],
],
[
'type' => 'field',
'key' => 'financial_type_id:label',
'dataType' => 'Integer',
'label' => E::ts('Financial Type'),
'sortable' => TRUE,
'cssRules' => [
[
'disabled',
'is_active',
'=',
FALSE,
],
],
],
[
'text' => 'Contributions',
'text' => E::ts('Links'),
'style' => 'default',
'size' => 'btn-sm',
'icon' => 'fa-credit-card',
'icon' => 'fa-link',
'links' => [
[
'entity' => '',
'action' => '',
'join' => '',
'target' => '',
'icon' => 'fa-external-link',
'text' => E::ts('Current Month-To-Date'),
'text' => E::ts('Live Page'),
'style' => 'default',
'path' => 'civicrm/contribute/search?reset=1&contribution_page_id=[id]&force=1&test=0&receive_date_low=[CURDATE()-7]&receive_date_high=[CURDATE()]',
'path' => 'civicrm/contribute/transact?reset=1&id=[id]',
'condition' => [],
],
[
Expand All @@ -110,56 +154,31 @@
'join' => '',
'target' => '',
'icon' => 'fa-external-link',
'text' => E::ts('Fiscal Year-To-Date'),
'style' => 'default',
'path' => 'civicrm/contribute/search?reset=1&contribution_page_id=[id]&force=1&test=0&receive_date_low=[CURDATE()]&receive_date_high=[CURDATE()]',
'condition' => [],
],
[
'path' => 'civicrm/contribute/search?reset=1&contribution_page_id=[id]&force=1&test=0',
'icon' => 'fa-external-link',
'text' => E::ts('Cumulative'),
'text' => E::ts('Test-drive'),
'style' => 'default',
'path' => 'civicrm/contribute/transact?reset=1&id=[id]&action=preview',
'condition' => [],
'entity' => '',
'action' => '',
'join' => '',
'target' => '',
],
],
'type' => 'menu',
'alignment' => 'text-right',
],
[
'text' => E::ts('Links'),
'style' => 'default',
'size' => 'btn-sm',
'icon' => 'fa-link',
'size' => 'btn-xs',
'links' => [
[
'entity' => '',
'action' => '',
'join' => '',
'target' => '',
'icon' => 'fa-external-link',
'text' => E::ts('Live Page'),
'style' => 'default',
'path' => 'civicrm/contribute/transact?reset=1&id=[id]',
'condition' => [],
],
[
'entity' => '',
'action' => '',
'join' => '',
'target' => '',
'icon' => 'fa-external-link',
'text' => E::ts('Test-drive'),
'icon' => 'fa-search',
'text' => E::ts('Find Contributions'),
'style' => 'default',
'path' => 'civicrm/contribute/transact?reset=1&id=[id]&action=preview',
'path' => 'civicrm/contribute/search?contribution_page_id=[id]&force=1&reset=1',
'condition' => [],
],
],
'type' => 'menu',
'type' => 'buttons',
'alignment' => 'text-right',
],
[
Expand All @@ -177,7 +196,7 @@
'condition' => [],
],
[
'path' => 'civicrm/admin/contribute&action=copy&gid=[id]',
'path' => 'civicrm/admin/contribute?action=copy&gid=[id]',
'icon' => 'fa-clone',
'text' => E::ts('Clone'),
'style' => 'secondary',
Expand All @@ -203,11 +222,6 @@
'alignment' => 'text-right',
],
],
'addButton' => [
'path' => 'civicrm/admin/contribute/add?reset=1&action=add',
'text' => E::ts('Add Contribution Page'),
'icon' => 'fa-plus',
],
'button' => NULL,
],
'acl_bypass' => FALSE,
Expand Down

0 comments on commit c2fffd4

Please sign in to comment.