Installation now uses a title again

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 3222d00989908672d68370fa0a444c070c067b22..9855ede8c54efe76136fe398bd063819173fd566 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -309,11 +309,11 @@ WCF.ACP.Package.Installation.prototype = {
        prepareInstallation: function() {
                var $dialog = WCF.showAJAXDialog('packageInstallationDialog', true, {
                        ajax: true,
-                       url: 'index.php/' + this._actionName + '/?t=' + SECURITY_TOKEN + SID_ARG_2ND,
+                       closable: false,
                        data: { queueID: this._queueID, step: 'prepare' },
                        success: $.proxy(this._handleResponse, this),
-                       preventClose: true,
-                       hideTitle: true
+                       title: WCF.Language.get('wcf.acp.package.installation.title'),
+                       url: 'index.php/' + this._actionName + '/?t=' + SECURITY_TOKEN + SID_ARG_2ND
                });
                
                this._api = $dialog.data('wcfDialog');

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index d1a64eac8197059425cc59cb3c080278d636a1b1..53ba2f7a203be8c0dd587718910fff5351c7519d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -3,7 +3,8 @@
 <script type="text/javascript">
        //<![CDATA[
        $(function() {
-               var packageInstallation = new WCF.ACP.Package.Installation('install', {@$queueID}, true);
+               WCF.Language.add('wcf.acp.package.installation.title', '{lang}wcf.acp.package.installation.title{/lang}');
+               new WCF.ACP.Package.Installation('install', {@$queueID}, true);
        });
        //]]>
 </script>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index 7205be99a7f9ba6d5df5d6a1b0cdafcb4c560019..435ba871c016e103e8e16328c1688ceacd791108 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -2,8 +2,12 @@
 
 <script type="text/javascript">
        //<![CDATA[
-       $installation = new WCF.ACP.Package.Installation('install', {@$queueID}, false);
-       $installation.prepareInstallation();
+       $(function() {
+               WCF.Language.add('wcf.acp.package.installation.title', '{lang}wcf.acp.package.installation.title{/lang}');
+
+               var $installation = new WCF.ACP.Package.Installation('install', {@$queueID}, false);
+               $installation.prepareInstallation();
+       });
        //]]>
 </script>