[TASK] Store System Maintenance tokens in data attributes 51/57451/3
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Mon, 2 Jul 2018 14:42:23 +0000 (16:42 +0200)
committerMathias Brodala <mbrodala@pagemachine.de>
Tue, 3 Jul 2018 07:01:24 +0000 (09:01 +0200)
The tokens used in the System Maintenance area are stored in hidden
`<div>` elements, which is syntactically wrong and considered bad
practice.
Instead, the tokens are now stored in data attributes.

Resolves: #85455
Releases: master
Change-Id: I3a3be24897caa56c20355f0d36c7e7c4ae702640
Reviewed-on: https://review.typo3.org/57451
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
36 files changed:
typo3/sysext/install/Resources/Private/Partials/Settings/Presets.html
typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTables.html
typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTypo3tempFiles.html
typo3/sysext/install/Resources/Private/Templates/Maintenance/CreateAdmin.html
typo3/sysext/install/Resources/Private/Templates/Maintenance/DatabaseAnalyzer.html
typo3/sysext/install/Resources/Private/Templates/Maintenance/LanguagePacks.html
typo3/sysext/install/Resources/Private/Templates/Settings/ChangeInstallToolPassword.html
typo3/sysext/install/Resources/Private/Templates/Settings/ExtensionConfigurationGetContent.html
typo3/sysext/install/Resources/Private/Templates/Settings/LocalConfigurationGetContent.html
typo3/sysext/install/Resources/Private/Templates/Settings/PresetsGetContent.html
typo3/sysext/install/Resources/Private/Templates/Settings/SystemMaintainer.html
typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionCompatTester.html
typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionScanner.html
typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetContent.html
typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
typo3/sysext/install/Resources/Public/JavaScript/Installer.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ChangeInstallToolPassword.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ClearTables.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ClearTypo3tempFiles.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/CreateAdmin.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/DatabaseAnalyzer.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ExtensionCompatTester.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ExtensionConfiguration.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/ExtensionScanner.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/LanguagePacks.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/LocalConfiguration.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/MailTest.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/Presets.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/SystemMaintainer.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeDocs.js
typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeWizards.js

index 95ba051..80a61f8 100644 (file)
@@ -1,4 +1 @@
-<div style="display:none;">
-       <div id="t3js-presets-getContent-token">{presetGetContentToken}</div>
-</div>
 <div class="t3js-presets-content"></div>
index ce30de7..be4fd3c 100644 (file)
        </li>
 </ul>
 
-<div style="display:none">
-       <div id="t3js-mailTest-token">{mailTestToken}</div>
-</div>
+<div class="t3js-module-content" data-mail-test-token="{mailTestToken}">
+       <div class="t3js-mailTest-output"></div>
 
-<div class="t3js-mailTest-output"></div>
+       <form id="t3js-mailTest-form">
+               <div class="form-group">
+                       <label for="t3-install-checkmail">Email address:</label>
+                       <input
+                               id="t3-install-checkmail"
+                               type="email"
+                               class="t3-install-form-input-text form-control t3js-mailTest-email"
+                               required
+                       />
+               </div>
+               <button
+                       class="btn btn-default"
+                       type="submit"
+               >
+                       Send test mail
+               </button>
+       </form>
 
-<form id="t3js-mailTest-form">
-       <div class="form-group">
-               <label for="t3-install-checkmail">Email address:</label>
-               <input
-                       id="t3-install-checkmail"
-                       type="email"
-                       class="t3-install-form-input-text form-control t3js-mailTest-email"
-                       required
-               />
-       </div>
-       <button
-               class="btn btn-default"
-               type="submit"
-       >
-               Send test mail
-       </button>
-</form>
+</div>
index b54849c..d9ae74b 100644 (file)
-<div style="display: none;">
-       <div id="t3js-installer-databaseConnect-execute-token">{executeDatabaseConnectToken}</div>
-</div>
-
-<h3>Select database</h3>
-<f:if condition="{hasAtLeastOneOption}">
-       <f:then>
-               <p>
-                       You will need to create a database user with the appropriate privileges to access your database.
-               </p>
-               <div class="t3js-installer-databaseConnect-output"></div>
-               <div class="row">
-                       <div class="col-md-6">
-                               <form method="post" class="form-horizontal">
-                                       <div class="form-group">
-                                               <label for="t3js-connect-database-driver" class="control-label col-md-2">Connection</label>
-                                               <div class="col-md-10">
-                                                       <select id="t3js-connect-database-driver" class="form-control" name="install[values][availableSet]">
-                                                               <f:if condition="{hasMysqliManualConfiguration}">
-                                                                       <option
-                                                                               value="mysqliManualConfiguration"
-                                                                               {f:if(condition:'{activeAvailableOption} == mysqliManualConfiguration', then: 'selected="selected"')}
-                                                                       >
-                                                                       Manually configured MySQL TCP/IP connection
-                                                                       </option>
-                                                               </f:if>
-                                                               <f:if condition="{hasMysqliSocketManualConfiguration}">
-                                                                       <option
-                                                                               value="mysqliSocketManualConfiguration"
-                                                                               {f:if(condition:'{activeAvailableOption} == mysqliSocketManualConfiguration', then: 'selected="selected"')}
-                                                                       >
-                                                                       Manually configured MySQL socket connection
-                                                                       </option>
-                                                               </f:if>
-                                                               <f:if condition="{hasPostgresManualConfiguration}">
-                                                                       <option
-                                                                               value="postgresManualConfiguration"
-                                                                               {f:if(condition:'{activeAvailableOption} == postgresManualConfiguration', then: 'selected="selected"')}
-                                                                       >
-                                                                       Manually configured PostgreSQL connection
-                                                                       </option>
-                                                               </f:if>
-                                                               <f:if condition="{hasSqliteManualConfiguration}">
-                                                                       <option
-                                                                               value="sqliteManualConfiguration"
-                                                                               {f:if(condition:'{activeAvailableOption} == sqliteManualConfiguration', then: 'selected="selected"')}
-                                                                       >
-                                                                       Manually configured SQLite connection
-                                                                       </option>
-                                                               </f:if>
-                                                               <f:if condition="{hasConfigurationFromEnvironment}">
-                                                                       <option
-                                                                               value="configurationFromEnvironment"
-                                                                               {f:if(condition:'{activeAvailableOption} == configurationFromEnvironment', then: 'selected="selected"')}
-                                                                       >
-                                                                       Configuration from environment variables
-                                                                       </option>
-                                                               </f:if>
-                                                       </select>
+<div class="t3js-module-content" data-installer-database-connect-execute-token="{executeDatabaseConnectToken}">
+       <h3>Select database</h3>
+       <f:if condition="{hasAtLeastOneOption}">
+               <f:then>
+                       <p>
+                               You will need to create a database user with the appropriate privileges to access your database.
+                       </p>
+                       <div class="t3js-installer-databaseConnect-output"></div>
+                       <div class="row">
+                               <div class="col-md-6">
+                                       <form method="post" class="form-horizontal">
+                                               <div class="form-group">
+                                                       <label for="t3js-connect-database-driver" class="control-label col-md-2">Connection</label>
+                                                       <div class="col-md-10">
+                                                               <select id="t3js-connect-database-driver" class="form-control" name="install[values][availableSet]">
+                                                                       <f:if condition="{hasMysqliManualConfiguration}">
+                                                                               <option
+                                                                                       value="mysqliManualConfiguration"
+                                                                                       {f:if(condition:'{activeAvailableOption} == mysqliManualConfiguration', then: 'selected="selected"')}
+                                                                               >
+                                                                               Manually configured MySQL TCP/IP connection
+                                                                               </option>
+                                                                       </f:if>
+                                                                       <f:if condition="{hasMysqliSocketManualConfiguration}">
+                                                                               <option
+                                                                                       value="mysqliSocketManualConfiguration"
+                                                                                       {f:if(condition:'{activeAvailableOption} == mysqliSocketManualConfiguration', then: 'selected="selected"')}
+                                                                               >
+                                                                               Manually configured MySQL socket connection
+                                                                               </option>
+                                                                       </f:if>
+                                                                       <f:if condition="{hasPostgresManualConfiguration}">
+                                                                               <option
+                                                                                       value="postgresManualConfiguration"
+                                                                                       {f:if(condition:'{activeAvailableOption} == postgresManualConfiguration', then: 'selected="selected"')}
+                                                                               >
+                                                                               Manually configured PostgreSQL connection
+                                                                               </option>
+                                                                       </f:if>
+                                                                       <f:if condition="{hasSqliteManualConfiguration}">
+                                                                               <option
+                                                                                       value="sqliteManualConfiguration"
+                                                                                       {f:if(condition:'{activeAvailableOption} == sqliteManualConfiguration', then: 'selected="selected"')}
+                                                                               >
+                                                                               Manually configured SQLite connection
+                                                                               </option>
+                                                                       </f:if>
+                                                                       <f:if condition="{hasConfigurationFromEnvironment}">
+                                                                               <option
+                                                                                       value="configurationFromEnvironment"
+                                                                                       {f:if(condition:'{activeAvailableOption} == configurationFromEnvironment', then: 'selected="selected"')}
+                                                                               >
+                                                                               Configuration from environment variables
+                                                                               </option>
+                                                                       </f:if>
+                                                               </select>
+                                                       </div>
                                                </div>
-                                       </div>
 
-                                       <f:if condition="{hasMysqliManualConfiguration}">
-                                               <div id="mysqliManualConfiguration" class="t3-install-driver-data">
-                                                       <input type="hidden" value="mysqli" name="install[values][driver]"/>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliManualConfiguration-username" class="control-label col-md-2">
-                                                                       Username
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliManualConfiguration-username"
-                                                                               class="form-control"
-                                                                               type="text"
-                                                                               value="{mysqliManualConfigurationOptions.username}"
-                                                                               name="install[values][username]"
-                                                                               autocomplete="off"
-                                                                       />
+                                               <f:if condition="{hasMysqliManualConfiguration}">
+                                                       <div id="mysqliManualConfiguration" class="t3-install-driver-data">
+                                                               <input type="hidden" value="mysqli" name="install[values][driver]"/>
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliManualConfiguration-username" class="control-label col-md-2">
+                                                                               Username
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliManualConfiguration-username"
+                                                                                       class="form-control"
+                                                                                       type="text"
+                                                                                       value="{mysqliManualConfigurationOptions.username}"
+                                                                                       name="install[values][username]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliManualConfiguration-password" class="control-label col-md-2">
-                                                                       Password
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliManualConfiguration-password"
-                                                                               class="form-control"
-                                                                               type="password"
-                                                                               value="{mysqliManualConfigurationOptions.password}"
-                                                                               name="install[values][password]"
-                                                                               autocomplete="off"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliManualConfiguration-password" class="control-label col-md-2">
+                                                                               Password
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliManualConfiguration-password"
+                                                                                       class="form-control"
+                                                                                       type="password"
+                                                                                       value="{mysqliManualConfigurationOptions.password}"
+                                                                                       name="install[values][password]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliManualConfiguration-host" class="control-label col-md-2">
-                                                                       Host
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliManualConfiguration-host"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{mysqliManualConfigurationOptions.host}"
-                                                                               name="install[values][host]"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliManualConfiguration-host" class="control-label col-md-2">
+                                                                               Host
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliManualConfiguration-host"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{mysqliManualConfigurationOptions.host}"
+                                                                                       name="install[values][host]"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliManualConfiguration-port" class="control-label col-md-2">
-                                                                       Port
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliManualConfiguration-port"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{mysqliManualConfigurationOptions.port}"
-                                                                               name="install[values][port]"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliManualConfiguration-port" class="control-label col-md-2">
+                                                                               Port
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliManualConfiguration-port"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{mysqliManualConfigurationOptions.port}"
+                                                                                       name="install[values][port]"
+                                                                               />
+                                                                       </div>
                                                                </div>
                                                        </div>
-                                               </div>
-                                       </f:if>
+                                               </f:if>
 
-                                       <f:if condition="{hasMysqliSocketManualConfiguration}">
-                                               <div id="mysqliSocketManualConfiguration" class="t3-install-driver-data">
-                                                       <input type="hidden" value="mysqli" name="install[values][driver]"/>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliSocketManualConfiguration-username" class="control-label col-md-2">
-                                                                       Username
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliSocketManualConfiguration-username"
-                                                                               class="form-control"
-                                                                               type="text"
-                                                                               value="{mysqliSocketManualConfigurationOptions.username}"
-                                                                               name="install[values][username]"
-                                                                               autocomplete="off"
-                                                                       />
+                                               <f:if condition="{hasMysqliSocketManualConfiguration}">
+                                                       <div id="mysqliSocketManualConfiguration" class="t3-install-driver-data">
+                                                               <input type="hidden" value="mysqli" name="install[values][driver]"/>
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliSocketManualConfiguration-username" class="control-label col-md-2">
+                                                                               Username
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliSocketManualConfiguration-username"
+                                                                                       class="form-control"
+                                                                                       type="text"
+                                                                                       value="{mysqliSocketManualConfigurationOptions.username}"
+                                                                                       name="install[values][username]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliSocketManualConfiguration-password" class="control-label col-md-2">
-                                                                       Password
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliSocketManualConfiguration-password"
-                                                                               class="form-control"
-                                                                               type="password"
-                                                                               value="{mysqliSocketManualConfigurationOptions.password}"
-                                                                               name="install[values][password]"
-                                                                               autocomplete="off"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliSocketManualConfiguration-password" class="control-label col-md-2">
+                                                                               Password
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliSocketManualConfiguration-password"
+                                                                                       class="form-control"
+                                                                                       type="password"
+                                                                                       value="{mysqliSocketManualConfigurationOptions.password}"
+                                                                                       name="install[values][password]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <input type="hidden" value="localhost" name="install[values][host]"/>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-mysqliSocketManualConfiguration-socket" class="control-label col-md-2">
-                                                                       Socket
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-mysqliSocketManualConfiguration-socket"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{mysqliSocketManualConfigurationOptions.socket}"
-                                                                               name="install[values][socket]"
-                                                                               placeholder="Default socket or enter name"
-                                                                       />
+                                                               <input type="hidden" value="localhost" name="install[values][host]"/>
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-mysqliSocketManualConfiguration-socket" class="control-label col-md-2">
+                                                                               Socket
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-mysqliSocketManualConfiguration-socket"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{mysqliSocketManualConfigurationOptions.socket}"
+                                                                                       name="install[values][socket]"
+                                                                                       placeholder="Default socket or enter name"
+                                                                               />
+                                                                       </div>
                                                                </div>
                                                        </div>
-                                               </div>
-                                       </f:if>
+                                               </f:if>
 
-                                       <f:if condition="{hasPostgresManualConfiguration}">
-                                               <div id="postgresManualConfiguration" class="t3-install-driver-data">
-                                                       <input type="hidden" value="pdo_pgsql" name="install[values][driver]"/>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-postgresManualConfiguration-username" class="control-label col-md-2">
-                                                                       Username
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-postgresManualConfiguration-username"
-                                                                               class="form-control"
-                                                                               type="text"
-                                                                               value="{postgresManualConfigurationOptions.username}"
-                                                                               name="install[values][username]"
-                                                                               autocomplete="off"
-                                                                       />
+                                               <f:if condition="{hasPostgresManualConfiguration}">
+                                                       <div id="postgresManualConfiguration" class="t3-install-driver-data">
+                                                               <input type="hidden" value="pdo_pgsql" name="install[values][driver]"/>
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-postgresManualConfiguration-username" class="control-label col-md-2">
+                                                                               Username
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-postgresManualConfiguration-username"
+                                                                                       class="form-control"
+                                                                                       type="text"
+                                                                                       value="{postgresManualConfigurationOptions.username}"
+                                                                                       name="install[values][username]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-postgresManualConfiguration-password" class="control-label col-md-2">
-                                                                       Password
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-postgresManualConfiguration-password"
-                                                                               class="form-control"
-                                                                               type="password"
-                                                                               value="{postgresManualConfigurationOptions.password}"
-                                                                               name="install[values][password]"
-                                                                               autocomplete="off"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-postgresManualConfiguration-password" class="control-label col-md-2">
+                                                                               Password
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-postgresManualConfiguration-password"
+                                                                                       class="form-control"
+                                                                                       type="password"
+                                                                                       value="{postgresManualConfigurationOptions.password}"
+                                                                                       name="install[values][password]"
+                                                                                       autocomplete="off"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-postgresManualConfiguration-database" class="control-label col-md-2">
-                                                                       Database
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-postgresManualConfiguration-database"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{postgresManualConfigurationOptions.database}"
-                                                                               name="install[values][database]"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-postgresManualConfiguration-database" class="control-label col-md-2">
+                                                                               Database
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-postgresManualConfiguration-database"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{postgresManualConfigurationOptions.database}"
+                                                                                       name="install[values][database]"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-postgresManualConfiguration-host" class="control-label col-md-2">
-                                                                       Host
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-postgresManualConfiguration-host"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{postgresManualConfigurationOptions.host}"
-                                                                               name="install[values][host]"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-postgresManualConfiguration-host" class="control-label col-md-2">
+                                                                               Host
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-postgresManualConfiguration-host"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{postgresManualConfigurationOptions.host}"
+                                                                                       name="install[values][host]"
+                                                                               />
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                                       <div class="form-group">
-                                                               <label for="t3-install-step-postgresManualConfiguration-port" class="control-label col-md-2">
-                                                                       Port
-                                                               </label>
-                                                               <div class="col-md-10">
-                                                                       <input
-                                                                               id="t3-install-step-postgresManualConfiguration-port"
-                                                                               class="t3-install-form-input-text form-control"
-                                                                               type="text"
-                                                                               value="{postgresManualConfigurationOptions.port}"
-                                                                               name="install[values][port]"
-                                                                       />
+                                                               <div class="form-group">
+                                                                       <label for="t3-install-step-postgresManualConfiguration-port" class="control-label col-md-2">
+                                                                               Port
+                                                                       </label>
+                                                                       <div class="col-md-10">
+                                                                               <input
+                                                                                       id="t3-install-step-postgresManualConfiguration-port"
+                                                                                       class="t3-install-form-input-text form-control"
+                                                                                       type="text"
+                                                                                       value="{postgresManualConfigurationOptions.port}"
+                                                                                       name="install[values][port]"
+                                                                               />
+                                                                       </div>
                                                                </div>
                                                        </div>
-                                               </div>
-                                       </f:if>
+                                               </f:if>
 
-                                       <f:if condition="{hasSqliteManualConfiguration}">
-                                               <div id="sqliteManualConfiguration" class="t3-install-driver-data">
-                                                       <input type="hidden" value="pdo_sqlite" name="install[values][driver]"/>
-                                               </div>
-                                       </f:if>
+                                               <f:if condition="{hasSqliteManualConfiguration}">
+                                                       <div id="sqliteManualConfiguration" class="t3-install-driver-data">
+                                                               <input type="hidden" value="pdo_sqlite" name="install[values][driver]"/>
+                                                       </div>
+                                               </f:if>
 
-                                       <f:if condition="{hasConfigurationFromEnvironment}">
-                                               <div id="configurationFromEnvironment" class="t3-install-driver-data">
-                                               </div>
-                                       </f:if>
+                                               <f:if condition="{hasConfigurationFromEnvironment}">
+                                                       <div id="configurationFromEnvironment" class="t3-install-driver-data">
+                                                       </div>
+                                               </f:if>
 
-                                       <hr/>
-                                       <button class="btn btn-success t3js-installer-databaseConnect-execute">
-                                               Continue
-                                       </button>
-                               </form>
+                                               <hr/>
+                                               <button class="btn btn-success t3js-installer-databaseConnect-execute">
+                                                       Continue
+                                               </button>
+                                       </form>
+                               </div>
                        </div>
-               </div>
-       </f:then>
+               </f:then>
 
-       <f:else>
-               <div class="t3js-message typo3-message alert alert-danger" role="alert">
-                       <h4>No database driver found</h4>
-                       <p class="messageText">You have no database driver installed or enabled. Please install a driver in order to complete the database connection.</p>
-               </div>
-       </f:else>
-</f:if>
+               <f:else>
+                       <div class="t3js-message typo3-message alert alert-danger" role="alert">
+                               <h4>No database driver found</h4>
+                               <p class="messageText">You have no database driver installed or enabled. Please install a driver in order to complete the database connection.</p>
+                       </div>
+               </f:else>
+       </f:if>
+</div>
index 2f703a7..77651cf 100644 (file)
@@ -1,84 +1,82 @@
-<div style="display: none;">
-       <div id="t3js-installer-databaseData-execute-token">{executeDatabaseDataToken}</div>
-</div>
-
-<h3>Create Administrative User / Specify Site Name</h3>
+<div class="t3js-module-content" data-installer-database-data-execute-token="{executeDatabaseDataToken}">
+       <h3>Create Administrative User / Specify Site Name</h3>
 
-<p>
-       Use this account to log into the backend of your site.
-</p>
-<p>
-       The password you provide for this account is also used to access the <strong>Install Tool</strong>.
-</p>
-<p>
-       On this page you can also set a name for your new website.
-</p>
+       <p>
+               Use this account to log into the backend of your site.
+       </p>
+       <p>
+               The password you provide for this account is also used to access the <strong>Install Tool</strong>.
+       </p>
+       <p>
+               On this page you can also set a name for your new website.
+       </p>
 
-<div class="t3js-installer-databaseData-output"></div>
+       <div class="t3js-installer-databaseData-output"></div>
 
-<div class="row">
-       <div class="col-md-6">
-               <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before form-horizontal">
-                       <input type="hidden" value="execute" name="install[set]" />
-                       <div class="form-group">
-                               <label for="password" class="control-label col-md-2">Username</label>
-                               <div class="col-md-10">
-                                       <input
-                                               class="t3-install-form-input-text form-control"
-                                               name="install[values][username]"
-                                               id="username"
-                                               placeholder="admin"
-                                               autocomplete="off"
-                                       />
+       <div class="row">
+               <div class="col-md-6">
+                       <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before form-horizontal">
+                               <input type="hidden" value="execute" name="install[set]" />
+                               <div class="form-group">
+                                       <label for="password" class="control-label col-md-2">Username</label>
+                                       <div class="col-md-10">
+                                               <input
+                                                       class="t3-install-form-input-text form-control"
+                                                       name="install[values][username]"
+                                                       id="username"
+                                                       placeholder="admin"
+                                                       autocomplete="off"
+                                               />
+                                       </div>
                                </div>
-                       </div>
-                       <div class="form-group">
-                               <label for="password" class="control-label col-md-2">Password</label>
-                               <div class="col-md-10">
-                                       <input
-                                               class="t3-install-form-input-text t3-install-form-password-strength form-control"
-                                               name="install[values][password]"
-                                               id="password"
-                                               type="password"
-                                               autocomplete="off"
-                                       />
-                                       <div class="checkbox">
-                                               <label>
-                                                       <input
-                                                               type="checkbox"
-                                                               id="show-password"
-                                                               onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
-                                                       />
-                                                       Show password
-                                               </label>
+                               <div class="form-group">
+                                       <label for="password" class="control-label col-md-2">Password</label>
+                                       <div class="col-md-10">
+                                               <input
+                                                       class="t3-install-form-input-text t3-install-form-password-strength form-control"
+                                                       name="install[values][password]"
+                                                       id="password"
+                                                       type="password"
+                                                       autocomplete="off"
+                                               />
+                                               <div class="checkbox">
+                                                       <label>
+                                                               <input
+                                                                       type="checkbox"
+                                                                       id="show-password"
+                                                                       onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
+                                                               />
+                                                               Show password
+                                                       </label>
+                                               </div>
                                        </div>
                                </div>
-                       </div>
-                       <div class="row">
-                               <div class="col-md-2"></div>
-                               <div class="col-md-10">
-                                       <div class="alert alert-warning">
-                                               If compromised, this account will provide an attacker with complete access to your installation. A strong password is recommended. Include lower and upper case characters, special characters and numbers. Your password must be at least eight characters long.
+                               <div class="row">
+                                       <div class="col-md-2"></div>
+                                       <div class="col-md-10">
+                                               <div class="alert alert-warning">
+                                                       If compromised, this account will provide an attacker with complete access to your installation. A strong password is recommended. Include lower and upper case characters, special characters and numbers. Your password must be at least eight characters long.
+                                               </div>
                                        </div>
                                </div>
-                       </div>
-                       <div class="form-group">
+                               <div class="form-group">
 
-                               <label for="sitename" class="control-label col-md-2">Site name</label>
-                               <div class="col-md-10">
+                                       <label for="sitename" class="control-label col-md-2">Site name</label>
+                                       <div class="col-md-10">
 
-                                       <input
-                                               class="t3-install-form-input-text form-control"
-                                               name="install[values][sitename]"
-                                               id="sitename"
-                                               type="text"
-                                               value="{siteName}"
-                                       />
+                                               <input
+                                                       class="t3-install-form-input-text form-control"
+                                                       name="install[values][sitename]"
+                                                       id="sitename"
+                                                       type="text"
+                                                       value="{siteName}"
+                                               />
+                                       </div>
                                </div>
-                       </div>
-                       <button class="btn btn-success t3js-installer-databaseData-execute">
-                               Continue
-                       </button>
-               </form>
+                               <button class="btn btn-success t3js-installer-databaseData-execute">
+                                       Continue
+                               </button>
+                       </form>
+               </div>
        </div>
 </div>
index 388e728..4f50e2b 100644 (file)
@@ -1,80 +1,78 @@
-<div style="display: none;">
-       <div id="t3js-installer-databaseSelect-execute-token">{executeDatabaseSelectToken}</div>
-</div>
-
-<h3>Select a database</h3>
+<div class="t3js-module-content" data-installer-database-select-execute-token="{executeDatabaseSelectToken}">
+       <h3>Select a database</h3>
 
-<div class="t3js-installer-databaseSelect-output"></div>
+       <div class="t3js-installer-databaseSelect-output"></div>
 
-<f:if condition="{errors -> f:count()}">
-       <f:for each="{errors}" as="error">
-               <div class="alert alert-danger">
-                       <h4>Exception</h4>
-                       <p>{error}</p>
-               </div>
-       </f:for>
-</f:if>
-
-<form method="post" id="stepInstaller-databaseSelect">
-       <div class="row">
-               <div class="col-md-6">
-                       <div class="radio">
-                               <label for="t3-install-form-db-select-type-existing">
-                                       <input id="t3-install-form-db-select-type-existing" type="radio" name="install[values][type]" value="existing" class="radio" checked="checked" />
-                                       Use an existing empty database:
-                               </label>
-                       </div>
-                       <div class="form-group">
-                               <select
-                                       id="t3-install-step-database-existing"
-                                       name="install[values][existing]"
-                                       class="form-control"
-                                       onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
-                               >
-                                       <option value="">-- Select database --</option>
-                                       <f:for each="{databaseList}" as="database">
-                                               <f:if condition="{database.tables}">
-                                                       <f:then>
-                                                               <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <option value="{database.name}">{database.name}</option>
-                                                       </f:else>
-                                               </f:if>
-                                       </f:for>
-                               </select>
+       <f:if condition="{errors -> f:count()}">
+               <f:for each="{errors}" as="error">
+                       <div class="alert alert-danger">
+                               <h4>Exception</h4>
+                               <p>{error}</p>
                        </div>
-                       <div class="radio">
-                               <label for="t3-install-step-database-new">
+               </f:for>
+       </f:if>
+
+       <form method="post" id="stepInstaller-databaseSelect">
+               <div class="row">
+                       <div class="col-md-6">
+                               <div class="radio">
+                                       <label for="t3-install-form-db-select-type-existing">
+                                               <input id="t3-install-form-db-select-type-existing" type="radio" name="install[values][type]" value="existing" class="radio" checked="checked" />
+                                               Use an existing empty database:
+                                       </label>
+                               </div>
+                               <div class="form-group">
+                                       <select
+                                               id="t3-install-step-database-existing"
+                                               name="install[values][existing]"
+                                               class="form-control"
+                                               onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
+                                       >
+                                               <option value="">-- Select database --</option>
+                                               <f:for each="{databaseList}" as="database">
+                                                       <f:if condition="{database.tables}">
+                                                               <f:then>
+                                                                       <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       <option value="{database.name}">{database.name}</option>
+                                                               </f:else>
+                                                       </f:if>
+                                               </f:for>
+                                       </select>
+                               </div>
+                               <div class="radio">
+                                       <label for="t3-install-step-database-new">
+                                               <input
+                                                       id="t3-install-form-db-select-type-new"
+                                                       type="radio"
+                                                       name="install[values][type]"
+                                                       value="new"
+                                                       class="radio"
+                                               />
+                                               Create a new database:
+                                       </label>
+                               </div>
+                               <div class="form-group">
+                                       <p>
+                                               Specify a name for your TYPO3 database.
+                                       </p>
                                        <input
-                                               id="t3-install-form-db-select-type-new"
-                                               type="radio"
-                                               name="install[values][type]"
-                                               value="new"
-                                               class="radio"
+                                               id="t3-install-step-database-new"
+                                               class="t3-install-form-input-text form-control"
+                                               type="text"
+                                               name="install[values][new]"
+                                               checked="checked"
+                                               onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
                                        />
-                                       Create a new database:
-                               </label>
-                       </div>
-                       <div class="form-group">
-                               <p>
-                                       Specify a name for your TYPO3 database.
-                               </p>
-                               <input
-                                       id="t3-install-step-database-new"
-                                       class="t3-install-form-input-text form-control"
-                                       type="text"
-                                       name="install[values][new]"
-                                       checked="checked"
-                                       onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
-                               />
-                       </div>
+                               </div>
 
-                       <div class="form-group">
-                               <button class="btn btn-success t3js-installer-databaseSelect-execute">
-                                       Continue
-                               </button>
+                               <div class="form-group">
+                                       <button class="btn btn-success t3js-installer-databaseSelect-execute">
+                                               Continue
+                                       </button>
+                               </div>
                        </div>
                </div>
-       </div>
-</form>
+       </form>
+</div>
index d54e604..746199b 100644 (file)
@@ -1,49 +1,47 @@
-<div style="display: none;">
-       <div id="t3js-installer-defaultConfiguration-execute-token">{executeDefaultConfigurationToken}</div>
-</div>
-
-<h3>Installation Complete</h3>
+<div class="t3js-module-content" data-installer-default-configuration-execute-token="{executeDefaultConfigurationToken}">
+       <h3>Installation Complete</h3>
 
-<p>
-       The Installation Wizard can create an empty page at the root of your website to help get you started. If you would like to use this option select "Create empty starting page".
-</p>
+       <p>
+               The Installation Wizard can create an empty page at the root of your website to help get you started. If you would like to use this option select "Create empty starting page".
+       </p>
 
-<div class="t3js-installer-defaultConfiguration-output"></div>
+       <div class="t3js-installer-defaultConfiguration-output"></div>
 
-<f:if condition="!{composerMode}">
-       <div class="alert alert-notice">
-               <h4>Want a pre-configured site?</h4>
-               <p>
-                       You currently have an empty installation of TYPO3. If you would like to view a list of pre-configured distributions select “download list of distributions” from the list below.
-                       <strong>Note: This may take some time to load.</strong>
-               </p>
-       </div>
-</f:if>
+       <f:if condition="!{composerMode}">
+               <div class="alert alert-notice">
+                       <h4>Want a pre-configured site?</h4>
+                       <p>
+                               You currently have an empty installation of TYPO3. If you would like to view a list of pre-configured distributions select “download list of distributions” from the list below.
+                               <strong>Note: This may take some time to load.</strong>
+                       </p>
+               </div>
+       </f:if>
 
-<form method="post">
-       <div class="form-group">
-               <f:if condition="!{composerMode}">
+       <form method="post">
+               <div class="form-group">
+                       <f:if condition="!{composerMode}">
+                               <div class="radio">
+                                       <label for="load-distributions">
+                                               <input type="radio" id="load-distributions" name="install[values][sitesetup]" value="loaddistribution" />
+                                               Yes, download the list of distributions
+                                       </label>
+                               </div>
+                       </f:if>
                        <div class="radio">
-                               <label for="load-distributions">
-                                       <input type="radio" id="load-distributions" name="install[values][sitesetup]" value="loaddistribution" />
-                                       Yes, download the list of distributions
+                               <label for="create-site">
+                                       <input type="radio" id="create-site" name="install[values][sitesetup]" value="createsite" />
+                                       Create empty starting page
+                               </label>
+                       </div>
+                       <div class="radio">
+                               <label for="do-nothing">
+                                       <input type="radio" id="do-nothing" name="install[values][sitesetup]" value="donothing" checked="checked" />
+                                       Take me straight to the backend
                                </label>
                        </div>
-               </f:if>
-               <div class="radio">
-                       <label for="create-site">
-                               <input type="radio" id="create-site" name="install[values][sitesetup]" value="createsite" />
-                               Create empty starting page
-                       </label>
-               </div>
-               <div class="radio">
-                       <label for="do-nothing">
-                               <input type="radio" id="do-nothing" name="install[values][sitesetup]" value="donothing" checked="checked" />
-                               Take me straight to the backend
-                       </label>
                </div>
-       </div>
-       <button class="btn btn-success t3js-installer-defaultConfiguration-execute">
-               Open the TYPO3 Backend
-       </button>
-</form>
+               <button class="btn btn-success t3js-installer-defaultConfiguration-execute">
+                       Open the TYPO3 Backend
+               </button>
+       </form>
+</div>
index 7cffa9c..309905a 100644 (file)
@@ -9,31 +9,33 @@
        You could log out all users, delete all their basket data, and lose logging information!
 </p>
 
-<div class="t3js-clearTables-output"></div>
+<div class="t3js-module-content" data-clear-tables-clear-token="{clearTablesClearToken}">
+       <div class="t3js-clearTables-output"></div>
 
-<button
-       class="btn btn-default t3js-clearTables-stats"
-       type="button"
->
-       Scan again
-</button>
-<hr>
+       <button
+               class="btn btn-default t3js-clearTables-stats"
+               type="button"
+       >
+               Scan again
+       </button>
+       <hr>
 
-<div class="form-group">
-       <div class="t3js-clearTables-stat-container"></div>
-</div>
+       <div class="form-group">
+               <div class="t3js-clearTables-stat-container"></div>
+       </div>
 
-<div style="display:none;">
-       <div id="t3js-clearTables-clear-token">{clearTablesClearToken}</div>
-       <div class="t3js-clearTables-stat-template">
-               <p class="t3js-clearTables-stat-description">{clearTableStatistic.description}</p>
-               <button
-                       class="btn btn-warning t3js-clearTables-clear"
-                       type="button"
-               >
-                       Delete <span class="t3js-clearTables-stat-rows"></span> rows
-                       from table "<span class="t3js-clearTables-stat-name"></span>" table
-               </button>
-               <hr class="t3js-clearTables-stat-lastRuler">
+       <div style="display:none;">
+               <div class="t3js-clearTables-stat-template">
+                       <p class="t3js-clearTables-stat-description">{clearTableStatistic.description}</p>
+                       <button
+                               class="btn btn-warning t3js-clearTables-clear"
+                               type="button"
+                       >
+                               Delete <span class="t3js-clearTables-stat-rows"></span> rows
+                               from table "<span class="t3js-clearTables-stat-name"></span>" table
+                       </button>
+                       <hr class="t3js-clearTables-stat-lastRuler">
+               </div>
        </div>
+
 </div>
index 6abd99c..d5d83c8 100644 (file)
@@ -1,43 +1,44 @@
-       <h4>About</h4>
-       <p>
-               TYPO3 stores processed files and cached images in a dedicated directory.
-               This directory is likely to grow quickly.
-       </p>
-       <p>
-               With this action you can delete the files in this folder. Afterwards, you
-               should also clear the cache database tables.
-       </p>
-       <p>
-               The File Abstraction Layer additionally stores a database record for every file
-               it needs to process. (e.g. image thumbnails). In case you modified some graphics
-               settings (All Configuration [GFX]) and you need all processed files to get regenerated,
-               you can use this tool to remove the "_processed_" ones.
-       </p>
+<h4>About</h4>
+<p>
+       TYPO3 stores processed files and cached images in a dedicated directory.
+       This directory is likely to grow quickly.
+</p>
+<p>
+       With this action you can delete the files in this folder. Afterwards, you
+       should also clear the cache database tables.
+</p>
+<p>
+       The File Abstraction Layer additionally stores a database record for every file
+       it needs to process. (e.g. image thumbnails). In case you modified some graphics
+       settings (All Configuration [GFX]) and you need all processed files to get regenerated,
+       you can use this tool to remove the "_processed_" ones.
+</p>
 
+<div class="t3js-module-content" data-clear-typo3temp-delete-token="{clearTypo3tempFilesToken}">
        <div class="t3js-clearTypo3temp-output"></div>
 
        <hr>
 
-<div class="form-group">
-       <div class="t3js-clearTypo3temp-stat-container"></div>
-</div>
+       <div class="form-group">
+               <div class="t3js-clearTypo3temp-stat-container"></div>
+       </div>
 
-<div style="display:none;">
-       <div id="t3js-clearTypo3temp-delete-token" style="display:none;">{clearTypo3tempFilesToken}</div>
-       <div class="t3js-clearTypo3temp-stat-template">
-               <button
+       <div style="display:none;">
+               <div class="t3js-clearTypo3temp-stat-template">
+                       <button
                                class="btn btn-warning t3js-clearTypo3temp-delete"
                                type="button"
-               >
-                       Delete <span class="t3js-clearTypo3temp-stat-numberOfFiles"></span> files in
-                       typo3temp/assets/<span class="t3js-clearTypo3temp-stat-directory"></span>
-               </button>
-               <hr class="t3js-clearTypo3temp-stat-lastRuler">
+                       >
+                               Delete <span class="t3js-clearTypo3temp-stat-numberOfFiles"></span> files in
+                               typo3temp/assets/<span class="t3js-clearTypo3temp-stat-directory"></span>
+                       </button>
+                       <hr class="t3js-clearTypo3temp-stat-lastRuler">
+               </div>
        </div>
-</div>
        <button
                class="btn btn-default t3js-clearTypo3temp-stats"
                type="button"
        >
                Scan again
        </button>
+</div>
index b7f0fd4..61310a5 100644 (file)
@@ -2,67 +2,63 @@
        After you've created the user, log in and add the rest of the user information, like email and real name.
 </p>
 
-<div style="display:none;">
-       <div id="t3js-createAdmin-token">{createAdminToken}</div>
-</div>
-
-
-
-<form action="" id="t3js-createAdmin-form" method="post">
-       <div class="form-group">
-               <label for="t3-install-admin-username" class="control-label">Username:</label>
-               <input
-                       id="t3-install-admin-username"
-                       class="t3-install-form-input-text t3js-createAdmin-user form-control"
-                       type="text"
-                       autocomplete="off"
-                       required
-               />
-       </div>
-       <div class="form-group">
-               <label for="t3-install-admin-password" class="control-label">Password:</label>
-               <input
-                       id="t3-install-admin-password"
-                       class="t3-install-form-input-text t3-install-form-password-strength t3js-createAdmin-password form-control"
-                       type="password"
-                       autocomplete="off"
-                       required
-                       minlength=8
-                       pattern=".{8,}"
-                       title="Password must be at least eight characters long."
-               />
-       </div>
-       <div class="form-group">
-               <label for="t3-install-admin-password-repeat" class="control-label">Repeat password:</label>
-               <input
-                       id="t3-install-admin-password-repeat"
-                       class="t3-install-form-input-text t3js-createAdmin-password-check form-control"
-                       type="password"
-                       autocomplete="off"
-                       required
-                       minlength=8
-                       pattern=".{8,}"
-               />
-       </div>
-    <div class="form-group">
-               <div class="checkbox">
-                       <label>
-                               <input
-                                       class="t3-install-form-input-checkbox t3js-createAdmin-system-maintainer"
-                                       type="checkbox"
-                                       id="add-as-sytem-maintainer"
-                               />
-                               Add as system maintainer
-                       </label>
+<div class="t3js-module-content" data-create-admin-token="{createAdminToken}">
+       <form action="" id="t3js-createAdmin-form" method="post">
+               <div class="form-group">
+                       <label for="t3-install-admin-username" class="control-label">Username:</label>
+                       <input
+                               id="t3-install-admin-username"
+                               class="t3-install-form-input-text t3js-createAdmin-user form-control"
+                               type="text"
+                               autocomplete="off"
+                               required
+                       />
+               </div>
+               <div class="form-group">
+                       <label for="t3-install-admin-password" class="control-label">Password:</label>
+                       <input
+                               id="t3-install-admin-password"
+                               class="t3-install-form-input-text t3-install-form-password-strength t3js-createAdmin-password form-control"
+                               type="password"
+                               autocomplete="off"
+                               required
+                               minlength=8
+                               pattern=".{8,}"
+                               title="Password must be at least eight characters long."
+                       />
+               </div>
+               <div class="form-group">
+                       <label for="t3-install-admin-password-repeat" class="control-label">Repeat password:</label>
+                       <input
+                               id="t3-install-admin-password-repeat"
+                               class="t3-install-form-input-text t3js-createAdmin-password-check form-control"
+                               type="password"
+                               autocomplete="off"
+                               required
+                               minlength=8
+                               pattern=".{8,}"
+                       />
+               </div>
+               <div class="form-group">
+                       <div class="checkbox">
+                               <label>
+                                       <input
+                                               class="t3-install-form-input-checkbox t3js-createAdmin-system-maintainer"
+                                               type="checkbox"
+                                               id="add-as-sytem-maintainer"
+                                       />
+                                       Add as system maintainer
+                               </label>
+                       </div>
                </div>
-    </div>
 
-       <div class="t3js-createAdmin-output"></div>
+               <div class="t3js-createAdmin-output"></div>
 
-       <button
-               class="btn btn-default t3js-createAdmin-create"
-               type="submit"
-       >
-       Create administrator user
-       </button>
-</form>
+               <button
+                       class="btn btn-default t3js-createAdmin-create"
+                       type="submit"
+               >
+                       Create administrator user
+               </button>
+       </form>
+</div>
index 986f3e5..e63a3d2 100644 (file)
@@ -1,57 +1,59 @@
 <p>
-    Compares the database table and field definitions of the current database with the specifications from all loaded extensions' ext_tables.sql files.
-    Depending on the specification, the analyzer can update, delete, and change tables and fields.
+       Compares the database table and field definitions of the current database with the specifications from all loaded
+       extensions' ext_tables.sql files.
+       Depending on the specification, the analyzer can update, delete, and change tables and fields.
 </p>
 
 <div style="display:none;">
-    <div id="t3js-databaseAnalyzer-execute-token">{databaseAnalyzerExecuteToken}</div>
-    <div class="t3js-databaseAnalyzer-suggestion-block">
-        <fieldset>
-            <h4 class="t3js-databaseAnalyzer-suggestion-block-legend"></h4>
-            <ol class="list-unstyled t3js-databaseAnalyzer-suggestion-list">
-                <li class="t3-install-form-label-after">
-                    <input
-                        type="checkbox"
-                        class="t3js-databaseAnalyzer-suggestion-block-checkbox"
-                    />
-                    <label class="t3js-databaseAnalyzer-suggestion-block-label">select/deselect all</label>
-                </li>
-            </ol>
-        </fieldset>
-    </div>
-    <ul class="t3js-databaseAnalyzer-suggestion-line-template">
-        <li class="t3js-databaseAnalyzer-suggestion-line t3-install-form-label-after">
-            <input
-                type="checkbox"
-                class="t3js-databaseAnalyzer-suggestion-line-checkbox"
-                value="1"
-            />
-            <label class="t3js-databaseAnalyzer-suggestion-line-label">
-                <span class="t3js-databaseAnalyzer-suggestion-line-statement"></span>
-                <span class="t3js-databaseAnalyzer-suggestion-line-current" style="display:none;">
-                    <br/>
-                    Current value: <span class="t3js-databaseAnalyzer-suggestion-line-current-value"></span>
-                </span>
-                <span class="t3js-databaseAnalyzer-suggestion-line-count" style="display:none;">
-                    <br/>
-                    Rows in table: <span class="t3js-databaseAnalyzer-suggestion-line-count-value"></span>
-                </span>
-            </label>
-        </li>
-    </ul>
+       <div class="t3js-databaseAnalyzer-suggestion-block">
+               <fieldset>
+                       <h4 class="t3js-databaseAnalyzer-suggestion-block-legend"></h4>
+                       <ol class="list-unstyled t3js-databaseAnalyzer-suggestion-list">
+                               <li class="t3-install-form-label-after">
+                                       <input
+                                               type="checkbox"
+                                               class="t3js-databaseAnalyzer-suggestion-block-checkbox"
+                                       />
+                                       <label class="t3js-databaseAnalyzer-suggestion-block-label">select/deselect all</label>
+                               </li>
+                       </ol>
+               </fieldset>
+       </div>
+       <ul class="t3js-databaseAnalyzer-suggestion-line-template">
+               <li class="t3js-databaseAnalyzer-suggestion-line t3-install-form-label-after">
+                       <input
+                               type="checkbox"
+                               class="t3js-databaseAnalyzer-suggestion-line-checkbox"
+                               value="1"
+                       />
+                       <label class="t3js-databaseAnalyzer-suggestion-line-label">
+                               <span class="t3js-databaseAnalyzer-suggestion-line-statement"></span>
+                               <span class="t3js-databaseAnalyzer-suggestion-line-current" style="display:none;">
+                                                                       <br/>
+                                                                       Current value: <span class="t3js-databaseAnalyzer-suggestion-line-current-value"></span>
+                                                       </span>
+                               <span class="t3js-databaseAnalyzer-suggestion-line-count" style="display:none;">
+                                                                       <br/>
+                                                                       Rows in table: <span class="t3js-databaseAnalyzer-suggestion-line-count-value"></span>
+                                                       </span>
+                       </label>
+               </li>
+       </ul>
+</div>
+<div class="t3js-module-content" data-database-analyzer-execute-token="{databaseAnalyzerExecuteToken}">
+       <div class="t3js-databaseAnalyzer-output"></div>
+       <button
+               class="btn btn-default t3js-databaseAnalyzer-analyze"
+               type="button"
+               disabled
+       >
+               Run database compare again
+       </button>
+       <button
+               class="btn btn-warning t3js-databaseAnalyzer-execute"
+               type="button"
+               disabled
+       >
+               Apply selected changes
+       </button>
 </div>
-<div class="t3js-databaseAnalyzer-output"></div>
-<button
-    class="btn btn-default t3js-databaseAnalyzer-analyze"
-    type="button"
-    disabled
->
-    Run database compare again
-</button>
-<button
-    class="btn btn-warning t3js-databaseAnalyzer-execute"
-    type="button"
-    disabled
->
-    Apply selected changes
-</button>
index 2e55ee0..4b4b533 100644 (file)
@@ -1,17 +1,21 @@
 <div style="display:none;">
-    <div id="t3js-languagePacks-activateLanguage-token">{languagePacksActivateLanguageToken}</div>
-    <div id="t3js-languagePacks-deactivateLanguage-token">{languagePacksDeactivateLanguageToken}</div>
-    <div id="t3js-languagePacks-updatePack-token">{languagePacksUpdatePackToken}</div>
-    <div id="t3js-languagePacks-updateIsoTimes-token">{languagePacksUpdateIsoTimesToken}</div>
     <div id="t3js-languagePacks-activate-icon"><core:icon identifier="actions-add" /></div>
     <div id="t3js-languagePacks-deactivate-icon"><core:icon identifier="actions-remove" /></div>
     <div id="t3js-languagePacks-languageUpdate-icon"><core:icon identifier="actions-system-refresh" /></div>
     <div id="t3js-languagePacks-extensionPack-misses-icon"><core:icon identifier="actions-add" /></div>
 </div>
-<p>
-    Gives an overview of available languages excluding the default (English) language.
-    It allows you to activate and deactivate additional localizations and to update language packs from the official TYPO3 translation server.
-</p>
-<div class="t3js-languagePacks-notifications"></div>
-<div class="t3js-languagePacks-output"></div>
+<div
+       class="t3js-module-content"
+       data-language-packs-activate-language-token="{languagePacksActivateLanguageToken}"
+       data-language-packs-deactivate-language-token="{languagePacksDeactivateLanguageToken}"
+       data-language-packs-update-pack-token="{languagePacksUpdatePackToken}"
+       data-language-packs-update-iso-times-token="{languagePacksUpdateIsoTimesToken}"
+>
+       <p>
+                       Gives an overview of available languages excluding the default (English) language.
+                       It allows you to activate and deactivate additional localizations and to update language packs from the official TYPO3 translation server.
+       </p>
+       <div class="t3js-languagePacks-notifications"></div>
+       <div class="t3js-languagePacks-output"></div>
 <div class="t3js-languagePacks-mainContent"></div>
+</div>
index 1cbe5ad..2bd4caa 100644 (file)
@@ -1,11 +1,9 @@
 <p>
-       Allows you to set a new Install Tool password. The hash for this password will be written to LocalConfiguration.php and will overwrite the previously specified password.
+       Allows you to set a new Install Tool password. The hash for this password will be written to LocalConfiguration.php
+       and will overwrite the previously specified password.
 </p>
 
-<div style="display:none;">
-       <div id="t3js-changeInstallToolPassword-token">{changeInstallToolPasswordToken}</div>
-</div>
-
+<div class="t3js-module-content" data-install-tool-token="{changeInstallToolPasswordToken}">
        <div class="form-group">
                <label for="t3-install-tool-password" class="control-label">Enter new password:</label>
                <input
@@ -32,3 +30,4 @@
        >
                Set new password
        </button>
+</div>
index 0caa9c9..ee94df2 100644 (file)
@@ -2,21 +2,19 @@
        Select extension here
 </p>
 
-<div style="display:none;">
-       <div id="t3js-extensionConfiguration-write-token">{extensionConfigurationWriteToken}</div>
-</div>
-
-<div class="t3js-extensionConfiguration-output"></div>
+<div class="t3js-module-content" data-extension-configuration-write-token="{extensionConfigurationWriteToken}">
+       <div class="t3js-extensionConfiguration-output"></div>
 
-<div class="form-group">
-       <div class="input-group">
-               <span class="input-group-addon">Filter by:</span>
-               <input type="text" class="form-control t3js-extensionConfiguration-search" placeholder="search setting">
+       <div class="form-group">
+               <div class="input-group">
+                       <span class="input-group-addon">Filter by:</span>
+                       <input type="text" class="form-control t3js-extensionConfiguration-search" placeholder="search setting">
+               </div>
        </div>
-</div>
 
-<div class="panel-group" role="tablist" aria-multiselectable="true">
-       <f:for each="{extensionsWithConfigurations}" as="extensionData" key="extensionKey">
-               <f:render partial="Settings/ExtensionConfiguration/ExtensionForm" arguments="{_all}"/>
-       </f:for>
+       <div class="panel-group" role="tablist" aria-multiselectable="true">
+               <f:for each="{extensionsWithConfigurations}" as="extensionData" key="extensionKey">
+                       <f:render partial="Settings/ExtensionConfiguration/ExtensionForm" arguments="{_all}"/>
+               </f:for>
+       </div>
 </div>
index 9399bc1..527a897 100644 (file)
@@ -1,32 +1,32 @@
 <p>
-       Modified values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php is not controlled by the TYPO3’s core and may override certain settings. Administrators must maintain AdditionalConfiguration.php manually and should be used with caution.
+       Modified values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php is not controlled
+       by the TYPO3’s core and may override certain settings. Administrators must maintain AdditionalConfiguration.php
+       manually and should be used with caution.
 </p>
 
-<div style="display:none;">
-       <div id="t3js-localConfiguration-write-token">{localConfigurationWriteToken}</div>
-</div>
-
-<div class="form-group">
-       <div class="input-group">
-               <span class="input-group-addon">Filter by:</span>
-               <input type="text" class="form-control t3js-localConfiguration-search" placeholder="search setting">
+<div class="t3js-module-content" data-local-configuration-write-token="{localConfigurationWriteToken}">
+       <div class="form-group">
+               <div class="input-group">
+                       <span class="input-group-addon">Filter by:</span>
+                       <input type="text" class="form-control t3js-localConfiguration-search" placeholder="search setting">
+               </div>
        </div>
-</div>
 
-<div class="panel-group" role="tablist" aria-multiselectable="true">
-       <f:for each="{localConfigurationData}" as="sectionData" key="sectionName">
-               <f:if condition="{sectionData.items}">
-                       <f:render partial="Settings/LocalConfiguration/SubSection" arguments="{_all}"/>
-               </f:if>
-       </f:for>
-</div>
+       <div class="panel-group" role="tablist" aria-multiselectable="true">
+               <f:for each="{localConfigurationData}" as="sectionData" key="sectionName">
+                       <f:if condition="{sectionData.items}">
+                               <f:render partial="Settings/LocalConfiguration/SubSection" arguments="{_all}"/>
+                       </f:if>
+               </f:for>
+       </div>
 
-<div id="fixed-footer-handler">
-       <div id="fixed-footer">
-               <div class="t3js-localConfiguration-output"></div>
-               <div class="footer-innerWrap">
-                       <span class="btn btn-default t3js-localConfiguration-write">Write configuration</span>
-                       <span class="btn btn-default t3js-localConfiguration-toggleAll">Toggle All</span>
+       <div id="fixed-footer-handler">
+               <div id="fixed-footer">
+                       <div class="t3js-localConfiguration-output"></div>
+                       <div class="footer-innerWrap">
+                               <span class="btn btn-default t3js-localConfiguration-write">Write configuration</span>
+                               <span class="btn btn-default t3js-localConfiguration-toggleAll">Toggle All</span>
+                       </div>
                </div>
        </div>
 </div>
index c1340f0..87eb343 100644 (file)
@@ -8,10 +8,7 @@
        Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php is not controlled by the TYPO3’s core and may override certain settings. Administrators must maintain AdditionalConfiguration.php manually and should be used with caution.
 </p>
 
-<div style="display:none;">
-       <div id="t3js-presets-activate-token">{presetsActivateToken}</div>
-</div>
-<div class="t3js-presets-content">
+<div class="t3js-presets-content" data-presets-activate-token="{presetsActivateToken}">
        <form method="post" class="form-horizontal">
                <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
                        <f:for each="{presetFeatures}" as="feature">
index b4cef91..8790c11 100644 (file)
@@ -1,5 +1,6 @@
 <p>
-       Administrative users listed here will have full access to the Admin Tools module located in the backend. Note that all backend administrative users have access to this module when the system is running in development mode.
+       Administrative users listed here will have full access to the Admin Tools module located in the backend. Note that all
+       backend administrative users have access to this module when the system is running in development mode.
 </p>
 
 <f:if condition="{systemMaintainerIsDevelopmentContext}">
        </div>
 </f:if>
 
-<div style="display:none;">
-       <div id="t3js-systemMaintainer-write-token">{systemMaintainerWriteToken}</div>
-</div>
-
-<div class="form-group">
-       <div class="input-group t3js-systemMaintainer-chosen" style="display:none">
-               <span class="input-group-addon">System Maintainer:</span>
-               <select
-                       class="chosen-select t3js-systemMaintainer-chosen-select"
-                       data-placeholder="none"
-                       style="width:100%;"
-                       multiple
-                       tabindex=""
-               >
-               </select>
+<div class="t3js-module-content" data-system-maintainer-write-token="{systemMaintainerWriteToken}">
+       <div class="form-group">
+               <div class="input-group t3js-systemMaintainer-chosen" style="display:none">
+                       <span class="input-group-addon">System Maintainer:</span>
+                       <select
+                               class="chosen-select t3js-systemMaintainer-chosen-select"
+                               data-placeholder="none"
+                               style="width:100%;"
+                               multiple
+                               tabindex=""
+                       >
+                       </select>
+               </div>
        </div>
-</div>
 
-<div class="t3js-systemMaintainer-output"></div>
+       <div class="t3js-systemMaintainer-output"></div>
 
-<button
-       class="btn btn-default t3js-systemMaintainer-write"
-       type="button"
->
-       Save system maintainer list
-</button>
+       <button
+               class="btn btn-default t3js-systemMaintainer-write"
+               type="button"
+       >
+               Save system maintainer list
+       </button>
+</div>
index c984c43..0fb14f8 100644 (file)
@@ -3,17 +3,19 @@
        meaning they can be loaded without breaking the system.
 </p>
 
-<div style="display:none">
-       <div id="t3js-extensionCompatTester-loadExtLocalconf-token">{extensionCompatTesterLoadExtLocalconfToken}</div>
-       <div id="t3js-extensionCompatTester-loadExtTables-token">{extensionCompatTesterLoadExtTablesToken}</div>
-       <div id="t3js-extensionCompatTester-uninstallExtension-token">{extensionCompatTesterUninstallToken}</div>
-</div>
-<div class="t3js-extensionCompatTester-output"></div>
-<div class="btn-group">
-       <button class="btn btn-default t3js-extensionCompatTester-check" disabled>
-               Check extensions
-       </button>
-       <button class="btn btn-default t3js-extensionCompatTester-uninstall" style="display:none;">
-               Uninstall extension
-       </button>
+<div
+       class="t3js-module-content"
+       data-extension-compat-tester-load-ext_localconf-token="{extensionCompatTesterLoadExtLocalconfToken}"
+       data-extension-compat-tester-load-ext_tables-token="{extensionCompatTesterLoadExtTablesToken}"
+       data-extension-compat-tester-uninstall-extension-token="{extensionCompatTesterUninstallToken}"
+>
+       <div class="t3js-extensionCompatTester-output"></div>
+       <div class="btn-group">
+               <button class="btn btn-default t3js-extensionCompatTester-check" disabled>
+                       Check extensions
+               </button>
+               <button class="btn btn-default t3js-extensionCompatTester-uninstall" style="display:none;">
+                       Uninstall extension
+               </button>
+       </div>
 </div>
index a6c9e83..8387a4c 100644 (file)
@@ -9,10 +9,12 @@
        </a>
 </p>
 
-<div style="display:none;">
-       <div id="t3js-extensionScanner-files-token">{extensionScannerFilesToken}</div>
-       <div id="t3js-extensionScanner-scan-file-token">{extensionScannerScanFileToken}</div>
-       <div id="t3js-extensionScanner-mark-fully-scanned-rest-files-token">{extensionScannerMarkFullyScannedRestFilesToken}</div>
+<div
+       class="t3js-module-content"
+       data-extension-scanner-files-token="{extensionScannerFilesToken}"
+       data-extension-scanner-scan-file-token="{extensionScannerScanFileToken}"
+       data-extension-scanner-mark-fully-scanned-rest-files-token="{extensionScannerMarkFullyScannedRestFilesToken}"
+>
        <div id="t3js-extensionScanner-file-hit-template">
                <div class="panel panel-flat t3js-extensionScanner-hit-panel risk-medium">
                        <div class="panel-heading">
index 3501ae4..44d6d73 100644 (file)
-<div style="display:none">
-       <div id="t3js-upgradeDocs-markRead-token">{upgradeDocsMarkReadToken}</div>
-       <div id="t3js-upgradeDocs-unmarkRead-token">{upgradeDocsUnmarkReadToken}</div>
-</div>
-
-<div class="row">
-       <div class="col-md-12">
-               <div class="form-group">
-                       <div class="input-group">
-                               <span class="input-group-addon">Search:</span>
-                               <input
-                                       type="text"
-                                       class="form-control t3js-upgradeDocs-fulltext-search"
-                                       placeholder="search setting"
-                               >
+<div class="t3js-module-content" data-upgrade-cocs-mark-read-token="{upgradeDocsMarkReadToken}" data-upgrade-docs-unmark-read-token="{upgradeDocsUnmarkReadToken}">
+       <div class="row">
+               <div class="col-md-12">
+                       <div class="form-group">
+                               <div class="input-group">
+                                       <span class="input-group-addon">Search:</span>
+                                       <input
+                                               type="text"
+                                               class="form-control t3js-upgradeDocs-fulltext-search"
+                                               placeholder="search setting"
+                                       >
+                               </div>
                        </div>
                </div>
        </div>
-</div>
-<div class="row">
-       <div class="col-md-12">
-               <div class="form-group">
-                       <div class="input-group">
-                               <span class="input-group-addon">Filter by:</span>
-                               <select
-                                       class="chosen-select t3js-upgradeDocs-chosen-select"
-                                       data-placeholder=""
-                                       style="width:100%;"
-                                       multiple
-                                       tabindex=""
-                               >
-                               </select>
+       <div class="row">
+               <div class="col-md-12">
+                       <div class="form-group">
+                               <div class="input-group">
+                                       <span class="input-group-addon">Filter by:</span>
+                                       <select
+                                               class="chosen-select t3js-upgradeDocs-chosen-select"
+                                               data-placeholder=""
+                                               style="width:100%;"
+                                               multiple
+                                               tabindex=""
+                                       >
+                                       </select>
+                               </div>
                        </div>
                </div>
        </div>
-</div>
 
-<div class="panel-group panel-group-rst" role="tablist" aria-multiselectable="true">
-       <f:for each="{upgradeDocsFiles}" as="versionArray" key="version" iteration="iterator">
-               <f:if condition="{versionArray -> f:count()} > 0">
-                       <div class="panel panel-default panel-version">
-                               <div class="panel-heading" role="tab" id="heading-{iterator.index}">
-                                       <h2 class="panel-title">
-                                               <a href="#version-{iterator.index}"
-                                                       class="collapsed" data-toggle="collapse"
-                                                       aria-expanded="false"
-                                                       aria-controls="#version-{iterator.index}"
-                                               >
-                                                       <span class="caret"></span>
-                                                       Version: <strong>{version}</strong>
-                                               </a>
-                                       </h2>
-                               </div>
-                               <div class="panel-collapse collapse"
-                                       id="version-{iterator.index}" role="tabpanel" data-group-version="{version}">
-                                       <div class="panel-body" role="tablist" aria-multiselectable="false">
-                                               <f:for each="{versionArray}" as="fileArray" iteration="fileIterator">
-                                                       <f:render partial="Upgrade/UpgradeDocs/PanelItem"
-                                                               arguments="{id:'file-{iterator.index}-{fileIterator.index}', fileArray:fileArray, version:version}"/>
-                                               </f:for>
+       <div class="panel-group panel-group-rst" role="tablist" aria-multiselectable="true">
+               <f:for each="{upgradeDocsFiles}" as="versionArray" key="version" iteration="iterator">
+                       <f:if condition="{versionArray -> f:count()} > 0">
+                               <div class="panel panel-default panel-version">
+                                       <div class="panel-heading" role="tab" id="heading-{iterator.index}">
+                                               <h2 class="panel-title">
+                                                       <a href="#version-{iterator.index}"
+                                                                class="collapsed" data-toggle="collapse"
+                                                                aria-expanded="false"
+                                                                aria-controls="#version-{iterator.index}"
+                                                       >
+                                                               <span class="caret"></span>
+                                                               Version: <strong>{version}</strong>
+                                                       </a>
+                                               </h2>
+                                       </div>
+                                       <div class="panel-collapse collapse"
+                                                        id="version-{iterator.index}" role="tabpanel" data-group-version="{version}">
+                                               <div class="panel-body" role="tablist" aria-multiselectable="false">
+                                                       <f:for each="{versionArray}" as="fileArray" iteration="fileIterator">
+                                                               <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id:'file-{iterator.index}-{fileIterator.index}', fileArray:fileArray, version:version}"/>
+                                                       </f:for>
+                                               </div>
                                        </div>
                                </div>
-                       </div>
-               </f:if>
-       </f:for>
+                       </f:if>
+               </f:for>
 
-       <div class="panel panel-default panel-version">
-               <div class="panel-heading" role="tab" id="heading-read">
-                       <h2 class="panel-title">
-                               <a href="#collapseRead" class="collapsed" data-toggle="collapse" aria-expanded="false"
-                                       aria-controls="collapseRead">
-                                       <span class="caret"></span>
-                                       Files marked as read
-                               </a>
-                       </h2>
-               </div>
-               <div class="collapse" id="collapseRead" role="tabpanel">
-                       <div class="panel-body panel-body-read" role="tablist" aria-multiselectable="false">
-                               <f:for each="{upgradeDocsReadFiles}" as="fileArray" iteration="fileIterator">
-                                       <f:render partial="Upgrade/UpgradeDocs/PanelItem"
-                                               arguments="{id:'read-{fileIterator.index}', fileArray:fileArray, version:fileArray.section, read:'true'}"/>
-                               </f:for>
+               <div class="panel panel-default panel-version">
+                       <div class="panel-heading" role="tab" id="heading-read">
+                               <h2 class="panel-title">
+                                       <a href="#collapseRead" class="collapsed" data-toggle="collapse" aria-expanded="false"
+                                                aria-controls="collapseRead">
+                                               <span class="caret"></span>
+                                               Files marked as read
+                                       </a>
+                               </h2>
+                       </div>
+                       <div class="collapse" id="collapseRead" role="tabpanel">
+                               <div class="panel-body panel-body-read" role="tablist" aria-multiselectable="false">
+                                       <f:for each="{upgradeDocsReadFiles}" as="fileArray" iteration="fileIterator">
+                                               <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id:'read-{fileIterator.index}', fileArray:fileArray, version:fileArray.section, read:'true'}"/>
+                                       </f:for>
+                               </div>
                        </div>
                </div>
-       </div>
 
-       <div class="panel panel-default panel-version">
-               <div class="panel-heading" role="tab" id="heading-not-affected">
-                       <h2 class="panel-title">
-                               <a href="#collapseNotAffected" class="collapsed" data-toggle="collapse">
-                                       <span class="caret"></span>
-                                       Files marked as not affected by extension scanner
-                               </a>
-                       </h2>
-               </div>
-               <div class="collapse" id="collapseNotAffected" role="tabpanel">
-                       <div class="panel-body panel-body-not-affected" role="tablist" aria-multiselectable="false">
-                               <f:for each="{upgradeDocsNotAffectedFiles}" as="fileArray" iteration="fileIterator">
-                                       <f:render partial="Upgrade/UpgradeDocs/PanelItem"
-                                               arguments="{id:'scanner-{fileIterator.index}', fileArray:fileArray, version:fileArray.section, read:'true'}"
-                                       />
-                               </f:for>
+               <div class="panel panel-default panel-version">
+                       <div class="panel-heading" role="tab" id="heading-not-affected">
+                               <h2 class="panel-title">
+                                       <a href="#collapseNotAffected" class="collapsed" data-toggle="collapse">
+                                               <span class="caret"></span>
+                                               Files marked as not affected by extension scanner
+                                       </a>
+                               </h2>
+                       </div>
+                       <div class="collapse" id="collapseNotAffected" role="tabpanel">
+                               <div class="panel-body panel-body-not-affected" role="tablist" aria-multiselectable="false">
+                                       <f:for each="{upgradeDocsNotAffectedFiles}" as="fileArray" iteration="fileIterator">
+                                               <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id:'scanner-{fileIterator.index}', fileArray:fileArray, version:fileArray.section, read:'true'}"
+                                               />
+                                       </f:for>
+                               </div>
                        </div>
                </div>
        </div>
index bf136e6..0ad9d04 100644 (file)
@@ -4,11 +4,12 @@
        records or explicitly install extensions that ship with the latest TYPO3 version.
 </p>
 
-<div style="display:none">
-       <div id="t3js-upgradeWizards-markUndone-token">{upgradeWizardsMarkUndoneToken}</div>
-       <div id="t3js-upgradeWizards-input-token">{upgradeWizardsInputToken}</div>
-       <div id="t3js-upgradeWizards-execute-token">{upgradeWizardsExecuteToken}</div>
-
+<div
+       class="t3js-module-content"
+       data-upgrade-wizards-mark-undone-token="{upgradeWizardsMarkUndoneToken}"
+       data-upgrade-wizards-input-token="{upgradeWizardsInputToken}"
+       data-upgrade-wizards-execute-token="{upgradeWizardsExecuteToken}"
+>
        <div class="t3js-upgradeWizards-blocking-charset-template">
                <p>
                        The default database charset of the main MySQL database is not utf-8.
index e5cdaf0..5510640 100644 (file)
@@ -29,12 +29,9 @@ require([
 
   var Installer = {
     selectorBody: '.t3js-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorMainContent: '.t3js-installer-content',
     selectorProgressBar: '.t3js-installer-progress',
-    selectorExecuteDatabaseConnectToken: '#t3js-installer-databaseConnect-execute-token',
-    selectorExecuteDatabaseSelectToken: '#t3js-installer-databaseSelect-execute-token',
-    selectorExecuteDatabaseDataToken: '#t3js-installer-databaseData-execute-token',
-    selectorExecuteDefaultConfigurationToken: '#t3js-installer-defaultConfiguration-execute-token',
     selectorDatabaseConnectOutput: '.t3js-installer-databaseConnect-output',
     selectorDatabaseSelectOutput: '.t3js-installer-databaseSelect-output',
     selectorDatabaseDataOutput: '.t3js-installer-databaseData-output',
@@ -296,7 +293,7 @@ require([
       var $outputContainer = $(this.selectorDatabaseConnectOutput);
       var postData = {
         'install[action]': 'executeDatabaseConnect',
-        'install[token]': $(self.selectorExecuteDatabaseConnectToken).text()
+        'install[token]': $(self.selectorModuleContent).data('installer-database-connect-execute-token')
       };
       $($(this.selectorBody + ' form').serializeArray()).each(function() {
         postData[this.name] = this.value;
@@ -355,7 +352,7 @@ require([
       var $outputContainer = $(this.selectorDatabaseSelectOutput);
       var postData = {
         'install[action]': 'executeDatabaseSelect',
-        'install[token]': $(self.selectorExecuteDatabaseSelectToken).text()
+        'install[token]': $(self.selectorModuleContent).data('installer-database-select-execute-token')
       };
       $($(this.selectorBody + ' form').serializeArray()).each(function() {
         postData[this.name] = this.value;
@@ -414,7 +411,7 @@ require([
       var $outputContainer = $(this.selectorDatabaseDataOutput);
       var postData = {
         'install[action]': 'executeDatabaseData',
-        'install[token]': $(self.selectorExecuteDatabaseDataToken).text()
+        'install[token]': $(self.selectorModuleContent).data('installer-database-data-execute-token')
       };
       $($(this.selectorBody + ' form').serializeArray()).each(function() {
         postData[this.name] = this.value;
@@ -459,7 +456,7 @@ require([
       var self = this;
       var postData = {
         'install[action]': 'executeDefaultConfiguration',
-        'install[token]': $(self.selectorExecuteDefaultConfigurationToken).text()
+        'install[token]': $(self.selectorModuleContent).data('installer-default-configuration-execute-token')
       };
       $($(this.selectorBody + ' form').serializeArray()).each(function() {
         postData[this.name] = this.value;
index cb4ae8b..f500596 100644 (file)
@@ -25,7 +25,7 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorChangeToken: '#t3js-changeInstallToolPassword-token',
+    selectorModuleContent: '.t3js-module-content',
     selectorChangeTrigger: '.t3js-changeInstallToolPassword-change',
     selectorOutputContainer: '.t3js-changeInstallToolPassword-output',
     currentModal: {},
@@ -65,7 +65,7 @@ define([
 
     change: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorChangeToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('install-tool-token');
       $.ajax({
         url: Router.getUrl(),
         method: 'POST',
index 8cf0edc..f3e7617 100644 (file)
@@ -27,7 +27,7 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorClearToken: '#t3js-clearTables-clear-token',
+    selectorModuleContent: '.t3js-module-content',
     selectorClearTrigger: '.t3js-clearTables-clear',
     selectorStatsTrigger: '.t3js-clearTables-stats',
     selectorOutputContainer: '.t3js-clearTables-output',
@@ -90,7 +90,7 @@ define([
 
     clear: function(table) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorClearToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('clear-tables-clear-token');
       $.ajax({
         url: Router.getUrl(),
         method: 'POST',
index 9bf8a92..12b071d 100644 (file)
@@ -27,7 +27,7 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorDeleteToken: '#t3js-clearTypo3temp-delete-token',
+    selectorModuleContent: '.t3js-module-content',
     selectorDeleteTrigger: '.t3js-clearTypo3temp-delete',
     selectorOutputContainer: '.t3js-clearTypo3temp-output',
     selectorStatContainer: '.t3js-clearTypo3temp-stat-container',
@@ -89,7 +89,7 @@ define([
 
     delete: function(folder) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorDeleteToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('clear-typo3temp-delete-token');
       $.ajax({
         method: 'POST',
         url: Router.getUrl(),
index 76e5a03..1160a1b 100644 (file)
@@ -28,8 +28,8 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorCreateForm: '#t3js-createAdmin-form',
-    selectorCreateToken: '#t3js-createAdmin-token',
     selectorCreateTrigger: '.t3js-createAdmin-create',
     selectorOutputContainer: '.t3js-createAdmin-output',
     currentModal: {},
@@ -70,7 +70,7 @@ define([
 
     create: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorCreateToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('create-admin-token');
       $.ajax({
         url: Router.getUrl(),
         method: 'POST',
index f40f94f..1002ae1 100644 (file)
@@ -28,6 +28,7 @@ define([
   return {
 
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorAnalyzeTrigger: '.t3js-databaseAnalyzer-analyze',
     selectorExecuteTrigger: '.t3js-databaseAnalyzer-execute',
     selectorOutputContainer: '.t3js-databaseAnalyzer-output',
@@ -131,7 +132,7 @@ define([
 
     execute: function() {
       var self = this;
-      var executeToken = self.currentModal.find('#t3js-databaseAnalyzer-execute-token').text();
+      var executeToken = self.currentModal.find(self.selectorModuleContent).data('database-analyzer-execute-token');
       var selectedHashes = [];
       self.currentModal.find('.t3js-databaseAnalyzer-output .t3js-databaseAnalyzer-suggestion-line input:checked').each(function() {
         selectedHashes.push($(this).data('hash'));
index 25746ec..f79cb7a 100644 (file)
@@ -28,9 +28,7 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorLoadExtLocalconfToken: '#t3js-extensionCompatTester-loadExtLocalconf-token',
-    selectorLoadExtTablesToken: '#t3js-extensionCompatTester-loadExtTables-token',
-    selectorUninstallExtensionToken: '#t3js-extensionCompatTester-uninstallExtension-token',
+    selectorModuleContent: '.t3js-module-content',
     selectorCheckTrigger: '.t3js-extensionCompatTester-check',
     selectorUninstallTrigger: '.t3js-extensionCompatTester-uninstall',
     selectorOutputContainer: '.t3js-extensionCompatTester-output',
@@ -113,7 +111,7 @@ define([
 
     loadExtLocalconf: function(extension) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorLoadExtLocalconfToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('extension-compat-tester-load-ext_localconf-token');
       var $ajax = $.ajax({
         url: Router.getUrl(),
         method: 'POST',
@@ -137,7 +135,7 @@ define([
 
     loadExtTables: function(extension) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorLoadExtTablesToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('extension-compat-tester-load-ext_tables-token');
       var $ajax = $.ajax({
         url: Router.getUrl(),
         method: 'POST',
@@ -166,12 +164,11 @@ define([
      */
     uninstallExtension: function(extension) {
       var self = this;
-      var executeToken = self.currentModal.find(self.selectorUninstallExtensionToken).text();
+      var executeToken = self.currentModal.find(self.selectorModuleContent).data('extension-compat-tester-uninstall-extension-token');
       var modalContent = self.currentModal.find(self.selectorModalBody);
       var $outputContainer = $(this.selectorOutputContainer);
       var message = ProgressBar.render(Severity.loading, 'Loading...', '');
       $outputContainer.append(message);
-      console.log('ExtensionCompatTester.js@174', extension, executeToken);
       $.ajax({
         url: Router.getUrl(),
         cache: false,
index 28a39b8..2753fa6 100644 (file)
@@ -28,9 +28,9 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorContentContainer: '.t3js-extensionConfiguration-content',
     selectorFormListener: '.t3js-extensionConfiguration-form',
-    selectorWriteToken: '#t3js-extensionConfiguration-write-token',
     selectorOutputContainer: '.t3js-extensionConfiguration-output',
     selectorSearchInput: '.t3js-extensionConfiguration-search',
 
@@ -112,7 +112,7 @@ define([
      */
     write: function($form) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorWriteToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('extension-configuration-write-token');
       var extensionConfiguration = {};
       $.each($form.serializeArray(), function() {
         extensionConfiguration[this.name] = this.value;
index 2951e5c..e793789 100644 (file)
@@ -22,10 +22,8 @@ define(['jquery',
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     listOfAffectedRestFileHashes: [],
-    selectorFilesToken: '#t3js-extensionScanner-files-token',
-    selectorScanFileToken: '#t3js-extensionScanner-scan-file-token',
-    selectorMarkFullyScannedRestFilesToken: '#t3js-extensionScanner-mark-fully-scanned-rest-files-token',
     selectorExtensionContainer: '.t3js-extensionScanner-extension',
     selectorNumberOfFiles: '.t3js-extensionScanner-number-of-files',
     selectorScanSingleTrigger: '.t3js-extensionScanner-scan-single',
@@ -150,7 +148,7 @@ define(['jquery',
           data: {
             'install': {
               'action': 'extensionScannerMarkFullyScannedRestFiles',
-              'token': self.currentModal.find(self.selectorMarkFullyScannedRestFilesToken).text(),
+              'token': self.currentModal.find(self.selectorModuleContent).data('extension-scanner-mark-fully-scanned-rest-files-token'),
               'hashes': self.uniqueArray(this.listOfAffectedRestFileHashes)
             }
           },
@@ -186,7 +184,7 @@ define(['jquery',
      */
     scanSingleExtension: function(extension) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorFilesToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('extension-scanner-files-token');
       var modalContent = this.currentModal.find(self.selectorModalBody);
       var $extensionContainer = this.currentModal.find(this.getExtensionSelector(extension));
       var hitTemplate = '#t3js-extensionScanner-file-hit-template';
@@ -223,7 +221,7 @@ define(['jquery',
                   data: {
                     'install': {
                       'action': 'extensionScannerScanFile',
-                      'token': self.currentModal.find(self.selectorScanFileToken).text(),
+                      'token': self.currentModal.find(self.selectorModuleContent).data('extension-scanner-scan-file-token'),
                       'extension': extension,
                       'file': file
                     }
index 95ddb99..8fcf78e 100644 (file)
@@ -27,21 +27,18 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorOutputContainer: '.t3js-languagePacks-output',
     selectorContentContainer: '.t3js-languagePacks-mainContent',
     selectorActivateLanguage: '.t3js-languagePacks-activateLanguage',
-    selectorActivateLanguageToken: '#t3js-languagePacks-activateLanguage-token',
     selectorActivateLanguageIcon: '#t3js-languagePacks-activate-icon',
     selectorAddLanguageToggle: '.t3js-languagePacks-addLanguage-toggle',
     selectorLanguageInactive: '.t3js-languagePacks-inactive',
     selectorDeactivateLanguage: '.t3js-languagePacks-deactivateLanguage',
-    selectorDeactivateLanguageToken: '#t3js-languagePacks-deactivateLanguage-token',
     selectorDeactivateLanguageIcon: '#t3js-languagePacks-deactivate-icon',
     selectorUpdate: '.t3js-languagePacks-update',
-    selectorUpdatePackToken: '#t3js-languagePacks-updatePack-token',
     selectorLanguageUpdateIcon: '#t3js-languagePacks-languageUpdate-icon',
     selectorExtensionPackMissesIcon: '#t3js-languagePacks-extensionPack-misses-icon',
-    selectorUpdateIsoTimesToken: '#t3js-languagePacks-updateIsoTimes-token',
     selectorNotifications: '.t3js-languagePacks-notifications',
 
     currentModal: {},
@@ -132,7 +129,7 @@ define([
         data: {
           'install': {
             'action': 'languagePacksActivateLanguage',
-            'token': self.currentModal.find(this.selectorActivateLanguageToken).text(),
+            'token': self.currentModal.find(self.selectorModuleContent).data('language-packs-activate-language-token'),
             'iso': iso
           }
         },
@@ -171,7 +168,7 @@ define([
         data: {
           'install': {
             'action': 'languagePacksDeactivateLanguage',
-            'token': self.currentModal.find(this.selectorDeactivateLanguageToken).text(),
+            'token': self.currentModal.find(self.selectorModuleContent).data('language-packs-deactivate-language-token'),
             'iso': iso
           }
         },
@@ -236,7 +233,7 @@ define([
             data: {
               'install': {
                 'action': 'languagePacksUpdatePack',
-                'token': self.currentModal.find(self.selectorUpdatePackToken).text(),
+                'token': self.currentModal.find(self.selectorModuleContent).data('language-packs-update-pack-token'),
                 'iso': iso,
                 'extension': extension
               }
@@ -293,7 +290,7 @@ define([
             data: {
               'install': {
                 'action': 'languagePacksUpdateIsoTimes',
-                'token': self.currentModal.find(self.selectorUpdateIsoTimesToken).text(),
+                'token': self.currentModal.find(self.selectorModuleContent).data('language-packs-update-iso-times-token'),
                 'isos': isos
               }
             },
index c950324..56ec69d 100644 (file)
@@ -28,10 +28,10 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorToggleAllTrigger: '.t3js-localConfiguration-toggleAll',
     selectorWriteTrigger: '.t3js-localConfiguration-write',
     selectorSearchTrigger: '.t3js-localConfiguration-search',
-    selectorWriteToken: '#t3js-localConfiguration-write-token',
     selectorContentContainer: '.t3js-localConfiguration-content',
     selectorOutputContainer: '.t3js-localConfiguration-output',
     currentModal: {},
@@ -125,7 +125,7 @@ define([
 
     write: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorWriteToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('local-configuration-write-token');
       var configurationValues = {};
       self.currentModal.find('.t3js-localConfiguration-pathValue').each(function(i, element) {
         var $element = $(element);
index 705edb2..dbea150 100644 (file)
@@ -28,7 +28,7 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorSendToken: '#t3js-mailTest-token',
+    selectorModuleContent: '.t3js-module-content',
     selectorForm: '#t3js-mailTest-form',
     selectorEmail: '.t3js-mailTest-email',
     selectorOutputContainer: '.t3js-mailTest-output',
@@ -65,7 +65,7 @@ define([
 
     send: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorSendToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('mail-test-token');
       var $outputContainer = this.currentModal.find(this.selectorOutputContainer);
       var message = ProgressBar.render(Severity.loading, 'Loading...', '');
       $outputContainer.empty().html(message);
index 5e1e049..fc760bc 100644 (file)
@@ -27,10 +27,8 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
-    selectorGetContentToken: '#t3js-presets-getContent-token',
-    selectorActivateToken: '#t3js-presets-activate-token',
+    selectorModuleContent: '.t3js-presets-content',
     selectorActivateTrigger: '.t3js-presets-activate',
-    selectorContentContainer: '.t3js-presets-content',
     selectorOutputContainer: '.t3js-presets-output',
     selectorImageExecutable: '.t3js-presets-image-executable',
     selectorImageExecutableTrigger: '.t3js-presets-image-executable-trigger',
@@ -79,9 +77,9 @@ define([
 
     activate: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorActivateToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('presets-activate-token');
       var postData = {};
-      $(self.currentModal.find(this.selectorContentContainer + ' form').serializeArray()).each(function() {
+      $(self.currentModal.find(this.selectorModuleContent + ' form').serializeArray()).each(function() {
         postData[this.name] = this.value;
       });
       postData['install[action]'] = 'presetsActivate';
index 59cbd3c..afb2e21 100644 (file)
@@ -29,8 +29,8 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorWriteTrigger: '.t3js-systemMaintainer-write',
-    selectorWriteToken: '#t3js-systemMaintainer-write-token',
     selectorOutputContainer: '.t3js-systemMaintainer-output',
     selectorChosenContainer: '.t3js-systemMaintainer-chosen',
     selectorChosenField: '.t3js-systemMaintainer-chosen-select',
@@ -106,7 +106,7 @@ define([
 
     write: function() {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorWriteToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('system-maintainer-write-token');
       var selectedUsers = self.currentModal.find(this.selectorChosenField).val();
       $.ajax({
         method: 'POST',
index 90a355b..629e202 100644 (file)
@@ -29,9 +29,8 @@ define([
 
   return {
     selectorModalBody: '.t3js-modal-body',
+    selectorModuleContent: '.t3js-module-content',
     selectorContentContainer: '.t3js-upgradeDocs-content',
-    selectorMarkReadToken: '#t3js-upgradeDocs-markRead-token',
-    selectorUnmarkReadToken: '#t3js-upgradeDocs-unmarkRead-token',
     selectorRestFileItem: '.upgrade_analysis_item_to_filter',
     selectorFulltextSearch: '.t3js-upgradeDocs-fulltext-search',
     selectorChosenField: '.t3js-upgradeDocs-chosen-select',
@@ -206,7 +205,7 @@ define([
 
     markRead: function(element) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorMarkReadToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('upgrade-cocs-mark-read-token');
       var $button = $(element).closest('a');
       $button.toggleClass('t3js-upgradeDocs-unmarkRead t3js-upgradeDocs-markRead');
       $button.find('i').toggleClass('fa-check fa-ban');
@@ -229,7 +228,7 @@ define([
 
     unmarkRead: function(element) {
       var self = this;
-      var executeToken = self.currentModal.find(this.selectorUnmarkReadToken).text();
+      var executeToken = self.currentModal.find(this.selectorModuleContent).data('upgrade-docs-unmark-read-token');
       var $button = $(element).closest('a');
       var version = $button.closest('.panel').data('item-version');
       $button.toggleClass('t3js-upgradeDocs-markRead t3js-upgradeDocs-unmarkRead');
index aa426e2..fcf464c 100644 (file)
@@ -28,7 +28,7 @@ define([
 
     return {
       selectorModalBody: '.t3js-modal-body',
-      selectorMarkUndoneToken: '#t3js-upgradeWizards-markUndone-token',
+      selectorModuleContent: '.t3js-module-content',
       selectorOutputWizardsContainer: '.t3js-upgradeWizards-wizards-output',
       selectorOutputDoneContainer: '.t3js-upgradeWizards-done-output',
       selectorWizardsBlockingAddsTemplate: '.t3js-upgradeWizards-blocking-adds-template',
@@ -47,12 +47,10 @@ define([
       selectorWizardsListRowTitle: '.t3js-upgradeWizards-list-row-title',
       selectorWizardsListRowExplanation: '.t3js-upgradeWizards-list-row-explanation',
       selectorWizardsListRowExecute: '.t3js-upgradeWizards-list-row-execute',
-      selectorWizardsInputToken: '#t3js-upgradeWizards-input-token',
       selectorWizardsInputTemplate: '.t3js-upgradeWizards-input',
       selectorWizardsInputTitle: '.t3js-upgradeWizards-input-title',
       selectorWizardsInputHtml: '.t3js-upgradeWizards-input-html',
       selectorWizardsInputPerform: '.t3js-upgradeWizards-input-perform',
-      selectorWizardsExecuteToken: '#t3js-upgradeWizards-execute-token',
 
       loadingMessage: ProgressBar.render(Severity.loading, 'Loading...', ''),
 
@@ -320,7 +318,7 @@ define([
 
       wizardInput: function(identifier) {
         var self = this;
-        var executeToken = self.currentModal.find(this.selectorWizardsInputToken).text();
+        var executeToken = self.currentModal.find(this.selectorModuleContent).data('upgrade-wizards-input-token');
         var modalContent = this.currentModal.find(self.selectorModalBody);
         var $outputContainer = self.currentModal.find(self.selectorOutputWizardsContainer);
         $outputContainer.empty().html(this.loadingMessage);
@@ -362,7 +360,7 @@ define([
 
       wizardExecute: function(identifier) {
         var self = this;
-        var executeToken = self.currentModal.find(this.selectorWizardsExecuteToken).text();
+        var executeToken = self.currentModal.find(self.selectorModuleContent).data('upgrade-wizards-execute-token');
         var modalContent = this.currentModal.find(self.selectorModalBody);
         console.log(identifier);
         var postData = {
@@ -459,7 +457,7 @@ define([
 
       markUndone: function(identifier) {
         var self = this;
-        var executeToken = self.currentModal.find(this.selectorMarkUndoneToken).text();
+        var executeToken = self.currentModal.find(self.selectorModuleContent).data('upgrade-wizards-mark-undone-token');
         var modalContent = this.currentModal.find(self.selectorModalBody);
         var $outputContainer = this.currentModal.find(this.selectorOutputDoneContainer);
         $outputContainer.empty().html(this.loadingMessage);