From 8bebe2e568bc8b8e7e108f64baf233cdb04cf2cd Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 2 May 2021 12:00:12 +0200 Subject: [PATCH] Simplify the domain and landing page management --- .../acp/templates/applicationManagement.tpl | 144 ++++++++--- .../acp/form/ApplicationEditForm.class.php | 5 + .../form/ApplicationManagementForm.class.php | 231 ++++++++++++++++++ .../page/ApplicationManagementPage.class.php | 62 ----- .../application/ApplicationHandler.class.php | 1 + wcfsetup/install/lang/de.xml | 14 ++ wcfsetup/install/lang/en.xml | 14 ++ 7 files changed, 374 insertions(+), 97 deletions(-) create mode 100644 wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php delete mode 100644 wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl index 7bac0ef6ee..87e4e41a7e 100644 --- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl +++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl @@ -14,42 +14,116 @@ {/hascontent} -
- - - - - - - - +{if $isMultiDomainSetup} +
{lang}wcf.acp.application.multiDomain{/lang}
+{/if} + + + {if !$isMultiDomainSetup} +
+

{lang}wcf.acp.application.management.domain{/lang}

+ + +
+
+
+ http(s):// + +
+ {if $errorField == 'domainName'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.acp.application.management.domainName.error.{$errorType}{/lang} + {/if} + + {/if} + {lang}wcf.acp.application.management.domainName.description{/lang} +
+ + + +
+
+ + {if $errorField == 'cookieDomain'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.acp.application.management.cookieDomain.error.{$errorType}{/lang} + {/if} + + {/if} + {lang}wcf.acp.application.management.cookieDomain.description{/lang} +
+ +
+ + + {/if} + +
+

{lang}wcf.acp.application.landingPage{/lang}

+ +
+
{lang}wcf.global.objectID{/lang}{lang}wcf.acp.package.name{/lang}{lang}wcf.acp.application.domainName{/lang}{lang}wcf.acp.application.domainPath{/lang}{lang}wcf.acp.application.landingPage{/lang}
+ + + + + + + {event name='columnHeads'} + + - {event name='columnHeads'} - - - - - {foreach from=$applicationList item=application} - - - - - - - - - {event name='columns'} - - {/foreach} - -
{lang}wcf.global.objectID{/lang}{lang}wcf.acp.package.name{/lang}{lang}wcf.acp.application.landingPage{/lang}
{#$application->packageID}{$application->getPackage()}{$application->domainName}{$application->domainPath} - {if $application->landingPageID && $pageList[$application->landingPageID]|isset} - {$pageList[$application->landingPageID]} - {else} - {lang}wcf.global.noSelection{/lang} - {/if} -
-
+ + {foreach from=$applicationList item=application} + + {#$application->packageID} + +

{$application->getPackage()}

+ {$application->getPageURL()} + + + + + + {event name='columns'} + + {/foreach} + + + + + +
+ + {csrfToken} +
+