Skip to content

Commit 9db78a2

Browse files
author
Rafael Grigorian
committed
Fixed #46 
1 parent 1b3bad6 commit 9db78a2

File tree

9 files changed

+245
-193
lines changed

9 files changed

+245
-193
lines changed

‎src/app/code/JetRails/Cloudflare/etc/acl.xml‎

Lines changed: 111 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -61,66 +61,64 @@
6161
id="JetRails_Cloudflare::ssl_tls"
6262
title="SSL/TLS" >
6363
<resource
64-
id="JetRails_Cloudflare::ssl_tls_recommender"
65-
title="SSL/TLS Recommender" />
66-
<resource
67-
id="JetRails_Cloudflare::ssl"
68-
title="SSL" />
69-
<resource
70-
id="JetRails_Cloudflare::always_use_https"
71-
title="Always Use HTTPS" />
72-
<resource
73-
id="JetRails_Cloudflare::http_strict_transport_security"
74-
title="HTTP Strict Transport Security (HSTS)" />
75-
<resource
76-
id="JetRails_Cloudflare::authenticated_origin_pulls"
77-
title="Authenticated Origin Pulls" />
78-
<resource
79-
id="JetRails_Cloudflare::opportunistic_encryption"
80-
title="Opportunistic Encryption" />
81-
<resource
82-
id="JetRails_Cloudflare::minimum_tls_version"
83-
title="Minimum TLS Version" />
84-
<resource
85-
id="JetRails_Cloudflare::tls_13"
86-
title="TLS 1.3" />
87-
<resource
88-
id="JetRails_Cloudflare::automatic_https_rewrites"
89-
title="Automatic HTTPS Rewrites" />
64+
id="JetRails_Cloudflare::overview_tab"
65+
title="Overview" >
66+
<resource
67+
id="JetRails_Cloudflare::ssl"
68+
title="SSL" />
69+
<resource
70+
id="JetRails_Cloudflare::ssl_tls_recommender"
71+
title="SSL/TLS Recommender" />
72+
</resource>
9073
<resource
91-
id="JetRails_Cloudflare::certificate_transparency_monitoring"
92-
title="Certificate Transparency Monitoring" />
74+
id="JetRails_Cloudflare::edge_certificates_tab"
75+
title="Edge Certificates" >
76+
<resource
77+
id="JetRails_Cloudflare::always_use_https"
78+
title="Always Use HTTPS" />
79+
<resource
80+
id="JetRails_Cloudflare::http_strict_transport_security"
81+
title="HTTP Strict Transport Security (HSTS)" />
82+
<resource
83+
id="JetRails_Cloudflare::minimum_tls_version"
84+
title="Minimum TLS Version" />
85+
<resource
86+
id="JetRails_Cloudflare::opportunistic_encryption"
87+
title="Opportunistic Encryption" />
88+
<resource
89+
id="JetRails_Cloudflare::tls_13"
90+
title="TLS 1.3" />
91+
<resource
92+
id="JetRails_Cloudflare::automatic_https_rewrites"
93+
title="Automatic HTTPS Rewrites" />
94+
<resource
95+
id="JetRails_Cloudflare::certificate_transparency_monitoring"
96+
title="Certificate Transparency Monitoring" />
97+
<resource
98+
id="JetRails_Cloudflare::disable_universal_ssl"
99+
title="Disable Universal SSL" />
100+
</resource>
93101
<resource
94-
id="JetRails_Cloudflare::disable_universal_ssl"
95-
title="Disable Universal SSL" />
102+
id="JetRails_Cloudflare::origin_server_tab"
103+
title="Origin Server" >
104+
<resource
105+
id="JetRails_Cloudflare::authenticated_origin_pulls"
106+
title="Authenticated Origin Pulls" />
107+
</resource>
96108
</resource>
97109
<resource
98110
id="JetRails_Cloudflare::firewall"
99111
title="Firewall" >
100112
<resource
101-
id="JetRails_Cloudflare::security_level"
102-
title="Security Level" />
103-
<resource
104-
id="JetRails_Cloudflare::bot_fight_mode"
105-
title="Bot Fight Mode" />
106-
<resource
107-
id="JetRails_Cloudflare::bot_management"
108-
title="Bot Management" />
109-
<resource
110-
id="JetRails_Cloudflare::javascript_detections"
111-
title="JavaScript Detections" />
112-
<resource
113-
id="JetRails_Cloudflare::challenge_passage"
114-
title="Challenge Passage" />
115-
<resource
116-
id="JetRails_Cloudflare::browser_integrity_check"
117-
title="Browser Integrity Check" />
118-
<resource
119-
id="JetRails_Cloudflare::privacy_pass_support"
120-
title="Privacy Pass Support" />
113+
id="JetRails_Cloudflare::managed_rules_tab"
114+
title="Managed Rules" >
115+
<resource
116+
id="JetRails_Cloudflare::web_application_firewall"
117+
title="Web Application Firewall" />
118+
</resource>
121119
<resource
122-
id="JetRails_Cloudflare::ip_firewall"
123-
title="IP Firewall" >
120+
id="JetRails_Cloudflare::tools_tab"
121+
title="Tools" >
124122
<resource
125123
id="JetRails_Cloudflare::access_rules"
126124
title="Access Rules" />
@@ -132,52 +130,74 @@
132130
title="Unmetered DDoS Mitigation" />
133131
</resource>
134132
<resource
135-
id="JetRails_Cloudflare::waf"
136-
title="Web Application Firewall" >
133+
id="JetRails_Cloudflare::settings_tab"
134+
title="Settings" >
137135
<resource
138-
id="JetRails_Cloudflare::web_application_firewall"
139-
title="Web Application Firewall" />
136+
id="JetRails_Cloudflare::security_level"
137+
title="Security Level" />
138+
<resource
139+
id="JetRails_Cloudflare::bot_fight_mode"
140+
title="Bot Fight Mode" />
141+
<resource
142+
id="JetRails_Cloudflare::bot_management"
143+
title="Bot Management" />
144+
<resource
145+
id="JetRails_Cloudflare::javascript_detections"
146+
title="JavaScript Detections" />
147+
<resource
148+
id="JetRails_Cloudflare::challenge_passage"
149+
title="Challenge Passage" />
150+
<resource
151+
id="JetRails_Cloudflare::browser_integrity_check"
152+
title="Browser Integrity Check" />
153+
<resource
154+
id="JetRails_Cloudflare::privacy_pass_support"
155+
title="Privacy Pass Support" />
140156
</resource>
141157
</resource>
142158
<resource
143159
id="JetRails_Cloudflare::speed"
144160
title="Speed" >
145161
<resource
146-
id="JetRails_Cloudflare::image_resizing"
147-
title="Image Resizing" />
148-
<resource
149-
id="JetRails_Cloudflare::automatic_platform_optimization"
150-
title="Automatic Platform Optimization for WordPress" />
151-
<resource
152-
id="JetRails_Cloudflare::enhanced_http2_prioritization"
153-
title="Enhanced HTTP/2 Prioritization" />
154-
<resource
155-
id="JetRails_Cloudflare::tcp_turbo"
156-
title="TCP Turbo" />
157-
<resource
158-
id="JetRails_Cloudflare::auto_minify"
159-
title="Auto Minify" />
160-
<resource
161-
id="JetRails_Cloudflare::polish"
162-
title="Polish" />
163-
<resource
164-
id="JetRails_Cloudflare::brotli"
165-
title="Brotli" />
166-
<resource
167-
id="JetRails_Cloudflare::mirage"
168-
title="Mirage" />
169-
<resource
170-
id="JetRails_Cloudflare::rocket_loader"
171-
title="Rocker Loader" />
172-
<resource
173-
id="JetRails_Cloudflare::prefetch_urls"
174-
title="Prefetch URLs" />
175-
<resource
176-
id="JetRails_Cloudflare::amp_real_url"
177-
title="AMP Real URL" />
178-
<resource
179-
id="JetRails_Cloudflare::mobile_redirect"
180-
title="Mobile Redirect" />
162+
id="JetRails_Cloudflare::optimization_tab"
163+
title="Optimization" >
164+
<resource
165+
id="JetRails_Cloudflare::image_resizing"
166+
title="Image Resizing" />
167+
<resource
168+
id="JetRails_Cloudflare::automatic_platform_optimization"
169+
title="Automatic Platform Optimization for WordPress" />
170+
<resource
171+
id="JetRails_Cloudflare::enhanced_http2_prioritization"
172+
title="Enhanced HTTP/2 Prioritization" />
173+
<resource
174+
id="JetRails_Cloudflare::tcp_turbo"
175+
title="TCP Turbo" />
176+
<resource
177+
id="JetRails_Cloudflare::auto_minify"
178+
title="Auto Minify" />
179+
<resource
180+
id="JetRails_Cloudflare::polish"
181+
title="Polish" />
182+
<resource
183+
id="JetRails_Cloudflare::brotli"
184+
title="Brotli" />
185+
<resource
186+
id="JetRails_Cloudflare::mirage"
187+
title="Mirage" />
188+
<resource
189+
id="JetRails_Cloudflare::rocket_loader"
190+
title="Rocker Loader" />
191+
<resource
192+
id="JetRails_Cloudflare::prefetch_urls"
193+
title="Prefetch URLs" />
194+
<resource
195+
id="JetRails_Cloudflare::amp_real_url"
196+
title="AMP Real URL" />
197+
<resource
198+
id="JetRails_Cloudflare::mobile_redirect"
199+
title="Mobile Redirect" />
200+
</resource>
181201
</resource>
182202
<resource
183203
id="JetRails_Cloudflare::page_rule"

‎src/app/code/JetRails/Cloudflare/view/adminhtml/templates/caching.phtml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
<h1 class="tab-content" >Caching</h1>
2-
<h2 class="tab-content" >Manage caching settings for your website</h2>
3-
<?php
1+
<section class='tabs-wrapper at_least_one' >
2+
<div data-tab='configuration' class="active" >Configuration</div>
3+
<div data-tab-content='configuration' class='active' >
4+
<?php
45

5-
echo $block->renderSections ( "caching", array (
6-
"purge_cache",
7-
"caching_level",
8-
"browser_cache_expiration",
9-
"always_online",
10-
"development_mode",
11-
"enable_query_string_sort"
12-
));
6+
echo $block->renderSections ( "caching/configuration_tab", array (
7+
"purge_cache",
8+
"caching_level",
9+
"browser_cache_expiration",
10+
"always_online",
11+
"development_mode",
12+
"enable_query_string_sort"
13+
));
1314

14-
?>
15+
?>
16+
</div>
17+
</section>

‎src/app/code/JetRails/Cloudflare/view/adminhtml/templates/dns.phtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<h1 class="tab-content" >DNS</h1>
2-
<h2 class="tab-content" >Manage your Domain Name System (DNS) settings</h2>
31
<?php
42

53
echo $block->renderSections ( "dns", array (

‎src/app/code/JetRails/Cloudflare/view/adminhtml/templates/firewall.phtml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
<h1 class="tab-content" >Firewall</h1>
2-
<h2 class="tab-content" >Manage access by IP, country, or query rules</h2>
3-
<?php
1+
<section class='tabs-wrapper at_least_one' >
2+
<div data-tab='managed_rules' class="active" >Managed Rules</div>
3+
<div data-tab='tools' >Tools</div>
4+
<div data-tab='settings' >Settings</div>
5+
<div data-tab-content='managed_rules' class='active' >
6+
<?php
47

5-
echo $block->renderSections ( "firewall", array (
6-
"security_level",
7-
"bot_fight_mode",
8-
"bot_management",
9-
"javascript_detections",
10-
"challenge_passage",
11-
"browser_integrity_check",
12-
"privacy_pass_support"
13-
));
8+
echo $block->renderSections ( "firewall/managed_rules_tab", array (
9+
"web_application_firewall"
10+
));
1411

15-
?>
16-
<section class='tabs-wrapper at_least_one' >
17-
<div data-tab='ip_firewall' class='active' >IP Firewall</div>
18-
<div data-tab='web_application_firewall' >Web Application Firewall</div>
19-
<div data-tab-content='ip_firewall' class='active' >
12+
?>
13+
</div>
14+
<div data-tab-content='tools' >
2015
<?php
2116

22-
echo $block->renderSections ( "firewall/ip_firewall", array (
17+
echo $block->renderSections ( "firewall/tools_tab", array (
2318
"access_rules",
2419
"user_agent_blocking",
2520
"unmetered_ddos_mitigation"
2621
));
2722

2823
?>
2924
</div>
30-
<div data-tab-content='web_application_firewall' >
25+
<div data-tab-content='settings' >
3126
<?php
3227

33-
echo $this->renderSections ( "firewall/waf", array (
34-
"web_application_firewall"
28+
echo $block->renderSections ( "firewall/settings_tab", array (
29+
"security_level",
30+
"bot_fight_mode",
31+
"bot_management",
32+
"javascript_detections",
33+
"challenge_passage",
34+
"browser_integrity_check",
35+
"privacy_pass_support"
3536
));
3637

3738
?>

‎src/app/code/JetRails/Cloudflare/view/adminhtml/templates/overview.phtml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<h1 class="tab-content" >Overview</h1>
21
<?php
32

43
if ( $block->isValidAuth () && $block->isValidZone () ) {

‎src/app/code/JetRails/Cloudflare/view/adminhtml/templates/speed.phtml‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
1-
<h1 class="tab-content" >Speed</h1>
2-
<h2 class="tab-content" >Manage performance settings for your website</h2>
3-
<?php
4-
5-
echo $block->renderSections ( "speed", array (
6-
"image_resizing",
7-
"automatic_platform_optimization",
8-
"enhanced_http2_prioritization",
9-
"tcp_turbo",
10-
"auto_minify",
11-
"polish",
12-
"brotli",
13-
"mirage",
14-
"rocket_loader",
15-
"prefetch_urls",
16-
"amp_real_url",
17-
"mobile_redirect"
18-
));
19-
20-
?>
1+
<section class='tabs-wrapper at_least_one' >
2+
<div data-tab='optimization' class="active" >Optimization</div>
3+
<div data-tab-content='optimization' class='active' >
4+
<h1 class="tab-content" >File Size Optimization</h1>
5+
<?php
6+
7+
echo $block->renderSections ( "speed/optimization_tab", array (
8+
"image_resizing",
9+
"polish",
10+
"auto_minify",
11+
"brotli"
12+
));
13+
14+
?>
15+
<h1 class="tab-content" >Optimized Delivery</h1>
16+
<?php
17+
18+
echo $block->renderSections ( "speed/optimization_tab", array (
19+
"automatic_platform_optimization",
20+
"enhanced_http2_prioritization",
21+
"tcp_turbo",
22+
"mirage",
23+
"rocket_loader"
24+
));
25+
26+
?>
27+
<h1 class="tab-content" >Caching</h1>
28+
<?php
29+
30+
echo $block->renderSections ( "speed/optimization_tab", array (
31+
"prefetch_urls"
32+
));
33+
34+
?>
35+
<h1 class="tab-content" >Mobile</h1>
36+
<?php
37+
38+
echo $block->renderSections ( "speed/optimization_tab", array (
39+
"amp_real_url",
40+
"mobile_redirect"
41+
));
42+
43+
?>
44+
</div>
45+
</section>

0 commit comments

Comments
 (0)