Skip to content

Commit

Permalink
Merge pull request #648 from dxw/develop
Browse files Browse the repository at this point in the history 
Production release 15/11/2024
  • Loading branch information
@serena-piccioni
serena-piccioni authored Nov 15, 2024
2 parents 0038122 + 50bd625 commit 6125f85
Show file tree
Hide file tree
Showing 7 changed files with 5,394 additions and 6,432 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,4 @@ wp-content/languages/
/wp-content/plugins/classic-editor
/wp-content/plugins/co-authors-plus
/wp-content/plugins/page-excerpt
/wp-content/plugins/two-factor
3 changes: 2 additions & 1 deletion whippet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{"name": "akismet", "ref": "v5"},
{"name": "classic-editor", "ref": "v1"},
{"name": "co-authors-plus", "ref": "v3"},
{"name": "page-excerpt", "ref": "v1"}
{"name": "page-excerpt", "ref": "v1"},
{"name": "two-factor", "ref": "v0"}
]
}
17 changes: 11 additions & 6 deletions whippet.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"hash": "f30ab9eeae7c76adf21fa9e9e1634ab2a19e56d8",
"hash": "b85cc521ae65368fc547cdf8de2c2c6b0494d2d7",
"plugins": [
{
"name": "advanced-custom-fields-pro",
"src": "[email protected]:dxw-wordpress-plugins/advanced-custom-fields-pro",
"revision": "abdd0897141a69679fb172b3f45401b48cad57e9"
},
{
"name": "akismet",
"src": "[email protected]:dxw-wordpress-plugins/akismet",
Expand All @@ -9,22 +14,22 @@
{
"name": "classic-editor",
"src": "[email protected]:dxw-wordpress-plugins/classic-editor",
"revision": "dba7b7514d549d8169ad51dca2107b981040b3ad"
"revision": "d6b9f81757669b679f65f6f53f761bf791762282"
},
{
"name": "co-authors-plus",
"src": "[email protected]:dxw-wordpress-plugins/co-authors-plus",
"revision": "6e6b49ff93c44cdd9d69873e414f9ace6fc6ecdc"
"revision": "39a1582cf982f9fc58269ba4e2bcf0df0c388790"
},
{
"name": "page-excerpt",
"src": "[email protected]:dxw-wordpress-plugins/page-excerpt",
"revision": "150fe6f26955a306d318b57354d11bc5f8a4868a"
},
{
"name": "advanced-custom-fields-pro",
"src": "[email protected]:dxw-wordpress-plugins/advanced-custom-fields-pro",
"revision": "7325be0875bebb9d12279ab6ce2bf9ee525ee8c3"
"name": "two-factor",
"src": "[email protected]:dxw-wordpress-plugins/two-factor",
"revision": "c5485d0bcc71a379d767307bfadd4ba8530bdaae"
}
]
}
4 changes: 4 additions & 0 deletions wp-content/themes/dxw-security-2017/app/Posts/CustomFields.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ public function register()

public function addPageTemplatesFields()
{
if (!function_exists('acf_add_local_field_group')) {
return;
}

acf_add_local_field_group([
'key' => 'group_59427d8ae4e29',
'title' => 'Page introduction',
Expand Down
180 changes: 92 additions & 88 deletions wp-content/themes/dxw-security-2017/app/Theme/OptionsPage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,103 +6,107 @@ class OptionsPage implements \Dxw\Iguana\Registerable
{
public function register()
{
acf_add_options_sub_page('Banner');
if (function_exists('acf_add_options_sub_page')) {
acf_add_options_sub_page('Banner');
}

// Hire us banner
acf_add_local_field_group([
'key' => 'group_5857b450d2170',
'title' => 'Call to action banner',
'fields' => [
[
'key' => 'field_5857b463ac3e9',
'label' => 'Header',
'name' => 'header',
'type' => 'text',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
if (function_exists('acf_add_local_field_group')) {
acf_add_local_field_group([
'key' => 'group_5857b450d2170',
'title' => 'Call to action banner',
'fields' => [
[
'key' => 'field_5857b463ac3e9',
'label' => 'Header',
'name' => 'header',
'type' => 'text',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
],
'default_value' => '',
'placeholder' => '',
'prepend' => '',
'append' => '',
'maxlength' => '',
],
'default_value' => '',
'placeholder' => '',
'prepend' => '',
'append' => '',
'maxlength' => '',
],
[
'key' => 'field_5857b46dac3ea',
'label' => 'Content',
'name' => 'content',
'type' => 'wysiwyg',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
[
'key' => 'field_5857b46dac3ea',
'label' => 'Content',
'name' => 'content',
'type' => 'wysiwyg',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
],
'default_value' => '',
'tabs' => 'all',
'toolbar' => 'basic',
'media_upload' => 0,
],
'default_value' => '',
'tabs' => 'all',
'toolbar' => 'basic',
'media_upload' => 0,
],
[
'key' => 'field_5857b47dac3eb',
'label' => 'URL',
'name' => 'url',
'type' => 'url',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
[
'key' => 'field_5857b47dac3eb',
'label' => 'URL',
'name' => 'url',
'type' => 'url',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
],
'default_value' => '',
'placeholder' => '',
],
'default_value' => '',
'placeholder' => '',
],
[
'key' => 'field_5857b491ac3ec',
'label' => 'Call to action',
'name' => 'cta',
'type' => 'text',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
[
'key' => 'field_5857b491ac3ec',
'label' => 'Call to action',
'name' => 'cta',
'type' => 'text',
'instructions' => '',
'required' => 0,
'conditional_logic' => 0,
'wrapper' => [
'width' => '',
'class' => '',
'id' => '',
],
'default_value' => '',
'placeholder' => '',
'prepend' => '',
'append' => '',
'maxlength' => '',
],
'default_value' => '',
'placeholder' => '',
'prepend' => '',
'append' => '',
'maxlength' => '',
],
],
'location' => [
[
'location' => [
[
'param' => 'options_page',
'operator' => '==',
'value' => 'acf-options-banner',
[
'param' => 'options_page',
'operator' => '==',
'value' => 'acf-options-banner',
],
],
],
],
'menu_order' => 0,
'position' => 'normal',
'style' => 'default',
'label_placement' => 'top',
'instruction_placement' => 'label',
'hide_on_screen' => '',
'active' => 1,
'description' => '',
]);
'menu_order' => 0,
'position' => 'normal',
'style' => 'default',
'label_placement' => 'top',
'instruction_placement' => 'label',
'hide_on_screen' => '',
'active' => 1,
'description' => '',
]);
}
}
}
26 changes: 13 additions & 13 deletions wp-content/themes/dxw-security-2017/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6125f85

Please sign in to comment.