From 149cb2892ad08f7f364b962d8a44325a68c61b6f Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@outlook.com>
Date: Sun, 21 Apr 2019 12:19:42 +0200
Subject: [PATCH] [TASK] Streamline formatting of html templates
The indentations in the HTML templates are out of control.
Even if we provide an EditorConfig, which should ensure
that the files are all uniformly indented. There seems to
have been an increasing aversion to TABS over time.
This has led to the fact that above all newly created templates
have always been indented with SPACES instead of TABS.
We now have a mix of TABS and SPACES in our project, partly
also in a single file.
To avoid this in the future, all existing templates were converted
to indentations with SPACES and the provided EditorConfig was
adapted. In order to really, really make sure that it doesn't get
out of hand, we also introduce a new linter, which ensures
that all HTML templates are properly indented.
Resolves: #88180
Releases: master
Change-Id: I86d23120bc68e3696f398b1ae76f1efc4804d501
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60522
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Oliver Wand <wand@itaw.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.editorconfig | 4 +-
Build/Gruntfile.js | 14 +-
Build/package.json | 1 +
Build/yarn.lock | 72 ++-
.../Resources/Private/Partials/About.html | 12 +-
.../Resources/Private/Partials/CoreTeam.html | 16 +-
.../Resources/Private/Partials/Credits.html | 16 +-
.../Resources/Private/Partials/Donation.html | 22 +-
.../Private/Partials/Extensions.html | 92 +--
.../Private/Partials/ExternalLibraries.html | 228 ++++----
.../Resources/Private/Partials/Logo.html | 6 +-
.../Resources/Private/Partials/Modules.html | 78 +--
.../Private/Templates/About/Index.html | 68 +--
.../Private/Partials/Data/TableKeyValue.html | 26 +-
.../Private/Partials/Modules/Item.html | 8 +-
.../Private/Layouts/ContextSensitiveHelp.html | 14 +-
.../Private/Layouts/ImageManipulation.html | 28 +-
.../Resources/Private/Layouts/Login.html | 228 ++++----
.../Private/Partials/Backend/Topbar.html | 64 +-
.../Resources/Private/Partials/ButtonBar.html | 28 +-
.../Partials/Clipboard/CopymodeSelector.html | 30 +-
.../Partials/Clipboard/MenuSelector.html | 24 +-
.../Private/Partials/Clipboard/Tab.html | 48 +-
.../Partials/Clipboard/TabContent.html | 88 +--
.../Partials/ContextSensitiveHelp/Manual.html | 68 +--
.../ContextSensitiveHelp/TableOfContents.html | 54 +-
.../Resources/Private/Partials/DocHeader.html | 110 ++--
.../ImageManipulation/ModalTitle.html | 10 +-
.../Partials/Login/InterfaceSelector.html | 30 +-
.../Resources/Private/Partials/LoginNews.html | 42 +-
.../Partials/Menus/SelectBoxJumpMenu.html | 6 +-
.../Private/Partials/RecordHistory/Diff.html | 26 +-
.../Partials/RecordHistory/History.html | 150 ++---
.../Partials/RecordHistory/MultipleDiff.html | 62 +-
.../Partials/RecordHistory/Settings.html | 146 ++---
.../ShortcutToolbarItem/Shortcut.html | 44 +-
.../Private/Templates/Avatar/Main.html | 16 +-
.../Private/Templates/Backend/Main.html | 38 +-
.../Private/Templates/Clipboard/Main.html | 62 +-
.../ContentElement/ElementInformation.html | 208 +++----
.../Templates/ContextSensitiveHelp/All.html | 12 +-
.../ContextSensitiveHelp/Detail.html | 6 +-
.../Templates/ContextSensitiveHelp/Index.html | 10 +-
.../Templates/DocumentTemplate/Collapse.html | 74 +--
.../DocumentTemplate/Partials/StateIcon.html | 8 +-
.../Templates/DocumentTemplate/Tabs.html | 94 +--
.../ImageManipulationElement.html | 154 ++---
.../ImageManipulationWizard.html | 160 ++---
.../Resources/Private/Templates/InfoBox.html | 2 +-
.../Resources/Private/Templates/Module.html | 44 +-
.../Private/Templates/ModuleMenu/Main.html | 64 +-
.../Templates/NewContentElement/Main.html | 72 +--
.../Templates/NewContentElement/MenuItem.html | 70 +--
.../Private/Templates/OuterWrapContainer.html | 26 +-
.../ShortcutToolbarItem/DropDown.html | 48 +-
.../ShortcutToolbarItem/EditForm.html | 34 +-
.../Templates/ShortcutToolbarItem/Item.html | 4 +-
.../Templates/SiteConfiguration/Edit.html | 2 +-
.../Templates/SiteConfiguration/Overview.html | 300 +++++-----
.../ToolbarItems/ClearCacheToolbarItem.html | 4 +-
.../ClearCacheToolbarItemDropDown.html | 34 +-
.../ClearCacheToolbarItemSingle.html | 2 +-
.../ToolbarItems/HelpToolbarItem.html | 4 +-
.../ToolbarItems/HelpToolbarItemDropDown.html | 36 +-
.../ToolbarItems/LiveSearchToolbarItem.html | 20 +-
.../SystemInformationDropDown.html | 106 ++--
.../SystemInformationToolbarItem.html | 4 +-
.../ToolbarItems/UserToolbarItem.html | 24 +-
.../ToolbarItems/UserToolbarItemDropDown.html | 104 ++--
.../Private/Templates/UserPassLoginForm.html | 40 +-
.../Resources/Private/Templates/blank.html | 2 +-
.../Templates/helper_javascript_css.html | 2 +-
.../Resources/Private/Layouts/Default.html | 2 +-
.../Private/Partials/Content/Filter.html | 272 ++++-----
.../Private/Partials/Content/LogEntries.html | 450 +++++++-------
.../Private/Templates/BackendLog/List.html | 28 +-
.../Resources/Private/Layouts/Default.html | 28 +-
.../Partials/BackendUser/IndexListRow.html | 172 +++---
.../Partials/BackendUser/OnlineListRow.html | 90 +--
.../BackendUserGroup/IndexListRow.html | 80 +--
.../BackendUserGroup/PaginatedListWidget.html | 2 +-
.../Partials/Filters/BackendUser/Index.html | 98 ++--
.../Partials/Permission/Groupname.html | 70 +--
.../Partials/Permission/Ownername.html | 70 +--
.../Templates/BackendUser/Compare.html | 396 ++++++-------
.../Private/Templates/BackendUser/Index.html | 88 +--
.../Private/Templates/BackendUser/Online.html | 38 +-
.../Templates/BackendUserGroup/Index.html | 14 +-
.../Private/Templates/Permission/Edit.html | 178 +++---
.../Private/Templates/Permission/Index.html | 350 +++++------
.../PermissionAjax/ChangePermission.html | 2 +-
.../Private/Templates/ErrorPage/Error.html | 87 ++-
.../Private/MVC/NotFoundView_Template.html | 2 +-
.../Resources/Private/Layouts/Main.html | 8 +-
.../Private/Partials/List/Distribution.html | 84 +--
.../Private/Partials/List/TerPaginator.html | 20 +-
.../List/TerShowVersionsSingleLine.html | 12 +-
.../Partials/List/TerShowVersionsTable.html | 32 +-
.../Private/Partials/List/TerSingleLine.html | 38 +-
.../Private/Partials/List/TerTable.html | 24 +-
.../Partials/List/UnresolvedDependencies.html | 38 +-
.../List/UnresolvedDependenciesMessage.html | 8 +-
.../Private/Partials/List/UpdateFromTer.html | 26 +-
.../Private/Partials/List/UploadForm.html | 6 +-
.../Private/Templates/Distribution/Show.html | 142 ++---
.../Private/Templates/List/Distributions.html | 64 +-
.../Private/Templates/List/Index.html | 184 +++---
.../Templates/List/ShowAllVersions.html | 106 ++--
.../Resources/Private/Templates/List/Ter.html | 64 +-
.../List/UnresolvedDependencies.html | 22 +-
.../Private/Templates/UpdateScript/Show.html | 22 +-
.../Templates/UploadExtensionFile/Form.html | 46 +-
.../Private/Templates/FrontendLogin.html | 192 +++---
.../Resources/Private/Layouts/Default.html | 6 +-
.../Private/Partials/SearchForm.html | 18 +-
.../Private/Templates/File/CreateFolder.html | 2 +-
.../Private/Templates/File/ReplaceFile.html | 10 +-
.../Private/Templates/FileList/Index.html | 82 +--
.../Private/Templates/FileList/Search.html | 414 ++++++-------
.../ViewHelpers/Be/Widget/Paginate/Index.html | 204 +++----
.../Widget/Autocomplete/Index.html | 8 +-
.../ViewHelpers/Widget/Paginate/Index.html | 116 ++--
.../Resources/Private/Layouts/Default.html | 94 +--
.../Private/Partials/Bullets/Type-0.html | 10 +-
.../Private/Partials/Bullets/Type-1.html | 10 +-
.../Private/Partials/Bullets/Type-2.html | 28 +-
.../Private/Partials/Footer/All.html | 6 +-
.../Private/Partials/Header/All.html | 36 +-
.../Private/Partials/Header/Date.html | 10 +-
.../Private/Partials/Header/Header.html | 88 +--
.../Private/Partials/Header/SubHeader.html | 70 +--
.../Private/Partials/Media/Gallery.html | 42 +-
.../Private/Partials/Media/Type.html | 18 +-
.../Private/Partials/Media/Type/Audio.html | 16 +-
.../Private/Partials/Media/Type/Image.html | 48 +-
.../Private/Partials/Media/Type/Video.html | 16 +-
.../Private/Partials/Table/Columns.html | 176 +++---
.../Resources/Private/Templates/Bullets.html | 2 +-
.../Resources/Private/Templates/Div.html | 2 +-
.../Resources/Private/Templates/Generic.html | 10 +-
.../Resources/Private/Templates/Html.html | 2 +-
.../Resources/Private/Templates/Image.html | 6 +-
.../Resources/Private/Templates/List.html | 2 +-
.../Private/Templates/MenuAbstract.html | 28 +-
.../Templates/MenuCategorizedContent.html | 22 +-
.../Templates/MenuCategorizedPages.html | 22 +-
.../Private/Templates/MenuPages.html | 22 +-
.../Templates/MenuRecentlyUpdated.html | 22 +-
.../Private/Templates/MenuRelatedPages.html | 22 +-
.../Private/Templates/MenuSection.html | 48 +-
.../Private/Templates/MenuSectionPages.html | 44 +-
.../Private/Templates/MenuSitemap.html | 26 +-
.../Private/Templates/MenuSitemapPages.html | 26 +-
.../Private/Templates/MenuSubpages.html | 22 +-
.../Resources/Private/Templates/Shortcut.html | 2 +-
.../Resources/Private/Templates/Table.html | 108 ++--
.../Resources/Private/Templates/Text.html | 2 +-
.../Private/Templates/Textmedia.html | 60 +-
.../Resources/Private/Templates/Textpic.html | 60 +-
.../Resources/Private/Templates/Uploads.html | 76 +--
.../Private/Backend/Layouts/FormEditor.html | 56 +-
.../FormEditor/Inspector/CheckboxEditor.html | 16 +-
.../CollectionElementHeaderEditor.html | 6 +-
.../FormEditor/Inspector/FinishersEditor.html | 16 +-
.../Inspector/FormElementHeaderEditor.html | 2 +-
...GridColumnViewPortConfigurationEditor.html | 26 +-
.../Inspector/MultiSelectEditor.html | 8 +-
.../Inspector/PropertyGridEditor.html | 82 +--
.../Inspector/RemoveElementEditor.html | 2 +-
.../Inspector/RequiredValidatorEditor.html | 30 +-
.../Inspector/SingleSelectEditor.html | 8 +-
.../FormEditor/Inspector/TextEditor.html | 40 +-
.../FormEditor/Inspector/TextareaEditor.html | 14 +-
.../Inspector/Typo3WinBrowserEditor.html | 30 +-
.../ValidationErrorMessageEditor.html | 18 +-
.../Inspector/ValidatorsEditor.html | 16 +-
.../FormEditor/Modals/InsertElements.html | 48 +-
.../FormEditor/Modals/InsertPages.html | 50 +-
.../FormEditor/Modals/ValidationErrors.html | 28 +-
.../FormEditor/Stage/ContentElement.html | 46 +-
.../Partials/FormEditor/Stage/Fieldset.html | 24 +-
.../FormEditor/Stage/FileUploadTemplate.html | 52 +-
.../FormEditor/Stage/SelectTemplate.html | 50 +-
.../FormEditor/Stage/SimpleTemplate.html | 48 +-
.../Partials/FormEditor/Stage/StaticText.html | 46 +-
.../FormEditor/Stage/_ElementToolbar.html | 62 +-
.../Backend/Templates/FormEditor/Index.html | 98 ++--
.../Templates/FormEditor/InlineTemplates.html | 6 +-
.../Backend/Templates/FormManager/Index.html | 226 +++----
.../Frontend/Partials/AdvancedPassword.html | 52 +-
.../Private/Frontend/Partials/Checkbox.html | 30 +-
.../Frontend/Partials/ContentElement.html | 42 +-
.../Private/Frontend/Partials/Date.html | 20 +-
.../Private/Frontend/Partials/DatePicker.html | 86 +--
.../Private/Frontend/Partials/Email.html | 20 +-
.../Frontend/Partials/Field/Field.html | 42 +-
.../Private/Frontend/Partials/Fieldset.html | 16 +-
.../Private/Frontend/Partials/FileUpload.html | 34 +-
.../Frontend/Partials/Form/Navigation.html | 48 +-
.../Frontend/Partials/GridContainer.html | 10 +-
.../Private/Frontend/Partials/GridRow.html | 14 +-
.../Private/Frontend/Partials/Hidden.html | 10 +-
.../Private/Frontend/Partials/Honeypot.html | 12 +-
.../Frontend/Partials/ImageUpload.html | 38 +-
.../Frontend/Partials/MultiCheckbox.html | 40 +-
.../Frontend/Partials/MultiSelect.html | 56 +-
.../Private/Frontend/Partials/Number.html | 20 +-
.../Private/Frontend/Partials/Page.html | 12 +-
.../Private/Frontend/Partials/Password.html | 18 +-
.../Frontend/Partials/RadioButton.html | 48 +-
.../Frontend/Partials/SingleSelect.html | 52 +-
.../Private/Frontend/Partials/StaticText.html | 16 +-
.../Frontend/Partials/SummaryPage.html | 84 +--
.../Private/Frontend/Partials/Telephone.html | 20 +-
.../Private/Frontend/Partials/Text.html | 18 +-
.../Private/Frontend/Partials/Textarea.html | 22 +-
.../Private/Frontend/Partials/Url.html | 20 +-
.../Templates/Finishers/Email/Html.html | 74 +--
.../Private/Frontend/Templates/Form.html | 32 +-
.../Private/Frontend/Templates/Render.html | 2 +-
.../Resources/Private/Layouts/Default.html | 6 +-
.../Private/Partials/ContentOverview.html | 184 +++---
.../Partials/Export/AdvancedOptions.html | 34 +-
.../Partials/Export/Configuration.html | 220 +++----
.../Private/Partials/Export/Save.html | 86 +--
.../Private/Partials/Import/Import.html | 158 ++---
.../Private/Partials/Import/MetaData.html | 48 +-
.../Private/Partials/Import/Upload.html | 36 +-
.../Templates/ImportExport/Export.html | 128 ++--
.../Templates/ImportExport/Import.html | 144 ++---
.../Resources/Private/Partials/Form.html | 194 +++---
.../Resources/Private/Partials/Rules.html | 8 +-
.../Private/Partials/Searchresult.html | 58 +-
.../Administration/ExternalDocuments.html | 124 ++--
.../Templates/Administration/Index.html | 212 +++----
.../Templates/Administration/Pages.html | 156 ++---
.../Templates/Administration/Statistic.html | 254 ++++----
.../Administration/StatisticDetails.html | 354 +++++------
.../Templates/Administration/WordDetail.html | 90 +--
.../Private/Templates/Search/Search.html | 142 ++---
.../Private/Partials/PageTsConfig/Page.html | 4 +-
.../fileadmin-temp-index.html | 4 +-
.../Private/Partials/Card/Header.html | 26 +-
.../Partials/Layout/MenuModuleLink.html | 20 +-
.../ExtensionConfiguration/ExtensionForm.html | 124 ++--
.../LocalConfiguration/SubSection.html | 244 ++++----
.../Partials/Settings/Presets/Context.html | 46 +-
.../Settings/Presets/Context/Custom.html | 54 +-
.../Settings/Presets/Context/Debug.html | 24 +-
.../Settings/Presets/Context/Live.html | 24 +-
.../Partials/Settings/Presets/Image.html | 98 ++--
.../Settings/Presets/Image/Custom.html | 54 +-
.../Presets/Image/GraphicsMagick.html | 48 +-
.../Settings/Presets/Image/ImageMagick6.html | 48 +-
.../Partials/Settings/Presets/Mail.html | 50 +-
.../Settings/Presets/Mail/Custom.html | 54 +-
.../Settings/Presets/Mail/Sendmail.html | 42 +-
.../Partials/Settings/Presets/Mail/Smtp.html | 28 +-
.../Settings/Presets/PasswordHashing.html | 52 +-
.../Presets/PasswordHashing/Argon2i.html | 54 +-
.../Presets/PasswordHashing/Bcrypt.html | 52 +-
.../Presets/PasswordHashing/Custom.html | 62 +-
.../Presets/PasswordHashing/Pbkdf2.html | 52 +-
.../Presets/PasswordHashing/Phpass.html | 52 +-
.../Upgrade/UpgradeDocs/PanelItem.html | 52 +-
.../Private/Templates/Environment/Cards.html | 108 ++--
.../Environment/EnvironmentCheck.html | 6 +-
.../Environment/FolderStructure.html | 24 +-
.../Environment/ImageProcessing.html | 408 ++++++-------
.../Templates/Environment/MailTest.html | 60 +-
.../Templates/Environment/PhpInfo.html | 2 +-
.../Environment/SystemInformation.html | 100 ++--
.../Private/Templates/Installer/Init.html | 26 +-
.../Templates/Installer/MainLayout.html | 26 +-
.../Installer/ShowDatabaseConnect.html | 550 +++++++++---------
.../Templates/Installer/ShowDatabaseData.html | 142 ++---
.../Installer/ShowDatabaseSelect.html | 152 ++---
.../Installer/ShowDefaultConfiguration.html | 90 +--
.../Installer/ShowEnvironmentAndFolders.html | 54 +-
.../Installer/ShowInstallerNotAvailable.html | 18 +-
.../Private/Templates/Layout/Init.html | 36 +-
.../Private/Templates/Layout/MainLayout.html | 236 ++++----
.../Login/ShowEnableInstallToolFile.html | 50 +-
.../Private/Templates/Login/ShowLogin.html | 86 +--
.../Private/Templates/Maintenance/Cards.html | 164 +++---
.../Templates/Maintenance/ClearTables.html | 60 +-
.../Maintenance/ClearTypo3tempFiles.html | 62 +-
.../Templates/Maintenance/CreateAdmin.html | 114 ++--
.../Maintenance/DatabaseAnalyzer.html | 104 ++--
.../Templates/Maintenance/LanguagePacks.html | 32 +-
.../Private/Templates/Settings/Cards.html | 108 ++--
.../Settings/ChangeInstallToolPassword.html | 62 +-
.../ExtensionConfigurationGetContent.html | 24 +-
.../Settings/FeaturesGetContent.html | 62 +-
.../LocalConfigurationGetContent.html | 40 +-
.../Templates/Settings/PresetsGetContent.html | 26 +-
.../Templates/Settings/SystemMaintainer.html | 56 +-
.../Private/Templates/Upgrade/Cards.html | 128 ++--
.../Private/Templates/Upgrade/CoreUpdate.html | 54 +-
.../Upgrade/ExtensionCompatTester.html | 30 +-
.../Templates/Upgrade/ExtensionScanner.html | 182 +++---
.../Templates/Upgrade/TcaExtTablesCheck.html | 4 +-
.../Templates/Upgrade/TcaMigrationsCheck.html | 10 +-
.../UpgradeDocsGetChangelogForVersion.html | 18 +-
.../Upgrade/UpgradeDocsGetContent.html | 166 +++---
.../Templates/Upgrade/UpgradeWizards.html | 196 +++----
.../Private/Templates/mailtemplate.html | 18 +-
.../Private/Templates/mod_template.html | 82 +--
.../Templates/Backend/Configuration.html | 66 +--
.../Templates/Backend/CustomSearch.html | 22 +-
.../Templates/Backend/IntegrityOverview.html | 14 +-
.../Templates/Backend/RecordStatistics.html | 132 ++---
.../Templates/Backend/ReferenceIndex.html | 12 +-
.../Private/Templates/Backend/Relations.html | 54 +-
.../Templates/ToolbarItems/DropDown.html | 108 ++--
.../Templates/ToolbarItems/ToolbarItem.html | 2 +-
.../Private/Templates/LinkBrowser/File.html | 66 +--
.../Private/Templates/LinkBrowser/Folder.html | 64 +-
.../Private/Templates/LinkBrowser/Mail.html | 34 +-
.../Private/Templates/LinkBrowser/Page.html | 82 +--
.../Private/Templates/LinkBrowser/Record.html | 24 +-
.../Templates/LinkBrowser/Telephone.html | 34 +-
.../Private/Templates/LinkBrowser/Url.html | 46 +-
.../Partials/RecordsTable/DeletedRecord.html | 100 ++--
.../Private/Templates/Ajax/RecordsTable.html | 14 +-
.../Templates/RecyclerModule/Index.html | 124 ++--
.../Private/Partials/Pagination.html | 196 +++----
.../Templates/Management/Overview.html | 346 +++++------
.../Resources/Private/Layouts/Default.html | 2 +-
.../Private/Templates/Report/Detail.html | 18 +-
.../Private/Templates/Report/Index.html | 36 +-
.../Backend/SchedulerModule/ServerTime.html | 4 +-
.../Backend/SchedulerModule/TaskList.html | 346 +++++------
.../Backend/SchedulerModule/CheckScreen.html | 6 +-
.../Backend/SchedulerModule/EditTask.html | 36 +-
.../Backend/SchedulerModule/InfoScreen.html | 78 +--
.../SchedulerModule/InfoScreenNoClasses.html | 2 +-
.../Backend/SchedulerModule/ListTasks.html | 8 +-
.../Private/Templates/Note/List.html | 88 +--
.../Resources/Private/Templates/InfoBox.html | 2 +-
.../Resources/Private/Templates/Main.html | 2 +-
.../Private/Templates/NoTemplate.html | 2 +-
.../Resources/Private/Templates/PageZero.html | 8 +-
.../TemplateAnalyzerModuleFunction.html | 14 +-
.../TemplateObjectBrowserModuleFunction.html | 428 +++++++-------
.../Resources/Private/Layouts/DocHeader.html | 12 +-
.../Private/Templates/ViewModule/Show.html | 154 ++---
.../Resources/Private/Layouts/Module.html | 2 +-
.../Resources/Private/Layouts/Nodoc.html | 24 +-
.../Resources/Private/Partials/Legend.html | 12 +-
.../Private/Partials/Navigation.html | 68 +--
.../Partials/Preview/StageButtons.html | 6 +-
.../Private/Partials/WorkingTable.html | 178 +++---
.../Templates/Preview/Ajax/StageButtons.html | 2 +-
.../Private/Templates/Preview/Index.html | 132 ++---
.../Private/Templates/Review/FullIndex.html | 4 +-
.../Private/Templates/Review/Index.html | 30 +-
.../Private/Templates/Review/SingleIndex.html | 4 +-
.../Templates/ToolbarItems/DropDown.html | 102 ++--
.../Templates/ToolbarItems/ToolbarItem.html | 4 +-
360 files changed, 11623 insertions(+), 11545 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index d72178db1695..66125aea26fe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,8 +17,8 @@ indent_size = 4
# HTML-Files
[*.html]
-indent_style = tab
-indent_size = 2
+indent_style = space
+indent_size = 4
# TMPL-Files
[*.tmpl]
diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js
index 82da7bbe32d9..b763abca5d1a 100644
--- a/Build/Gruntfile.js
+++ b/Build/Gruntfile.js
@@ -551,6 +551,16 @@ module.exports = function (grunt) {
}
]
}
+ },
+ lintspaces: {
+ html: {
+ src: [
+ '<%= paths.sysext %>*/Resources/Private/**/*.html'
+ ],
+ options: {
+ editorconfig: '../.editorconfig'
+ }
+ }
}
});
@@ -564,6 +574,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-tslint');
grunt.loadNpmTasks('grunt-stylelint');
+ grunt.loadNpmTasks('grunt-lintspaces');
grunt.loadNpmTasks('grunt-contrib-imagemin');
/**
@@ -583,8 +594,9 @@ module.exports = function (grunt) {
* this task does the following things:
* - tslint
* - stylelint
+ * - lintspaces
*/
- grunt.registerTask('lint', ['tslint', 'stylelint']);
+ grunt.registerTask('lint', ['tslint', 'stylelint', 'lintspaces']);
/**
* grunt format
diff --git a/Build/package.json b/Build/package.json
index 27b1e25aa5a3..3d1868d3e05b 100644
--- a/Build/package.json
+++ b/Build/package.json
@@ -45,6 +45,7 @@
"grunt-contrib-uglify": "3.3.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-exec": "^2.0.0",
+ "grunt-lintspaces": "^0.8.5",
"grunt-npm-install": "^0.3.1",
"grunt-npmcopy": "^0.1.0",
"grunt-postcss": "^0.8.0",
diff --git a/Build/yarn.lock b/Build/yarn.lock
index 1776d9e062ee..8ddc9192928d 100644
--- a/Build/yarn.lock
+++ b/Build/yarn.lock
@@ -1327,6 +1327,11 @@ commander@^2.12.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+commander@^2.19.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+ integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
commander@^2.9.0, commander@~2.14.1:
version "2.14.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
@@ -1863,6 +1868,11 @@ dateformat@^2.0.0:
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
+dateformat@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+ integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+
debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2230,6 +2240,16 @@ editorconfig@^0.13.2:
semver "^5.1.0"
sigmund "^1.0.1"
+editorconfig@^0.15.0:
+ version "0.15.3"
+ resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+ integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+ dependencies:
+ commander "^2.19.0"
+ lru-cache "^4.1.5"
+ semver "^5.6.0"
+ sigmund "^1.0.1"
+
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3365,6 +3385,14 @@ grunt-legacy-util@~1.1.1:
underscore.string "~3.3.4"
which "~1.3.0"
+grunt-lintspaces@^0.8.5:
+ version "0.8.5"
+ resolved "https://registry.yarnpkg.com/grunt-lintspaces/-/grunt-lintspaces-0.8.5.tgz#b517230f83c62e7cacdf3df6e6b514a68eff414e"
+ integrity sha512-km8PlO5Jm5Re10UWVSwux+d/IATsVqXZKX/YdQvSX2LoN6DFeq6Fqo2s+lV2qgZoLhdtQ9xTr7xbDVLmEgGM/Q==
+ dependencies:
+ junitwriter "^0.4.1"
+ lintspaces "^0.6.2"
+
grunt-npm-install@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/grunt-npm-install/-/grunt-npm-install-0.3.1.tgz#916170595e370e2078e1dfb04224331db1de8437"
@@ -4573,6 +4601,16 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
+junitwriter@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/junitwriter/-/junitwriter-0.4.1.tgz#351cc0548c1ba7e15f040d392f671860bd05cbff"
+ integrity sha512-v4U/uX3xlpAFl09yNEZjkfF7bxUPOxXVJ7U/nDTLIXI+svpCK3/jxVoMEUdkvSPenxNR47pAAS4qs/BpVFulRA==
+ dependencies:
+ dateformat "^3.0.3"
+ merge "^1.2.1"
+ mkdirp "^0.5.1"
+ xmlbuilder "^10.1.1"
+
karma-chrome-launcher@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -4813,6 +4851,15 @@ libnpx@^10.2.0:
y18n "^4.0.0"
yargs "^11.0.0"
+lintspaces@^0.6.2:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/lintspaces/-/lintspaces-0.6.3.tgz#44a7de459032bcfbcb8b92d049070be8b4c90f32"
+ integrity sha512-nUwq/jK+gUhpILtV9Ms2cuF16LB9a8nnecowSQD5LRNX3+h1Bl1zIvPZNQgJYeK9xxuoR+HuWnjagQsvyJbS4w==
+ dependencies:
+ deep-extend "^0.6.0"
+ editorconfig "^0.15.0"
+ rc "^1.2.8"
+
livereload-js@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
@@ -5106,6 +5153,14 @@ lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
pseudomap "^1.0.2"
yallist "^2.1.2"
+lru-cache@^4.1.5:
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+ integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+ dependencies:
+ pseudomap "^1.0.2"
+ yallist "^2.1.2"
+
make-dir@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
@@ -5219,6 +5274,11 @@ merge-stream@^1.0.0:
dependencies:
readable-stream "^2.0.1"
+merge@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+ integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
version "2.3.11"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -6856,7 +6916,7 @@ raw-body@~2.1.5:
iconv-lite "0.4.13"
unpipe "1.0.0"
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7484,6 +7544,11 @@ semver@^5.0.3, semver@^5.4.1, semver@^5.5.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
+semver@^5.6.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+ integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -9065,6 +9130,11 @@ xmlbuilder@8.2.2:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
+xmlbuilder@^10.1.1:
+ version "10.1.1"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz#8cae6688cc9b38d850b7c8d3c0a4161dcaf475b0"
+ integrity sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==
+
xmlhttprequest-ssl@~1.5.4:
version "1.5.5"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
diff --git a/typo3/sysext/about/Resources/Private/Partials/About.html b/typo3/sysext/about/Resources/Private/Partials/About.html
index e9ea241e47d3..c5d23d0710b9 100644
--- a/typo3/sysext/about/Resources/Private/Partials/About.html
+++ b/typo3/sysext/about/Resources/Private/Partials/About.html
@@ -1,8 +1,8 @@
<p>
- {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:cms_description',
- arguments: '{
- 0: currentVersion,
- 1: "© {copyrightYear}",
- 2: "Kasper Skårhøj"
- }') -> f:format.raw()}
+ {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:cms_description',
+ arguments: '{
+ 0: currentVersion,
+ 1: "© {copyrightYear}",
+ 2: "Kasper Skårhøj"
+ }') -> f:format.raw()}
</p>
diff --git a/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html b/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
index 5deef90482f3..b68ca17bfbab 100644
--- a/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
+++ b/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
@@ -1,10 +1,10 @@
<div class="panel panel-default">
- <div class="panel-body panel-body-highlightlinks">
- <h2 class="h4">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:coredevs" />
- </h2>
- <p>
- {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:coredevs_detail') -> f:format.raw()}
- </p>
- </div>
+ <div class="panel-body panel-body-highlightlinks">
+ <h2 class="h4">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:coredevs" />
+ </h2>
+ <p>
+ {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:coredevs_detail') -> f:format.raw()}
+ </p>
+ </div>
</div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Credits.html b/typo3/sysext/about/Resources/Private/Partials/Credits.html
index b10298b84053..00c4364dc947 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Credits.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Credits.html
@@ -1,10 +1,10 @@
<div class="panel panel-default">
- <div class="panel-body panel-body-highlightlinks">
- <h2 class="h4">
- {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:community_credits') -> f:format.raw()}
- </h2>
- <p>
- {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:information_detail') -> f:format.raw()}
- </p>
- </div>
+ <div class="panel-body panel-body-highlightlinks">
+ <h2 class="h4">
+ {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:community_credits') -> f:format.raw()}
+ </h2>
+ <p>
+ {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:information_detail') -> f:format.raw()}
+ </p>
+ </div>
</div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Donation.html b/typo3/sysext/about/Resources/Private/Partials/Donation.html
index 27516ee2c099..17fdb7ba04b6 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Donation.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Donation.html
@@ -1,13 +1,13 @@
<div class="panel panel-default">
- <div class="panel-body panel-body-highlightlinks">
- <h2 class="h4">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_header" />
- </h2>
- <p>
- {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_message') -> f:format.raw()}
- </p>
- <a href="{donationUrl}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_button')}" target="_blank">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_button" />
- </a>
- </div>
+ <div class="panel-body panel-body-highlightlinks">
+ <h2 class="h4">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_header" />
+ </h2>
+ <p>
+ {f:translate(key: 'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_message') -> f:format.raw()}
+ </p>
+ <a href="{donationUrl}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_button')}" target="_blank">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:donation_button" />
+ </a>
+ </div>
</div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Extensions.html b/typo3/sysext/about/Resources/Private/Partials/Extensions.html
index 9282ffb35f72..d4f181aa8e52 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Extensions.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Extensions.html
@@ -1,48 +1,48 @@
<f:if condition="{loadedExtensions}">
- <div class="panel panel-default">
- <div class="panel-body panel-body-highlightlinks">
- <h2 class="h3">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_authors" />
- </h2>
- <p>
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_list_info" />
- </p>
- </div>
- <table class="table panel-table">
- <thead>
- <tr>
- <th width="60%"><f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension" /></th>
- <th><f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_author" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{loadedExtensions}" as="loadedExtension">
- <tr>
- <td>
- {loadedExtension.title} ({loadedExtension.key})
- </td>
- <td>
- <f:for each="{loadedExtension.authors}" as="extensionAuthor" iteration="i">
- <f:if condition="{extensionAuthor.email}">
- <f:then>
- <f:link.email
- email="{extensionAuthor.email}?subject={f:format.urlencode(value:'Thanks for your {loadedExtension.title} extension')}"
- >
- {extensionAuthor.name}
- </f:link.email>
- </f:then>
- <f:else>
- {extensionAuthor.name}
- </f:else>
- </f:if>
- <f:if condition="{i.isLast} == false">
- <br>
- </f:if>
- </f:for>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-body panel-body-highlightlinks">
+ <h2 class="h3">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_authors" />
+ </h2>
+ <p>
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_list_info" />
+ </p>
+ </div>
+ <table class="table panel-table">
+ <thead>
+ <tr>
+ <th width="60%"><f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension" /></th>
+ <th><f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:extension_author" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{loadedExtensions}" as="loadedExtension">
+ <tr>
+ <td>
+ {loadedExtension.title} ({loadedExtension.key})
+ </td>
+ <td>
+ <f:for each="{loadedExtension.authors}" as="extensionAuthor" iteration="i">
+ <f:if condition="{extensionAuthor.email}">
+ <f:then>
+ <f:link.email
+ email="{extensionAuthor.email}?subject={f:format.urlencode(value:'Thanks for your {loadedExtension.title} extension')}"
+ >
+ {extensionAuthor.name}
+ </f:link.email>
+ </f:then>
+ <f:else>
+ {extensionAuthor.name}
+ </f:else>
+ </f:if>
+ <f:if condition="{i.isLast} == false">
+ <br>
+ </f:if>
+ </f:for>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
</f:if>
diff --git a/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html b/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
index 49c45c723713..41bad08f9f21 100644
--- a/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
+++ b/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
@@ -1,116 +1,116 @@
<div class="panel panel-default">
- <div class="panel-body panel-body-highlightlinks">
- <h2 class="h3">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:external_libraries" />
- </h2>
- <p>
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:external_thanks" />
- </p>
- </div>
- <table class="table panel-table">
- <tr>
- <td>Composer</td>
- <td><a href="https://getcomposer.org" target="_blank" rel="noopener noreferrer">getcomposer.org</a></td>
- </tr>
- <tr>
- <td>jQuery</td>
- <td><a href="https://jquery.com" target="_blank" rel="noopener noreferrer">jquery.com</a></td>
- </tr>
- <tr>
- <td>Twitter Bootstrap</td>
- <td><a href="http://getbootstrap.com" target="_blank" rel="noopener noreferrer">getbootstrap.com</a></td>
- </tr>
- <tr>
- <td>Swift Mailer</td>
- <td><a href="http://swiftmailer.org" target="_blank" rel="noopener noreferrer">swiftmailer.org</a></td>
- </tr>
- <tr>
- <td>Doctrine Project (DBAL Component and Instantiator)</td>
- <td><a href="http://www.doctrine-project.org/projects/dbal.html" target="_blank" rel="noopener noreferrer">doctrine-project.org</a></td>
- </tr>
- <tr>
- <td>Symfony Framework (YAML, Console and Finder Component)</td>
- <td><a href="https://symfony.com" target="_blank" rel="noopener noreferrer">symfony.com</a></td>
- </tr>
- <tr>
- <td>Guzzle PHP</td>
- <td><a href="http://guzzlephp.org" target="_blank" rel="noopener noreferrer">guzzlephp.org</a></td>
- </tr>
- <tr>
- <td>d3 Data Driven Documents</td>
- <td><a href="https://d3js.org" target="_blank" rel="noopener noreferrer">d3js.org</a></td>
- </tr>
- <tr>
- <td>CKEditor</td>
- <td><a href="http://ckeditor.com" target="_blank" rel="noopener noreferrer">ckeditor.com</a></td>
- </tr>
- <tr>
- <td>RequireJS</td>
- <td><a href="http://requirejs.org" target="_blank" rel="noopener noreferrer">requirejs.org</a></td>
- </tr>
- <tr>
- <td>moment.js</td>
- <td><a href="https://momentjs.com" target="_blank" rel="noopener noreferrer">momentjs.com</a></td>
- </tr>
- <tr>
- <td>NProgress</td>
- <td><a href="http://ricostacruz.com/nprogress/" target="_blank" rel="noopener noreferrer">ricostacruz.com</a></td>
- </tr>
- <tr>
- <td>jQuery UI</td>
- <td><a href="https://jqueryui.com" target="_blank" rel="noopener noreferrer">jqueryui.com</a></td>
- </tr>
- <tr>
- <td>Twitter Bootstrap Plugin: DateTimePicker</td>
- <td><a href="https://eonasdan.github.io/bootstrap-datetimepicker/" target="_blank" rel="noopener noreferrer">eonasdan.github.io</a></td>
- </tr>
- <tr>
- <td>Twitter Bootstrap Plugin: Slider</td>
- <td><a href="http://seiyria.com/bootstrap-slider/" target="_blank" rel="noopener noreferrer">seiyria.com</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: Ajax AutoComplete</td>
- <td><a href="https://www.devbridge.com/sourcery/components/jquery-autocomplete/" target="_blank" rel="noopener noreferrer">devbridge.com</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: Autosize</td>
- <td><a href="http://www.jacklmoore.com/autosize/" target="_blank" rel="noopener noreferrer">jacklmoore.com</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: Cropper</td>
- <td><a href="https://fengyuanchen.github.io/cropper/" target="_blank" rel="noopener noreferrer">fengyuanchen.github.io</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: DataTables</td>
- <td><a href="https://datatables.net" target="_blank" rel="noopener noreferrer">datatables.net</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: ImagesLoaded</td>
- <td><a href="http://imagesloaded.desandro.com" target="_blank" rel="noopener noreferrer">imagesloaded.desandro.com</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: MiniColors</td>
- <td><a href="http://labs.abeautifulsite.net/jquery-minicolors/" target="_blank" rel="noopener noreferrer">labs.abeautifulsite.net</a></td>
- </tr>
- <tr>
- <td>jQuery Plugin: Tab Override</td>
- <td><a href="http://wjbryant.github.io/taboverride/" target="_blank" rel="noopener noreferrer">wjbryant.github.io</a></td>
- </tr>
- <tr>
- <td>Neos (Form component)</td>
- <td><a href="https://www.neos.io" target="_blank" rel="noopener noreferrer">neos.io</a></td>
- </tr>
- <tr>
- <td>FineDiff</td>
- <td><a href="https://github.com/cogpowered/FineDiff" target="_blank" rel="noopener noreferrer">github.com</a></td>
- </tr>
- <tr>
- <td>IDNA Convert</td>
- <td><a href="https://idnaconv.net" target="_blank" rel="noopener noreferrer">idnaconv.net</a></td>
- </tr>
- <tr>
- <td>CodeMirror</td>
- <td><a href="http://codemirror.net" target="_blank" rel="noopener noreferrer">codemirror.net</a></td>
- </tr>
- </table>
+ <div class="panel-body panel-body-highlightlinks">
+ <h2 class="h3">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:external_libraries" />
+ </h2>
+ <p>
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:external_thanks" />
+ </p>
+ </div>
+ <table class="table panel-table">
+ <tr>
+ <td>Composer</td>
+ <td><a href="https://getcomposer.org" target="_blank" rel="noopener noreferrer">getcomposer.org</a></td>
+ </tr>
+ <tr>
+ <td>jQuery</td>
+ <td><a href="https://jquery.com" target="_blank" rel="noopener noreferrer">jquery.com</a></td>
+ </tr>
+ <tr>
+ <td>Twitter Bootstrap</td>
+ <td><a href="http://getbootstrap.com" target="_blank" rel="noopener noreferrer">getbootstrap.com</a></td>
+ </tr>
+ <tr>
+ <td>Swift Mailer</td>
+ <td><a href="http://swiftmailer.org" target="_blank" rel="noopener noreferrer">swiftmailer.org</a></td>
+ </tr>
+ <tr>
+ <td>Doctrine Project (DBAL Component and Instantiator)</td>
+ <td><a href="http://www.doctrine-project.org/projects/dbal.html" target="_blank" rel="noopener noreferrer">doctrine-project.org</a></td>
+ </tr>
+ <tr>
+ <td>Symfony Framework (YAML, Console and Finder Component)</td>
+ <td><a href="https://symfony.com" target="_blank" rel="noopener noreferrer">symfony.com</a></td>
+ </tr>
+ <tr>
+ <td>Guzzle PHP</td>
+ <td><a href="http://guzzlephp.org" target="_blank" rel="noopener noreferrer">guzzlephp.org</a></td>
+ </tr>
+ <tr>
+ <td>d3 Data Driven Documents</td>
+ <td><a href="https://d3js.org" target="_blank" rel="noopener noreferrer">d3js.org</a></td>
+ </tr>
+ <tr>
+ <td>CKEditor</td>
+ <td><a href="http://ckeditor.com" target="_blank" rel="noopener noreferrer">ckeditor.com</a></td>
+ </tr>
+ <tr>
+ <td>RequireJS</td>
+ <td><a href="http://requirejs.org" target="_blank" rel="noopener noreferrer">requirejs.org</a></td>
+ </tr>
+ <tr>
+ <td>moment.js</td>
+ <td><a href="https://momentjs.com" target="_blank" rel="noopener noreferrer">momentjs.com</a></td>
+ </tr>
+ <tr>
+ <td>NProgress</td>
+ <td><a href="http://ricostacruz.com/nprogress/" target="_blank" rel="noopener noreferrer">ricostacruz.com</a></td>
+ </tr>
+ <tr>
+ <td>jQuery UI</td>
+ <td><a href="https://jqueryui.com" target="_blank" rel="noopener noreferrer">jqueryui.com</a></td>
+ </tr>
+ <tr>
+ <td>Twitter Bootstrap Plugin: DateTimePicker</td>
+ <td><a href="https://eonasdan.github.io/bootstrap-datetimepicker/" target="_blank" rel="noopener noreferrer">eonasdan.github.io</a></td>
+ </tr>
+ <tr>
+ <td>Twitter Bootstrap Plugin: Slider</td>
+ <td><a href="http://seiyria.com/bootstrap-slider/" target="_blank" rel="noopener noreferrer">seiyria.com</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: Ajax AutoComplete</td>
+ <td><a href="https://www.devbridge.com/sourcery/components/jquery-autocomplete/" target="_blank" rel="noopener noreferrer">devbridge.com</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: Autosize</td>
+ <td><a href="http://www.jacklmoore.com/autosize/" target="_blank" rel="noopener noreferrer">jacklmoore.com</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: Cropper</td>
+ <td><a href="https://fengyuanchen.github.io/cropper/" target="_blank" rel="noopener noreferrer">fengyuanchen.github.io</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: DataTables</td>
+ <td><a href="https://datatables.net" target="_blank" rel="noopener noreferrer">datatables.net</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: ImagesLoaded</td>
+ <td><a href="http://imagesloaded.desandro.com" target="_blank" rel="noopener noreferrer">imagesloaded.desandro.com</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: MiniColors</td>
+ <td><a href="http://labs.abeautifulsite.net/jquery-minicolors/" target="_blank" rel="noopener noreferrer">labs.abeautifulsite.net</a></td>
+ </tr>
+ <tr>
+ <td>jQuery Plugin: Tab Override</td>
+ <td><a href="http://wjbryant.github.io/taboverride/" target="_blank" rel="noopener noreferrer">wjbryant.github.io</a></td>
+ </tr>
+ <tr>
+ <td>Neos (Form component)</td>
+ <td><a href="https://www.neos.io" target="_blank" rel="noopener noreferrer">neos.io</a></td>
+ </tr>
+ <tr>
+ <td>FineDiff</td>
+ <td><a href="https://github.com/cogpowered/FineDiff" target="_blank" rel="noopener noreferrer">github.com</a></td>
+ </tr>
+ <tr>
+ <td>IDNA Convert</td>
+ <td><a href="https://idnaconv.net" target="_blank" rel="noopener noreferrer">idnaconv.net</a></td>
+ </tr>
+ <tr>
+ <td>CodeMirror</td>
+ <td><a href="http://codemirror.net" target="_blank" rel="noopener noreferrer">codemirror.net</a></td>
+ </tr>
+ </table>
</div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Logo.html b/typo3/sysext/about/Resources/Private/Partials/Logo.html
index d446c7e7d953..74367e58d256 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Logo.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Logo.html
@@ -1,8 +1,8 @@
<img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'backend')}" width="150"
- alt="{f:translate(key:'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:typo3_logo')}" />
+ alt="{f:translate(key:'LLL:EXT:about/Resources/Private/Language/Modules/about.xlf:typo3_logo')}" />
<br>
<br>
<h1>
- TYPO3 CMS {currentVersion}<br>
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext" />
+ TYPO3 CMS {currentVersion}<br>
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext" />
</h1>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Modules.html b/typo3/sysext/about/Resources/Private/Partials/Modules.html
index c879af0c8cc3..71ac507211ac 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Modules.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Modules.html
@@ -1,43 +1,43 @@
<p>
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext2" />
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext2" />
</p>
<f:for each="{modules}" as="mainModule">
- <f:if condition="{mainModule.subModules}">
- <f:if condition="{mainModule.label}">
- <h2>{f:translate(key: mainModule.label)}</h2>
- </f:if>
- <section class="card-container">
- <f:for each="{mainModule.subModules}" as="subModule" iteration="subModuleIterator">
- <a
- href="#"
- onclick="top.goToModule('{mainModule.name}_{subModule.name}'); return false;"
- title="{f:if(condition: subModule.shortDescription, then: '{f:translate(key: subModule.shortDescription)}')}"
- class="card card-size-medium"
- >
- <div class="card-header">
- <div class="card-icon">
- <core:icon identifier="{subModule.iconIdentifier}" size="default" />
- </div>
- <f:if condition="{subModule.label}">
- <div class="card-header-body">
- <h3 class="card-title">
- {f:translate(key: subModule.label)}
- </h3>
- <f:if condition="{subModule.shortDescription}">
- <span class="card-subtitle">
- <f:translate key="{subModule.shortDescription}" />
- </span>
- </f:if>
- <f:if condition="{subModule.longDescription}">
- <div class="card-longdesc">
- {f:translate(key: subModule.longDescription) -> f:format.raw()}
- </div>
- </f:if>
- </div>
- </f:if>
- </div>
- </a>
- </f:for>
- </section>
- </f:if>
+ <f:if condition="{mainModule.subModules}">
+ <f:if condition="{mainModule.label}">
+ <h2>{f:translate(key: mainModule.label)}</h2>
+ </f:if>
+ <section class="card-container">
+ <f:for each="{mainModule.subModules}" as="subModule" iteration="subModuleIterator">
+ <a
+ href="#"
+ onclick="top.goToModule('{mainModule.name}_{subModule.name}'); return false;"
+ title="{f:if(condition: subModule.shortDescription, then: '{f:translate(key: subModule.shortDescription)}')}"
+ class="card card-size-medium"
+ >
+ <div class="card-header">
+ <div class="card-icon">
+ <core:icon identifier="{subModule.iconIdentifier}" size="default" />
+ </div>
+ <f:if condition="{subModule.label}">
+ <div class="card-header-body">
+ <h3 class="card-title">
+ {f:translate(key: subModule.label)}
+ </h3>
+ <f:if condition="{subModule.shortDescription}">
+ <span class="card-subtitle">
+ <f:translate key="{subModule.shortDescription}" />
+ </span>
+ </f:if>
+ <f:if condition="{subModule.longDescription}">
+ <div class="card-longdesc">
+ {f:translate(key: subModule.longDescription) -> f:format.raw()}
+ </div>
+ </f:if>
+ </div>
+ </f:if>
+ </div>
+ </a>
+ </f:for>
+ </section>
+ </f:if>
</f:for>
diff --git a/typo3/sysext/about/Resources/Private/Templates/About/Index.html b/typo3/sysext/about/Resources/Private/Templates/About/Index.html
index 875ec4d87f2d..c3057f114426 100644
--- a/typo3/sysext/about/Resources/Private/Templates/About/Index.html
+++ b/typo3/sysext/about/Resources/Private/Templates/About/Index.html
@@ -1,39 +1,39 @@
<div class="container-small about-module">
- <f:render partial="Logo" arguments="{_all}" />
+ <f:render partial="Logo" arguments="{_all}" />
- <f:if condition="{warnings}">
- <f:be.infobox title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.header')}" state="2">
- <f:if condition="{f:count(subject: warnings)} > 1">
- <f:then>
- <ul>
- <f:for each="{warnings}" as="warning">
- <li>{warning -> f:format.raw()}</li>
- </f:for>
- </ul>
- </f:then>
- <f:else>
- <p>
- <f:for each="{warnings}" as="warning">
- {warning -> f:format.raw()}
- </f:for>
- </p>
- </f:else>
- </f:if>
- </f:be.infobox>
- </f:if>
+ <f:if condition="{warnings}">
+ <f:be.infobox title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.header')}" state="2">
+ <f:if condition="{f:count(subject: warnings)} > 1">
+ <f:then>
+ <ul>
+ <f:for each="{warnings}" as="warning">
+ <li>{warning -> f:format.raw()}</li>
+ </f:for>
+ </ul>
+ </f:then>
+ <f:else>
+ <p>
+ <f:for each="{warnings}" as="warning">
+ {warning -> f:format.raw()}
+ </f:for>
+ </p>
+ </f:else>
+ </f:if>
+ </f:be.infobox>
+ </f:if>
- <f:render partial="About" arguments="{_all}" />
- <f:render partial="Modules" arguments="{_all}" />
- <f:render partial="Donation" arguments="{_all}" />
- <f:render partial="Credits" arguments="{_all}" />
- <f:render partial="CoreTeam" arguments="{_all}" />
- <f:render partial="ExternalLibraries" arguments="{_all}" />
- <f:render partial="Extensions" arguments="{_all}" />
+ <f:render partial="About" arguments="{_all}" />
+ <f:render partial="Modules" arguments="{_all}" />
+ <f:render partial="Donation" arguments="{_all}" />
+ <f:render partial="Credits" arguments="{_all}" />
+ <f:render partial="CoreTeam" arguments="{_all}" />
+ <f:render partial="ExternalLibraries" arguments="{_all}" />
+ <f:render partial="Extensions" arguments="{_all}" />
- <p>
- <em class="text-muted">
- <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:endText" />
- </em>
- </p>
- <p>{copyRightNotice -> f:format.raw()}</p>
+ <p>
+ <em class="text-muted">
+ <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:endText" />
+ </em>
+ </p>
+ <p>{copyRightNotice -> f:format.raw()}</p>
</div>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
index c2a5bb3d9ce2..40b0e7b3e850 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:adm="http://typo3.org/ns/TYPO3/CMS/Adminpanel/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{data}">
- <f:if condition="{label}">
- <h2 class="typo3-adminPanel-headline">{label}</h2>
- </f:if>
- <div class="typo3-adminPanel-table-overflow">
+ <f:if condition="{label}">
+ <h2 class="typo3-adminPanel-headline">{label}</h2>
+ </f:if>
+ <div class="typo3-adminPanel-table-overflow">
<table class="typo3-adminPanel-table typo3-adminPanel-table-debug">
<thead>
<tr>
@@ -23,15 +23,15 @@
<f:if condition="{val as float} === {val}"><f:variable name="typeClass" value="float" /></f:if>
<f:if condition="{adm:isArray(value: val)}"><f:variable name="typeClass" value="array" /></f:if>
<f:switch expression="{typeClass}">
- <f:case value="string">
- <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}"><f:if condition="{val}"><f:translate key="{val}" default="{val}" extensionName="adminpanel"/></f:if></pre>
- </f:case>
- <f:case value="array">
- <f:render partial="Data/TableKeyValue" arguments="{data: val}" />
- </f:case>
- <f:defaultCase>
- <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}">{val}</pre>
- </f:defaultCase>
+ <f:case value="string">
+ <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}"><f:if condition="{val}"><f:translate key="{val}" default="{val}" extensionName="adminpanel"/></f:if></pre>
+ </f:case>
+ <f:case value="array">
+ <f:render partial="Data/TableKeyValue" arguments="{data: val}" />
+ </f:case>
+ <f:defaultCase>
+ <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}">{val}</pre>
+ </f:defaultCase>
</f:switch>
</td>
</tr>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
index adf3e934844f..273aa3214237 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:adm="http://typo3.org/ns/TYPO3/CMS/Adminpanel/ViewHelpers"
- data-namespace-typo3-fluid="true">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:adm="http://typo3.org/ns/TYPO3/CMS/Adminpanel/ViewHelpers"
+ data-namespace-typo3-fluid="true">
<div class="typo3-adminPanel-module{f:if(condition: uid, then: ' typo3-adminPanel-module-{uid}')}">
<div class="typo3-adminPanel-module-trigger" data-typo3-role="typo3-adminPanel-module-trigger">
<f:if condition="{icon}"><span class="typo3-adminPanel-module-trigger-icon">{icon -> f:format.raw()}</span></f:if>
@@ -57,7 +57,7 @@
<div class="typo3-adminPanel-content-panes-item{f:if(condition:'{subModulesIterator.isFirst}',then:' typo3-adminPanel-content-panes-item-active')}" data-typo3-role="typo3-adminPanel-content-pane" data-typo3-tab-id="{sub.identifier}">
<f:if condition="{sub.label}"><h1 class="typo3-adminPanel-headline">{sub.label}</h1></f:if>
<f:format.raw>
- <adm:subModuleRender data="{data}" module="{sub}"/>
+ <adm:subModuleRender data="{data}" module="{sub}"/>
</f:format.raw>
</div>
</f:for>
diff --git a/typo3/sysext/backend/Resources/Private/Layouts/ContextSensitiveHelp.html b/typo3/sysext/backend/Resources/Private/Layouts/ContextSensitiveHelp.html
index 2738dec68952..e6a1a51b45c5 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/ContextSensitiveHelp.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/ContextSensitiveHelp.html
@@ -1,11 +1,11 @@
<div class="tx_cshmanual">
- <f:render section="content" />
+ <f:render section="content" />
- <hr />
- <div class="t3-copyright-notice">
+ <hr />
+ <div class="t3-copyright-notice">
- <p>
- <f:format.raw>{copyright}</f:format.raw>
- </p>
- </div>
+ <p>
+ <f:format.raw>{copyright}</f:format.raw>
+ </p>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
index 05351ecbc8ba..40d1311457b7 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
@@ -1,16 +1,16 @@
<div class="t3js-formengine-field-item">
- {fieldInformation -> f:format.raw()}
- <div class="form-wizards-wrap">
- <div class="form-wizards-element">
- <f:render section="Main" />
- </div>
- <div class="form-wizards-items-aside">
- <div class="btn-group">
- {fieldControl -> f:format.raw()}
- </div>
- </div>
- <div class="form-wizards-items-bottom">
- {fieldWizard -> f:format.raw()}
- </div>
- </div>
+ {fieldInformation -> f:format.raw()}
+ <div class="form-wizards-wrap">
+ <div class="form-wizards-element">
+ <f:render section="Main" />
+ </div>
+ <div class="form-wizards-items-aside">
+ <div class="btn-group">
+ {fieldControl -> f:format.raw()}
+ </div>
+ </div>
+ <div class="form-wizards-items-bottom">
+ {fieldWizard -> f:format.raw()}
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Layouts/Login.html b/typo3/sysext/backend/Resources/Private/Layouts/Login.html
index 8bd4807ac4a9..e028983a8477 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/Login.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/Login.html
@@ -1,119 +1,119 @@
<div class="typo3-login">
- <div class="typo3-login-inner">
- <div class="typo3-login-container">
- <div class="typo3-login-wrap">
- <div class="panel panel-lg panel-login">
- <div class="panel-body">
- <div class="typo3-login-logo">
- <img src="{logo}" class="typo3-login-image" alt="" />
- </div>
- <f:if condition="{formType} == 'LoginForm'">
- <f:then>
- <f:if condition="{hasLoginError}">
- <div class="t3js-login-error" id="t3-login-error">
- <div class="alert alert-danger">
- <strong><f:translate key="login.error.message" /></strong>
- <p><f:translate key="login.error.description" /></p>
- </div>
- </div>
- </f:if>
- <noscript>
- <f:be.infobox message="{f:translate(key: 'login.error.javascript')}" state="2" />
- </noscript>
- <div class="hidden t3js-login-error-nocookies">
- <f:be.infobox message="{f:translate(key: 'login.error.cookies')}" state="2" />
- </div>
- <div class="typo3-login-form t3js-login-formfields">
- <form action="?loginProvider={loginProviderIdentifier}" method="post" name="loginform" id="typo3-login-form">
- <f:form.hidden name="login_status" value="login" />
- <f:form.hidden name="userident" id="t3-field-userident" class="t3js-login-userident-field" value="" />
- <f:form.hidden name="redirect_url" value="{redirectUrl}" />
- <f:form.hidden name="loginRefresh" value="{loginRefresh}" />
+ <div class="typo3-login-inner">
+ <div class="typo3-login-container">
+ <div class="typo3-login-wrap">
+ <div class="panel panel-lg panel-login">
+ <div class="panel-body">
+ <div class="typo3-login-logo">
+ <img src="{logo}" class="typo3-login-image" alt="" />
+ </div>
+ <f:if condition="{formType} == 'LoginForm'">
+ <f:then>
+ <f:if condition="{hasLoginError}">
+ <div class="t3js-login-error" id="t3-login-error">
+ <div class="alert alert-danger">
+ <strong><f:translate key="login.error.message" /></strong>
+ <p><f:translate key="login.error.description" /></p>
+ </div>
+ </div>
+ </f:if>
+ <noscript>
+ <f:be.infobox message="{f:translate(key: 'login.error.javascript')}" state="2" />
+ </noscript>
+ <div class="hidden t3js-login-error-nocookies">
+ <f:be.infobox message="{f:translate(key: 'login.error.cookies')}" state="2" />
+ </div>
+ <div class="typo3-login-form t3js-login-formfields">
+ <form action="?loginProvider={loginProviderIdentifier}" method="post" name="loginform" id="typo3-login-form">
+ <f:form.hidden name="login_status" value="login" />
+ <f:form.hidden name="userident" id="t3-field-userident" class="t3js-login-userident-field" value="" />
+ <f:form.hidden name="redirect_url" value="{redirectUrl}" />
+ <f:form.hidden name="loginRefresh" value="{loginRefresh}" />
- <f:render partial="Login/InterfaceSelector" arguments="{_all}" />
+ <f:render partial="Login/InterfaceSelector" arguments="{_all}" />
- <f:render section="loginFormFields" />
+ <f:render section="loginFormFields" />
- <div class="form-group" id="t3-login-submit-section">
- <button class="btn btn-block btn-login t3js-login-submit" id="t3-login-submit" type="submit" name="commandLI" data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> {f:translate(key: 'login.process')}" autocomplete="off">
- <f:translate key="login.submit" />
- </button>
- </div>
- <ul class="list-unstyled typo3-login-links">
- <f:for each="{loginProviders}" as="provider" key="providerKey">
- <f:if condition="{provider.label}">
- <f:if condition="{loginProviderIdentifier} != {providerKey}">
- <li class="t3js-loginprovider-switch" data-providerkey="{providerKey}"><a href="?loginProvider={providerKey}"><i class="fa fa-fw {provider.icon-class}"></i> <span><f:translate key="{provider.label}" /></span></a></li>
- </f:if>
- </f:if>
- </f:for>
- </ul>
- </form>
- </div>
- </f:then>
- <f:else>
- <form action="index.php" method="post" name="loginform">
- <input type="hidden" name="login_status" value="logout" />
- <div class="t3-login-box-body">
- <div class="t3-login-logout-form">
- <div class="t3-login-username">
- <div class="t3-login-label t3-username">
- <f:translate key="login.username" />
- </div>
- <div class="t3-username-current">
- {backendUser.username}
- </div>
- </div>
- <f:if condition="{showInterfaceSelector}">
- <f:then>
- <div class="t3-login-interface">
- <div class="t3-login-label t3-interface-selector">
- <f:translate key="login.interface" />
- </div>
- <f:form.select name="users" options="{interfaces}" optionValueField="jumpScript" optionLabelField="label" />
- </div>
- </f:then>
- <f:else>
- <f:if condition="{interface}">
- <f:form.hidden name="interface" value="{interface}" />
- </f:if>
- </f:else>
- </f:if>
- <input type="hidden" name="p_field" value="" />
- <input class="btn btn-block btn-lg" type="submit" name="commandLO" value="{f:translate(key: 'login.submit')}" id="t3-login-submit" />
- </div>
- </div>
- </form>
- </f:else>
- </f:if>
- </div>
- <f:render partial="LoginNews" arguments="{_all}" />
- <div class="panel-footer">
- <div class="typo3-login-copyright-wrap">
- <a href="#loginCopyright" class="typo3-login-copyright-link collapsed" data-toggle="collapse" aria-expanded="false" aria-controls="loginCopyright">
- <span><f:translate key="login.copyrightLink" /></span>
- <img src="{images.typo3}" alt="{f:translate(key: 'login.typo3Logo')}" width="70" height="20" />
- </a>
- <div id="loginCopyright" class="collapse">
- <div class="typo3-login-copyright-text">
- <p>
- <f:format.raw>{copyright}</f:format.raw>
- </p>
- <ul class="list-unstyled">
- <li><a href="https://typo3.org" target="_blank" class="t3-login-link-typo3"><i class="fa fa-external-link"></i> TYPO3.org</a></li>
- <li><a href="https://typo3.org/donate/online-donation/" target="_blank" class="t3-login-link-donate"><i class="fa fa-external-link"></i> <f:translate key="login.donate" /></a></li>
- </ul>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <f:if condition="{loginFootnote}">
- <div class="typo3-login-footnote">
- <p>{loginFootnote}</p>
- </div>
- </f:if>
- </div>
+ <div class="form-group" id="t3-login-submit-section">
+ <button class="btn btn-block btn-login t3js-login-submit" id="t3-login-submit" type="submit" name="commandLI" data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> {f:translate(key: 'login.process')}" autocomplete="off">
+ <f:translate key="login.submit" />
+ </button>
+ </div>
+ <ul class="list-unstyled typo3-login-links">
+ <f:for each="{loginProviders}" as="provider" key="providerKey">
+ <f:if condition="{provider.label}">
+ <f:if condition="{loginProviderIdentifier} != {providerKey}">
+ <li class="t3js-loginprovider-switch" data-providerkey="{providerKey}"><a href="?loginProvider={providerKey}"><i class="fa fa-fw {provider.icon-class}"></i> <span><f:translate key="{provider.label}" /></span></a></li>
+ </f:if>
+ </f:if>
+ </f:for>
+ </ul>
+ </form>
+ </div>
+ </f:then>
+ <f:else>
+ <form action="index.php" method="post" name="loginform">
+ <input type="hidden" name="login_status" value="logout" />
+ <div class="t3-login-box-body">
+ <div class="t3-login-logout-form">
+ <div class="t3-login-username">
+ <div class="t3-login-label t3-username">
+ <f:translate key="login.username" />
+ </div>
+ <div class="t3-username-current">
+ {backendUser.username}
+ </div>
+ </div>
+ <f:if condition="{showInterfaceSelector}">
+ <f:then>
+ <div class="t3-login-interface">
+ <div class="t3-login-label t3-interface-selector">
+ <f:translate key="login.interface" />
+ </div>
+ <f:form.select name="users" options="{interfaces}" optionValueField="jumpScript" optionLabelField="label" />
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{interface}">
+ <f:form.hidden name="interface" value="{interface}" />
+ </f:if>
+ </f:else>
+ </f:if>
+ <input type="hidden" name="p_field" value="" />
+ <input class="btn btn-block btn-lg" type="submit" name="commandLO" value="{f:translate(key: 'login.submit')}" id="t3-login-submit" />
+ </div>
+ </div>
+ </form>
+ </f:else>
+ </f:if>
+ </div>
+ <f:render partial="LoginNews" arguments="{_all}" />
+ <div class="panel-footer">
+ <div class="typo3-login-copyright-wrap">
+ <a href="#loginCopyright" class="typo3-login-copyright-link collapsed" data-toggle="collapse" aria-expanded="false" aria-controls="loginCopyright">
+ <span><f:translate key="login.copyrightLink" /></span>
+ <img src="{images.typo3}" alt="{f:translate(key: 'login.typo3Logo')}" width="70" height="20" />
+ </a>
+ <div id="loginCopyright" class="collapse">
+ <div class="typo3-login-copyright-text">
+ <p>
+ <f:format.raw>{copyright}</f:format.raw>
+ </p>
+ <ul class="list-unstyled">
+ <li><a href="https://typo3.org" target="_blank" class="t3-login-link-typo3"><i class="fa fa-external-link"></i> TYPO3.org</a></li>
+ <li><a href="https://typo3.org/donate/online-donation/" target="_blank" class="t3-login-link-donate"><i class="fa fa-external-link"></i> <f:translate key="login.donate" /></a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <f:if condition="{loginFootnote}">
+ <div class="typo3-login-footnote">
+ <p>{loginFootnote}</p>
+ </div>
+ </f:if>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Backend/Topbar.html b/typo3/sysext/backend/Resources/Private/Partials/Backend/Topbar.html
index 4b64fc207638..577e44249fe3 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Backend/Topbar.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Backend/Topbar.html
@@ -1,36 +1,36 @@
<div class="scaffold-topbar t3js-scaffold-topbar" data-topbar-identifier="topbar">
- <div class="topbar">
- <div class="topbar-header t3js-topbar-header">
- <button class="topbar-button topbar-button-modulemenu t3js-topbar-button-modulemenu">
- <core:icon identifier="actions-menu" alternativeMarkupIdentifier="inline" />
- </button>
- <button class="topbar-button topbar-button-navigationcomponent t3js-topbar-button-navigationcomponent">
- <core:icon identifier="actions-pagetree" alternativeMarkupIdentifier="inline" />
- </button>
- <div class="topbar-header-site">
- <a href="./" target="_top" title="{siteName} - {applicationVersion}">
- <span class="topbar-header-site-logo">
- <img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
- </span>
- <span class="topbar-header-site-title">
- <span class="topbar-header-site-name">{siteName}</span>
- <span class="topbar-header-site-version">{applicationVersion}</span>
- </span>
- </a>
- </div>
- <button class="topbar-button topbar-button-toolbar t3js-topbar-button-toolbar">
- <core:icon identifier="actions-system-extension-configure" alternativeMarkupIdentifier="inline" />
- </button>
- <button class="topbar-button topbar-button-search t3js-topbar-button-search">
- <core:icon identifier="actions-search" alternativeMarkupIdentifier="inline" />
- </button>
- </div>
- </div>
+ <div class="topbar">
+ <div class="topbar-header t3js-topbar-header">
+ <button class="topbar-button topbar-button-modulemenu t3js-topbar-button-modulemenu">
+ <core:icon identifier="actions-menu" alternativeMarkupIdentifier="inline" />
+ </button>
+ <button class="topbar-button topbar-button-navigationcomponent t3js-topbar-button-navigationcomponent">
+ <core:icon identifier="actions-pagetree" alternativeMarkupIdentifier="inline" />
+ </button>
+ <div class="topbar-header-site">
+ <a href="./" target="_top" title="{siteName} - {applicationVersion}">
+ <span class="topbar-header-site-logo">
+ <img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
+ </span>
+ <span class="topbar-header-site-title">
+ <span class="topbar-header-site-name">{siteName}</span>
+ <span class="topbar-header-site-version">{applicationVersion}</span>
+ </span>
+ </a>
+ </div>
+ <button class="topbar-button topbar-button-toolbar t3js-topbar-button-toolbar">
+ <core:icon identifier="actions-system-extension-configure" alternativeMarkupIdentifier="inline" />
+ </button>
+ <button class="topbar-button topbar-button-search t3js-topbar-button-search">
+ <core:icon identifier="actions-search" alternativeMarkupIdentifier="inline" />
+ </button>
+ </div>
+ </div>
</div>
<div class="scaffold-toolbar t3js-scaffold-toolbar" data-toolbar-identifier="toolbar">
- <div class="toolbar t3js-topbar-toolbar">
- <ul class="toolbar-list" data-typo3-role="typo3-module-menu">
- <f:format.raw>{toolbar}</f:format.raw>
- </ul>
- </div>
+ <div class="toolbar t3js-topbar-toolbar">
+ <ul class="toolbar-list" data-typo3-role="typo3-module-menu">
+ <f:format.raw>{toolbar}</f:format.raw>
+ </ul>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/ButtonBar.html b/typo3/sysext/backend/Resources/Private/Partials/ButtonBar.html
index 128d6a5cc0f5..57a0c4cd0a41 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ButtonBar.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ButtonBar.html
@@ -1,16 +1,16 @@
<div class="btn-toolbar" role="toolbar" aria-label="">
- <f:for each="{buttons}" as="buttonGroup">
- <f:if condition="{buttonGroup -> f:count()} > 1">
- <f:then>
- <div class="btn-group" role="group" aria-label="">
- <f:for each="{buttonGroup}" as="button">
- {button -> f:format.raw()}
- </f:for>
- </div>
- </f:then>
- <f:else>
- {buttonGroup.0 -> f:format.raw()}
- </f:else>
- </f:if>
- </f:for>
+ <f:for each="{buttons}" as="buttonGroup">
+ <f:if condition="{buttonGroup -> f:count()} > 1">
+ <f:then>
+ <div class="btn-group" role="group" aria-label="">
+ <f:for each="{buttonGroup}" as="button">
+ {button -> f:format.raw()}
+ </f:for>
+ </div>
+ </f:then>
+ <f:else>
+ {buttonGroup.0 -> f:format.raw()}
+ </f:else>
+ </f:if>
+ </f:for>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/CopymodeSelector.html b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/CopymodeSelector.html
index 3b1251c57582..bf96693f1590 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/CopymodeSelector.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/CopymodeSelector.html
@@ -1,17 +1,17 @@
<div class="btn-group">
- <button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <f:if condition="{currentMode} == 'copy'">
- <f:then>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:copyElements')}
- </f:then>
- <f:else>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:moveElements')}
- </f:else>
- </f:if>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="copymodeSelector">
- <li><a href="#" onclick="document.getElementById('clipboard_form').method='POST'; document.getElementById('clipboard_form').action={actionCopyModeUrl}; document.getElementById('clipboard_form').submit(); return true;">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:moveElements')}</a></li>
- <li><a href="#" onclick="document.getElementById('clipboard_form').method='POST'; document.getElementById('clipboard_form').action={actionCopyModeUrl1}; document.getElementById('clipboard_form').submit(); return true;">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:copyElements')}</a></li>
- </ul>
+ <button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ <f:if condition="{currentMode} == 'copy'">
+ <f:then>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:copyElements')}
+ </f:then>
+ <f:else>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:moveElements')}
+ </f:else>
+ </f:if>
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="copymodeSelector">
+ <li><a href="#" onclick="document.getElementById('clipboard_form').method='POST'; document.getElementById('clipboard_form').action={actionCopyModeUrl}; document.getElementById('clipboard_form').submit(); return true;">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:moveElements')}</a></li>
+ <li><a href="#" onclick="document.getElementById('clipboard_form').method='POST'; document.getElementById('clipboard_form').action={actionCopyModeUrl1}; document.getElementById('clipboard_form').submit(); return true;">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:copyElements')}</a></li>
+ </ul>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/MenuSelector.html b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/MenuSelector.html
index 4a48d8926bd1..6abcf2ea2015 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/MenuSelector.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/MenuSelector.html
@@ -1,14 +1,14 @@
<div class="btn-group">
- <button class="btn btn-default dropdown-toggle" type="button" id="menuSelector" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="true">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.menu')}
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="menuSelector">
- <f:for each="{optionArray}" as="option" key="key">
- <li>
- <f:link.external uri="{option.uri}" data="{option.data}" additionalAttributes="{option.additionalAttributes}" defaultScheme="">{option.label}</f:link.external>
- </li>
- </f:for>
- </ul>
+ <button class="btn btn-default dropdown-toggle" type="button" id="menuSelector" data-toggle="dropdown"
+ aria-haspopup="true" aria-expanded="true">
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.menu')}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="menuSelector">
+ <f:for each="{optionArray}" as="option" key="key">
+ <li>
+ <f:link.external uri="{option.uri}" data="{option.data}" additionalAttributes="{option.additionalAttributes}" defaultScheme="">{option.label}</f:link.external>
+ </li>
+ </f:for>
+ </ul>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/Tab.html b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/Tab.html
index a4a71da099c0..cdb4a5befaa9 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/Tab.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/Tab.html
@@ -1,28 +1,28 @@
<tr>
- <td colspan="3"><a href="{tab.url}#clip_head"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.description}')}">
- <f:if condition="{current} == {tab.id}">
- <f:then>
- <span class="t3-icon fa fa-check-circle"></span><strong>
- <f:format.printf
- arguments="{1: '{tab.number}'}" value="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}">{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}
- </f:format.printf>
- {tab.padding}
- </strong>
- </f:then>
- <f:else>
- <span class="t3-icon fa fa-circle-o"></span><span class="text-muted"><f:format.printf
- arguments="{1: '{tab.number}'}" value="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}">{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}
- </f:format.printf>{tab.padding}</span>
- </f:else>
- </f:if>
- </a></td>
+ <td colspan="3"><a href="{tab.url}#clip_head"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.description}')}">
+ <f:if condition="{current} == {tab.id}">
+ <f:then>
+ <span class="t3-icon fa fa-check-circle"></span><strong>
+ <f:format.printf
+ arguments="{1: '{tab.number}'}" value="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}">{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}
+ </f:format.printf>
+ {tab.padding}
+ </strong>
+ </f:then>
+ <f:else>
+ <span class="t3-icon fa fa-circle-o"></span><span class="text-muted"><f:format.printf
+ arguments="{1: '{tab.number}'}" value="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}">{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:{tab.label}')}
+ </f:format.printf>{tab.padding}</span>
+ </f:else>
+ </f:if>
+ </a></td>
</tr>
<f:if condition="{current} == {tab.id}">
- <f:format.raw>{tab.content_old}</f:format.raw>
- <f:if condition="{tab.content}">
- <f:for each="{tab.content}" as="content" key="key">
- <f:render partial="Clipboard/TabContent" arguments="{tab: tab, content: content, currentMode: currentMode}"/>
- </f:for>
- </f:if>
+ <f:format.raw>{tab.content_old}</f:format.raw>
+ <f:if condition="{tab.content}">
+ <f:for each="{tab.content}" as="content" key="key">
+ <f:render partial="Clipboard/TabContent" arguments="{tab: tab, content: content, currentMode: currentMode}"/>
+ </f:for>
+ </f:if>
</f:if>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
index aa3e97566e3d..02f460ee7e4d 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
@@ -1,46 +1,46 @@
<tr>
- <td class="col-icon nowrap">
- <f:format.raw>{content.icon}</f:format.raw>
- </td>
- <td width="95%" class="nowrap">
- <f:format.raw>{content.title}</f:format.raw>
- <f:if condition="{tab.id} == 'normal'">
- <strong>(
- <f:if condition="{currentMode} == 'copy'">
- <f:then>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy')}
- </f:then>
- <f:else>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cut')}
- </f:else>
- </f:if>
- )</strong>
- </f:if>
- <f:if condition="{content.thumb}">
- <br>
- <img src="{content.thumb.image}" title="{content.thumb.title}" />
- </f:if>
- </td>
- <td class="col-control nowrap">
- <f:if condition="{content.infoLink}">
- <div class="btn-group">
- <a class="btn btn-default" href="#" onclick="{content.infoLink}"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.info')}">
- <f:format.raw>
- <core:icon identifier="actions-document-info" alternativeMarkupIdentifier="inline"/>
- </f:format.raw>
- </a>
- </div>
- </f:if>
- <f:if condition="{content.removeLink}">
- <div class="btn-group">
- <a class="btn btn-default" href="{content.removeLink}#clip_head"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.removeItem')}">
- <f:format.raw>
- <core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"/>
- </f:format.raw>
- </a>
- </div>
- </f:if>
- </td>
+ <td class="col-icon nowrap">
+ <f:format.raw>{content.icon}</f:format.raw>
+ </td>
+ <td width="95%" class="nowrap">
+ <f:format.raw>{content.title}</f:format.raw>
+ <f:if condition="{tab.id} == 'normal'">
+ <strong>(
+ <f:if condition="{currentMode} == 'copy'">
+ <f:then>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy')}
+ </f:then>
+ <f:else>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cut')}
+ </f:else>
+ </f:if>
+ )</strong>
+ </f:if>
+ <f:if condition="{content.thumb}">
+ <br>
+ <img src="{content.thumb.image}" title="{content.thumb.title}" />
+ </f:if>
+ </td>
+ <td class="col-control nowrap">
+ <f:if condition="{content.infoLink}">
+ <div class="btn-group">
+ <a class="btn btn-default" href="#" onclick="{content.infoLink}"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.info')}">
+ <f:format.raw>
+ <core:icon identifier="actions-document-info" alternativeMarkupIdentifier="inline"/>
+ </f:format.raw>
+ </a>
+ </div>
+ </f:if>
+ <f:if condition="{content.removeLink}">
+ <div class="btn-group">
+ <a class="btn btn-default" href="{content.removeLink}#clip_head"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.removeItem')}">
+ <f:format.raw>
+ <core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"/>
+ </f:format.raw>
+ </a>
+ </div>
+ </f:if>
+ </td>
</tr>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/Manual.html b/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/Manual.html
index 01dd2e1326e4..54191ea372c8 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/Manual.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/Manual.html
@@ -5,48 +5,48 @@
<p>{manual.content -> f:format.raw()}</p>
<f:if condition="{manual.configuration.details}">
- <h3>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:details" />
- </h3>
- {manual.configuration.details -> f:format.stripTags(allowedTags:'<strong><em><b><i>') -> f:format.nl2br()}
+ <h3>
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:details" />
+ </h3>
+ {manual.configuration.details -> f:format.stripTags(allowedTags:'<strong><em><b><i>') -> f:format.nl2br()}
</f:if>
<f:if condition="{manual.configuration.syntax}">
- <h3>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:syntax" />
- </h3>
- {manual.configuration.syntax -> f:format.raw()}
+ <h3>
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:syntax" />
+ </h3>
+ {manual.configuration.syntax -> f:format.raw()}
</f:if>
<f:if condition="{manual.images}">
- <f:for each="{manual.images}" as="image">
- <div>
- <img src="../{image.image}" class="img-responsive" />
- <f:if condition="{image.description}">
- <p>{image.description}</p>
- </f:if>
- </div>
- </f:for>
- {manual.configuration.syntax -> f:format.raw()}
+ <f:for each="{manual.images}" as="image">
+ <div>
+ <img src="../{image.image}" class="img-responsive" />
+ <f:if condition="{image.description}">
+ <p>{image.description}</p>
+ </f:if>
+ </div>
+ </f:for>
+ {manual.configuration.syntax -> f:format.raw()}
</f:if>
<f:if condition="{manual.seeAlso}">
- <h3>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:seeAlso" />
- </h3>
- <ul>
- <f:for each="{manual.seeAlso}" as="link">
- <li>
- <f:if condition="{link.internal}">
- <f:then>
- <f:link.action action="detail" arguments="{link.arguments}">{link.title}</f:link.action>
- </f:then>
- <f:else>
- <a href="{link.url}" target="{link.target}">{link.title}</a>
- </f:else>
- </f:if>
+ <h3>
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:seeAlso" />
+ </h3>
+ <ul>
+ <f:for each="{manual.seeAlso}" as="link">
+ <li>
+ <f:if condition="{link.internal}">
+ <f:then>
+ <f:link.action action="detail" arguments="{link.arguments}">{link.title}</f:link.action>
+ </f:then>
+ <f:else>
+ <a href="{link.url}" target="{link.target}">{link.title}</a>
+ </f:else>
+ </f:if>
- </li>
- </f:for>
- </ul>
+ </li>
+ </f:for>
+ </ul>
</f:if>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/TableOfContents.html b/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/TableOfContents.html
index f1daf79c2e0e..fbfb5f170055 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/TableOfContents.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ContextSensitiveHelp/TableOfContents.html
@@ -1,41 +1,41 @@
<html xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers">
<h1>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:manual_title" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:manual_title" />
</h1>
<p class="lead">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:description" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:description" />
</p>
<h2>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:TOC" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:TOC" />
</h2>
<f:if condition="{toc}">
- <ul>
- <f:for each="{toc}" as="modules" key="type">
- <li>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:TOC_{type}" default="{type}" />
+ <ul>
+ <f:for each="{toc}" as="modules" key="type">
+ <li>
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:TOC_{type}" default="{type}" />
- <ul>
- <f:for each="{modules}" as="title" key="module">
- <li>
- <f:if condition="{all}">
- <f:then>
- <a href="#{module}">{module}</a>
- </f:then>
- <f:else>
- <a href="{be:moduleLink(route:'help_cshmanual',arguments:{action:'detail', table:module,field:'*'})}">
- {title}
- </a>
- </f:else>
- </f:if>
- </li>
- </f:for>
- </ul>
- </li>
- </f:for>
- </ul>
+ <ul>
+ <f:for each="{modules}" as="title" key="module">
+ <li>
+ <f:if condition="{all}">
+ <f:then>
+ <a href="#{module}">{module}</a>
+ </f:then>
+ <f:else>
+ <a href="{be:moduleLink(route:'help_cshmanual',arguments:{action:'detail', table:module,field:'*'})}">
+ {title}
+ </a>
+ </f:else>
+ </f:if>
+ </li>
+ </f:for>
+ </ul>
+ </li>
+ </f:for>
+ </ul>
</f:if>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
index bba6b8b4674e..6ed37a7c3cfa 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
@@ -1,58 +1,58 @@
<div class="module-loading-indicator"></div>
<div class="module-docheader t3js-module-docheader">
- <div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation row">
- <f:if condition="{docHeader.menus}">
- <f:then>
- <f:if condition="{docHeader.menus->f:count()} > 1">
- <f:then>
- <div class="module-docheader-bar-column-left col-xs-12 col-sm-5 col-md-6 col-lg-4">
- <div class="form-inline row">
- <f:for each="{docHeader.menus}" as="menu">
- <div class="form-group form-group-sm col-xs-6">
- <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
- </div>
- </f:for>
- </div>
- </div>
- <div class="module-docheader-bar-column-right col-xs-12 col-sm-7 col-md-6 col-lg-8 text-right">
- </f:then>
- <f:else>
- <div class="module-docheader-bar-column-left col-xs-12 col-sm-3">
- <div class="form-inline">
- <f:for each="{docHeader.menus}" as="menu">
- <div class="form-group form-group-sm">
- <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
- </div>
- </f:for>
- </div>
- </div>
- <div class="module-docheader-bar-column-right col-xs-12 col-sm-9 text-right">
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <div class="module-docheader-bar-column-left col-xs-12 text-right">
- </f:else>
- </f:if>
- <f:if condition="{docHeader.metaInformation.recordInformation}">
- <span class="typo3-docheader-pagePath">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
- </span>
- <strong>
- <f:format.raw>
- {docHeader.metaInformation.recordInformationIcon} {docHeader.metaInformation.recordInformationTitle} <f:if condition="{docHeader.metaInformation.recordInformationUid}">[{docHeader.metaInformation.recordInformationUid}]</f:if>
- </f:format.raw>
- </strong>
- {docHeader.metaInformation.recordInformationAdditionalInfo}
- </f:if>
- </div>
- </div>
- <div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
- <div class="module-docheader-bar-column-left">
- <f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.left}" />
- </div>
- <div class="module-docheader-bar-column-right">
- <f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}" />
- </div>
- </div>
+ <div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation row">
+ <f:if condition="{docHeader.menus}">
+ <f:then>
+ <f:if condition="{docHeader.menus->f:count()} > 1">
+ <f:then>
+ <div class="module-docheader-bar-column-left col-xs-12 col-sm-5 col-md-6 col-lg-4">
+ <div class="form-inline row">
+ <f:for each="{docHeader.menus}" as="menu">
+ <div class="form-group form-group-sm col-xs-6">
+ <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
+ </div>
+ </f:for>
+ </div>
+ </div>
+ <div class="module-docheader-bar-column-right col-xs-12 col-sm-7 col-md-6 col-lg-8 text-right">
+ </f:then>
+ <f:else>
+ <div class="module-docheader-bar-column-left col-xs-12 col-sm-3">
+ <div class="form-inline">
+ <f:for each="{docHeader.menus}" as="menu">
+ <div class="form-group form-group-sm">
+ <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
+ </div>
+ </f:for>
+ </div>
+ </div>
+ <div class="module-docheader-bar-column-right col-xs-12 col-sm-9 text-right">
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <div class="module-docheader-bar-column-left col-xs-12 text-right">
+ </f:else>
+ </f:if>
+ <f:if condition="{docHeader.metaInformation.recordInformation}">
+ <span class="typo3-docheader-pagePath">
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
+ </span>
+ <strong>
+ <f:format.raw>
+ {docHeader.metaInformation.recordInformationIcon} {docHeader.metaInformation.recordInformationTitle} <f:if condition="{docHeader.metaInformation.recordInformationUid}">[{docHeader.metaInformation.recordInformationUid}]</f:if>
+ </f:format.raw>
+ </strong>
+ {docHeader.metaInformation.recordInformationAdditionalInfo}
+ </f:if>
+ </div>
+ </div>
+ <div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
+ <div class="module-docheader-bar-column-left">
+ <f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.left}" />
+ </div>
+ <div class="module-docheader-bar-column-right">
+ <f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}" />
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/ImageManipulation/ModalTitle.html b/typo3/sysext/backend/Resources/Private/Partials/ImageManipulation/ModalTitle.html
index 4601b6a6161a..90e20b4dc938 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ImageManipulation/ModalTitle.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ImageManipulation/ModalTitle.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
- <f:section name="Main">
- <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.image-manipulation" />
- : <f:if condition="{image.properties.title}"><f:then>{image.properties.title} — {image.name}</f:then><f:else>{image.name}</f:else></f:if>
- ({image.properties.width} × {image.properties.height})
- </f:section>
+ <f:section name="Main">
+ <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.image-manipulation" />
+ : <f:if condition="{image.properties.title}"><f:then>{image.properties.title} — {image.name}</f:then><f:else>{image.name}</f:else></f:if>
+ ({image.properties.width} × {image.properties.height})
+ </f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Login/InterfaceSelector.html b/typo3/sysext/backend/Resources/Private/Partials/Login/InterfaceSelector.html
index 5cfce60a474c..41bb583291b8 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Login/InterfaceSelector.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Login/InterfaceSelector.html
@@ -1,17 +1,17 @@
<f:if condition="{showInterfaceSelector}">
- <f:then>
- <div class="form-group t3js-login-interface-section" id="t3-login-interface-section">
- <div class="form-control-wrap">
- <div class="form-control-holder">
- <label for="t3-interfaces"><f:translate key="login.interface" /></label>
- <f:form.select id="t3-interfaces" class="form-control" name="interface" options="{interfaces}" optionValueField="interface" optionLabelField="label" />
- </div>
- </div>
- </div>
- </f:then>
- <f:else>
- <f:if condition="{interface}">
- <f:form.hidden name="interface" value="{interface}" />
- </f:if>
- </f:else>
+ <f:then>
+ <div class="form-group t3js-login-interface-section" id="t3-login-interface-section">
+ <div class="form-control-wrap">
+ <div class="form-control-holder">
+ <label for="t3-interfaces"><f:translate key="login.interface" /></label>
+ <f:form.select id="t3-interfaces" class="form-control" name="interface" options="{interfaces}" optionValueField="interface" optionLabelField="label" />
+ </div>
+ </div>
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{interface}">
+ <f:form.hidden name="interface" value="{interface}" />
+ </f:if>
+ </f:else>
</f:if>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/LoginNews.html b/typo3/sysext/backend/Resources/Private/Partials/LoginNews.html
index d7565109648e..c3d871224e5a 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/LoginNews.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/LoginNews.html
@@ -1,23 +1,23 @@
<f:if condition="{loginNewsItems}">
- <div class="panel-carousel carousel slide t3js-login-news-carousel" id="loginNews" data-interval="0" data-ride="carousel">
- <div class="carousel-inner" role="listbox">
- <f:for each="{loginNewsItems}" as="item" iteration="loginNewsIterator">
- <div class="item{f:if(condition: loginNewsIterator.isFirst,then: ' active')}">
- <h3 class="typo3-login-news-heading">{item.header}</h3>
- <f:format.html>{item.content}</f:format.html>
- <span class="text-muted">{item.date}</span>
- </div>
- </f:for>
- </div>
- <f:if condition="{loginNewsItems -> f:count()} > 1">
- <a class="left typo3-login-carousel-control" href="#loginNews" role="button" data-slide="prev">
- <i class="fa fa-angle-left"></i>
- <span class="sr-only"><f:translate key="login.news.previous" /></span>
- </a>
- <a class="right typo3-login-carousel-control" href="#loginNews" role="button" data-slide="next">
- <i class="fa fa-angle-right"></i>
- <span class="sr-only"><f:translate key="login.news.next" /></span>
- </a>
- </f:if>
- </div>
+ <div class="panel-carousel carousel slide t3js-login-news-carousel" id="loginNews" data-interval="0" data-ride="carousel">
+ <div class="carousel-inner" role="listbox">
+ <f:for each="{loginNewsItems}" as="item" iteration="loginNewsIterator">
+ <div class="item{f:if(condition: loginNewsIterator.isFirst,then: ' active')}">
+ <h3 class="typo3-login-news-heading">{item.header}</h3>
+ <f:format.html>{item.content}</f:format.html>
+ <span class="text-muted">{item.date}</span>
+ </div>
+ </f:for>
+ </div>
+ <f:if condition="{loginNewsItems -> f:count()} > 1">
+ <a class="left typo3-login-carousel-control" href="#loginNews" role="button" data-slide="prev">
+ <i class="fa fa-angle-left"></i>
+ <span class="sr-only"><f:translate key="login.news.previous" /></span>
+ </a>
+ <a class="right typo3-login-carousel-control" href="#loginNews" role="button" data-slide="next">
+ <i class="fa fa-angle-right"></i>
+ <span class="sr-only"><f:translate key="login.news.next" /></span>
+ </a>
+ </f:if>
+ </div>
</f:if>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html b/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
index bfa9bbbf227c..dc076a7202a9 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
@@ -1,5 +1,5 @@
{menu.label} <select class="form-control t3-js-jumpMenuBox" name="{menu.identifier}" data-menu-identifier="{menu.dataIdentifier}" onchange="if(this.options[this.selectedIndex].value){window.location.href=(this.options[this.selectedIndex].value);}">
- <f:for each="{menu.menuItems}" as="menuItem">
- <option value="{menuItem.href}" {f:if(condition: '{menuItem.active}', then: ' selected="selected"')}>{menuItem.title}</option>
- </f:for>
+ <f:for each="{menu.menuItems}" as="menuItem">
+ <option value="{menuItem.href}" {f:if(condition: '{menuItem.active}', then: ' selected="selected"')}>{menuItem.title}</option>
+ </f:for>
</select>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Diff.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Diff.html
index 37c3fa09b1ce..24efccbaa4e4 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Diff.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Diff.html
@@ -1,15 +1,15 @@
<div class="diff">
- <f:for each="{differences}" as="differencesItem" key="key">
- <div class="diff-item">
- <div class="diff-item-title">
- <f:if condition="{rollbackUrl}">
- <a href="{rollbackUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertField')}</a>
- </f:if>
- {differencesItem.link} {differencesItem.title}
- </div>
- <div class="diff-item-result"><f:spaceless>
- <f:format.raw>{differencesItem.result}</f:format.raw>
- </f:spaceless></div>
- </div>
- </f:for>
+ <f:for each="{differences}" as="differencesItem" key="key">
+ <div class="diff-item">
+ <div class="diff-item-title">
+ <f:if condition="{rollbackUrl}">
+ <a href="{rollbackUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertField')}</a>
+ </f:if>
+ {differencesItem.link} {differencesItem.title}
+ </div>
+ <div class="diff-item-result"><f:spaceless>
+ <f:format.raw>{differencesItem.result}</f:format.raw>
+ </f:spaceless></div>
+ </div>
+ </f:for>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
index 2569fa66ae0d..3b8352459be0 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
@@ -2,79 +2,79 @@
<h2>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:changes')}</h2>
<div>
- <f:be.infobox state="-1">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:differenceMsg') -> f:format.raw()}</f:be.infobox>
- <table class="table table-striped table-hover table-vertical-top" id="typo3-history">
- <thead>
- <tr>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:rollback')}</th>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:time')}</th>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:age')}</th>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:user')}</th>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:tableUid')}</th>
- <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:differences')}</th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{history}" as="historyRow">
- <tr>
- <td>
- <f:if condition="{editLock}">
- <f:then>
- <button class="btn btn-default disabled" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:editLockIsActive')}">
- <core:icon identifier="actions-document-history-open" />
- </button>
- </f:then>
- <f:else>
- <a class="btn btn-default" href="{historyRow.diffUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:sumUpChanges')}">
- <core:icon identifier="actions-document-history-open" />
- </a>
- </f:else>
- </f:if>
- </td>
- <td>{historyRow.time}</td>
- <td>{historyRow.age}</td>
- <td>
- <be:avatar backendUser="{historyRow.backendUserUid}"/>
- <f:if condition="{historyRow.backendUserUid}">
- <f:then>
- {historyRow.backendUserName}
- </f:then>
- <f:else>
- {f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:externalChange')}
- </f:else>
- </f:if>
- <f:if condition="{historyRow.originalBackendUserName}"> ({f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:viaUser')} {historyRow.originalBackendUserName})</f:if>
- </td>
- <td>
- <a href="{elementUrl}" title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:linkRecordHistory')}">{historyRow.title -> f:format.raw()}</a>
- </td>
- <td>
- <f:switch expression="{historyRow.actiontype}">
- <f:case value="1">
- <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong>
- </f:case>
- <f:case value="4">
- <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:delete')}</strong>
- </f:case>
- <f:case value="5">
- <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong>
- </f:case>
- </f:switch>
- <f:if condition="{historyRow.fieldNames}">
- {historyRow.fieldNames}
- </f:if>
- <f:if condition="{historyRow.differences}">
- <f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
- </f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- <f:if condition="{fullViewUrl}">
- <br/>
- <a href="{fullViewUrl}" class="btn btn-default">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:fullView')}</a>
- </f:if>
- <br/>
- <br/>
+ <f:be.infobox state="-1">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:differenceMsg') -> f:format.raw()}</f:be.infobox>
+ <table class="table table-striped table-hover table-vertical-top" id="typo3-history">
+ <thead>
+ <tr>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:rollback')}</th>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:time')}</th>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:age')}</th>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:user')}</th>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:tableUid')}</th>
+ <th>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:differences')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{history}" as="historyRow">
+ <tr>
+ <td>
+ <f:if condition="{editLock}">
+ <f:then>
+ <button class="btn btn-default disabled" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:editLockIsActive')}">
+ <core:icon identifier="actions-document-history-open" />
+ </button>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default" href="{historyRow.diffUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:sumUpChanges')}">
+ <core:icon identifier="actions-document-history-open" />
+ </a>
+ </f:else>
+ </f:if>
+ </td>
+ <td>{historyRow.time}</td>
+ <td>{historyRow.age}</td>
+ <td>
+ <be:avatar backendUser="{historyRow.backendUserUid}"/>
+ <f:if condition="{historyRow.backendUserUid}">
+ <f:then>
+ {historyRow.backendUserName}
+ </f:then>
+ <f:else>
+ {f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:externalChange')}
+ </f:else>
+ </f:if>
+ <f:if condition="{historyRow.originalBackendUserName}"> ({f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:viaUser')} {historyRow.originalBackendUserName})</f:if>
+ </td>
+ <td>
+ <a href="{elementUrl}" title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:linkRecordHistory')}">{historyRow.title -> f:format.raw()}</a>
+ </td>
+ <td>
+ <f:switch expression="{historyRow.actiontype}">
+ <f:case value="1">
+ <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong>
+ </f:case>
+ <f:case value="4">
+ <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:delete')}</strong>
+ </f:case>
+ <f:case value="5">
+ <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong>
+ </f:case>
+ </f:switch>
+ <f:if condition="{historyRow.fieldNames}">
+ {historyRow.fieldNames}
+ </f:if>
+ <f:if condition="{historyRow.differences}">
+ <f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
+ </f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ <f:if condition="{fullViewUrl}">
+ <br/>
+ <a href="{fullViewUrl}" class="btn btn-default">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:fullView')}</a>
+ </f:if>
+ <br/>
+ <br/>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
index 57aaa3bc3d78..7d0731837e53 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
@@ -1,34 +1,34 @@
<h2>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:mergedDifferences')}</h2>
<div>
- <f:if condition="{revertAllUrl}">
- <f:then>
- <a href="{revertAllUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertAll')}</a>
- <div
- style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
- <f:for each="{multipleDiff}" as="historyRow" key="key">
- <h3>
- <a href="{historyRow.revertRecordUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertRecord')}</a>
- {historyRow.title}
- </h3>
- <div>
- <div
- style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
- <f:if condition="{historyRow.insertDelete} == 'delete'">
- <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:delete')}</strong><br/>
- </f:if>
- <f:if condition="{historyRow.insertDelete} == 'insert'">
- <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong><br/>
- </f:if>
- <f:if condition="{historyRow.differences}">
- <f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
- </f:if>
- </div>
- </div>
- </f:for>
- </div>
- </f:then>
- <f:else>
- {f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:noDifferences')}
- </f:else>
- </f:if>
+ <f:if condition="{revertAllUrl}">
+ <f:then>
+ <a href="{revertAllUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertAll')}</a>
+ <div
+ style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
+ <f:for each="{multipleDiff}" as="historyRow" key="key">
+ <h3>
+ <a href="{historyRow.revertRecordUrl}" class="btn btn-default" style="margin-right: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:revertRecord')}</a>
+ {historyRow.title}
+ </h3>
+ <div>
+ <div
+ style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
+ <f:if condition="{historyRow.insertDelete} == 'delete'">
+ <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:delete')}</strong><br/>
+ </f:if>
+ <f:if condition="{historyRow.insertDelete} == 'insert'">
+ <strong>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong><br/>
+ </f:if>
+ <f:if condition="{historyRow.differences}">
+ <f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
+ </f:if>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ </f:then>
+ <f:else>
+ {f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:noDifferences')}
+ </f:else>
+ </f:if>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
index dcb69d42c311..e7084ad2860d 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
@@ -1,75 +1,75 @@
<div>
- <f:if condition="{singleElement}">
- <h3>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:elementHistory')}</h3>
- <f:if condition="{fullHistoryUrl}">
- <a href="{fullHistoryUrl}" class="btn btn-default" style="margin-bottom: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:elementHistory_link')}</a>
- </f:if>
- </f:if>
- <form name="settings" action="{TYPO3_REQUEST_URI}" method="post">
- <div class="row">
- <div class="col-sm-12 col-md-6 col-lg-4">
- <div class="panel panel-default">
- <div class="panel-heading">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:settings')}</div>
- <table class="table">
- <f:for each="{settings}" as="values" key="key">
- <tr>
- <td>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{key}')}</td>
- <td>
- <div class="btn-group">
- <button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector"
- data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <f:for each="{currentSelection}" as="currentSelectionValue" key="currentSelectionKey">
- <f:if condition="{currentSelectionKey} == {key}">
- <f:then>
- <f:if condition="{currentSelectionValue}">
- <f:then>
- <f:for each="{values}" as="singleValue" key="singleKey">
- <f:if condition="{currentSelectionValue} == {singleKey}">
- <f:then>
- <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
- <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
- <f:else>{singleValue.value}</f:else>
- </f:if>
- </f:then>
- </f:if>
- </f:for>
- </f:then>
- <f:else>
- <f:for each="{values}" as="singleValue" iteration="iterator">
- <f:if condition="{iterator.isFirst}">
- <f:then>
- <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
- <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
- <f:else>{singleValue.value}</f:else>
- </f:if>
- </f:then>
- </f:if>
- </f:for>
- </f:else>
- </f:if>
- </f:then>
- </f:if>
- </f:for>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="copymodeSelector">
- <f:for each="{values}" as="singleValue" key="singleKey">
- <li><a href="#"
- onclick="document.settings.method='POST'; document.settings.action={singleValue.scriptUrl}; document.settings.submit()">
- <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
- <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
- <f:else>{singleValue.value}</f:else>
- </f:if>
- </a></li>
- </f:for>
- </ul>
- </div>
- </td>
- </tr>
- </f:for>
- </table>
- </div>
- </div>
- </div>
- </form>
+ <f:if condition="{singleElement}">
+ <h3>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:elementHistory')}</h3>
+ <f:if condition="{fullHistoryUrl}">
+ <a href="{fullHistoryUrl}" class="btn btn-default" style="margin-bottom: 5px;">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:elementHistory_link')}</a>
+ </f:if>
+ </f:if>
+ <form name="settings" action="{TYPO3_REQUEST_URI}" method="post">
+ <div class="row">
+ <div class="col-sm-12 col-md-6 col-lg-4">
+ <div class="panel panel-default">
+ <div class="panel-heading">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:settings')}</div>
+ <table class="table">
+ <f:for each="{settings}" as="values" key="key">
+ <tr>
+ <td>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{key}')}</td>
+ <td>
+ <div class="btn-group">
+ <button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector"
+ data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ <f:for each="{currentSelection}" as="currentSelectionValue" key="currentSelectionKey">
+ <f:if condition="{currentSelectionKey} == {key}">
+ <f:then>
+ <f:if condition="{currentSelectionValue}">
+ <f:then>
+ <f:for each="{values}" as="singleValue" key="singleKey">
+ <f:if condition="{currentSelectionValue} == {singleKey}">
+ <f:then>
+ <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+ <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+ <f:else>{singleValue.value}</f:else>
+ </f:if>
+ </f:then>
+ </f:if>
+ </f:for>
+ </f:then>
+ <f:else>
+ <f:for each="{values}" as="singleValue" iteration="iterator">
+ <f:if condition="{iterator.isFirst}">
+ <f:then>
+ <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+ <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+ <f:else>{singleValue.value}</f:else>
+ </f:if>
+ </f:then>
+ </f:if>
+ </f:for>
+ </f:else>
+ </f:if>
+ </f:then>
+ </f:if>
+ </f:for>
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="copymodeSelector">
+ <f:for each="{values}" as="singleValue" key="singleKey">
+ <li><a href="#"
+ onclick="document.settings.method='POST'; document.settings.action={singleValue.scriptUrl}; document.settings.submit()">
+ <f:if condition="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+ <f:then>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+ <f:else>{singleValue.value}</f:else>
+ </f:if>
+ </a></li>
+ </f:for>
+ </ul>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </table>
+ </div>
+ </div>
+ </div>
+ </form>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html b/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
index 7d34389ac043..f600b34439e1 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ShortcutToolbarItem/Shortcut.html
@@ -1,30 +1,30 @@
<div class="dropdown-table-row t3js-topbar-shortcut" data-shortcutid="{shortcut.raw.uid}" data-shortcutgroup="{group.id}">
- <div class="dropdown-table-column dropdown-table-icon">
- <span title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.shortcut')}">
- <f:format.raw>{shortcut.icon}</f:format.raw>
- </span>
- </div>
- <div class="dropdown-table-column dropdown-table-title">
- <f:link.external uri="#" class="dropdown-table-title-ellipsis" onclick="{shortcut.action} return false;" defaultScheme="">{shortcut.label}</f:link.external>
- </div>
- <div class="dropdown-table-column dropdown-table-actions">
- <f:render section="Edit"/>
- <f:render section="Delete"/>
- </div>
+ <div class="dropdown-table-column dropdown-table-icon">
+ <span title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.shortcut')}">
+ <f:format.raw>{shortcut.icon}</f:format.raw>
+ </span>
+ </div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <f:link.external uri="#" class="dropdown-table-title-ellipsis" onclick="{shortcut.action} return false;" defaultScheme="">{shortcut.label}</f:link.external>
+ </div>
+ <div class="dropdown-table-column dropdown-table-actions">
+ <f:render section="Edit"/>
+ <f:render section="Delete"/>
+ </div>
</div>
<f:section name="Edit">
- <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}"
- defaultScheme="">
- <core:icon identifier="actions-open" alternativeMarkupIdentifier="inline"/>
- </f:link.external>
+ <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}"
+ defaultScheme="">
+ <core:icon identifier="actions-open" alternativeMarkupIdentifier="inline"/>
+ </f:link.external>
</f:section>
<f:section name="Delete">
- <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete')}"
- defaultScheme="">
- <core:icon identifier="actions-delete" alternativeMarkupIdentifier="inline"/>
- </f:link.external>
+ <f:link.external uri="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete')}"
+ defaultScheme="">
+ <core:icon identifier="actions-delete" alternativeMarkupIdentifier="inline"/>
+ </f:link.external>
</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Avatar/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Avatar/Main.html
index bf3eed71a4f7..5a9323bb208c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Avatar/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Avatar/Main.html
@@ -1,10 +1,10 @@
<span class="avatar">
- <span class="avatar-image">
- {image -> f:format.raw()}
- </span>
- <f:if condition="{showIcon}">
- <span class="avatar-icon">
- <core:iconForRecord table="be_users" row="{backendUser}" size="small" />
- </span>
- </f:if>
+ <span class="avatar-image">
+ {image -> f:format.raw()}
+ </span>
+ <f:if condition="{showIcon}">
+ <span class="avatar-icon">
+ <core:iconForRecord table="be_users" row="{backendUser}" size="small" />
+ </span>
+ </f:if>
</span>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
index 9058823223c1..c8adcac8fa72 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
@@ -1,21 +1,21 @@
<div class="scaffold t3js-scaffold scaffold-modulemenu-expanded">
- <div class="t3js-scaffold-header">
- <f:format.raw>{topbar}</f:format.raw>
- </div>
- <div class="scaffold-modulemenu t3js-scaffold-modulemenu">
- <div class="modulemenu t3js-modulemenu">
- <f:format.raw>{moduleMenu}</f:format.raw>
- </div>
- </div>
- <div class="scaffold-content t3js-scaffold-content">
- <div class="scaffold-content-navigation t3js-scaffold-content-navigation">
- <div class="scaffold-content-navigation-component" data-component="typo3-navigationIframe">
- <iframe name="nav_frame" src="about:blank" id="typo3-navigationContainerIframe" scrolling="no" class="scaffold-content-navigation-iframe t3js-scaffold-content-navigation-iframe"></iframe>
- </div>
- </div>
- <div class="scaffold-content-module t3js-scaffold-content-module">
- <iframe name="list_frame" id="typo3-contentIframe" scrolling="no" class="scaffold-content-module-iframe t3js-scaffold-content-module-iframe"></iframe>
- </div>
- <div class="scaffold-content-overlay t3js-scaffold-content-overlay"></div>
- </div>
+ <div class="t3js-scaffold-header">
+ <f:format.raw>{topbar}</f:format.raw>
+ </div>
+ <div class="scaffold-modulemenu t3js-scaffold-modulemenu">
+ <div class="modulemenu t3js-modulemenu">
+ <f:format.raw>{moduleMenu}</f:format.raw>
+ </div>
+ </div>
+ <div class="scaffold-content t3js-scaffold-content">
+ <div class="scaffold-content-navigation t3js-scaffold-content-navigation">
+ <div class="scaffold-content-navigation-component" data-component="typo3-navigationIframe">
+ <iframe name="nav_frame" src="about:blank" id="typo3-navigationContainerIframe" scrolling="no" class="scaffold-content-navigation-iframe t3js-scaffold-content-navigation-iframe"></iframe>
+ </div>
+ </div>
+ <div class="scaffold-content-module t3js-scaffold-content-module">
+ <iframe name="list_frame" id="typo3-contentIframe" scrolling="no" class="scaffold-content-module-iframe t3js-scaffold-content-module-iframe"></iframe>
+ </div>
+ <div class="scaffold-content-overlay t3js-scaffold-content-overlay"></div>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
index 8ee071590548..0eb2d2639031 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
@@ -1,33 +1,33 @@
<form action="" id="clipboard_form">
- <a name="clip_head"></a>
- <div class="row">
- <div class="col-sm-12">
- <div class="panel panel-default">
- <div class="panel-heading">
- <f:format.raw>{clipboardHeader}</f:format.raw>
- </div>
- <table class="table">
- <tr>
- <td colspan="2" class="nowrap" width="95%">
- <f:render partial="Clipboard/CopymodeSelector" arguments="{_all}"/>
- <f:if condition="{elementCount}">
- <f:render partial="Clipboard/MenuSelector" arguments="{_all}"/>
- </f:if>
- </td>
- <td class="col-control nowrap">
- <f:if condition="{elementCount}">
- <a href="{removeAllUrl}#clip_head"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.clear')}" class="btn btn-danger">
- <f:format.raw><core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"></core:icon></f:format.raw>
- </a>
- </f:if>
- </td>
- </tr>
- <f:for each="{tabArray}" as="tab" key="key">
- <f:render partial="Clipboard/Tab" arguments="{tab: tab, current: current, currentMode: currentMode}"/>
- </f:for>
- </table>
- </div>
- </div>
- </div>
+ <a name="clip_head"></a>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <f:format.raw>{clipboardHeader}</f:format.raw>
+ </div>
+ <table class="table">
+ <tr>
+ <td colspan="2" class="nowrap" width="95%">
+ <f:render partial="Clipboard/CopymodeSelector" arguments="{_all}"/>
+ <f:if condition="{elementCount}">
+ <f:render partial="Clipboard/MenuSelector" arguments="{_all}"/>
+ </f:if>
+ </td>
+ <td class="col-control nowrap">
+ <f:if condition="{elementCount}">
+ <a href="{removeAllUrl}#clip_head"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.clear')}" class="btn btn-danger">
+ <f:format.raw><core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"></core:icon></f:format.raw>
+ </a>
+ </f:if>
+ </td>
+ </tr>
+ <f:for each="{tabArray}" as="tab" key="key">
+ <f:render partial="Clipboard/Tab" arguments="{tab: tab, current: current, currentMode: currentMode}"/>
+ </f:for>
+ </table>
+ </div>
+ </div>
+ </div>
</form>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html b/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
index 852dd371c4b2..275db8c4d47c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
@@ -1,108 +1,108 @@
<f:if condition="{accessAllowed}">
- <f:then>
- <h1>
- <f:if condition="{table}">
- <small>{table}</small><br />{icon -> f:format.raw()}
- <span title="{title}">{title -> f:format.crop(maxCharacters: maxTitleLength)}</span>
- </f:if>
- </h1>
- <f:if condition="{missingFile}">
- <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.file_missing')}" state="1">{missingFile}</f:be.infobox>
- </f:if>
- <f:if condition="{fileRenderer}">
- <p>
- {fileRenderer -> f:format.raw()}
- </p>
- </f:if>
- <f:if condition="{fileObject}">
- <p>
- <f:media file="{fileObject}"
- width="{width}"
- height="{height}"
- />
- </p>
- </f:if>
- <f:if condition="{url}">
- <p>
- <a class="btn btn-default" href="{url}" target="_blank">
- <core:icon identifier="actions-document-view" size="small" alternativeMarkupIdentifier="inline" />
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.show" />
- </a>
- </p>
- </f:if>
- <div class="table-fit table-fit-wrap">
- <table class="table table-striped table-hover">
- <f:for each="{extraFields}" as="extraField">
- <f:render section="extraFieldRow" arguments="{row: extraField}" />
- </f:for>
- <f:for each="{fields}" as="field">
- <f:render section="fieldRow" arguments="{row: field}" />
- </f:for>
- </table>
- </div>
- <f:if condition="{returnUrl}">
- <a class="btn btn-primary" href="{returnUrl}">
- <core:icon identifier="actions-view-go-back" size="small" />
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:back" />
- </a>
- </f:if>
- <f:if condition="{refLines}">
- <h3><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesToThisItem" /></h3>
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th class="col-icon"></th>
- <th class="col-title"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.title" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.table" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.uid" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.field" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting" /></th>
- <th class="col-control"></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{refLines}" as="refLine">
- <f:render section="refLineRow" arguments="{line: refLine, maxTitleLength: maxTitleLength}" />
- </f:for>
- </tbody>
- </table>
- </div>
- </f:if>
- <f:if condition="{refFromLines}">
- <h3><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesFromThisItem" /></h3>
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th class="col-icon"></th>
- <th class="col-title"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.title" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.table" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.uid" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.field" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting" /></th>
- <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.refString" /></th>
- <th class="col-control"></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{refFromLines}" as="refFromLine">
- <f:render section="refFromLineRow" arguments="{line: refFromLine, maxTitleLength: maxTitleLength}" />
- </f:for>
- </tbody>
- </table>
- </div>
- </f:if>
- </f:then>
- <f:else>
- <f:be.infobox state="2">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noEditPermission')}</f:be.infobox>
- </f:else>
+ <f:then>
+ <h1>
+ <f:if condition="{table}">
+ <small>{table}</small><br />{icon -> f:format.raw()}
+ <span title="{title}">{title -> f:format.crop(maxCharacters: maxTitleLength)}</span>
+ </f:if>
+ </h1>
+ <f:if condition="{missingFile}">
+ <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.file_missing')}" state="1">{missingFile}</f:be.infobox>
+ </f:if>
+ <f:if condition="{fileRenderer}">
+ <p>
+ {fileRenderer -> f:format.raw()}
+ </p>
+ </f:if>
+ <f:if condition="{fileObject}">
+ <p>
+ <f:media file="{fileObject}"
+ width="{width}"
+ height="{height}"
+ />
+ </p>
+ </f:if>
+ <f:if condition="{url}">
+ <p>
+ <a class="btn btn-default" href="{url}" target="_blank">
+ <core:icon identifier="actions-document-view" size="small" alternativeMarkupIdentifier="inline" />
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.show" />
+ </a>
+ </p>
+ </f:if>
+ <div class="table-fit table-fit-wrap">
+ <table class="table table-striped table-hover">
+ <f:for each="{extraFields}" as="extraField">
+ <f:render section="extraFieldRow" arguments="{row: extraField}" />
+ </f:for>
+ <f:for each="{fields}" as="field">
+ <f:render section="fieldRow" arguments="{row: field}" />
+ </f:for>
+ </table>
+ </div>
+ <f:if condition="{returnUrl}">
+ <a class="btn btn-primary" href="{returnUrl}">
+ <core:icon identifier="actions-view-go-back" size="small" />
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:back" />
+ </a>
+ </f:if>
+ <f:if condition="{refLines}">
+ <h3><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesToThisItem" /></h3>
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th class="col-icon"></th>
+ <th class="col-title"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.title" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.table" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.uid" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.field" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting" /></th>
+ <th class="col-control"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{refLines}" as="refLine">
+ <f:render section="refLineRow" arguments="{line: refLine, maxTitleLength: maxTitleLength}" />
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:if>
+ <f:if condition="{refFromLines}">
+ <h3><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesFromThisItem" /></h3>
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th class="col-icon"></th>
+ <th class="col-title"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.title" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.table" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.uid" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.field" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting" /></th>
+ <th><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:show_item.php.refString" /></th>
+ <th class="col-control"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{refFromLines}" as="refFromLine">
+ <f:render section="refFromLineRow" arguments="{line: refFromLine, maxTitleLength: maxTitleLength}" />
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="2">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noEditPermission')}</f:be.infobox>
+ </f:else>
</f:if>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/All.html b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/All.html
index 40eaa9b5c661..1bcdeb111e6d 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/All.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/All.html
@@ -1,11 +1,11 @@
<f:layout name="ContextSensitiveHelp" />
<f:section name="content">
- <f:render partial="ContextSensitiveHelp/TableOfContents" arguments="{toc:all.toc, all:1}" />
+ <f:render partial="ContextSensitiveHelp/TableOfContents" arguments="{toc:all.toc, all:1}" />
- <f:for each="{all.content}" as="sections">
- <f:for each="{sections.content}" as="item">
- <f:render partial="ContextSensitiveHelp/Manual" arguments="{manual:item}" />
- </f:for>
- </f:for>
+ <f:for each="{all.content}" as="sections">
+ <f:for each="{sections.content}" as="item">
+ <f:render partial="ContextSensitiveHelp/Manual" arguments="{manual:item}" />
+ </f:for>
+ </f:for>
</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Detail.html b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Detail.html
index 001aa81fecd1..c3ca7ca33002 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Detail.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Detail.html
@@ -1,7 +1,7 @@
<f:layout name="ContextSensitiveHelp" />
<f:section name="content">
- <f:for each="{manuals}" as="manual">
- <f:render partial="ContextSensitiveHelp/Manual" arguments="{manual:manual}" />
- </f:for>
+ <f:for each="{manuals}" as="manual">
+ <f:render partial="ContextSensitiveHelp/Manual" arguments="{manual:manual}" />
+ </f:for>
</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Index.html b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Index.html
index a3e439e63824..16c180dae3f6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Index.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ContextSensitiveHelp/Index.html
@@ -6,10 +6,10 @@
</f:section>
<f:section name="content">
- <f:render partial="ContextSensitiveHelp/TableOfContents" arguments="{toc:toc,all:0}" />
+ <f:render partial="ContextSensitiveHelp/TableOfContents" arguments="{toc:toc,all:0}" />
- <a href="{be:moduleLink(route:'help_cshmanual',arguments:{action:'all'})}">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:full_manual" />
- </a>
+ <a href="{be:moduleLink(route:'help_cshmanual',arguments:{action:'all'})}">
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_view_help.xlf:full_manual" />
+ </a>
</f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Collapse.html b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Collapse.html
index ae0ed4c43b3f..2c9e8a099d32 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Collapse.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Collapse.html
@@ -1,39 +1,39 @@
<div class="panel-group" id="{id}" role="tablist" aria-multiselectable="true">
- <f:for each="{items}" as="item" iteration="iteration">
- <f:if condition="{item.content}">
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="{id}-{iteration.cycle}-heading">
- <a data-toggle="collapse" title="{item.linkTitle}" data-parent="#{id}" href="#{id}-{iteration.cycle}" aria-expanded="true" aria-controls="{id}-{iteration.cycle}">
- <f:if condition="{item.icon}">
- <f:format.raw>{item.icon}</f:format.raw>
- </f:if>
- {item.label}
- <f:if condition="{item.requiredIcon}">
- <f:format.raw>{item.requiredIcon}</f:format.raw>
- </f:if>
- <f:if condition="{item.stateIcon}">
- <f:render partial="StateIcon" arguments="{item: item}" />
- </f:if>
- </a>
- </div>
- <div id="{id}-{iteration.cycle}" class="panel-collapse collapse{f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' in')}" role="tabpanel" aria-labelledby="{id}-{iteration.cycle}-heading">
- <f:if condition="{item.description}">
- <div class="panel-body">
- <p><f:format.nl2br>{item.description}</f:format.nl2br></p>
- </div>
- </f:if>
- <f:if condition="{wrapContent}">
- <f:then>
- <div class="panel-body">
- <f:format.raw>{item.content}</f:format.raw>
- </div>
- </f:then>
- <f:else>
- <f:format.raw>{item.content}</f:format.raw>
- </f:else>
- </f:if>
- </div>
- </div>
- </f:if>
- </f:for>
+ <f:for each="{items}" as="item" iteration="iteration">
+ <f:if condition="{item.content}">
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="{id}-{iteration.cycle}-heading">
+ <a data-toggle="collapse" title="{item.linkTitle}" data-parent="#{id}" href="#{id}-{iteration.cycle}" aria-expanded="true" aria-controls="{id}-{iteration.cycle}">
+ <f:if condition="{item.icon}">
+ <f:format.raw>{item.icon}</f:format.raw>
+ </f:if>
+ {item.label}
+ <f:if condition="{item.requiredIcon}">
+ <f:format.raw>{item.requiredIcon}</f:format.raw>
+ </f:if>
+ <f:if condition="{item.stateIcon}">
+ <f:render partial="StateIcon" arguments="{item: item}" />
+ </f:if>
+ </a>
+ </div>
+ <div id="{id}-{iteration.cycle}" class="panel-collapse collapse{f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' in')}" role="tabpanel" aria-labelledby="{id}-{iteration.cycle}-heading">
+ <f:if condition="{item.description}">
+ <div class="panel-body">
+ <p><f:format.nl2br>{item.description}</f:format.nl2br></p>
+ </div>
+ </f:if>
+ <f:if condition="{wrapContent}">
+ <f:then>
+ <div class="panel-body">
+ <f:format.raw>{item.content}</f:format.raw>
+ </div>
+ </f:then>
+ <f:else>
+ <f:format.raw>{item.content}</f:format.raw>
+ </f:else>
+ </f:if>
+ </div>
+ </div>
+ </f:if>
+ </f:for>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Partials/StateIcon.html b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Partials/StateIcon.html
index 5f66e47ecc6e..fbe91f5b1401 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Partials/StateIcon.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Partials/StateIcon.html
@@ -1,6 +1,6 @@
<f:switch expression="{item.stateIcon}">
- <f:case value="-1"><core:icon identifier="status-dialog-ok" /></f:case>
- <f:case value="1"><core:icon identifier="status-dialog-notification" /></f:case>
- <f:case value="2"><core:icon identifier="status-dialog-warning" /></f:case>
- <f:case value="3"><core:icon identifier="status-dialog-error" /></f:case>
+ <f:case value="-1"><core:icon identifier="status-dialog-ok" /></f:case>
+ <f:case value="1"><core:icon identifier="status-dialog-notification" /></f:case>
+ <f:case value="2"><core:icon identifier="status-dialog-warning" /></f:case>
+ <f:case value="3"><core:icon identifier="status-dialog-error" /></f:case>
</f:switch>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Tabs.html b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Tabs.html
index 0352053893ae..e6b9504722ca 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Tabs.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/DocumentTemplate/Tabs.html
@@ -1,49 +1,49 @@
<div role="tabpanel">
- <ul class="nav nav-tabs t3js-tabs" role="tablist" id="tabs-{id}" data-store-last-tab="{storeLastActiveTab}">
- <f:for each="{items}" as="item" iteration="iteration">
- <f:if condition="{item.content}">
- <li role="presentation" class="t3js-tabmenu-item {f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' active')}">
- <a href="#{id}-{iteration.cycle}" title="{item.linkTitle}" aria-controls="{id}-{iteration.cycle}" role="tab" data-toggle="tab">
- <f:if condition="{item.icon}">
- <f:format.raw>{item.icon}</f:format.raw>
- </f:if>
- {item.label}
- <f:if condition="{item.requiredIcon}">
- <f:format.raw>{item.requiredIcon}</f:format.raw>
- </f:if>
- <f:if condition="{item.stateIcon}">
- <f:render partial="StateIcon" arguments="{item: item}" />
- </f:if>
- </a>
- </li>
- </f:if>
- </f:for>
- </ul>
- <div class="tab-content">
- <f:for each="{items}" as="item" iteration="iteration">
- <f:if condition="{item.content}">
- <div role="tabpanel" class="tab-pane{f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' active')}" id="{id}-{iteration.cycle}">
- <f:if condition="{item.description}">
- <div class="panel panel-tab">
- <div class="panel-body">
- <p><f:format.nl2br>{item.description}</f:format.nl2br></p>
- </div>
- </div>
- </f:if>
- <f:if condition="{wrapContent}">
- <f:then>
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:format.raw>{item.content}</f:format.raw>
- </div>
- </div>
- </f:then>
- <f:else>
- <f:format.raw>{item.content}</f:format.raw>
- </f:else>
- </f:if>
- </div>
- </f:if>
- </f:for>
- </div>
+ <ul class="nav nav-tabs t3js-tabs" role="tablist" id="tabs-{id}" data-store-last-tab="{storeLastActiveTab}">
+ <f:for each="{items}" as="item" iteration="iteration">
+ <f:if condition="{item.content}">
+ <li role="presentation" class="t3js-tabmenu-item {f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' active')}">
+ <a href="#{id}-{iteration.cycle}" title="{item.linkTitle}" aria-controls="{id}-{iteration.cycle}" role="tab" data-toggle="tab">
+ <f:if condition="{item.icon}">
+ <f:format.raw>{item.icon}</f:format.raw>
+ </f:if>
+ {item.label}
+ <f:if condition="{item.requiredIcon}">
+ <f:format.raw>{item.requiredIcon}</f:format.raw>
+ </f:if>
+ <f:if condition="{item.stateIcon}">
+ <f:render partial="StateIcon" arguments="{item: item}" />
+ </f:if>
+ </a>
+ </li>
+ </f:if>
+ </f:for>
+ </ul>
+ <div class="tab-content">
+ <f:for each="{items}" as="item" iteration="iteration">
+ <f:if condition="{item.content}">
+ <div role="tabpanel" class="tab-pane{f:if(condition: '{iteration.cycle} == {defaultTabIndex}', then: ' active')}" id="{id}-{iteration.cycle}">
+ <f:if condition="{item.description}">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <p><f:format.nl2br>{item.description}</f:format.nl2br></p>
+ </div>
+ </div>
+ </f:if>
+ <f:if condition="{wrapContent}">
+ <f:then>
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:format.raw>{item.content}</f:format.raw>
+ </div>
+ </div>
+ </f:then>
+ <f:else>
+ <f:format.raw>{item.content}</f:format.raw>
+ </f:else>
+ </f:if>
+ </div>
+ </f:if>
+ </f:for>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationElement.html b/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationElement.html
index ea4c51b68de7..887af3100dcc 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationElement.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationElement.html
@@ -1,80 +1,80 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
- <f:layout name="ImageManipulation" />
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
+ <f:layout name="ImageManipulation" />
- <f:section name="Main">
- <f:if condition="{isAllowedFileExtension} && {image.properties.width}">
- <f:then>
- <f:if condition="{config.readOnly}">
- <f:else>
- <div class="form-control-wrap">
- <input type="hidden" id="{formEngine.field.id}"
- name="{formEngine.field.name}"
- value="{formEngine.field.value}"
- data-formengine-validation-rules="{formEngine.validation}"/>
- <button class="btn btn-default t3js-image-manipulation-trigger"
- data-url="{wizardUri}"
- data-payload="{wizardPayload}"
- data-preview-url="{previewUrl}"
- data-severity="notice"
- data-modal-title="{f:render(partial: 'ModalTitle', section:'Main', arguments: _all)}"
- data-image-uid="{image.uid}"
- data-crop-variants="{config.cropVariants -> f:format.json()}"
- data-button-preview-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.preview')}"
- data-button-dismiss-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.cancel')}"
- data-button-save-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.accept')}"
- data-file-field="{config.file_field}"
- data-field="{formEngine.field.id}">
- <span class="t3-icon fa fa-crop"></span>
- <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.open-editor"/>
- </button>
- </div>
- </f:else>
- </f:if>
- <div class="row media-gallery__list">
- <f:for each="{config.cropVariants}" as="cropVariant">
- <div class="col-xs-6 col-sm-4 col-md-3 media-gallery__item">
- <p>
- <b><f:translate id="{cropVariant.title}" default="{cropVariant.title}" /></b><br/>
- <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.aspect-ratio"/>: <span class="t3js-image-manipulation-selected-ratio" data-crop-variant-id="{cropVariant.id}"><f:translate id="{cropVariant.allowedAspectRatios.{cropVariant.selectedRatio}.title}" default="{cropVariant.allowedAspectRatios.{cropVariant.selectedRatio}.title}" /></span>
- </p>
- <div class="t3js-image-manipulation-preview media-object"
- data-preview-height="150"
- data-crop-variant-id="{cropVariant.id}">
- <f:image image="{image}" crop="{formEngine.field.value}"
- cropVariant="{cropVariant.id}"
- maxHeight="150"
- class="thumbnail thumbnail-status"
- additionalAttributes="{data-crop-variant: '{cropVariant -> f:format.json()}', data-crop-variant-id: cropVariant.id}"/>
- </div>
- </div>
- </f:for>
- </div>
- </f:then>
- <f:else>
- <div class="media-body">
- <f:if condition="{image.properties.width}">
- <f:then>
- <p>
- <em>
- <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.supported-types-message" /><br/>
- {config.allowedExtensions -> f:format.case(mode: 'upper')}
- </em>
- </p>
- </f:then>
- <f:else>
- <div class="alert alert-info">
- <h4>
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-dimensions"/>
- </h4>
- <p>
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-dimensions-message"/>
- </p>
- </div>
- </f:else>
- </f:if>
- </div>
- </f:else>
- </f:if>
- </f:section>
+ <f:section name="Main">
+ <f:if condition="{isAllowedFileExtension} && {image.properties.width}">
+ <f:then>
+ <f:if condition="{config.readOnly}">
+ <f:else>
+ <div class="form-control-wrap">
+ <input type="hidden" id="{formEngine.field.id}"
+ name="{formEngine.field.name}"
+ value="{formEngine.field.value}"
+ data-formengine-validation-rules="{formEngine.validation}"/>
+ <button class="btn btn-default t3js-image-manipulation-trigger"
+ data-url="{wizardUri}"
+ data-payload="{wizardPayload}"
+ data-preview-url="{previewUrl}"
+ data-severity="notice"
+ data-modal-title="{f:render(partial: 'ModalTitle', section:'Main', arguments: _all)}"
+ data-image-uid="{image.uid}"
+ data-crop-variants="{config.cropVariants -> f:format.json()}"
+ data-button-preview-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.preview')}"
+ data-button-dismiss-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.cancel')}"
+ data-button-save-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.accept')}"
+ data-file-field="{config.file_field}"
+ data-field="{formEngine.field.id}">
+ <span class="t3-icon fa fa-crop"></span>
+ <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.open-editor"/>
+ </button>
+ </div>
+ </f:else>
+ </f:if>
+ <div class="row media-gallery__list">
+ <f:for each="{config.cropVariants}" as="cropVariant">
+ <div class="col-xs-6 col-sm-4 col-md-3 media-gallery__item">
+ <p>
+ <b><f:translate id="{cropVariant.title}" default="{cropVariant.title}" /></b><br/>
+ <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.aspect-ratio"/>: <span class="t3js-image-manipulation-selected-ratio" data-crop-variant-id="{cropVariant.id}"><f:translate id="{cropVariant.allowedAspectRatios.{cropVariant.selectedRatio}.title}" default="{cropVariant.allowedAspectRatios.{cropVariant.selectedRatio}.title}" /></span>
+ </p>
+ <div class="t3js-image-manipulation-preview media-object"
+ data-preview-height="150"
+ data-crop-variant-id="{cropVariant.id}">
+ <f:image image="{image}" crop="{formEngine.field.value}"
+ cropVariant="{cropVariant.id}"
+ maxHeight="150"
+ class="thumbnail thumbnail-status"
+ additionalAttributes="{data-crop-variant: '{cropVariant -> f:format.json()}', data-crop-variant-id: cropVariant.id}"/>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ </f:then>
+ <f:else>
+ <div class="media-body">
+ <f:if condition="{image.properties.width}">
+ <f:then>
+ <p>
+ <em>
+ <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.supported-types-message" /><br/>
+ {config.allowedExtensions -> f:format.case(mode: 'upper')}
+ </em>
+ </p>
+ </f:then>
+ <f:else>
+ <div class="alert alert-info">
+ <h4>
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-dimensions"/>
+ </h4>
+ <p>
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-dimensions-message"/>
+ </p>
+ </div>
+ </f:else>
+ </f:if>
+ </div>
+ </f:else>
+ </f:if>
+ </f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationWizard.html b/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationWizard.html
index 52070b91c5ab..ad85e285a223 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationWizard.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ImageManipulation/ImageManipulationWizard.html
@@ -1,85 +1,85 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
- <f:section name="Main">
+ <f:section name="Main">
- <div class="modal-panel-main">
- <div id="t3js-crop-image-container" class="cropper-image-container">
- <f:image image="{image}" maxWidth="1000" maxHeight="1000" id="t3js-crop-image" class="cropper-image-container-image" additionalAttributes="{data-original-width: image.properties.width, data-original-height: image.properties.height}" />
- </div>
- </div>
- <div class="modal-panel-sidebar">
- <div class="panel-group" id="accordion-cropper-variants" role="tablist" aria-multiselectable="true">
- <f:for each="{cropVariants}" as="cropVariant" iteration="cropVariantIterator">
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="cropper-accordion-heading-{cropVariantIterator.cycle}">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion-cropper-variants"
- href="#cropper-collapse-{cropVariantIterator.cycle}"
- aria-expanded="{f:if(condition:cropVariantIterator.isFirst, then:'true', else:'false')}"
- aria-controls="cropper-collapse-{cropVariantIterator.cycle}"
- class="t3js-crop-variant-trigger {f:if(condition:cropVariantIterator.isFirst, then:'is-active', else:'collapsed')}"
- data-crop-variant-id="{cropVariant.id}"
- data-crop-variant>
- <span><i class="fa fa-chevron-{f:if(condition:cropVariantIterator.isFirst, then:'up', else:'down')}"
- aria-hidden="true"></i> {cropVariant.title -> f:translate(id: cropVariant.title)}</span>
- <div
- class="cropper-preview-thumbnail {f:if(condition:'{image.properties.width}>{image.properties.height}', then:'wide', else: 'tall')}">
- <img class="cropper-preview-thumbnail-image"
- src="{f:uri.image(image:image, maxWidth:'300', maxHeight: '300')}">
- <div class="cropper-preview-thumbnail-crop-area t3js-cropper-preview-thumbnail-crop-area">
- <img src="{f:uri.image(image:image, maxWidth:'300', maxHeight: '300')}"
- class="cropper-preview-thumbnail-crop-image t3js-cropper-preview-thumbnail-crop-image">
- <div class="cropper-preview-thumbnail-focus-area t3js-cropper-preview-thumbnail-focus-area"></div>
- </div>
- </div>
- </a>
- </h4>
- </div>
- <div id="cropper-collapse-{cropVariantIterator.cycle}"
- class="panel-collapse collapse {f:if(condition:cropVariantIterator.isFirst, then:'in')}"
- role="tabpanel"
- aria-labelledby="cropper-accordion-heading-{cropVariantIterator.cycle}">
- <div class="panel-body">
- <form class="form">
- <div class="form-group">
- <f:if condition="{cropVariant.allowedAspectRatios}">
- <label for="ratio-{cropVariantIterator.cycle}">
- <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.aspect-ratio"/>
- </label>
- <div id="ratio-{cropVariantIterator.cycle}" class="ratio-buttons t3js-ratio-buttons"
- data-toggle="buttons">
- <f:for each="{cropVariant.allowedAspectRatios}" as="ratio" iteration="ratioIterator">
- <label class="btn btn-secondary" data-method="setAspectRatio" data-option="{ratio.id}" title="{f:translate(id:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.set-aspect-ratio')}">
- <input
- class="sr-only" id="aspectRatio-{cropVariantIterator.cycle}-{ratioIterator.cycle}"
- name="aspectRatio-{cropVariantIterator.cycle}-{ratioIterator.cycle}" value="{cropVariant.id}"
- type="radio">
- <span class="t3-js-ratio-title" data-ratio-id="{cropVariant.id}{ratio.id}">{ratio.title -> f:translate(id: ratio.title)}</span> <i class="fa fa-check"></i></label>
- </f:for>
- </div>
- </f:if>
- <label><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.selection" /></label>
- <div class="table-fit-block">
- <table class="table table-no-borders table-transparent">
- <tr>
- <td class="t3js-cropper-info-crop"></td>
- </tr>
- </table>
- </div>
- <button class="btn btn-secondary" data-method="reset" data-crop-variant="{cropVariant -> f:format.json()}"
- title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}">
- <i class="fa fa-refresh"></i>
- {f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}
- </button>
- </div>
- </form>
- </div>
- </div>
- </div>
- </f:for>
- </div>
- </div>
+ <div class="modal-panel-main">
+ <div id="t3js-crop-image-container" class="cropper-image-container">
+ <f:image image="{image}" maxWidth="1000" maxHeight="1000" id="t3js-crop-image" class="cropper-image-container-image" additionalAttributes="{data-original-width: image.properties.width, data-original-height: image.properties.height}" />
+ </div>
+ </div>
+ <div class="modal-panel-sidebar">
+ <div class="panel-group" id="accordion-cropper-variants" role="tablist" aria-multiselectable="true">
+ <f:for each="{cropVariants}" as="cropVariant" iteration="cropVariantIterator">
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="cropper-accordion-heading-{cropVariantIterator.cycle}">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion-cropper-variants"
+ href="#cropper-collapse-{cropVariantIterator.cycle}"
+ aria-expanded="{f:if(condition:cropVariantIterator.isFirst, then:'true', else:'false')}"
+ aria-controls="cropper-collapse-{cropVariantIterator.cycle}"
+ class="t3js-crop-variant-trigger {f:if(condition:cropVariantIterator.isFirst, then:'is-active', else:'collapsed')}"
+ data-crop-variant-id="{cropVariant.id}"
+ data-crop-variant>
+ <span><i class="fa fa-chevron-{f:if(condition:cropVariantIterator.isFirst, then:'up', else:'down')}"
+ aria-hidden="true"></i> {cropVariant.title -> f:translate(id: cropVariant.title)}</span>
+ <div
+ class="cropper-preview-thumbnail {f:if(condition:'{image.properties.width}>{image.properties.height}', then:'wide', else: 'tall')}">
+ <img class="cropper-preview-thumbnail-image"
+ src="{f:uri.image(image:image, maxWidth:'300', maxHeight: '300')}">
+ <div class="cropper-preview-thumbnail-crop-area t3js-cropper-preview-thumbnail-crop-area">
+ <img src="{f:uri.image(image:image, maxWidth:'300', maxHeight: '300')}"
+ class="cropper-preview-thumbnail-crop-image t3js-cropper-preview-thumbnail-crop-image">
+ <div class="cropper-preview-thumbnail-focus-area t3js-cropper-preview-thumbnail-focus-area"></div>
+ </div>
+ </div>
+ </a>
+ </h4>
+ </div>
+ <div id="cropper-collapse-{cropVariantIterator.cycle}"
+ class="panel-collapse collapse {f:if(condition:cropVariantIterator.isFirst, then:'in')}"
+ role="tabpanel"
+ aria-labelledby="cropper-accordion-heading-{cropVariantIterator.cycle}">
+ <div class="panel-body">
+ <form class="form">
+ <div class="form-group">
+ <f:if condition="{cropVariant.allowedAspectRatios}">
+ <label for="ratio-{cropVariantIterator.cycle}">
+ <f:translate id="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.aspect-ratio"/>
+ </label>
+ <div id="ratio-{cropVariantIterator.cycle}" class="ratio-buttons t3js-ratio-buttons"
+ data-toggle="buttons">
+ <f:for each="{cropVariant.allowedAspectRatios}" as="ratio" iteration="ratioIterator">
+ <label class="btn btn-secondary" data-method="setAspectRatio" data-option="{ratio.id}" title="{f:translate(id:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.set-aspect-ratio')}">
+ <input
+ class="sr-only" id="aspectRatio-{cropVariantIterator.cycle}-{ratioIterator.cycle}"
+ name="aspectRatio-{cropVariantIterator.cycle}-{ratioIterator.cycle}" value="{cropVariant.id}"
+ type="radio">
+ <span class="t3-js-ratio-title" data-ratio-id="{cropVariant.id}{ratio.id}">{ratio.title -> f:translate(id: ratio.title)}</span> <i class="fa fa-check"></i></label>
+ </f:for>
+ </div>
+ </f:if>
+ <label><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.selection" /></label>
+ <div class="table-fit-block">
+ <table class="table table-no-borders table-transparent">
+ <tr>
+ <td class="t3js-cropper-info-crop"></td>
+ </tr>
+ </table>
+ </div>
+ <button class="btn btn-secondary" data-method="reset" data-crop-variant="{cropVariant -> f:format.json()}"
+ title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}">
+ <i class="fa fa-refresh"></i>
+ {f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}
+ </button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ </div>
- </f:section>
+ </f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/InfoBox.html b/typo3/sysext/backend/Resources/Private/Templates/InfoBox.html
index 870c90946284..40a93fcaebc2 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/InfoBox.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/InfoBox.html
@@ -1,3 +1,3 @@
<f:be.infobox title="{title}" state="{state}">
- <f:format.raw>{message}</f:format.raw>
+ <f:format.raw>{message}</f:format.raw>
</f:be.infobox>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Module.html b/typo3/sysext/backend/Resources/Private/Templates/Module.html
index 630f60218118..0a138553702a 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Module.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Module.html
@@ -1,24 +1,24 @@
<div class="module" data-module-id="{moduleId}" data-module-name="{moduleName}">
- <f:if condition="{formTag}">
- <f:then>
- <f:format.raw>{formTag}</f:format.raw>
- </f:then>
- </f:if>
- <f:if condition="{docHeader.enabled}">
- <f:render partial="DocHeader" arguments="{docHeader:docHeader}" />
- </f:if>
- <div class="module-body t3js-module-body">
- <f:if condition="{uiBlock}">
- <div id="t3js-ui-block" class="ui-block">
- <core:icon identifier="spinner-circle-light" size="large" />
- </div>
- </f:if>
- <f:flashMessages queueIdentifier="{flashMessageQueueIdentifier}" />
- <f:format.raw>{content}</f:format.raw>
- </div>
- <f:if condition="{formTag}">
- <f:then>
- </form>
- </f:then>
- </f:if>
+ <f:if condition="{formTag}">
+ <f:then>
+ <f:format.raw>{formTag}</f:format.raw>
+ </f:then>
+ </f:if>
+ <f:if condition="{docHeader.enabled}">
+ <f:render partial="DocHeader" arguments="{docHeader:docHeader}" />
+ </f:if>
+ <div class="module-body t3js-module-body">
+ <f:if condition="{uiBlock}">
+ <div id="t3js-ui-block" class="ui-block">
+ <core:icon identifier="spinner-circle-light" size="large" />
+ </div>
+ </f:if>
+ <f:flashMessages queueIdentifier="{flashMessageQueueIdentifier}" />
+ <f:format.raw>{content}</f:format.raw>
+ </div>
+ <f:if condition="{formTag}">
+ <f:then>
+ </form>
+ </f:then>
+ </f:if>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ModuleMenu/Main.html b/typo3/sysext/backend/Resources/Private/Templates/ModuleMenu/Main.html
index 5eca3711f3e1..7dd425b1894a 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ModuleMenu/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ModuleMenu/Main.html
@@ -1,35 +1,35 @@
<ul class="nav nav-modules" data-role="modulemenu" id="menu">
- <f:for each="{modules}" as="mainModule">
- <li class="modulemenu-group expanded" id="{mainModule.name}" data-modulename="{mainModule.name}" data-navigationcomponentid="{mainModule.navigationComponentId}" data-navigationframescript="{mainModule.navigationFrameScript}" data-navigationframescriptparameters="{mainModule.navigationFrameScriptParameters}">
- <div class="modulemenu-group-header">
- <span class="modulemenu-icon modulemenu-group-icon">
- <f:if condition="{mainModule.icon}">
- <f:then>
- <f:format.raw>{mainModule.icon}</f:format.raw>
- </f:then>
- <f:else>
- <core:icon identifier="actions-move-move" size="default" alternativeMarkupIdentifier="inline" />
- </f:else>
- </f:if>
- </span>
- <span class="modulemenu-group-title">
- {mainModule.title} <span class="caret"></span>
- </span>
- </div>
- <ul class="modulemenu-group-container">
- <f:for each="{mainModule.children}" as="subModule">
- <li id="{subModule.name}" class="modulemenu-item t3js-mainmodule" data-modulename="{mainModule.name}" data-navigationcomponentid="{subModule.navigationComponentId}" data-navigationframescript="{subModule.navigationFrameScript}" data-navigationframescriptparameters="{subModule.navigationFrameScriptParameters}">
- <a href="#" data-link="{subModule.link}" class="modulemenu-item-link" title="{subModule.description}">
- <span class="modulemenu-icon modulemenu-item-icon">
+ <f:for each="{modules}" as="mainModule">
+ <li class="modulemenu-group expanded" id="{mainModule.name}" data-modulename="{mainModule.name}" data-navigationcomponentid="{mainModule.navigationComponentId}" data-navigationframescript="{mainModule.navigationFrameScript}" data-navigationframescriptparameters="{mainModule.navigationFrameScriptParameters}">
+ <div class="modulemenu-group-header">
+ <span class="modulemenu-icon modulemenu-group-icon">
+ <f:if condition="{mainModule.icon}">
+ <f:then>
+ <f:format.raw>{mainModule.icon}</f:format.raw>
+ </f:then>
+ <f:else>
+ <core:icon identifier="actions-move-move" size="default" alternativeMarkupIdentifier="inline" />
+ </f:else>
+ </f:if>
+ </span>
+ <span class="modulemenu-group-title">
+ {mainModule.title} <span class="caret"></span>
+ </span>
+ </div>
+ <ul class="modulemenu-group-container">
+ <f:for each="{mainModule.children}" as="subModule">
+ <li id="{subModule.name}" class="modulemenu-item t3js-mainmodule" data-modulename="{mainModule.name}" data-navigationcomponentid="{subModule.navigationComponentId}" data-navigationframescript="{subModule.navigationFrameScript}" data-navigationframescriptparameters="{subModule.navigationFrameScriptParameters}">
+ <a href="#" data-link="{subModule.link}" class="modulemenu-item-link" title="{subModule.description}">
+ <span class="modulemenu-icon modulemenu-item-icon">
<f:format.raw>{subModule.icon}</f:format.raw>
- </span>
- <span class="modulemenu-item-title">
- {subModule.title}
- </span>
- </a>
- </li>
- </f:for>
- </ul>
- </li>
- </f:for>
+ </span>
+ <span class="modulemenu-item-title">
+ {subModule.title}
+ </span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </li>
+ </f:for>
</ul>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
index 2f5dcebafa0b..ac16541160b7 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
@@ -1,40 +1,40 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{hasAccess}">
- <f:then>
- <f:form action="" name="editForm" id="NewContentElementController">
- <f:form.hidden name="defValues" value="" />
- <f:if condition="{onClickEvent}">
- <f:then>
- <script type="text/javascript">
- function goToalt_doc() {<f:format.raw>{onClickEvent}</f:format.raw>}
- </script>
- {renderedTabs -> f:format.raw()}
- </f:then>
- <f:else>
- <div id="new-content-element-wizard-carousel" class="carousel slide" data-ride="carousel" data-interval="false">
- <div class="carousel-inner" role="listbox">
- <div class="item active" data-slide="next">
- <div class="t3-new-content-element-wizard-title">
- <h2>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:1_selectType')}</h2>
- </div>
- {renderedTabs -> f:format.raw()}
- </div>
- <div class="item">
- <div class="t3-new-content-element-wizard-title">
- <h2>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:2_selectPosition') -> f:format.htmlspecialchars()}</h2>
- </div>
- <div class="t3-new-content-element-wizard-body">
- {posMap -> f:format.raw()}
- </div>
- </div>
- </div>
- </div>
- </f:else>
- </f:if>
- </f:form>
- </f:then>
- <f:else>
- <h1>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:newContentElement')}</h1>
- </f:else>
+ <f:then>
+ <f:form action="" name="editForm" id="NewContentElementController">
+ <f:form.hidden name="defValues" value="" />
+ <f:if condition="{onClickEvent}">
+ <f:then>
+ <script type="text/javascript">
+ function goToalt_doc() {<f:format.raw>{onClickEvent}</f:format.raw>}
+ </script>
+ {renderedTabs -> f:format.raw()}
+ </f:then>
+ <f:else>
+ <div id="new-content-element-wizard-carousel" class="carousel slide" data-ride="carousel" data-interval="false">
+ <div class="carousel-inner" role="listbox">
+ <div class="item active" data-slide="next">
+ <div class="t3-new-content-element-wizard-title">
+ <h2>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:1_selectType')}</h2>
+ </div>
+ {renderedTabs -> f:format.raw()}
+ </div>
+ <div class="item">
+ <div class="t3-new-content-element-wizard-title">
+ <h2>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:2_selectPosition') -> f:format.htmlspecialchars()}</h2>
+ </div>
+ <div class="t3-new-content-element-wizard-body">
+ {posMap -> f:format.raw()}
+ </div>
+ </div>
+ </div>
+ </div>
+ </f:else>
+ </f:if>
+ </f:form>
+ </f:then>
+ <f:else>
+ <h1>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:newContentElement')}</h1>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/MenuItem.html b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/MenuItem.html
index 3539a5fa296a..67518b8927e7 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/MenuItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/MenuItem.html
@@ -1,39 +1,39 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="media media-new-content-element-wizard">
- <f:if condition="{onClickEvent}">
- <f:then>
- <a href="#" onclick="{aOnClick -> f:format.htmlspecialchars()}" data-dismiss="modal">
- <f:if condition="{content}">
- {content -> f:format.raw()}
- </f:if>
- <div class="media-left">
- {icon -> f:format.raw()}
- </div>
- <div class="media-body">
- <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
- <br/>
- {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
- </div>
- </a>
- </f:then>
- <f:else>
- <input type="radio" class="hide" name="tempB" value="{wizardKey -> f:format.htmlspecialchars()}"
- onclick="{wizardOnClick -> f:format.htmlspecialchars()}"/>
- <a href="#new-content-element-wizard-carousel" onclick="{aOnClick -> f:format.htmlspecialchars()}"
- data-slide="next">
- <f:if condition="{content}">
- {content -> f:format.raw()}
- </f:if>
- <div class="media-left">
- {icon -> f:format.raw()}
- </div>
- <div class="media-body">
- <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
- <br/>
- {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
- </div>
- </a>
- </f:else>
- </f:if>
+ <f:if condition="{onClickEvent}">
+ <f:then>
+ <a href="#" onclick="{aOnClick -> f:format.htmlspecialchars()}" data-dismiss="modal">
+ <f:if condition="{content}">
+ {content -> f:format.raw()}
+ </f:if>
+ <div class="media-left">
+ {icon -> f:format.raw()}
+ </div>
+ <div class="media-body">
+ <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
+ <br/>
+ {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
+ </div>
+ </a>
+ </f:then>
+ <f:else>
+ <input type="radio" class="hide" name="tempB" value="{wizardKey -> f:format.htmlspecialchars()}"
+ onclick="{wizardOnClick -> f:format.htmlspecialchars()}"/>
+ <a href="#new-content-element-wizard-carousel" onclick="{aOnClick -> f:format.htmlspecialchars()}"
+ data-slide="next">
+ <f:if condition="{content}">
+ {content -> f:format.raw()}
+ </f:if>
+ <div class="media-left">
+ {icon -> f:format.raw()}
+ </div>
+ <div class="media-body">
+ <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
+ <br/>
+ {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
+ </div>
+ </a>
+ </f:else>
+ </f:if>
</div>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/OuterWrapContainer.html b/typo3/sysext/backend/Resources/Private/Templates/OuterWrapContainer.html
index 35b4406ea36c..739184b29a17 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/OuterWrapContainer.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/OuterWrapContainer.html
@@ -1,22 +1,22 @@
<h1><f:format.raw>{pageTitle}</f:format.raw></h1>
<f:if condition="{recordDescription}">
- <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordInformation')}">
- {recordDescription -> f:format.nl2br()}
- </f:be.infobox>
+ <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordInformation')}">
+ {recordDescription -> f:format.nl2br()}
+ </f:be.infobox>
</f:if>
<f:if condition="{recordReadonly}">
- <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordInformation')}">
- {f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordReadonly')}
- </f:be.infobox>
+ <f:be.infobox title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordInformation')}">
+ {f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.recordReadonly')}
+ </f:be.infobox>
</f:if>
<div class="typo3-TCEforms{f:if(condition:isNewRecord, then:' has-change')}">
- <f:format.raw>{fieldInformationHtml}</f:format.raw>
- <f:format.raw>{fieldWizardHtml}</f:format.raw>
- <f:format.raw>{childHtml}</f:format.raw>
- <div class="help-block text-right">
- <f:format.raw>{icon}</f:format.raw>
- <strong><f:format.raw>{tableTitle}</f:format.raw></strong> <f:format.raw>{newOrUid}</f:format.raw>
- </div>
+ <f:format.raw>{fieldInformationHtml}</f:format.raw>
+ <f:format.raw>{fieldWizardHtml}</f:format.raw>
+ <f:format.raw>{childHtml}</f:format.raw>
+ <div class="help-block text-right">
+ <f:format.raw>{icon}</f:format.raw>
+ <strong><f:format.raw>{tableTitle}</f:format.raw></strong> <f:format.raw>{newOrUid}</f:format.raw>
+ </div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/DropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/DropDown.html
index 25317fb43e75..751da5fdf424 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/DropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/DropDown.html
@@ -1,32 +1,32 @@
<h3 class="dropdown-headline">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')}
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')}
</h3>
<hr>
<f:if condition="{f:count(subject: '{shortcutMenu}')} == 0">
- <f:then>
- <f:render section="helpMessage"/>
- </f:then>
- <f:else>
- <f:for each="{shortcutMenu}" as="group" iteration="iterator">
- <f:if condition="!{iterator.isFirst}">
- <hr>
- </f:if>
- <f:if condition="{group.title}">
- <h3 class="dropdown-headline" id="shortcut-group-{group.id}">{group.title}</h3>
- </f:if>
- <div class="dropdown-table" data-shortcutgroup="{group.id}">
- <f:for each="{group.shortcuts}" as="shortcut">
- <f:render partial="ShortcutToolbarItem/Shortcut" arguments="{group : group, shortcut : shortcut}" />
- </f:for>
- </div>
- </f:for>
- </f:else>
+ <f:then>
+ <f:render section="helpMessage"/>
+ </f:then>
+ <f:else>
+ <f:for each="{shortcutMenu}" as="group" iteration="iterator">
+ <f:if condition="!{iterator.isFirst}">
+ <hr>
+ </f:if>
+ <f:if condition="{group.title}">
+ <h3 class="dropdown-headline" id="shortcut-group-{group.id}">{group.title}</h3>
+ </f:if>
+ <div class="dropdown-table" data-shortcutgroup="{group.id}">
+ <f:for each="{group.shortcuts}" as="shortcut">
+ <f:render partial="ShortcutToolbarItem/Shortcut" arguments="{group : group, shortcut : shortcut}" />
+ </f:for>
+ </div>
+ </f:for>
+ </f:else>
</f:if>
<f:section name="helpMessage">
- <f:comment>No shortcuts added yet, show a small help message how to add shortcuts</f:comment>
- <f:alias
- map="{inlineIcon: '{core:icon(identifier: \'actions-system-shortcut-new\', alternativeMarkupIdentifier: \'inline\')}', inlineIconTitle: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks\')}'}">
- <p>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_description', arguments:'{0: \'<span title="{inlineIconTitle}">{inlineIcon -> f:format.raw()}</span>\'}') -> f:format.raw()}</p>
- </f:alias>
+ <f:comment>No shortcuts added yet, show a small help message how to add shortcuts</f:comment>
+ <f:alias
+ map="{inlineIcon: '{core:icon(identifier: \'actions-system-shortcut-new\', alternativeMarkupIdentifier: \'inline\')}', inlineIconTitle: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks\')}'}">
+ <p>{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_description', arguments:'{0: \'<span title="{inlineIconTitle}">{inlineIcon -> f:format.raw()}</span>\'}') -> f:format.raw()}</p>
+ </f:alias>
</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/EditForm.html b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/EditForm.html
index 0f0a36b8bc8d..205cdf6f5ab5 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/EditForm.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/EditForm.html
@@ -1,19 +1,19 @@
<form class="shortcut-form" role="form" data-shortcutid="{selectedShortcutId}">
- <h3 class="dropdown-headline">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}
- </h3>
- <hr>
- <div class="form-group">
- <input type="text" class="form-control" name="shortcut-title" value="{selectedShortcut.label}"/>
- </div>
- <div class="form-group">
- <select class="form-control" name="shortcut-group">
- <f:for each="{shortcutGroups}" key="shortcutGroupId" as="shortcutGroupTitle">
- <option value="{shortcutGroupId}" {f:if(condition: '{selectedShortcutGroupId} == {shortcutGroupId}', then: 'selected="selected"')}>{shortcutGroupTitle}</option>
- </f:for>
- </select>
- </div>
- <hr>
- <input type="button" class="btn btn-default shortcut-form-cancel" value="Cancel"/>
- <input type="button" class="btn btn-success shortcut-form-save" value="Save"/>
+ <h3 class="dropdown-headline">
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')}
+ </h3>
+ <hr>
+ <div class="form-group">
+ <input type="text" class="form-control" name="shortcut-title" value="{selectedShortcut.label}"/>
+ </div>
+ <div class="form-group">
+ <select class="form-control" name="shortcut-group">
+ <f:for each="{shortcutGroups}" key="shortcutGroupId" as="shortcutGroupTitle">
+ <option value="{shortcutGroupId}" {f:if(condition: '{selectedShortcutGroupId} == {shortcutGroupId}', then: 'selected="selected"')}>{shortcutGroupTitle}</option>
+ </f:for>
+ </select>
+ </div>
+ <hr>
+ <input type="button" class="btn btn-default shortcut-form-cancel" value="Cancel"/>
+ <input type="button" class="btn btn-success shortcut-form-save" value="Save"/>
</form>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/Item.html b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/Item.html
index 3486abc0582d..e6d46c3fcb70 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/Item.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ShortcutToolbarItem/Item.html
@@ -1,6 +1,6 @@
<span class="toolbar-item-icon" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')}">
- <core:icon identifier="apps-toolbar-menu-shortcut" alternativeMarkupIdentifier="inline" />
+ <core:icon identifier="apps-toolbar-menu-shortcut" alternativeMarkupIdentifier="inline" />
</span>
<span class="toolbar-item-title">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks"/>
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks"/>
</span>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Edit.html b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Edit.html
index eca5d6776513..2ee111273caa 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Edit.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Edit.html
@@ -15,4 +15,4 @@
<input type="hidden" name="rootPageId" value="{rootPageId}" />
{formEngineFooter -> f:format.raw()}
-</form>
\ No newline at end of file
+</form>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
index e313e61f7926..ac448f925219 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
@@ -1,160 +1,160 @@
<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true">
+ xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ data-namespace-typo3-fluid="true">
<h1><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.title" /></h1>
<f:if condition="{pages}">
- <f:then>
- <div class="table-fit">
- <table class="table table-striped table-hover table-condensed">
- <thead>
- <tr>
- <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.site" /></th>
- <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.configuration" /></th>
- <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.baseUrl" /></th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{pages}" as="page">
- <tr>
- <td nowrap valign="top">
- <f:for each="{page.rootline}" as="rootLinePage" iteration="i">
- <span style="width: 1px; height: 1px; display:inline-block; margin-left: {rootLinePage.margin}px"></span>
- <f:if condition="{rootLinePage.uid} == {page.uid}">
- <f:then>
- <a href="#" class="t3js-contextmenutrigger" data-table="pages" data-uid="{rootLinePage.uid}">
- <core:iconForRecord table="pages" row="{rootLinePage}" />
- </a>
- <f:if condition="{page.siteIdentifier}">
- <f:then>
- <f:be.link route="site_configuration" parameters="{action: 'edit', site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
- {rootLinePage.title} [ID: {page.uid}]
- </f:be.link>
- </f:then>
- <f:else>
- {rootLinePage.title} [ID: {page.uid}]
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <core:iconForRecord table="pages" row="{rootLinePage}" />
- {rootLinePage.title}<br>
- </f:else>
- </f:if>
- </f:for>
- </td>
- <td>
- <f:if condition="{page.siteIdentifier}">
- <f:then>
- <code>{page.siteIdentifier}</code>
- </f:then>
- <f:else>
- <div>
- <f:be.link route="site_configuration" parameters="{action: 'edit', pageUid: page.uid}" title="Create configuration" class="btn btn-primary">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.addSiteConfiguration" />
- </f:be.link>
- </div>
- </f:else>
- </f:if>
- </td>
- <td>
- <f:if condition="{page.siteConfiguration}">
- <table class="table table-striped table-no-borders">
- <tr>
- <th>{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.language')}</th>
- <th>{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.fullUrlPrefix')}</th>
- </tr>
- <f:for each="{page.siteConfiguration.allLanguages}" as="siteLanguage">
- <tr>
- <td>
- <f:if condition="{siteLanguage.enabled}">
- <f:then>
- <core:icon identifier="{siteLanguage.flagIdentifier}" /> {siteLanguage.title}
- </f:then>
- <f:else>
- <core:icon identifier="{siteLanguage.flagIdentifier}" overlay="overlay-hidden" /> <span class="text-muted">{siteLanguage.title} (<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:disabled">disabled</f:translate>)</span>
- </f:else>
- </f:if>
- </td>
- <td><a href="{siteLanguage.base}" target="_blank">{siteLanguage.base}</a></td>
- </tr>
- </f:for>
- </table>
- </f:if>
- </td>
- <td class="col-control nowrap">
- <div class="btn-group">
- <f:if condition="{page.siteIdentifier}">
- <f:be.link route="site_configuration" parameters="{action: 'edit', site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}" class="btn btn-default">
- <core:icon identifier="actions-open" />
- </f:be.link>
- <f:be.link
- route="site_configuration"
- parameters="{action: 'delete', site:page.siteIdentifier}"
- class="btn btn-default t3js-modal-trigger"
- title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration')}"
- data="{
- severity: 'error',
- title: '{f:translate(key:\'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration\')}',
- button-ok-text: '{f:translate(key:\'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete\')}'
- }"
- >
- <core:icon identifier="actions-delete" />
- </f:be.link>
- </f:if>
- </div>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </f:then>
- <f:else>
- <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.noPages.title')}">
- <p><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.noPages.message"/></p>
- </f:be.infobox>
- </f:else>
+ <f:then>
+ <div class="table-fit">
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.site" /></th>
+ <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.configuration" /></th>
+ <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.baseUrl" /></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{pages}" as="page">
+ <tr>
+ <td nowrap valign="top">
+ <f:for each="{page.rootline}" as="rootLinePage" iteration="i">
+ <span style="width: 1px; height: 1px; display:inline-block; margin-left: {rootLinePage.margin}px"></span>
+ <f:if condition="{rootLinePage.uid} == {page.uid}">
+ <f:then>
+ <a href="#" class="t3js-contextmenutrigger" data-table="pages" data-uid="{rootLinePage.uid}">
+ <core:iconForRecord table="pages" row="{rootLinePage}" />
+ </a>
+ <f:if condition="{page.siteIdentifier}">
+ <f:then>
+ <f:be.link route="site_configuration" parameters="{action: 'edit', site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
+ {rootLinePage.title} [ID: {page.uid}]
+ </f:be.link>
+ </f:then>
+ <f:else>
+ {rootLinePage.title} [ID: {page.uid}]
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <core:iconForRecord table="pages" row="{rootLinePage}" />
+ {rootLinePage.title}<br>
+ </f:else>
+ </f:if>
+ </f:for>
+ </td>
+ <td>
+ <f:if condition="{page.siteIdentifier}">
+ <f:then>
+ <code>{page.siteIdentifier}</code>
+ </f:then>
+ <f:else>
+ <div>
+ <f:be.link route="site_configuration" parameters="{action: 'edit', pageUid: page.uid}" title="Create configuration" class="btn btn-primary">
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.addSiteConfiguration" />
+ </f:be.link>
+ </div>
+ </f:else>
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{page.siteConfiguration}">
+ <table class="table table-striped table-no-borders">
+ <tr>
+ <th>{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.language')}</th>
+ <th>{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.fullUrlPrefix')}</th>
+ </tr>
+ <f:for each="{page.siteConfiguration.allLanguages}" as="siteLanguage">
+ <tr>
+ <td>
+ <f:if condition="{siteLanguage.enabled}">
+ <f:then>
+ <core:icon identifier="{siteLanguage.flagIdentifier}" /> {siteLanguage.title}
+ </f:then>
+ <f:else>
+ <core:icon identifier="{siteLanguage.flagIdentifier}" overlay="overlay-hidden" /> <span class="text-muted">{siteLanguage.title} (<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:disabled">disabled</f:translate>)</span>
+ </f:else>
+ </f:if>
+ </td>
+ <td><a href="{siteLanguage.base}" target="_blank">{siteLanguage.base}</a></td>
+ </tr>
+ </f:for>
+ </table>
+ </f:if>
+ </td>
+ <td class="col-control nowrap">
+ <div class="btn-group">
+ <f:if condition="{page.siteIdentifier}">
+ <f:be.link route="site_configuration" parameters="{action: 'edit', site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}" class="btn btn-default">
+ <core:icon identifier="actions-open" />
+ </f:be.link>
+ <f:be.link
+ route="site_configuration"
+ parameters="{action: 'delete', site:page.siteIdentifier}"
+ class="btn btn-default t3js-modal-trigger"
+ title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration')}"
+ data="{
+ severity: 'error',
+ title: '{f:translate(key:\'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration\')}',
+ button-ok-text: '{f:translate(key:\'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete\')}'
+ }"
+ >
+ <core:icon identifier="actions-delete" />
+ </f:be.link>
+ </f:if>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.noPages.title')}">
+ <p><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.noPages.message"/></p>
+ </f:be.infobox>
+ </f:else>
</f:if>
<f:if condition="{unassignedSites}">
- <h3>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.unassignedSites.title')}</h3>
- <p>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.unassignedSites.description')}</p>
+ <h3>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.unassignedSites.title')}</h3>
+ <p>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.unassignedSites.description')}</p>
- <table class="table table-striped table-hover table-condensed">
- <thead>
- <tr>
- <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.configuration" /></th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{unassignedSites}" as="unassignedSite">
- <tr>
- <td> <code>{unassignedSite.identifier}</code></td>
- <td class="col-control nowrap">
- <div class="btn-group">
- <f:be.link
- route="site_configuration"
- parameters="{action: 'delete', site:unassignedSite.identifier}"
- class="btn btn-default t3js-modal-trigger"
- title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration')}"
- data="{
- severity: 'error',
- title: '{f:translate(key:\'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration\')}',
- button-ok-text: '{f:translate(key:\'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete\')}'
- }"
- >
- <core:icon identifier="actions-delete" />
- </f:be.link>
- </div>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.configuration" /></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{unassignedSites}" as="unassignedSite">
+ <tr>
+ <td> <code>{unassignedSite.identifier}</code></td>
+ <td class="col-control nowrap">
+ <div class="btn-group">
+ <f:be.link
+ route="site_configuration"
+ parameters="{action: 'delete', site:unassignedSite.identifier}"
+ class="btn btn-default t3js-modal-trigger"
+ title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration')}"
+ data="{
+ severity: 'error',
+ title: '{f:translate(key:\'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.deleteSiteConfiguration\')}',
+ button-ok-text: '{f:translate(key:\'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete\')}'
+ }"
+ >
+ <core:icon identifier="actions-delete" />
+ </f:be.link>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
</f:if>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItem.html
index 8dedfc6e8965..8fe0135c35c2 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItem.html
@@ -1,6 +1,6 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="ToolbarItem" arguments="{
- title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
- icon: '{core:icon(identifier: \'apps-toolbar-menu-cache\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
+ title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
+ icon: '{core:icon(identifier: \'apps-toolbar-menu-cache\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
}" />
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
index 25fc2ed2750b..25d31c784c73 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
@@ -1,24 +1,24 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<h3 class="dropdown-headline">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache" />
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache" />
</h3>
<hr>
<div class="dropdown-table">
- <f:for each="{cacheActions}" as="cacheAction">
- <div class="dropdown-table-row">
- <a href="{cacheAction.href}" class="toolbar-cache-flush-action">
- <div class="dropdown-table-column dropdown-table-column-top dropdown-table-icon">
- <core:icon identifier="{cacheAction.iconIdentifier}" size="small" />
- </div>
- <div class="dropdown-table-column dropdown-table-column-top dropdown-table-text">
- <f:translate key="{cacheAction.title}" />
- <br>
- <small class="text-muted">{f:translate(key: '{f:if(condition: cacheAction.description, then: cacheAction.description, else:
- cacheAction.title)}')}
- </small>
- </div>
- </a>
- </div>
- </f:for>
+ <f:for each="{cacheActions}" as="cacheAction">
+ <div class="dropdown-table-row">
+ <a href="{cacheAction.href}" class="toolbar-cache-flush-action">
+ <div class="dropdown-table-column dropdown-table-column-top dropdown-table-icon">
+ <core:icon identifier="{cacheAction.iconIdentifier}" size="small" />
+ </div>
+ <div class="dropdown-table-column dropdown-table-column-top dropdown-table-text">
+ <f:translate key="{cacheAction.title}" />
+ <br>
+ <small class="text-muted">{f:translate(key: '{f:if(condition: cacheAction.description, then: cacheAction.description, else:
+ cacheAction.title)}')}
+ </small>
+ </div>
+ </a>
+ </div>
+ </f:for>
</div>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemSingle.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemSingle.html
index 0cc2a88503f3..c107e85a0a88 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemSingle.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemSingle.html
@@ -1,5 +1,5 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<a href="{link}" class="toolbar-cache-flush-action toolbar-item-link" title="{f:translate(key: title, default: title)}">
- <f:render partial="ToolbarItem" arguments="{title: title, icon: '{core:icon(identifier: iconIdentifier, size: \'small\')}'}"/>
+ <f:render partial="ToolbarItem" arguments="{title: title, icon: '{core:icon(identifier: iconIdentifier, size: \'small\')}'}"/>
</a>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItem.html
index abaac09783cb..d2c928de0c68 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItem.html
@@ -1,6 +1,6 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="ToolbarItem" arguments="{
- title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.help',
- icon: '{core:icon(identifier: \'apps-toolbar-menu-help\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
+ title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.help',
+ icon: '{core:icon(identifier: \'apps-toolbar-menu-help\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
}" />
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
index 068131059f79..bde2162af6d0 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
@@ -1,25 +1,25 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<h3 class="dropdown-headline">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.help') -> f:format.raw()}
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.help') -> f:format.raw()}
</h3>
<hr>
<div class="dropdown-table">
- <f:for each="{modules}" as="module">
- <div class="dropdown-table-row"
- id="{module.name -> f:format.htmlspecialchars()}"
- data-modulename="{module.name -> f:format.htmlspecialchars()}"
- data-navigationcomponentid="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
- data-navigationframescript="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
- data-navigationframescriptparameters="{module.navigationFrameScriptParameters -> f:format.htmlspecialchars()}">
- <div class="dropdown-table-column dropdown-table-icon">
- {module.icon -> f:format.raw()}
- </div>
- <div class="dropdown-table-column dropdown-table-title">
- <a href="#" data-link="{module.link}" title="{module.description -> f:format.htmlspecialchars()}">
- {module.title}
- </a>
- </div>
- </div>
- </f:for>
+ <f:for each="{modules}" as="module">
+ <div class="dropdown-table-row"
+ id="{module.name -> f:format.htmlspecialchars()}"
+ data-modulename="{module.name -> f:format.htmlspecialchars()}"
+ data-navigationcomponentid="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
+ data-navigationframescript="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
+ data-navigationframescriptparameters="{module.navigationFrameScriptParameters -> f:format.htmlspecialchars()}">
+ <div class="dropdown-table-column dropdown-table-icon">
+ {module.icon -> f:format.raw()}
+ </div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <a href="#" data-link="{module.link}" title="{module.description -> f:format.htmlspecialchars()}">
+ {module.title}
+ </a>
+ </div>
+ </div>
+ </f:for>
</div>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/LiveSearchToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/LiveSearchToolbarItem.html
index 5c3876ea3f80..8054a031fa1a 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/LiveSearchToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/LiveSearchToolbarItem.html
@@ -1,15 +1,15 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<form class="t3js-topbar-navigation-search toolbar-item-search-form live-search-wrapper" role="search">
- <div class="form-group">
- <div class="form-control-holder">
- <div class="form-control-icon">
- <core:icon identifier="apps-toolbar-menu-search" size="small" alternativeMarkupIdentifier="inline"/>
- </div>
- <input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field"
- placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.search') -> f:format.htmlspecialchars()}"
- id="live-search-box" autocomplete="off">
- </div>
- </div>
+ <div class="form-group">
+ <div class="form-control-holder">
+ <div class="form-control-icon">
+ <core:icon identifier="apps-toolbar-menu-search" size="small" alternativeMarkupIdentifier="inline"/>
+ </div>
+ <input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field"
+ placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.search') -> f:format.htmlspecialchars()}"
+ id="live-search-box" autocomplete="off">
+ </div>
+ </div>
</form>
<a href="#" class="dropdown-toggle t3js-toolbar-search-dropdowntoggle" data-toggle="dropdown" aria-expanded="false"></a>
<div class="dropdown-menu" role="menu"></div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
index cf080adbeb07..12fcf6ca9f45 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
@@ -1,69 +1,69 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<span class="systeminformationtoolbaritem-container t3js-systeminformation-container" data-count="{count}"
- data-severityclass="{severityBadgeClass}"></span>
+ data-severityclass="{severityBadgeClass}"></span>
<h3 class="dropdown-headline">
- <f:translate key="systemmessage.header"/>
+ <f:translate key="systemmessage.header"/>
</h3>
<p class="dropdown-text typo3-module-menu-item submodule mod-tools_toolsenvironment" data-modulename="tools_toolsenvironment">
- <f:format.raw>
- <f:translate key="systemmessage.intro" arguments="{0: '{environmentToolUrl}'}"/>
- </f:format.raw>
+ <f:format.raw>
+ <f:translate key="systemmessage.intro" arguments="{0: '{environmentToolUrl}'}"/>
+ </f:format.raw>
</p>
<f:if condition="{systemInformation}">
- <hr>
- <div class="dropdown-table">
- <f:for each="{systemInformation}" as="info">
- <div class="dropdown-table-row">
- <div class="dropdown-table-column dropdown-table-column-top dropdown-table-icon">
- <f:if condition="{info.iconIdentifier}">
- <f:then>
- <core:icon identifier="{info.iconIdentifier}" size="small" alternativeMarkupIdentifier="inline" />
- </f:then>
- <f:else>{info.icon -> f:format.raw()}</f:else>
- </f:if>
- </div>
- <div class="dropdown-table-column dropdown-table-column-top dropdown-table-title">
- <f:translate key="{info.title}" default="{info.title}"/>
- <f:if condition="{info.titleAddition}"> ({info.titleAddition -> f:format.htmlspecialchars()})</f:if>
- </div>
- <div
- class="dropdown-table-column dropdown-table-column-top dropdown-table-value {f:if(condition: info.status, then: 'text-{info.status}')}">
- {info.value}
- </div>
- </div>
- </f:for>
- </div>
+ <hr>
+ <div class="dropdown-table">
+ <f:for each="{systemInformation}" as="info">
+ <div class="dropdown-table-row">
+ <div class="dropdown-table-column dropdown-table-column-top dropdown-table-icon">
+ <f:if condition="{info.iconIdentifier}">
+ <f:then>
+ <core:icon identifier="{info.iconIdentifier}" size="small" alternativeMarkupIdentifier="inline" />
+ </f:then>
+ <f:else>{info.icon -> f:format.raw()}</f:else>
+ </f:if>
+ </div>
+ <div class="dropdown-table-column dropdown-table-column-top dropdown-table-title">
+ <f:translate key="{info.title}" default="{info.title}"/>
+ <f:if condition="{info.titleAddition}"> ({info.titleAddition -> f:format.htmlspecialchars()})</f:if>
+ </div>
+ <div
+ class="dropdown-table-column dropdown-table-column-top dropdown-table-value {f:if(condition: info.status, then: 'text-{info.status}')}">
+ {info.value}
+ </div>
+ </div>
+ </f:for>
+ </div>
</f:if>
<hr>
<f:if condition="{messages -> f:count()} > 0">
- <f:then>
- <f:for each="{messages}" as="message">
- <f:if condition="{message.module}">
- <f:then>
- <p id="systeminformation_{message.module}"
- class="dropdown-text t3js-systeminformation-module typo3-module-menu-item submodule mod-{message.module}"
- data-modulename="{message.module}" data-moduleparams="{message.params}">
- <span class="text-{message.status}"><f:format.raw>{message.text}</f:format.raw></span>
- </p>
- </f:then>
- <f:else>
- <p class="dropdown-text text-{message.status}">
- <f:format.raw>{message.text}</f:format.raw>
- </p>
- </f:else>
- </f:if>
- </f:for>
- </f:then>
- <f:else>
- <p class="dropdown-text text-success">
- <f:format.nl2br>
- <f:translate key="systemmessage.allgood"/>
- </f:format.nl2br>
- </p>
- </f:else>
+ <f:then>
+ <f:for each="{messages}" as="message">
+ <f:if condition="{message.module}">
+ <f:then>
+ <p id="systeminformation_{message.module}"
+ class="dropdown-text t3js-systeminformation-module typo3-module-menu-item submodule mod-{message.module}"
+ data-modulename="{message.module}" data-moduleparams="{message.params}">
+ <span class="text-{message.status}"><f:format.raw>{message.text}</f:format.raw></span>
+ </p>
+ </f:then>
+ <f:else>
+ <p class="dropdown-text text-{message.status}">
+ <f:format.raw>{message.text}</f:format.raw>
+ </p>
+ </f:else>
+ </f:if>
+ </f:for>
+ </f:then>
+ <f:else>
+ <p class="dropdown-text text-success">
+ <f:format.nl2br>
+ <f:translate key="systemmessage.allgood"/>
+ </f:format.nl2br>
+ </p>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationToolbarItem.html
index cfa06707022a..e042b36a3d3a 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationToolbarItem.html
@@ -1,7 +1,7 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="ToolbarItem" arguments="{
- title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo',
- icon: '{core:icon(identifier: \'actions-system-list-open\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
+ title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo',
+ icon: '{core:icon(identifier: \'actions-system-list-open\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
}" />
<span class="toolbar-item-badge t3js-systeminformation-counter badge"></span>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
index e646a3d216d7..b818cc090d83 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
@@ -2,17 +2,17 @@
<span class="toolbar-item-avatar"><be:avatar backendUser="{currentUser.uid}"/></span>
<f:if condition="{switchUserMode}">
- <f:then>
- <span class="toolbar-item-name"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:switchtouser')} {currentUser.username}">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:switchtousershort') -> f:format.raw()}
- {f:if(condition: '{currentUser.realName}', then: '{currentUser.realName} ({currentUser.username})', else: '{currentUser.username}')}
- </span>
- </f:then>
- <f:else>
- <span class="toolbar-item-name" title="{username}">
- {f:if(condition: '{currentUser.realName}', then: '{currentUser.realName}', else: '{currentUser.username}')}
- </span>
- </f:else>
+ <f:then>
+ <span class="toolbar-item-name"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:switchtouser')} {currentUser.username}">
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:switchtousershort') -> f:format.raw()}
+ {f:if(condition: '{currentUser.realName}', then: '{currentUser.realName} ({currentUser.username})', else: '{currentUser.username}')}
+ </span>
+ </f:then>
+ <f:else>
+ <span class="toolbar-item-name" title="{username}">
+ {f:if(condition: '{currentUser.realName}', then: '{currentUser.realName}', else: '{currentUser.username}')}
+ </span>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
index 33f1f362bd0c..dd98b99b584c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
@@ -1,63 +1,63 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers" data-namespace-typo3-fluid="true">
<h3 class="dropdown-headline">
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.user')}
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.user')}
</h3>
<hr>
<f:if condition="{modules}">
- <div class="dropdown-table">
- <f:for each="{modules}" as="module">
- <div class="dropdown-table-row"
- id="{module.name -> f:format.htmlspecialchars()}"
- data-modulename="{module.name -> f:format.htmlspecialchars()}"
- data-navigationcomponentid="{module.navigationComponentId -> f:format.htmlspecialchars()}"
- data-navigationframescript="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
- data-navigationframescriptparameters="{module.navigationFrameScriptParameters -> f:format.htmlspecialchars()}"
- >
- <div class="dropdown-table-column dropdown-table-icon">{module.icon -> f:format.raw()}</div>
- <div class="dropdown-table-column dropdown-table-title">
- <a href="#" data-link="{module.link}" title="{module.description}">
- {module.title}
- </a>
- </div>
- </div>
- </f:for>
- </div>
- <hr>
+ <div class="dropdown-table">
+ <f:for each="{modules}" as="module">
+ <div class="dropdown-table-row"
+ id="{module.name -> f:format.htmlspecialchars()}"
+ data-modulename="{module.name -> f:format.htmlspecialchars()}"
+ data-navigationcomponentid="{module.navigationComponentId -> f:format.htmlspecialchars()}"
+ data-navigationframescript="{module.navigationFrameScript -> f:format.htmlspecialchars()}"
+ data-navigationframescriptparameters="{module.navigationFrameScriptParameters -> f:format.htmlspecialchars()}"
+ >
+ <div class="dropdown-table-column dropdown-table-icon">{module.icon -> f:format.raw()}</div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <a href="#" data-link="{module.link}" title="{module.description}">
+ {module.title}
+ </a>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ <hr>
</f:if>
<f:if condition="{f:count(subject: recentUsers)} > 0">
- <h3 class="dropdown-headline"><f:translate key="usermodule.su.list" /></h3>
- <div class="dropdown-table">
- <f:for each="{recentUsers}" as="user">
- <div class="dropdown-table-row">
- <div class="dropdown-table-column dropdown-table-icon">
- <be:avatar backendUser="{user.uid}" size="32" />
- </div>
- <div class="dropdown-table-column dropdown-table-title">
- <a href="{user.switchUserLink}" title="{f:translate(key: 'usermodule.su.tooltip', arguments: {0: user.username})}">
- <f:if condition="{user.realName}">
- <f:then>
- {user.realName}
- </f:then>
- <f:else>
- {user.username}
- </f:else>
- </f:if>
- </a>
- </div>
- </div>
- </f:for>
- </div>
- <hr>
+ <h3 class="dropdown-headline"><f:translate key="usermodule.su.list" /></h3>
+ <div class="dropdown-table">
+ <f:for each="{recentUsers}" as="user">
+ <div class="dropdown-table-row">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <be:avatar backendUser="{user.uid}" size="32" />
+ </div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <a href="{user.switchUserLink}" title="{f:translate(key: 'usermodule.su.tooltip', arguments: {0: user.username})}">
+ <f:if condition="{user.realName}">
+ <f:then>
+ {user.realName}
+ </f:then>
+ <f:else>
+ {user.username}
+ </f:else>
+ </f:if>
+ </a>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ <hr>
</f:if>
<a href="{logoutUrl}" class="btn btn-danger pull-left" target="_top">
- <core:icon identifier="actions-logout" size="small" alternativeMarkupIdentifier="inline"/>
- <f:if condition="{switchUserMode}">
- <f:then>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.exit') -> f:format.raw()}
- </f:then>
- <f:else>
- {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.logout') -> f:format.raw()}
- </f:else>
- </f:if>
+ <core:icon identifier="actions-logout" size="small" alternativeMarkupIdentifier="inline"/>
+ <f:if condition="{switchUserMode}">
+ <f:then>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.exit') -> f:format.raw()}
+ </f:then>
+ <f:else>
+ {f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.logout') -> f:format.raw()}
+ </f:else>
+ </f:if>
</a>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/UserPassLoginForm.html b/typo3/sysext/backend/Resources/Private/Templates/UserPassLoginForm.html
index f21e64b55a91..6763b6f71b5c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/UserPassLoginForm.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/UserPassLoginForm.html
@@ -1,24 +1,24 @@
<f:layout name="Login" />
<f:section name="loginFormFields">
- <div class="form-group t3js-login-username-section" id="t3-login-username-section">
- <div class="form-control-wrap">
- <div class="form-control-holder">
- <input type="text" id="t3-username" name="username" value="{presetUsername}" placeholder="{f:translate(key: 'login.username')}" class="form-control input-login t3js-clearable t3js-login-username-field" autofocus="autofocus" required="required" />
- <div class="form-notice-capslock hidden t3js-login-alert-capslock">
- <img src="{images.capslock}" width="14" height="14" alt="{f:translate(key: 'login.error.capslock')}" title="{f:translate(key: 'login.error.capslock')}" />
- </div>
- </div>
- </div>
- </div>
- <div class="form-group t3js-login-password-section" id="t3-login-password-section">
- <div class="form-control-wrap">
- <div class="form-control-holder">
- <input type="password" id="t3-password" name="p_field" value="{presetPassword}" placeholder="{f:translate(key: 'login.password')}" class="form-control input-login t3js-clearable t3js-login-password-field" required="required" data-rsa-encryption="t3-field-userident" />
- <div class="form-notice-capslock hidden t3js-login-alert-capslock">
- <img src="{images.capslock}" width="14" height="14" alt="{f:translate(key: 'login.error.capslock')}" title="{f:translate(key: 'login.error.capslock')}" />
- </div>
- </div>
- </div>
- </div>
+ <div class="form-group t3js-login-username-section" id="t3-login-username-section">
+ <div class="form-control-wrap">
+ <div class="form-control-holder">
+ <input type="text" id="t3-username" name="username" value="{presetUsername}" placeholder="{f:translate(key: 'login.username')}" class="form-control input-login t3js-clearable t3js-login-username-field" autofocus="autofocus" required="required" />
+ <div class="form-notice-capslock hidden t3js-login-alert-capslock">
+ <img src="{images.capslock}" width="14" height="14" alt="{f:translate(key: 'login.error.capslock')}" title="{f:translate(key: 'login.error.capslock')}" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group t3js-login-password-section" id="t3-login-password-section">
+ <div class="form-control-wrap">
+ <div class="form-control-holder">
+ <input type="password" id="t3-password" name="p_field" value="{presetPassword}" placeholder="{f:translate(key: 'login.password')}" class="form-control input-login t3js-clearable t3js-login-password-field" required="required" data-rsa-encryption="t3-field-userident" />
+ <div class="form-notice-capslock hidden t3js-login-alert-capslock">
+ <img src="{images.capslock}" width="14" height="14" alt="{f:translate(key: 'login.error.capslock')}" title="{f:translate(key: 'login.error.capslock')}" />
+ </div>
+ </div>
+ </div>
+ </div>
</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/blank.html b/typo3/sysext/backend/Resources/Private/Templates/blank.html
index b1ae1ad5620c..484e97dc0edd 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/blank.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/blank.html
@@ -1,3 +1,3 @@
<!-- ###FULLDOC### begin -->
###CONTENT###
-<!-- ###FULLDOC### end -->
\ No newline at end of file
+<!-- ###FULLDOC### end -->
diff --git a/typo3/sysext/backend/Resources/Private/Templates/helper_javascript_css.html b/typo3/sysext/backend/Resources/Private/Templates/helper_javascript_css.html
index 1e1f2e25d5c1..71e9d66bc88e 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/helper_javascript_css.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/helper_javascript_css.html
@@ -6,4 +6,4 @@
###JS_LIBS_FOOTER###
###JS_INCLUDE_FOOTER###
###JS_INLINE_FOOTER###
-###FOOTERDATA###
\ No newline at end of file
+###FOOTERDATA###
diff --git a/typo3/sysext/belog/Resources/Private/Layouts/Default.html b/typo3/sysext/belog/Resources/Private/Layouts/Default.html
index 502aceb1a75a..bee758d6825d 100644
--- a/typo3/sysext/belog/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/belog/Resources/Private/Layouts/Default.html
@@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true">
<be:moduleLayout>
- <f:render section="Content" />
+ <f:render section="Content" />
</be:moduleLayout>
</html>
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
index b5a89cbd9f13..ff55a5c97231 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
@@ -4,158 +4,158 @@
data-namespace-typo3-fluid="true">
<f:comment>
- This is an ugly workaround.
- The function module in Web->Info already renders a form tag, and there is
- no easy way to circumvent this. The page id is needed for the info module
- that is not extbase based to figure the permissions. Thus, we have to add
- the page Id manually to hint the info module about that.
+ This is an ugly workaround.
+ The function module in Web->Info already renders a form tag, and there is
+ no easy way to circumvent this. The page id is needed for the info module
+ that is not extbase based to figure the permissions. Thus, we have to add
+ the page Id manually to hint the info module about that.
</f:comment>
<f:if condition="{isSubmoduleLayout}">
- <input type="hidden" name="id" value="{constraint.pageId}" />
+ <input type="hidden" name="id" value="{constraint.pageId}" />
</f:if>
<f:form object="{constraint}" action="list" name="constraint" class="form-inline form-inline-spaced">
- <div class="form-group">
- <label for="belog-users"><f:translate key="users" /></label>
- <f:form.select
- property="userOrGroup"
- options="{userGroups}"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-users"
- />
- </div>
+ <div class="form-group">
+ <label for="belog-users"><f:translate key="users" /></label>
+ <f:form.select
+ property="userOrGroup"
+ options="{userGroups}"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-users"
+ />
+ </div>
- <div class="form-group">
- <label for="belog-max"><f:translate key="max" /></label>
- <belog:form.translateLabelSelect
- property="number"
- options="{settings.selectableNumberOfLogEntries}"
- optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-max"
- />
- </div>
+ <div class="form-group">
+ <label for="belog-max"><f:translate key="max" /></label>
+ <belog:form.translateLabelSelect
+ property="number"
+ options="{settings.selectableNumberOfLogEntries}"
+ optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-max"
+ />
+ </div>
- <f:if condition="{workspacesExtensionLoaded}">
- <f:if condition="{showWorkspaceSelector}">
- <div class="form-group">
- <label for="belog-workspaces"><f:translate key="workspace" /></label>
- <f:form.select
- property="workspaceUid"
- options="{workspaces}"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-workspaces"
- />
- </div>
- </f:if>
- </f:if>
+ <f:if condition="{workspacesExtensionLoaded}">
+ <f:if condition="{showWorkspaceSelector}">
+ <div class="form-group">
+ <label for="belog-workspaces"><f:translate key="workspace" /></label>
+ <f:form.select
+ property="workspaceUid"
+ options="{workspaces}"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-workspaces"
+ />
+ </div>
+ </f:if>
+ </f:if>
- <f:if condition="{isSubmoduleLayout}">
- <div class="form-group">
- <label for="belog-depth"><f:translate key="chLog_menuDepth" /></label>
- <f:form.select
- property="depth"
- options="{pageDepths}"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-depth"
- />
- </div>
- </f:if>
+ <f:if condition="{isSubmoduleLayout}">
+ <div class="form-group">
+ <label for="belog-depth"><f:translate key="chLog_menuDepth" /></label>
+ <f:form.select
+ property="depth"
+ options="{pageDepths}"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-depth"
+ />
+ </div>
+ </f:if>
- <div class="form-group">
- <label for="belog-time"><f:translate key="time" /></label>
- <belog:form.translateLabelSelect
- property="timeFrame"
- options="{settings.selectableTimeFrames}"
- optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-time"
- />
- </div>
+ <div class="form-group">
+ <label for="belog-time"><f:translate key="time" /></label>
+ <belog:form.translateLabelSelect
+ property="timeFrame"
+ options="{settings.selectableTimeFrames}"
+ optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-time"
+ />
+ </div>
- <div class="form-group">
- <label for="belog-action"><f:translate key="action" /></label>
- <belog:form.translateLabelSelect
- property="action"
- options="{settings.selectableActions}"
- optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
- additionalAttributes="{onchange : 'submit()'}"
- class="form-control input-sm"
- id="belog-action"
- />
- </div>
+ <div class="form-group">
+ <label for="belog-action"><f:translate key="action" /></label>
+ <belog:form.translateLabelSelect
+ property="action"
+ options="{settings.selectableActions}"
+ optionLabelPrefix="LLL:EXT:belog/Resources/Private/Language/locallang.xlf:"
+ additionalAttributes="{onchange : 'submit()'}"
+ class="form-control input-sm"
+ id="belog-action"
+ />
+ </div>
- <f:if condition="{constraint.depth} > 0">
- <div class="form-group">
- <label for="belog-group"><f:translate key="groupByPage" /></label>
- <f:form.checkbox
- property="groupByPage"
- value="1"
- additionalAttributes="{onchange : 'submit()'}"
- id="belog-group"
- />
- </div>
- </f:if>
+ <f:if condition="{constraint.depth} > 0">
+ <div class="form-group">
+ <label for="belog-group"><f:translate key="groupByPage" /></label>
+ <f:form.checkbox
+ property="groupByPage"
+ value="1"
+ additionalAttributes="{onchange : 'submit()'}"
+ id="belog-group"
+ />
+ </div>
+ </f:if>
- <f:comment>
- Date time fields for manual date selection
- </f:comment>
+ <f:comment>
+ Date time fields for manual date selection
+ </f:comment>
- <f:if condition="{constraint.timeFrame} == 30">
- <f:be.pageRenderer includeRequireJsModules="{0: 'TYPO3/CMS/Backend/DateTimePicker'}" />
- <div class="form-group">
- <label for="manualDateStart"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:from" /></label>
- <div class="input-group input-group-sm">
- <f:form.textfield
- name="manualDateStart"
- value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStart}')}\")}"
- id="manualDateStart"
- class="form-control input-sm t3js-datetimepicker t3js-clearable"
- data="{date-type: 'datetime'}"
- />
- <f:form.hidden
- property="manualDateStart"
- value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'c', date: '{constraint.manualDateStart}')}\")}"
- />
- <span class="input-group-btn">
- <label class="btn btn-default" for="manualDateStart">
- <span class="fa fa-calendar"></span>
- </label>
- </span>
- </div>
- </div>
+ <f:if condition="{constraint.timeFrame} == 30">
+ <f:be.pageRenderer includeRequireJsModules="{0: 'TYPO3/CMS/Backend/DateTimePicker'}" />
+ <div class="form-group">
+ <label for="manualDateStart"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:from" /></label>
+ <div class="input-group input-group-sm">
+ <f:form.textfield
+ name="manualDateStart"
+ value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStart}')}\")}"
+ id="manualDateStart"
+ class="form-control input-sm t3js-datetimepicker t3js-clearable"
+ data="{date-type: 'datetime'}"
+ />
+ <f:form.hidden
+ property="manualDateStart"
+ value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'c', date: '{constraint.manualDateStart}')}\")}"
+ />
+ <span class="input-group-btn">
+ <label class="btn btn-default" for="manualDateStart">
+ <span class="fa fa-calendar"></span>
+ </label>
+ </span>
+ </div>
+ </div>
- <div class="form-group">
- <label for="manualDateStop"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:to" /></label>
- <div class="input-group input-group-sm">
- <f:form.textfield
- name="manualDateStop"
- value="{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStop}')}"
- id="manualDateStop"
- class="form-control input-sm t3js-datetimepicker t3js-clearable"
- data="{date-type: 'datetime'}"
- />
- <f:form.hidden property="manualDateStop"
- value="{f:format.date(format:'c', date: '{constraint.manualDateStop}')}"
- />
- <span class="input-group-btn">
- <label class="btn btn-default" for="manualDateStop">
- <span class="fa fa-calendar"></span>
- </label>
- </span>
- </div>
- </div>
+ <div class="form-group">
+ <label for="manualDateStop"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:to" /></label>
+ <div class="input-group input-group-sm">
+ <f:form.textfield
+ name="manualDateStop"
+ value="{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStop}')}"
+ id="manualDateStop"
+ class="form-control input-sm t3js-datetimepicker t3js-clearable"
+ data="{date-type: 'datetime'}"
+ />
+ <f:form.hidden property="manualDateStop"
+ value="{f:format.date(format:'c', date: '{constraint.manualDateStop}')}"
+ />
+ <span class="input-group-btn">
+ <label class="btn btn-default" for="manualDateStop">
+ <span class="fa fa-calendar"></span>
+ </label>
+ </span>
+ </div>
+ </div>
- <div class="form-group">
- <f:form.submit id="submit-constraint" value="{f:translate(key: 'set')}" class="btn btn-default btn-sm" />
- </div>
- </f:if>
+ <div class="form-group">
+ <f:form.submit id="submit-constraint" value="{f:translate(key: 'set')}" class="btn btn-default btn-sm" />
+ </div>
+ </f:if>
</f:form>
</html>
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
index 564604fd050f..fdb6b4ccf2aa 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
@@ -6,235 +6,235 @@
data-namespace-typo3-fluid="true">
<f:if condition="{constraint.groupByPage}">
- <div>
- <h2>
- <f:translate key="overview" />
- </h2>
- <f:translate
- key="timeInfo"
- arguments="{
- 0: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
- 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
- }"
- />
- <p>
- <f:for each="{groupedLogEntries}" as="pidEntry" key="pid">
- <f:if condition="{pid} > 0">
- <br />
- <f:translate
- key="pagenameWithUID"
- arguments="{
- 0: '{belog:be.pagePath(pid:\'{pid}\')}',
- 1: '{pid}'
- }"
- />
- </f:if>
- </f:for>
- </p>
- </div>
+ <div>
+ <h2>
+ <f:translate key="overview" />
+ </h2>
+ <f:translate
+ key="timeInfo"
+ arguments="{
+ 0: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
+ 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+ }"
+ />
+ <p>
+ <f:for each="{groupedLogEntries}" as="pidEntry" key="pid">
+ <f:if condition="{pid} > 0">
+ <br />
+ <f:translate
+ key="pagenameWithUID"
+ arguments="{
+ 0: '{belog:be.pagePath(pid:\'{pid}\')}',
+ 1: '{pid}'
+ }"
+ />
+ </f:if>
+ </f:for>
+ </p>
+ </div>
</f:if>
<f:for each="{groupedLogEntries}" as="pidEntry" key="pid">
- <div>
- <h2>
- <f:if condition="{constraint.groupByPage}">
- <f:then>
- <f:if condition="{pid} < 1">
- <f:then>
- <f:if condition="{pid} == -1">
- <f:translate
- key="logForNonPageRelatedActionsOrRootLevelOrPage"
- arguments="{
- 0: '{f:translate(key:\'forNonPageRelatedActions\')}',
- 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
- 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
- }"
- />
- </f:if>
- <f:if condition="{pid} == 0">
- <f:translate
- key="logForNonPageRelatedActionsOrRootLevelOrPage"
- arguments="{
- 0: '{f:translate(key:\'forRootLevel\')}',
- 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
- 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
- }"
- />
- </f:if>
- </f:then>
- <f:else>
- <f:comment>
- Nest view helpers three times:
- 1. Feed pid as argument to be.pagePath
- 2. Use this as argument for 'forPage' translate
- 3. Use this as argument for 'logForNonPageRelatedActionsOrRootLevelOrPage' translate
- </f:comment>
- <f:translate
- key="logForNonPageRelatedActionsOrRootLevelOrPage"
- arguments="{
- 0: '{f:translate(
- key:\'forPage\',
- arguments:\'{
- 0:\\\'{belog:be.pagePath(pid:\\\\\\\'{pid}\\\\\\\')}\\\',
- 1:\\\'{pid}\\\'
- }\'
- )}',
- 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
- 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
- }"
- />
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:translate
- key="logForNonPageRelatedActionsOrRootLevelOrPage"
- arguments="{
- 0: '',
- 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
- 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
- }"
- />
- </f:else>
- </f:if>
- </h2>
- <f:for each="{pidEntry}" as="day" key="dayTimestamp">
- <h3>
- <f:format.date format="{settings.dateFormat}">@{dayTimestamp}</f:format.date>
- </h3>
+ <div>
+ <h2>
+ <f:if condition="{constraint.groupByPage}">
+ <f:then>
+ <f:if condition="{pid} < 1">
+ <f:then>
+ <f:if condition="{pid} == -1">
+ <f:translate
+ key="logForNonPageRelatedActionsOrRootLevelOrPage"
+ arguments="{
+ 0: '{f:translate(key:\'forNonPageRelatedActions\')}',
+ 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
+ 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+ }"
+ />
+ </f:if>
+ <f:if condition="{pid} == 0">
+ <f:translate
+ key="logForNonPageRelatedActionsOrRootLevelOrPage"
+ arguments="{
+ 0: '{f:translate(key:\'forRootLevel\')}',
+ 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
+ 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+ }"
+ />
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:comment>
+ Nest view helpers three times:
+ 1. Feed pid as argument to be.pagePath
+ 2. Use this as argument for 'forPage' translate
+ 3. Use this as argument for 'logForNonPageRelatedActionsOrRootLevelOrPage' translate
+ </f:comment>
+ <f:translate
+ key="logForNonPageRelatedActionsOrRootLevelOrPage"
+ arguments="{
+ 0: '{f:translate(
+ key:\'forPage\',
+ arguments:\'{
+ 0:\\\'{belog:be.pagePath(pid:\\\\\\\'{pid}\\\\\\\')}\\\',
+ 1:\\\'{pid}\\\'
+ }\'
+ )}',
+ 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
+ 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+ }"
+ />
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:translate
+ key="logForNonPageRelatedActionsOrRootLevelOrPage"
+ arguments="{
+ 0: '',
+ 1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
+ 2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+ }"
+ />
+ </f:else>
+ </f:if>
+ </h2>
+ <f:for each="{pidEntry}" as="day" key="dayTimestamp">
+ <h3>
+ <f:format.date format="{settings.dateFormat}">@{dayTimestamp}</f:format.date>
+ </h3>
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th>
- <f:translate key="chLog_l_error"/>
- </th>
- <th>
- <f:translate key="chLog_l_time"/>
- </th>
- <th colspan="2">
- <f:translate key="chLog_l_user"/>
- </th>
- <th>
- <f:if condition="{isSubmoduleLayout}">
- <f:then>
- <f:translate key="chLog_l_table"/>
- </f:then>
- <f:else>
- <f:translate key="chLog_l_types"/>
- </f:else>
- </f:if>
- </th>
- <th>
- <f:translate key="chLog_l_action"/>
- </th>
- <th>
- <f:translate key="chLog_l_details"/>
- </th>
- <th>
- <f:translate key="actions"/>
- </th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{day}" as="logItem">
- <tr>
- <td>
- <f:if condition="{logItem.errorIconClass}">
- <core:icon identifier="{logItem.errorIconClass}" />
- </f:if>
- </td>
- <td>
- <f:format.date format="H:i:s">@{logItem.tstamp}</f:format.date>
- </td>
- <td>
- <f:if condition="{belog:username(uid:logItem.backendUserUid)}">
- <be:avatar backendUser="{logItem.backendUserUid}" showIcon="true"/>
- </f:if>
- </td>
- <td>
- <f:if condition="{belog:username(uid:logItem.backendUserUid)}">
- <f:then>
- <belog:username uid="{logItem.backendUserUid}"/>
- </f:then>
- <f:else>[{logItem.backendUserUid}]</f:else>
- </f:if>
- <f:if condition="{logItem.logData.originalUser}">
- ({f:translate(key:'viaUser')}
- <f:if condition="{belog:username(uid:logItem.logData.originalUser)}">
- <f:then>
- <belog:username uid="{logItem.logData.originalUser}"/>
- </f:then>
- <f:else>[{logItem.logData.originalUser}]</f:else>
- </f:if>
- )
- </f:if>
- <br>
- <span class="text-muted">
- <f:if condition="{belog:workspaceTitle(uid:logItem.workspaceUid)}">
- <f:then><belog:workspaceTitle uid="{logItem.workspaceUid}"/></f:then>
- <f:else>[{logItem.workspaceUid}]</f:else>
- </f:if>
- </span>
- </td>
- <td>
- <f:if condition="{isSubmoduleLayout}">
- <f:then>
- {logItem.tableName}
- </f:then>
- <f:else>
- <f:if condition="{f:translate(key:'type_{logItem.type}')}">
- <f:then>
- <f:translate key="type_{logItem.type}"/>
- </f:then>
- <f:else>
- [{logItem.type}]
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </td>
- <td>
- <f:if condition="{f:translate(key:'action_{logItem.type}_{logItem.action}')}">
- <f:then>
- <f:translate key="action_{logItem.type}_{logItem.action}"/>
- </f:then>
- <f:else>
- [{logItem.action}]
- </f:else>
- </f:if>
- </td>
- <td class="col-word-break">
- <belog:formatDetails logEntry="{logItem}"/>
- <f:if condition="{logItem.logData.history}">
- <a href="{be:moduleLink(route: 'record_history', arguments: '{historyEntry: logItem.logData.history}')}" title="{f:translate(key: 'showHistory')}">
- <core:icon identifier="actions-document-history-open" />
- </a>
- </f:if>
- <f:if condition="{logItem.detailsNumber} > 0">
- (msg#{logItem.type}.{logItem.action}.{logItem.detailsNumber})
- </f:if>
- </td>
- <td>
- <f:if condition="{logItem.error} == 1">
- <f:link.action action="deleteMessage" arguments="{errorUid:logItem.uid}" class="btn btn-warning">
- <f:translate key="actions.deleteWarnings"/>
- </f:link.action>
- </f:if>
- <f:if condition="{logItem.error} == 2">
- <f:link.action action="deleteMessage" arguments="{errorUid:logItem.uid}" class="btn btn-danger">
- <f:translate key="actions.delete"/>
- </f:link.action>
- </f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </f:for>
- </div>
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th>
+ <f:translate key="chLog_l_error"/>
+ </th>
+ <th>
+ <f:translate key="chLog_l_time"/>
+ </th>
+ <th colspan="2">
+ <f:translate key="chLog_l_user"/>
+ </th>
+ <th>
+ <f:if condition="{isSubmoduleLayout}">
+ <f:then>
+ <f:translate key="chLog_l_table"/>
+ </f:then>
+ <f:else>
+ <f:translate key="chLog_l_types"/>
+ </f:else>
+ </f:if>
+ </th>
+ <th>
+ <f:translate key="chLog_l_action"/>
+ </th>
+ <th>
+ <f:translate key="chLog_l_details"/>
+ </th>
+ <th>
+ <f:translate key="actions"/>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{day}" as="logItem">
+ <tr>
+ <td>
+ <f:if condition="{logItem.errorIconClass}">
+ <core:icon identifier="{logItem.errorIconClass}" />
+ </f:if>
+ </td>
+ <td>
+ <f:format.date format="H:i:s">@{logItem.tstamp}</f:format.date>
+ </td>
+ <td>
+ <f:if condition="{belog:username(uid:logItem.backendUserUid)}">
+ <be:avatar backendUser="{logItem.backendUserUid}" showIcon="true"/>
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{belog:username(uid:logItem.backendUserUid)}">
+ <f:then>
+ <belog:username uid="{logItem.backendUserUid}"/>
+ </f:then>
+ <f:else>[{logItem.backendUserUid}]</f:else>
+ </f:if>
+ <f:if condition="{logItem.logData.originalUser}">
+ ({f:translate(key:'viaUser')}
+ <f:if condition="{belog:username(uid:logItem.logData.originalUser)}">
+ <f:then>
+ <belog:username uid="{logItem.logData.originalUser}"/>
+ </f:then>
+ <f:else>[{logItem.logData.originalUser}]</f:else>
+ </f:if>
+ )
+ </f:if>
+ <br>
+ <span class="text-muted">
+ <f:if condition="{belog:workspaceTitle(uid:logItem.workspaceUid)}">
+ <f:then><belog:workspaceTitle uid="{logItem.workspaceUid}"/></f:then>
+ <f:else>[{logItem.workspaceUid}]</f:else>
+ </f:if>
+ </span>
+ </td>
+ <td>
+ <f:if condition="{isSubmoduleLayout}">
+ <f:then>
+ {logItem.tableName}
+ </f:then>
+ <f:else>
+ <f:if condition="{f:translate(key:'type_{logItem.type}')}">
+ <f:then>
+ <f:translate key="type_{logItem.type}"/>
+ </f:then>
+ <f:else>
+ [{logItem.type}]
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{f:translate(key:'action_{logItem.type}_{logItem.action}')}">
+ <f:then>
+ <f:translate key="action_{logItem.type}_{logItem.action}"/>
+ </f:then>
+ <f:else>
+ [{logItem.action}]
+ </f:else>
+ </f:if>
+ </td>
+ <td class="col-word-break">
+ <belog:formatDetails logEntry="{logItem}"/>
+ <f:if condition="{logItem.logData.history}">
+ <a href="{be:moduleLink(route: 'record_history', arguments: '{historyEntry: logItem.logData.history}')}" title="{f:translate(key: 'showHistory')}">
+ <core:icon identifier="actions-document-history-open" />
+ </a>
+ </f:if>
+ <f:if condition="{logItem.detailsNumber} > 0">
+ (msg#{logItem.type}.{logItem.action}.{logItem.detailsNumber})
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{logItem.error} == 1">
+ <f:link.action action="deleteMessage" arguments="{errorUid:logItem.uid}" class="btn btn-warning">
+ <f:translate key="actions.deleteWarnings"/>
+ </f:link.action>
+ </f:if>
+ <f:if condition="{logItem.error} == 2">
+ <f:link.action action="deleteMessage" arguments="{errorUid:logItem.uid}" class="btn btn-danger">
+ <f:translate key="actions.delete"/>
+ </f:link.action>
+ </f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:for>
+ </div>
</f:for>
</html>
diff --git a/typo3/sysext/belog/Resources/Private/Templates/BackendLog/List.html b/typo3/sysext/belog/Resources/Private/Templates/BackendLog/List.html
index 61f4f5346468..395766469a36 100644
--- a/typo3/sysext/belog/Resources/Private/Templates/BackendLog/List.html
+++ b/typo3/sysext/belog/Resources/Private/Templates/BackendLog/List.html
@@ -4,23 +4,23 @@
<f:layout name="{layout}"/>
<f:section name="Content">
- <h1>
- <f:translate key="adminLog" />
- </h1>
+ <h1>
+ <f:translate key="adminLog" />
+ </h1>
- <div>
- <f:render
- partial="Content/Filter"
- arguments="{_all}"
- />
- </div>
+ <div>
+ <f:render
+ partial="Content/Filter"
+ arguments="{_all}"
+ />
+ </div>
- <div class="divider"></div>
+ <div class="divider"></div>
- <f:render
- partial="Content/LogEntries"
- arguments="{_all}"
- />
+ <f:render
+ partial="Content/LogEntries"
+ arguments="{_all}"
+ />
</f:section>
</html>
diff --git a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
index d7924623cbd7..28c84025ffa1 100644
--- a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
@@ -4,23 +4,23 @@
data-namespace-typo3-fluid="true">
<be:moduleLayout>
- <f:be.pageRenderer
- includeRequireJsModules="{
- 0:'TYPO3/CMS/Backend/ContextMenu',
- 1:'TYPO3/CMS/Backend/Modal'
- }"
- />
+ <f:be.pageRenderer
+ includeRequireJsModules="{
+ 0:'TYPO3/CMS/Backend/ContextMenu',
+ 1:'TYPO3/CMS/Backend/Modal'
+ }"
+ />
- <be:moduleLayout.menu identifier="BackendUserModuleMenu">
- <be:moduleLayout.menuItem label="{f:translate(id: 'backendUsers')}" uri="{f:uri.action(controller: 'BackendUser', action: 'index')}"/>
- <be:moduleLayout.menuItem label="{f:translate(id: 'backendUserGroupsMenu')}" uri="{f:uri.action(controller: 'BackendUserGroup', action: 'index')}"/>
- <be:moduleLayout.menuItem label="{f:translate(id: 'onlineUsers')}" uri="{f:uri.action(controller: 'BackendUser', action: 'online')}"/>
- </be:moduleLayout.menu>
+ <be:moduleLayout.menu identifier="BackendUserModuleMenu">
+ <be:moduleLayout.menuItem label="{f:translate(id: 'backendUsers')}" uri="{f:uri.action(controller: 'BackendUser', action: 'index')}"/>
+ <be:moduleLayout.menuItem label="{f:translate(id: 'backendUserGroupsMenu')}" uri="{f:uri.action(controller: 'BackendUserGroup', action: 'index')}"/>
+ <be:moduleLayout.menuItem label="{f:translate(id: 'onlineUsers')}" uri="{f:uri.action(controller: 'BackendUser', action: 'online')}"/>
+ </be:moduleLayout.menu>
- <f:render section="Buttons" />
- <be:moduleLayout.button.shortcutButton displayName="{f:translate(id: shortcutLabel)}" />
+ <f:render section="Buttons" />
+ <be:moduleLayout.button.shortcutButton displayName="{f:translate(id: shortcutLabel)}" />
- <f:render section="Content" />
+ <f:render section="Content" />
</be:moduleLayout>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html
index 6f1401573250..99c1acd9ad95 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html
@@ -1,93 +1,93 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
<f:section name="list_row">
<tr>
- <td>
- <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{backendUser.uid}" title="{f:if(condition: '{backendUser.description}', then: '{backendUser.description} ')}(id={backendUser.uid})">
- <be:avatar backendUser="{backendUser.uid}" showIcon="TRUE" />
- </a>
- </td>
- <td class="col-title">
- <be:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
- <b>{backendUser.userName}</b>
- </be:link.editRecord>
- <f:if condition="{bu:arrayElement(array: onlineBackendUsers, key: backendUser.uid)}">
- <span class="label label-success"><f:translate key="online" /></span>
- </f:if>
- <br />
- <f:if condition="{backendUser.realName}">
- <be:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
- {backendUser.realName}
- </be:link.editRecord>
- </f:if>
- </td>
- <td>
- <f:if condition="{backendUser.lastLoginDateAndTime}">
- <f:then>
- <f:format.date format="{dateFormat} {timeFormat}">{backendUser.lastLoginDateAndTime}</f:format.date>
- </f:then>
- <f:else>
- <f:translate key="never" />
- </f:else>
- </f:if>
- </td>
- <td class="col-control">
- <div class="btn-group" role="group">
- <be:link.editRecord class="btn btn-default" table="be_users" uid="{backendUser.uid}" title="edit" >
- <core:icon identifier="actions-open" />
- </be:link.editRecord>
- <f:if condition="{backendUser.currentlyLoggedIn} == 1">
- <f:then>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:then>
- <f:else>
- <f:if condition="{backendUser.isDisabled} == 1">
- <f:then>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{backendUser.uid}][disable]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
- </f:then>
- <f:else>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{backendUser.uid}][disable]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- <f:if condition="{currentUserUid} == {backendUser.uid}">
- <f:then>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:then>
- <f:else>
- <a class="btn btn-default t3js-modal-trigger" href="{be:moduleLink(route:'tce_db', query:'cmd[be_users][{backendUser.uid}][delete]=1', currentUrlParameterName:'redirect')}"
- title="{f:translate(key:'LLL:EXT:beuser/Resources/Private/Language/locallang.xlf:delete')}"
- data-severity="warning"
- data-title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
- data-content="{f:translate(key:'confirm',arguments:'{0:backendUser.userName}')}"
- data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}">
- <core:icon identifier="actions-edit-delete" />
- </a>
- </f:else>
- </f:if>
- </div>
- <div class="btn-group" role="group">
- <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_users', '{backendUser.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
- </div>
- <div class="btn-group" role="group">
- <f:if condition="{compareUserUidList.{backendUser.uid}}">
- <f:then>
- <f:link.action action="removeFromCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default">
- <core:icon identifier="actions-remove" size="small"/>
- <f:translate key="compare" />
- </f:link.action>
- </f:then>
- <f:else>
- <f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><core:icon identifier="actions-add" size="small"/> <f:translate key="compare" /></f:link.action>
- </f:else>
- </f:if>
- <bu:SwitchUser backendUser="{backendUser}" />
- </div>
- </td>
+ <td>
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{backendUser.uid}" title="{f:if(condition: '{backendUser.description}', then: '{backendUser.description} ')}(id={backendUser.uid})">
+ <be:avatar backendUser="{backendUser.uid}" showIcon="TRUE" />
+ </a>
+ </td>
+ <td class="col-title">
+ <be:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
+ <b>{backendUser.userName}</b>
+ </be:link.editRecord>
+ <f:if condition="{bu:arrayElement(array: onlineBackendUsers, key: backendUser.uid)}">
+ <span class="label label-success"><f:translate key="online" /></span>
+ </f:if>
+ <br />
+ <f:if condition="{backendUser.realName}">
+ <be:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
+ {backendUser.realName}
+ </be:link.editRecord>
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{backendUser.lastLoginDateAndTime}">
+ <f:then>
+ <f:format.date format="{dateFormat} {timeFormat}">{backendUser.lastLoginDateAndTime}</f:format.date>
+ </f:then>
+ <f:else>
+ <f:translate key="never" />
+ </f:else>
+ </f:if>
+ </td>
+ <td class="col-control">
+ <div class="btn-group" role="group">
+ <be:link.editRecord class="btn btn-default" table="be_users" uid="{backendUser.uid}" title="edit" >
+ <core:icon identifier="actions-open" />
+ </be:link.editRecord>
+ <f:if condition="{backendUser.currentlyLoggedIn} == 1">
+ <f:then>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:then>
+ <f:else>
+ <f:if condition="{backendUser.isDisabled} == 1">
+ <f:then>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{backendUser.uid}][disable]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{backendUser.uid}][disable]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ <f:if condition="{currentUserUid} == {backendUser.uid}">
+ <f:then>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default t3js-modal-trigger" href="{be:moduleLink(route:'tce_db', query:'cmd[be_users][{backendUser.uid}][delete]=1', currentUrlParameterName:'redirect')}"
+ title="{f:translate(key:'LLL:EXT:beuser/Resources/Private/Language/locallang.xlf:delete')}"
+ data-severity="warning"
+ data-title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
+ data-content="{f:translate(key:'confirm',arguments:'{0:backendUser.userName}')}"
+ data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}">
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </f:else>
+ </f:if>
+ </div>
+ <div class="btn-group" role="group">
+ <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_users', '{backendUser.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
+ </div>
+ <div class="btn-group" role="group">
+ <f:if condition="{compareUserUidList.{backendUser.uid}}">
+ <f:then>
+ <f:link.action action="removeFromCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default">
+ <core:icon identifier="actions-remove" size="small"/>
+ <f:translate key="compare" />
+ </f:link.action>
+ </f:then>
+ <f:else>
+ <f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><core:icon identifier="actions-add" size="small"/> <f:translate key="compare" /></f:link.action>
+ </f:else>
+ </f:if>
+ <bu:SwitchUser backendUser="{backendUser}" />
+ </div>
+ </td>
</tr>
</f:section>
</html>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
index c0243850db8b..7d4d833de771 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
@@ -1,49 +1,49 @@
{namespace be = TYPO3\CMS\Backend\ViewHelpers}
{namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
<f:for each="{onlineUser.sessions}" as="session" iteration="it">
- <tr>
- <f:if condition="{it.isFirst}">
- <f:then>
- <td>
- <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{onlineUser.backendUser.uid}" title="{f:if(condition: '{onlineUser.backendUser.description}', then: '{onlineUser.backendUser.description} ')}(id={onlineUser.backendUser.uid})">
- <be:avatar backendUser="{onlineUser.backendUser.uid}" showIcon="true" />
- </a>
- </td>
- <td class="col-title">
- <b>{onlineUser.backendUser.userName}</b>
- <span class="label label-success"><f:translate key="online" /></span><br />
- {onlineUser.backendUser.realName}
- </td>
- </f:then>
- <f:else>
- <td></td>
- <td class="col-title"></td>
- </f:else>
- </f:if>
- <td>
- <f:format.date format="{dateFormat} {timeFormat}" date="{session.timestamp}" />
- </td>
- <td>{session.ip}</td>
- <td class="col-control">
- <div class="btn-group" role="group">
- <f:if condition="{currentSessionId} == {session.id}">
- <f:else>
- <f:link.action
- class="btn btn-default t3js-modal-trigger"
- action="terminateBackendUserSession"
- controller="BackendUser"
- arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
- data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel\')}'}"
- >
- <core:icon identifier="actions-close" />
- <f:translate key="endSession" />
- </f:link.action>
- </f:else>
- </f:if>
- <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_users', '{onlineUser.backendUser.uid}'); return false;">
- <core:icon identifier="actions-document-info" />
- </a>
- </div>
- </td>
- </tr>
+ <tr>
+ <f:if condition="{it.isFirst}">
+ <f:then>
+ <td>
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{onlineUser.backendUser.uid}" title="{f:if(condition: '{onlineUser.backendUser.description}', then: '{onlineUser.backendUser.description} ')}(id={onlineUser.backendUser.uid})">
+ <be:avatar backendUser="{onlineUser.backendUser.uid}" showIcon="true" />
+ </a>
+ </td>
+ <td class="col-title">
+ <b>{onlineUser.backendUser.userName}</b>
+ <span class="label label-success"><f:translate key="online" /></span><br />
+ {onlineUser.backendUser.realName}
+ </td>
+ </f:then>
+ <f:else>
+ <td></td>
+ <td class="col-title"></td>
+ </f:else>
+ </f:if>
+ <td>
+ <f:format.date format="{dateFormat} {timeFormat}" date="{session.timestamp}" />
+ </td>
+ <td>{session.ip}</td>
+ <td class="col-control">
+ <div class="btn-group" role="group">
+ <f:if condition="{currentSessionId} == {session.id}">
+ <f:else>
+ <f:link.action
+ class="btn btn-default t3js-modal-trigger"
+ action="terminateBackendUserSession"
+ controller="BackendUser"
+ arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
+ data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel\')}'}"
+ >
+ <core:icon identifier="actions-close" />
+ <f:translate key="endSession" />
+ </f:link.action>
+ </f:else>
+ </f:if>
+ <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_users', '{onlineUser.backendUser.uid}'); return false;">
+ <core:icon identifier="actions-document-info" />
+ </a>
+ </div>
+ </td>
+ </tr>
</f:for>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/IndexListRow.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/IndexListRow.html
index 1a1e0a67a0dd..4d83c730f42a 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/IndexListRow.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/IndexListRow.html
@@ -1,47 +1,47 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
<f:section name="list_row">
<tr>
- <td class="col-icon">
- <a href="#" class="t3js-contextmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" title="{f:if(condition: '{backendUserGroup.description}', then: '{backendUserGroup.description} ')}(id={backendUserGroup.uid})">
- <bu:spriteIconForRecord table="be_groups" object="{backendUserGroup}" />
- </a>
- </td>
- <td class="col-title">
- <be:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="edit">
- <b>{backendUserGroup.title}</b><br />
- {backendUser.realName}
- </be:link.editRecord>
- </td>
- <td>
- <f:for each="{backendUserGroup.subgroups}" as="subgroup" iteration="subGroupIterator">
- <be:link.editRecord table="be_groups" uid="{subgroup.uid}" title="edit">
- {subgroup.title}
- </be:link.editRecord>
- <f:if condition="{subGroupIterator.isLast}"><f:else>, </f:else></f:if>
- </f:for>
- </td>
- <td class="col-control">
- <div class="btn-group" role="group">
- <be:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="edit">
- <core:icon identifier="actions-open" />
- </be:link.editRecord>
- <f:if condition="{backendUserGroup.hidden}">
- <f:then>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_groups][{backendUserGroup.uid}][hidden]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
- </f:then>
- <f:else>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_groups][{backendUserGroup.uid}][hidden]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
- </f:else>
- </f:if>
- </div>
- <div class="btn-group" role="group">
- <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_groups', '{backendUserGroup.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
- </div>
- </td>
+ <td class="col-icon">
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" title="{f:if(condition: '{backendUserGroup.description}', then: '{backendUserGroup.description} ')}(id={backendUserGroup.uid})">
+ <bu:spriteIconForRecord table="be_groups" object="{backendUserGroup}" />
+ </a>
+ </td>
+ <td class="col-title">
+ <be:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="edit">
+ <b>{backendUserGroup.title}</b><br />
+ {backendUser.realName}
+ </be:link.editRecord>
+ </td>
+ <td>
+ <f:for each="{backendUserGroup.subgroups}" as="subgroup" iteration="subGroupIterator">
+ <be:link.editRecord table="be_groups" uid="{subgroup.uid}" title="edit">
+ {subgroup.title}
+ </be:link.editRecord>
+ <f:if condition="{subGroupIterator.isLast}"><f:else>, </f:else></f:if>
+ </f:for>
+ </td>
+ <td class="col-control">
+ <div class="btn-group" role="group">
+ <be:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="edit">
+ <core:icon identifier="actions-open" />
+ </be:link.editRecord>
+ <f:if condition="{backendUserGroup.hidden}">
+ <f:then>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_groups][{backendUserGroup.uid}][hidden]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_groups][{backendUserGroup.uid}][hidden]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
+ </f:else>
+ </f:if>
+ </div>
+ <div class="btn-group" role="group">
+ <a class="btn btn-default" href="#" onclick="top.TYPO3.InfoWindow.showItem('be_groups', '{backendUserGroup.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
+ </div>
+ </td>
</tr>
</f:section>
</html>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html
index bf487043c40a..5f25aae8c98c 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html
@@ -1,3 +1,3 @@
<f:be.widget.paginate objects="{backendUserGroups}" as="paginatedBackendUserGroups" configuration="{itemsPerPage: 50, insertBelow: 1}">
<f:render partial="BackendUserGroup/PaginatedListWidgetBody" arguments="{_all}" />
-</f:be.widget.paginate>
\ No newline at end of file
+</f:be.widget.paginate>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/Filters/BackendUser/Index.html b/typo3/sysext/beuser/Resources/Private/Partials/Filters/BackendUser/Index.html
index 898494d923e6..868df4b27abf 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/Filters/BackendUser/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/Filters/BackendUser/Index.html
@@ -1,52 +1,52 @@
<f:form action="index" objectName="demand" object="{demand}" class="form-inline form-inline-spaced">
- <div class="form-group">
- <label for="tx_Beuser_username"><f:translate key="userName">Username</f:translate></label>
- <f:form.textfield
- id="tx_Beuser_username"
- class="form-control input-sm"
- property="userName"
- />
- </div>
- <div class="form-group">
- <label for="tx_Beuser_usertype"><f:translate key="admin">Admin</f:translate></label>
- <f:form.select
- id="tx_Beuser_usertype"
- class="form-control input-sm"
- property="userType"
- options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"adminOnly\")}', 2: '{f:translate(key:\"normalUserOnly\")}'}"
- />
- </div>
- <div class="form-group">
- <label for="tx_Beuser_status"><f:translate key="status">Status</f:translate></label>
- <f:form.select
- id="tx_Beuser_status"
- class="form-control input-sm"
- property="status"
- options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"activeOnly\")}', 2: '{f:translate(key:\"inactiveOnly\")}'}"
- />
- </div>
- <div class="form-group">
- <label for="tx_Beuser_logins"><f:translate key="login">Login</f:translate></label>
- <f:form.select
- id="tx_Beuser_logins"
- class="form-control input-sm"
- property="logins"
- options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"loginBefore\")}', 2: '{f:translate(key:\"neverLoggedIn\")}'}"
- />
- </div>
- <div class="form-group">
- <label for="tx_beuser_backendUserGroup"><f:translate key="backendUserGroup">User Group</f:translate></label>
- <f:form.select
- id="tx_beuser_backendUserGroup"
- class="form-control input-sm"
- property="backendUserGroup"
- options="{backendUserGroups}"
- optionLabelField="title"
- optionValueField="uid"
- />
- </div>
- <div class="form-group">
- <f:form.submit value="{f:translate(key: 'filter')}" class="btn btn-default btn-sm" />
- </div>
+ <div class="form-group">
+ <label for="tx_Beuser_username"><f:translate key="userName">Username</f:translate></label>
+ <f:form.textfield
+ id="tx_Beuser_username"
+ class="form-control input-sm"
+ property="userName"
+ />
+ </div>
+ <div class="form-group">
+ <label for="tx_Beuser_usertype"><f:translate key="admin">Admin</f:translate></label>
+ <f:form.select
+ id="tx_Beuser_usertype"
+ class="form-control input-sm"
+ property="userType"
+ options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"adminOnly\")}', 2: '{f:translate(key:\"normalUserOnly\")}'}"
+ />
+ </div>
+ <div class="form-group">
+ <label for="tx_Beuser_status"><f:translate key="status">Status</f:translate></label>
+ <f:form.select
+ id="tx_Beuser_status"
+ class="form-control input-sm"
+ property="status"
+ options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"activeOnly\")}', 2: '{f:translate(key:\"inactiveOnly\")}'}"
+ />
+ </div>
+ <div class="form-group">
+ <label for="tx_Beuser_logins"><f:translate key="login">Login</f:translate></label>
+ <f:form.select
+ id="tx_Beuser_logins"
+ class="form-control input-sm"
+ property="logins"
+ options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"loginBefore\")}', 2: '{f:translate(key:\"neverLoggedIn\")}'}"
+ />
+ </div>
+ <div class="form-group">
+ <label for="tx_beuser_backendUserGroup"><f:translate key="backendUserGroup">User Group</f:translate></label>
+ <f:form.select
+ id="tx_beuser_backendUserGroup"
+ class="form-control input-sm"
+ property="backendUserGroup"
+ options="{backendUserGroups}"
+ optionLabelField="title"
+ optionValueField="uid"
+ />
+ </div>
+ <div class="form-group">
+ <f:form.submit value="{f:translate(key: 'filter')}" class="btn btn-default btn-sm" />
+ </div>
</f:form>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/Permission/Groupname.html b/typo3/sysext/beuser/Resources/Private/Partials/Permission/Groupname.html
index 0e190347b211..e8f5304204eb 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/Permission/Groupname.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/Permission/Groupname.html
@@ -1,37 +1,37 @@
<span id="g_{pageId}">
- <a
- class="ug_selector changegroup"
- data-page="{pageId}"
- data-group-id="{groupId}"
- data-groupname="{groupname}"
- >
- <f:if condition="{groupId} == 0">
- <f:then>
- <f:comment>
- No group set -> [not set]
- </f:comment>
- <span class="not_set">
- [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:notSet" />]
- </span>
- </f:then>
- <f:else>
- <f:if condition="{groupname}">
- <f:then>
- <f:comment>
- A group name can be resolved
- </f:comment>
- {groupname -> f:format.crop(maxCharacters:20)}
- </f:then>
- <f:else>
- <f:comment>
- Group was deleted -> [deleted]
- </f:comment>
- <span class="not_set" title="{groupId}">
- [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:deleted" />]
- </span>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </a>
+ <a
+ class="ug_selector changegroup"
+ data-page="{pageId}"
+ data-group-id="{groupId}"
+ data-groupname="{groupname}"
+ >
+ <f:if condition="{groupId} == 0">
+ <f:then>
+ <f:comment>
+ No group set -> [not set]
+ </f:comment>
+ <span class="not_set">
+ [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:notSet" />]
+ </span>
+ </f:then>
+ <f:else>
+ <f:if condition="{groupname}">
+ <f:then>
+ <f:comment>
+ A group name can be resolved
+ </f:comment>
+ {groupname -> f:format.crop(maxCharacters:20)}
+ </f:then>
+ <f:else>
+ <f:comment>
+ Group was deleted -> [deleted]
+ </f:comment>
+ <span class="not_set" title="{groupId}">
+ [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:deleted" />]
+ </span>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </a>
</span>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/Permission/Ownername.html b/typo3/sysext/beuser/Resources/Private/Partials/Permission/Ownername.html
index babb5e153a9e..c72356490d2c 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/Permission/Ownername.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/Permission/Ownername.html
@@ -1,38 +1,38 @@
{namespace be = TYPO3\CMS\Backend\ViewHelpers}
<span id="o_{pageId}">
- <a
- class="ug_selector changeowner"
- data-page="{pageId}"
- data-owner="{userId}"
- data-username="{username}"
- >
- <f:if condition="{userId} == 0">
- <f:then>
- <f:comment>
- No owner set -> [not set]
- </f:comment>
- <span class="not_set">
- [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:notSet" />]
- </span>
- </f:then>
- <f:else>
- <f:if condition="{username}">
- <f:then>
- <f:comment>
- A user name can be resolved
- </f:comment>
- {username -> f:format.crop(maxCharacters:20)}
- </f:then>
- <f:else>
- <f:comment>
- User was deleted -> [deleted]
- </f:comment>
- <span class="not_set" title="{userId}">
- [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:deleted" />]
- </span>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </a>
+ <a
+ class="ug_selector changeowner"
+ data-page="{pageId}"
+ data-owner="{userId}"
+ data-username="{username}"
+ >
+ <f:if condition="{userId} == 0">
+ <f:then>
+ <f:comment>
+ No owner set -> [not set]
+ </f:comment>
+ <span class="not_set">
+ [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:notSet" />]
+ </span>
+ </f:then>
+ <f:else>
+ <f:if condition="{username}">
+ <f:then>
+ <f:comment>
+ A user name can be resolved
+ </f:comment>
+ {username -> f:format.crop(maxCharacters:20)}
+ </f:then>
+ <f:else>
+ <f:comment>
+ User was deleted -> [deleted]
+ </f:comment>
+ <span class="not_set" title="{userId}">
+ [<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:deleted" />]
+ </span>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </a>
</span>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
index dce9963f6904..a318e503c5fa 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
@@ -1,208 +1,208 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:bu="http://typo3.org/ns/TYPO3/CMS/Beuser/ViewHelpers">
<f:layout name="Default" />
<f:section name="Buttons">
- <be:moduleLayout.button.linkButton
- icon="actions-view-go-back"
- title="{f:translate(id: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.goBack')}"
- link="{be:moduleLink(route: 'system_BeuserTxBeuser')}"
- />
+ <be:moduleLayout.button.linkButton
+ icon="actions-view-go-back"
+ title="{f:translate(id: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.goBack')}"
+ link="{be:moduleLink(route: 'system_BeuserTxBeuser')}"
+ />
</f:section>
<f:section name="Content">
- <h1><f:translate key="compareBackendUsers">Compare backend users</f:translate></h1>
- <div class="table-fit">
- <table border="0" cellpadding="0" cellspacing="0" id="tx_beuser_compare" class="table table-striped table-bordered table-hover">
- <thead>
- <tr>
- <th></th>
- <f:for each="{compareUserList}" as="compareUser">
- <th>
- <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" title="id={compareUser.uid}">
- <be:avatar backendUser="{compareUser.uid}" showIcon="true" />
- </a>
- {compareUser.userName}
- <be:link.editRecord class="btn btn-default pull-right" table="be_users" uid="{compareUser.uid}" title="edit">
- <core:icon identifier="actions-open" />
- </be:link.editRecord>
- </th>
- </f:for>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th><f:translate key="realName" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>{compareUser.realName}</td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="email" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.email}">
- <f:then>
- <f:link.email email="{compareUser.email}" />
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="admin" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.isAdministrator}">
- <f:then><f:translate key="yes" /></f:then>
- <f:else><f:translate key="no" /></f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="disable_compare" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.currentlyLoggedIn} == 0">
- <f:if condition="{compareUser.isDisabled} == 1">
- <f:then>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{compareUser.uid}][disable]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key: 'visibility.unhide')}">
- <core:icon identifier="actions-edit-unhide" />
- </a>
- </f:then>
- <f:else>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{compareUser.uid}][disable]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key: 'visibility.hide')}">
- <core:icon identifier="actions-edit-hide" />
- </a>
- </f:else>
- </f:if>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="startDateAndTime" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.startDateAndTime}">
- <f:then>
- <f:format.date format="{dateFormat} {timeFormat}">{compareUser.startDateAndTime}</f:format.date>
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="endDateAndTime" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.endDateAndTime}">
- <f:then>
- <f:format.date format="{dateFormat} {timeFormat}">{compareUser.endDateAndTime}</f:format.date>
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="lastLogin" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.lastLoginDateAndTime}">
- <f:then>
- <f:format.date format="{dateFormat} {timeFormat}">{compareUser.lastLoginDateAndTime}</f:format.date>
- </f:then>
- <f:else>
- <f:translate key="never" />
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="backendUserGroups" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:for each="{compareUser.BackendUserGroups}" as="backendUserGroup">
- <a href="#" class="t3js-contextmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" title="id={backendUserGroup.uid}">
- <bu:spriteIconForRecord table="be_users" object="{backendUserGroup}" />
- </a>
- {backendUserGroup.title}<br />
- </f:for>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="allowedLanguages" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.allowedLanguages}">
- <f:then>
- <bu:display.sysLanguage uids="{compareUser.allowedLanguages}" />
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="dbMountPoints" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.dbMountPoints}">
- <f:then>
- <bu:display.pages uids="{compareUser.dbMountPoints}" />
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="fileMounts" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.fileMountPoints}">
- <f:then>
- <bu:display.sysFileMounts uids="{compareUser.fileMountPoints}" />
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- <tr>
- <th><f:translate key="disableIpLock" /></th>
- <f:for each="{compareUserList}" as="compareUser">
- <td>
- <f:if condition="{compareUser.ipLockIsDisabled} == 1">
- <f:then><f:translate key="yes" /></f:then>
- <f:else><f:translate key="no" /></f:else>
- </f:if>
- </td>
- </f:for>
- </tr>
- </tbody>
- </table>
- </div>
+ <h1><f:translate key="compareBackendUsers">Compare backend users</f:translate></h1>
+ <div class="table-fit">
+ <table border="0" cellpadding="0" cellspacing="0" id="tx_beuser_compare" class="table table-striped table-bordered table-hover">
+ <thead>
+ <tr>
+ <th></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <th>
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" title="id={compareUser.uid}">
+ <be:avatar backendUser="{compareUser.uid}" showIcon="true" />
+ </a>
+ {compareUser.userName}
+ <be:link.editRecord class="btn btn-default pull-right" table="be_users" uid="{compareUser.uid}" title="edit">
+ <core:icon identifier="actions-open" />
+ </be:link.editRecord>
+ </th>
+ </f:for>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th><f:translate key="realName" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>{compareUser.realName}</td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="email" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.email}">
+ <f:then>
+ <f:link.email email="{compareUser.email}" />
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="admin" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.isAdministrator}">
+ <f:then><f:translate key="yes" /></f:then>
+ <f:else><f:translate key="no" /></f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="disable_compare" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.currentlyLoggedIn} == 0">
+ <f:if condition="{compareUser.isDisabled} == 1">
+ <f:then>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{compareUser.uid}][disable]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key: 'visibility.unhide')}">
+ <core:icon identifier="actions-edit-unhide" />
+ </a>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[be_users][{compareUser.uid}][disable]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key: 'visibility.hide')}">
+ <core:icon identifier="actions-edit-hide" />
+ </a>
+ </f:else>
+ </f:if>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="startDateAndTime" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.startDateAndTime}">
+ <f:then>
+ <f:format.date format="{dateFormat} {timeFormat}">{compareUser.startDateAndTime}</f:format.date>
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="endDateAndTime" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.endDateAndTime}">
+ <f:then>
+ <f:format.date format="{dateFormat} {timeFormat}">{compareUser.endDateAndTime}</f:format.date>
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="lastLogin" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.lastLoginDateAndTime}">
+ <f:then>
+ <f:format.date format="{dateFormat} {timeFormat}">{compareUser.lastLoginDateAndTime}</f:format.date>
+ </f:then>
+ <f:else>
+ <f:translate key="never" />
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="backendUserGroups" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:for each="{compareUser.BackendUserGroups}" as="backendUserGroup">
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" title="id={backendUserGroup.uid}">
+ <bu:spriteIconForRecord table="be_users" object="{backendUserGroup}" />
+ </a>
+ {backendUserGroup.title}<br />
+ </f:for>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="allowedLanguages" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.allowedLanguages}">
+ <f:then>
+ <bu:display.sysLanguage uids="{compareUser.allowedLanguages}" />
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="dbMountPoints" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.dbMountPoints}">
+ <f:then>
+ <bu:display.pages uids="{compareUser.dbMountPoints}" />
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="fileMounts" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.fileMountPoints}">
+ <f:then>
+ <bu:display.sysFileMounts uids="{compareUser.fileMountPoints}" />
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ <tr>
+ <th><f:translate key="disableIpLock" /></th>
+ <f:for each="{compareUserList}" as="compareUser">
+ <td>
+ <f:if condition="{compareUser.ipLockIsDisabled} == 1">
+ <f:then><f:translate key="yes" /></f:then>
+ <f:else><f:translate key="no" /></f:else>
+ </f:if>
+ </td>
+ </f:for>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</f:section>
</html>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
index 3300ee957a8a..c9022836b87e 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
@@ -7,55 +7,55 @@
<f:layout name="Default" />
<f:section name="Buttons">
- <be:moduleLayout.button.linkButton
- icon="actions-add"
- title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newRecordGeneral')}"
- link="{be:uri.newRecord(table: 'be_users')}"
- />
+ <be:moduleLayout.button.linkButton
+ icon="actions-add"
+ title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newRecordGeneral')}"
+ link="{be:uri.newRecord(table: 'be_users')}"
+ />
</f:section>
<f:section name="Content">
- <h1><f:translate key="backendUserListing" /></h1>
- <f:comment>
- Listing of users on compare list
- </f:comment>
- <f:if condition="{compareUserList}">
- <h3>{f:translate(key: 'section.compare', default: 'Compare')}</h3>
- <div class="table-fit">
- <table id="typo3-backend-user-list-compare" class="table table-hover">
- <tbody>
- <f:for each="{compareUserList}" as="compareUser">
- <tr>
- <td>
- <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" title="id={compareUser.uid}">
- <be:avatar backendUser="{compareUser.uid}" showIcon="TRUE" />
- </a>
- </td>
- <td class="col-title">
- {compareUser.userName}
- </td>
- <td>
- <f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right btn btn-default">
- <core:icon identifier="actions-remove" />
- </f:link.action>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- <f:form action="compare">
- <f:form.submit value="{f:translate(key: 'compareUserList', default: 'Compare user list')}" class="btn btn-default" />
- </f:form>
- <hr>
- </f:if>
+ <h1><f:translate key="backendUserListing" /></h1>
+ <f:comment>
+ Listing of users on compare list
+ </f:comment>
+ <f:if condition="{compareUserList}">
+ <h3>{f:translate(key: 'section.compare', default: 'Compare')}</h3>
+ <div class="table-fit">
+ <table id="typo3-backend-user-list-compare" class="table table-hover">
+ <tbody>
+ <f:for each="{compareUserList}" as="compareUser">
+ <tr>
+ <td>
+ <a href="#" class="t3js-contextmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" title="id={compareUser.uid}">
+ <be:avatar backendUser="{compareUser.uid}" showIcon="TRUE" />
+ </a>
+ </td>
+ <td class="col-title">
+ {compareUser.userName}
+ </td>
+ <td>
+ <f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right btn btn-default">
+ <core:icon identifier="actions-remove" />
+ </f:link.action>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ <f:form action="compare">
+ <f:form.submit value="{f:translate(key: 'compareUserList', default: 'Compare user list')}" class="btn btn-default" />
+ </f:form>
+ <hr>
+ </f:if>
- <f:comment>
- Filter section
- </f:comment>
- <f:render partial="Filters/BackendUser/Index" arguments="{demand: demand, backendUserGroups: backendUserGroups}" />
+ <f:comment>
+ Filter section
+ </f:comment>
+ <f:render partial="Filters/BackendUser/Index" arguments="{demand: demand, backendUserGroups: backendUserGroups}" />
- <f:render partial="BackendUser/PaginatedListWidget" arguments="{_all}" />
+ <f:render partial="BackendUser/PaginatedListWidget" arguments="{_all}" />
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html
index 45cb49132fda..ac26086d56d7 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html
@@ -6,23 +6,23 @@
</f:section>
<f:section name="Content">
- <h1><f:translate key="onlineUsers" /></h1>
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th></th>
- <th class="col-title"><f:translate key="userName" /> / <f:translate key="realName" /></th>
- <th><f:translate key="lastAccess" /></th>
- <th><f:translate key="ipAddress" /></th>
- <th class="col-control"></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{onlineUsersAndSessions}" as="onlineUser">
- <f:render partial="BackendUser/OnlineListRow" arguments="{onlineUser: onlineUser, dateFormat: dateFormat, timeFormat: timeFormat, currentSessionId: currentSessionId}" />
- </f:for>
- </tbody>
- </table>
- </div>
+ <h1><f:translate key="onlineUsers" /></h1>
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th></th>
+ <th class="col-title"><f:translate key="userName" /> / <f:translate key="realName" /></th>
+ <th><f:translate key="lastAccess" /></th>
+ <th><f:translate key="ipAddress" /></th>
+ <th class="col-control"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{onlineUsersAndSessions}" as="onlineUser">
+ <f:render partial="BackendUser/OnlineListRow" arguments="{onlineUser: onlineUser, dateFormat: dateFormat, timeFormat: timeFormat, currentSessionId: currentSessionId}" />
+ </f:for>
+ </tbody>
+ </table>
+ </div>
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
index 3402300ddaac..5f9d7a841a74 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
@@ -6,14 +6,14 @@
<f:layout name="Default" />
<f:section name="Buttons">
- <be:moduleLayout.button.linkButton
- icon="actions-add"
- title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newRecordGeneral')}"
- link="{be:uri.newRecord(table: 'be_groups')}"
- />
+ <be:moduleLayout.button.linkButton
+ icon="actions-add"
+ title="{f:translate(id: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newRecordGeneral')}"
+ link="{be:uri.newRecord(table: 'be_groups')}"
+ />
</f:section>
<f:section name="Content">
- <h1><f:translate key="backendUserGroupListing" /></h1>
- <f:render partial="BackendUserGroup/PaginatedListWidget" arguments="{_all}" />
+ <h1><f:translate key="backendUserGroupListing" /></h1>
+ <f:render partial="BackendUserGroup/PaginatedListWidget" arguments="{_all}" />
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
index e462c4c2f6b1..9a271386f120 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
@@ -3,105 +3,105 @@
<f:layout name="Permission" />
<f:section name="headline">
- <h1>
- <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" />:
- <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Edit" />
- </h1>
+ <h1>
+ <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" />:
+ <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Edit" />
+ </h1>
</f:section>
<f:section name="content">
- <f:form action="update" name="editform" id="PermissionControllerEdit">
+ <f:form action="update" name="editform" id="PermissionControllerEdit">
- <div class="form-group">
- <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></label>
- <f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" class="form-control" />
- </div>
+ <div class="form-group">
+ <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></label>
+ <f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" class="form-control" />
+ </div>
- <div class="form-group">
- <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></label>
- <f:if condition="{f:count(subject:beGroupData)} > 1">
- <f:then>
- <f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" class="form-control" />
- </f:then>
- <f:else>
- <div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
- </f:else>
- </f:if>
- </div>
+ <div class="form-group">
+ <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></label>
+ <f:if condition="{f:count(subject:beGroupData)} > 1">
+ <f:then>
+ <f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" class="form-control" />
+ </f:then>
+ <f:else>
+ <div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
+ </f:else>
+ </f:if>
+ </div>
- <div class="panel panel-default panel-space">
- <div class="table-fit">
- <table class="table table-striped table-hover" id="typo3-permissionMatrix">
- <thead>
- <tr>
- <th></th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
- <td><input type="checkbox" name="check[perms_user][1]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
- <td><input type="checkbox" name="check[perms_user][5]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
- <td><input type="checkbox" name="check[perms_user][2]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
- <td><input type="checkbox" name="check[perms_user][3]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
- <td><input type="checkbox" name="check[perms_user][4]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
- </tr>
- <tr>
- <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
- <td><input type="checkbox" name="check[perms_group][1]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
- <td><input type="checkbox" name="check[perms_group][5]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
- <td><input type="checkbox" name="check[perms_group][2]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
- <td><input type="checkbox" name="check[perms_group][3]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
- <td><input type="checkbox" name="check[perms_group][4]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
- </tr>
- <tr>
- <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
- <td><input type="checkbox" name="check[perms_everybody][1]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
- <td><input type="checkbox" name="check[perms_everybody][5]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
- <td><input type="checkbox" name="check[perms_everybody][2]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
- <td><input type="checkbox" name="check[perms_everybody][3]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
- <td><input type="checkbox" name="check[perms_everybody][4]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
+ <div class="panel panel-default panel-space">
+ <div class="table-fit">
+ <table class="table table-striped table-hover" id="typo3-permissionMatrix">
+ <thead>
+ <tr>
+ <th></th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
+ <td><input type="checkbox" name="check[perms_user][1]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+ <td><input type="checkbox" name="check[perms_user][5]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+ <td><input type="checkbox" name="check[perms_user][2]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+ <td><input type="checkbox" name="check[perms_user][3]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+ <td><input type="checkbox" name="check[perms_user][4]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+ </tr>
+ <tr>
+ <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
+ <td><input type="checkbox" name="check[perms_group][1]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+ <td><input type="checkbox" name="check[perms_group][5]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+ <td><input type="checkbox" name="check[perms_group][2]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+ <td><input type="checkbox" name="check[perms_group][3]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+ <td><input type="checkbox" name="check[perms_group][4]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+ </tr>
+ <tr>
+ <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
+ <td><input type="checkbox" name="check[perms_everybody][1]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+ <td><input type="checkbox" name="check[perms_everybody][5]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+ <td><input type="checkbox" name="check[perms_everybody][2]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+ <td><input type="checkbox" name="check[perms_everybody][3]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+ <td><input type="checkbox" name="check[perms_everybody][4]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
- <div class="form-group">
- <label for="recursionLevel"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" /></label>
- <f:form.select id="recursionLevel" name="mirror[pages][{id}]" options="{recursiveSelectOptions}" class="form-control" />
- </div>
+ <div class="form-group">
+ <label for="recursionLevel"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" /></label>
+ <f:form.select id="recursionLevel" name="mirror[pages][{id}]" options="{recursiveSelectOptions}" class="form-control" />
+ </div>
- <f:form.hidden name="data[pages][{id}][perms_user]" value="{pageInfo.perms_user}" />
- <f:form.hidden name="data[pages][{id}][perms_group]" value="{pageInfo.perms_group}" />
- <f:form.hidden name="data[pages][{id}][perms_everybody]" value="{pageInfo.perms_everybody}" />
- <f:form.hidden name="depth" value="{depth}" />
- <f:form.hidden name="returnUrl" value="{returnUrl}" />
+ <f:form.hidden name="data[pages][{id}][perms_user]" value="{pageInfo.perms_user}" />
+ <f:form.hidden name="data[pages][{id}][perms_group]" value="{pageInfo.perms_group}" />
+ <f:form.hidden name="data[pages][{id}][perms_everybody]" value="{pageInfo.perms_everybody}" />
+ <f:form.hidden name="depth" value="{depth}" />
+ <f:form.hidden name="returnUrl" value="{returnUrl}" />
- </f:form>
+ </f:form>
- <hr>
- <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
- <p>
- <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
- <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
- <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
- <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
- <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
- </p>
- <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+ <hr>
+ <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
+ <p>
+ <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
+ <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
+ <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
+ <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
+ <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
+ </p>
+ <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
- <script type="text/javascript">
- require(["jquery", "TYPO3/CMS/Beuser/Permissions"], function($, Permissions) {
- Permissions.setCheck("check[perms_user]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]");
- Permissions.setCheck("check[perms_group]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]");
- Permissions.setCheck("check[perms_everybody]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]");
- });
- </script>
+ <script type="text/javascript">
+ require(["jquery", "TYPO3/CMS/Beuser/Permissions"], function($, Permissions) {
+ Permissions.setCheck("check[perms_user]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]");
+ Permissions.setCheck("check[perms_group]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]");
+ Permissions.setCheck("check[perms_everybody]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]");
+ });
+ </script>
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
index c792938846b8..e69fb5975dc4 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
@@ -4,193 +4,193 @@
<f:layout name="Permission" />
<f:section name="headline">
- <h1><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" /></h1>
+ <h1><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" /></h1>
</f:section>
<f:section name="content">
- <div class="form-group">
- <label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
- <f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'TYPO3.Permissions.jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
- </div>
+ <div class="form-group">
+ <label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
+ <f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'TYPO3.Permissions.jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
+ </div>
- <div class="panel panel-default panel-space">
- <div class="table-fit">
- <table class="table table-striped table-hover" id="typo3-permissionList">
- <thead>
- <tr>
- <th colspan="2"> </th>
- <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
- <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
- <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
- <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
- </tr>
- </thead>
- <f:for each="{viewTree}" as="data">
- <tr>
- <f:if condition="{data.row.uid}">
- <f:then>
- <f:comment>
- A "normal" page row is rendered, not the root page
- </f:comment>
+ <div class="panel panel-default panel-space">
+ <div class="table-fit">
+ <table class="table table-striped table-hover" id="typo3-permissionList">
+ <thead>
+ <tr>
+ <th colspan="2"> </th>
+ <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
+ <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
+ <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
+ <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
+ </tr>
+ </thead>
+ <f:for each="{viewTree}" as="data">
+ <tr>
+ <f:if condition="{data.row.uid}">
+ <f:then>
+ <f:comment>
+ A "normal" page row is rendered, not the root page
+ </f:comment>
- <td align="left" class="nowrap">
- <f:link.action
- action="edit"
- arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
- title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
- >
- <f:format.raw>{data.depthData}{data.HTML}</f:format.raw>
- {data.row.title -> f:format.crop(maxCharacters:20)}
- </f:link.action>
- </td>
+ <td align="left" class="nowrap">
+ <f:link.action
+ action="edit"
+ arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
+ title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
+ >
+ <f:format.raw>{data.depthData}{data.HTML}</f:format.raw>
+ {data.row.title -> f:format.crop(maxCharacters:20)}
+ </f:link.action>
+ </td>
- <td>
- <f:comment>
- Edit link is workspace aware: If in ws, link to edit the ws overlay record is rendered
- </f:comment>
- <f:link.action
- action="edit"
- arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
- class="btn btn-default"
- title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
- >
- <core:icon identifier="actions-open" />
- </f:link.action>
- </td>
+ <td>
+ <f:comment>
+ Edit link is workspace aware: If in ws, link to edit the ws overlay record is rendered
+ </f:comment>
+ <f:link.action
+ action="edit"
+ arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
+ class="btn btn-default"
+ title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
+ >
+ <core:icon identifier="actions-open" />
+ </f:link.action>
+ </td>
- <td class="nowrap">
- <bu:permissions permission="{data.row.perms_user}" scope="user" pageId="{data.row.uid}" />
- <f:render
- partial="Permission/Ownername"
- arguments="{
- pageId: '{data.row.uid}',
- userId: '{data.row.perms_userid}',
- username: '{bu:arrayElement(array:beUsers, key:data.row.perms_userid, subKey:\'username\')}'
- }"
- />
- </td>
+ <td class="nowrap">
+ <bu:permissions permission="{data.row.perms_user}" scope="user" pageId="{data.row.uid}" />
+ <f:render
+ partial="Permission/Ownername"
+ arguments="{
+ pageId: '{data.row.uid}',
+ userId: '{data.row.perms_userid}',
+ username: '{bu:arrayElement(array:beUsers, key:data.row.perms_userid, subKey:\'username\')}'
+ }"
+ />
+ </td>
- <td class="nowrap">
- <bu:permissions permission="{data.row.perms_group}" scope="group" pageId="{data.row.uid}" />
- <f:render
- partial="Permission/Groupname"
- arguments="{
- pageId: '{data.row.uid}',
- groupId: '{data.row.perms_groupid}',
- groupname: '{bu:arrayElement(array:beGroups, key:data.row.perms_groupid, subKey:\'title\')}'
- }"
- />
- </td>
+ <td class="nowrap">
+ <bu:permissions permission="{data.row.perms_group}" scope="group" pageId="{data.row.uid}" />
+ <f:render
+ partial="Permission/Groupname"
+ arguments="{
+ pageId: '{data.row.uid}',
+ groupId: '{data.row.perms_groupid}',
+ groupname: '{bu:arrayElement(array:beGroups, key:data.row.perms_groupid, subKey:\'title\')}'
+ }"
+ />
+ </td>
- <td class="nowrap">
- <bu:permissions permission="{data.row.perms_everybody}" scope="everybody" pageId="{data.row.uid}" />
- </td>
+ <td class="nowrap">
+ <bu:permissions permission="{data.row.perms_everybody}" scope="everybody" pageId="{data.row.uid}" />
+ </td>
- <td class="nowrap">
- <span id="el_{data.row.uid}">
- <f:if condition="{data.row.editlock}">
- <f:then>
- <a
- class="editlock btn btn-default"
- data-page="{data.row.uid}"
- data-lockstate="1"
- title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
- >
- <core:icon identifier="actions-lock" />
- </a>
- </f:then>
- <f:else>
- <a
- class="editlock btn btn-default"
- data-page="{data.row.uid}"
- data-lockstate="0"
- title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
- >
- <core:icon identifier="actions-unlock" />
- </a>
- </f:else>
- </f:if>
- </span>
- </td>
- </f:then>
+ <td class="nowrap">
+ <span id="el_{data.row.uid}">
+ <f:if condition="{data.row.editlock}">
+ <f:then>
+ <a
+ class="editlock btn btn-default"
+ data-page="{data.row.uid}"
+ data-lockstate="1"
+ title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
+ >
+ <core:icon identifier="actions-lock" />
+ </a>
+ </f:then>
+ <f:else>
+ <a
+ class="editlock btn btn-default"
+ data-page="{data.row.uid}"
+ data-lockstate="0"
+ title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
+ >
+ <core:icon identifier="actions-unlock" />
+ </a>
+ </f:else>
+ </f:if>
+ </span>
+ </td>
+ </f:then>
- <f:else>
- <f:comment>
- Root page row is rendered
- </f:comment>
- <td align="left" class="nowrap">
- <f:format.raw>{data.HTML}</f:format.raw>
- {data.row.title -> f:format.crop(maxCharacters:20)}
- </td>
- <td></td>
- <td class="nowrap"></td>
- <td class="nowrap"></td>
- <td class="nowrap"></td>
- <td class="nowrap"></td>
- </f:else>
- </f:if>
- </tr>
- </f:for>
- </table>
- </div>
- </div>
+ <f:else>
+ <f:comment>
+ Root page row is rendered
+ </f:comment>
+ <td align="left" class="nowrap">
+ <f:format.raw>{data.HTML}</f:format.raw>
+ {data.row.title -> f:format.crop(maxCharacters:20)}
+ </td>
+ <td></td>
+ <td class="nowrap"></td>
+ <td class="nowrap"></td>
+ <td class="nowrap"></td>
+ <td class="nowrap"></td>
+ </f:else>
+ </f:if>
+ </tr>
+ </f:for>
+ </table>
+ </div>
+ </div>
- <f:format.raw>{cshItem}</f:format.raw>
+ <f:format.raw>{cshItem}</f:format.raw>
- <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
- <div class="beuser-legend">
- <table>
- <tr>
- <td class="edge nowrap"><span><span></span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="nowrap"><span class="number">1</span></td>
- <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td>
- </tr>
- <tr>
- <td class="vr nowrap"><span></span></td>
- <td class="edge nowrap"><span><span></span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="nowrap"><span class="number">2</span></td>
- <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td>
- </tr>
- <tr>
- <td class="vr nowrap"><span></span></td>
- <td class="vr nowrap"><span></span></td>
- <td class="edge nowrap"><span><span></span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="nowrap"><span class="number">3</span></td>
- <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td>
- </tr>
- <tr>
- <td class="vr nowrap"><span></span></td>
- <td class="vr nowrap"><span></span></td>
- <td class="vr nowrap"><span></span></td>
- <td class="edge nowrap"><span><span></span></span></td>
- <td class="hr nowrap"><span></span></td>
- <td class="nowrap"><span class="number">4</span></td>
- <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
- </tr>
- <tr>
- <td class="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
- <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
- <td class="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
- <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
- <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
- <td class="nowrap"><span class="number">5</span></td>
- <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
- </tr>
- </table>
- </div>
- <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
- <p>
- <core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
- <core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
- </p>
+ <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
+ <div class="beuser-legend">
+ <table>
+ <tr>
+ <td class="edge nowrap"><span><span></span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="nowrap"><span class="number">1</span></td>
+ <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td>
+ </tr>
+ <tr>
+ <td class="vr nowrap"><span></span></td>
+ <td class="edge nowrap"><span><span></span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="nowrap"><span class="number">2</span></td>
+ <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td>
+ </tr>
+ <tr>
+ <td class="vr nowrap"><span></span></td>
+ <td class="vr nowrap"><span></span></td>
+ <td class="edge nowrap"><span><span></span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="nowrap"><span class="number">3</span></td>
+ <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td>
+ </tr>
+ <tr>
+ <td class="vr nowrap"><span></span></td>
+ <td class="vr nowrap"><span></span></td>
+ <td class="vr nowrap"><span></span></td>
+ <td class="edge nowrap"><span><span></span></span></td>
+ <td class="hr nowrap"><span></span></td>
+ <td class="nowrap"><span class="number">4</span></td>
+ <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
+ </tr>
+ <tr>
+ <td class="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+ <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+ <td class="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+ <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+ <td class="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+ <td class="nowrap"><span class="number">5</span></td>
+ <td class="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
+ </tr>
+ </table>
+ </div>
+ <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+ <p>
+ <core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
+ <core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
+ </p>
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/PermissionAjax/ChangePermission.html b/typo3/sysext/beuser/Resources/Private/Templates/PermissionAjax/ChangePermission.html
index bbc70e048ee9..2babba5aa498 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/PermissionAjax/ChangePermission.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/PermissionAjax/ChangePermission.html
@@ -1,2 +1,2 @@
{namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
-<bu:permissions permission="{permission}" scope="{scope}" pageId="{pageId}" />
\ No newline at end of file
+<bu:permissions permission="{permission}" scope="{scope}" pageId="{pageId}" />
diff --git a/typo3/sysext/core/Resources/Private/Templates/ErrorPage/Error.html b/typo3/sysext/core/Resources/Private/Templates/ErrorPage/Error.html
index daf70e6cbef8..25faafebbea0 100644
--- a/typo3/sysext/core/Resources/Private/Templates/ErrorPage/Error.html
+++ b/typo3/sysext/core/Resources/Private/Templates/ErrorPage/Error.html
@@ -1,48 +1,47 @@
<!DOCTYPE html>
<html xmlns:f="https://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="robots" content="noindex, follow">
- <title>{title}</title>
- <link rel="stylesheet" href="{cssFile}">
- </head>
- <body class="t3-message-page t3-{severityCssClass}page-message">
- <div class="t3-error-wrap">
- <div class="t3-message-page-container">
- <div class="t3-message-page-logo">
- <img src="{logo}" class="typo3-error-image" alt="TYPO3 logo">
- </div>
- <div class="callout callout-danger">
- <div class="media">
- <div class="media-left">
- <span class="fa-stack fa-lg callout-icon">
- <i class="fa fa-circle fa-stack-2x"></i>
- <i class="fa fa-exclamation-triangle fa-stack-1x"></i>
- </span>
- </div>
- <div class="media-body">
- <h4 class="alert-title">{title}</h4>
- <div class="callout-body">
- {message}
- <f:if condition="{errorCode} > 0">
- <p>More information regarding this error might be available <a href="{errorCodeUrlPrefix}{errorCode}" target="_blank">online</a>.</p>
- </f:if>
- </div>
- </div>
- </div>
- </div>
- <div id="t3-footer">
- <div id="t3-copyright-notice">
- TYPO3 is an open source content management system. To maintain the quality of the system and to improve it, please help us by
- donating.
- Copyright © {copyrightYear} Kasper SkÃ¥rhøj. Extensions are copyright of their respective owners. Go to
- <a href="https://typo3.org/">https://typo3.org/</a> for details.
- TYPO3 CMS comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.
- Obstructing the appearance of this notice is prohibited by law.
- </div>
- </div>
- </div>
- </div>
- </body>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <meta name="robots" content="noindex, follow">
+ <title>{title}</title>
+ <link rel="stylesheet" href="{cssFile}">
+ </head>
+ <body class="t3-message-page t3-{severityCssClass}page-message">
+ <div class="t3-error-wrap">
+ <div class="t3-message-page-container">
+ <div class="t3-message-page-logo">
+ <img src="{logo}" class="typo3-error-image" alt="TYPO3 logo">
+ </div>
+ <div class="callout callout-danger">
+ <div class="media">
+ <div class="media-left">
+ <span class="fa-stack fa-lg callout-icon">
+ <i class="fa fa-circle fa-stack-2x"></i>
+ <i class="fa fa-exclamation-triangle fa-stack-1x"></i>
+ </span>
+ </div>
+ <div class="media-body">
+ <h4 class="alert-title">{title}</h4>
+ <div class="callout-body">
+ {message}
+ <f:if condition="{errorCode} > 0">
+ <p>More information regarding this error might be available <a href="{errorCodeUrlPrefix}{errorCode}" target="_blank">online</a>.</p>
+ </f:if>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="t3-footer">
+ <div id="t3-copyright-notice">
+ TYPO3 is an open source content management system. To maintain the quality of the system and to improve it, please help us by
+ donating.
+ Copyright © {copyrightYear} Kasper SkÃ¥rhøj. Extensions are copyright of their respective owners. Go to
+ <a href="https://typo3.org/">https://typo3.org/</a> for details.
+ TYPO3 CMS comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.
+ Obstructing the appearance of this notice is prohibited by law.
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
</html>
-
diff --git a/typo3/sysext/extbase/Resources/Private/MVC/NotFoundView_Template.html b/typo3/sysext/extbase/Resources/Private/MVC/NotFoundView_Template.html
index bcb5dd890c9e..dd2671a1f319 100644
--- a/typo3/sysext/extbase/Resources/Private/MVC/NotFoundView_Template.html
+++ b/typo3/sysext/extbase/Resources/Private/MVC/NotFoundView_Template.html
@@ -1,2 +1,2 @@
<p><strong>Sorry, the requested view was not found.</strong></p>
-<p>The technical reason is: <em>###ERROR_MESSAGE###</em>.</p>
\ No newline at end of file
+<p>The technical reason is: <em>###ERROR_MESSAGE###</em>.</p>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html b/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html
index 6a79f34b5201..d93623470fcd 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html
@@ -1,10 +1,10 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<f:be.pageRenderer
- includeRequireJsModules="{
- 0:'TYPO3/CMS/Extensionmanager/Main'
- }"
- />
+ includeRequireJsModules="{
+ 0:'TYPO3/CMS/Extensionmanager/Main'
+ }"
+ />
<em:be.trigger triggers="{triggers}" />
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
index a5a800bb86a1..2edacf928ae2 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
@@ -1,50 +1,50 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<div class="card card-size-fixed-small">
- <div class="card-image">
- <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}">
- <em:distributionImage extensionkey="{distribution.extensionKey}" alt="{distribution.title}" height="225" width="300" />
- </f:link.action>
- <f:if condition="{distribution.dependencies}">
- <div class="card-image-badge">
- <em:typo3Dependency extension="{distribution}" />
- </div>
- </f:if>
- <f:if condition="{official}">
- <div class="distribution-official-badge">
- <f:image
- src="EXT:extensionmanager/Resources/Public/Images/OfficialBadge.svg" alt="{distribution.title}"
- height="64"
- width="64"
- />
- </div>
- </f:if>
- </div>
+ <div class="card-image">
+ <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}">
+ <em:distributionImage extensionkey="{distribution.extensionKey}" alt="{distribution.title}" height="225" width="300" />
+ </f:link.action>
+ <f:if condition="{distribution.dependencies}">
+ <div class="card-image-badge">
+ <em:typo3Dependency extension="{distribution}" />
+ </div>
+ </f:if>
+ <f:if condition="{official}">
+ <div class="distribution-official-badge">
+ <f:image
+ src="EXT:extensionmanager/Resources/Public/Images/OfficialBadge.svg" alt="{distribution.title}"
+ height="64"
+ width="64"
+ />
+ </div>
+ </f:if>
+ </div>
- <div class="card-header">
- <h3 class="card-title">
- <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}">
- {distribution.title}
- </f:link.action>
- </h3>
- <span class="card-subtitle">
- {distribution.extensionKey}
- </span>
- </div>
+ <div class="card-header">
+ <h3 class="card-title">
+ <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}">
+ {distribution.title}
+ </f:link.action>
+ </h3>
+ <span class="card-subtitle">
+ {distribution.extensionKey}
+ </span>
+ </div>
- <div class="card-content">
- <p class="card-text">
- {distribution.description -> f:format.crop(maxCharacters: 150) -> f:format.raw()}
- </p>
- </div>
+ <div class="card-content">
+ <p class="card-text">
+ {distribution.description -> f:format.crop(maxCharacters: 150) -> f:format.raw()}
+ </p>
+ </div>
- <div class="card-footer">
- <f:link.action action="installDistribution" controller="Download" arguments="{extension:distribution}" class="btn btn-default t3-button-action-installdistribution">
- <core:icon identifier="actions-system-extension-import" /> <f:translate key="extensionList.installDistribution">Install</f:translate>
- </f:link.action>
- <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}" class="btn btn-link">
- <f:translate key="button.details">Show Details</f:translate>
- </f:link.action>
- </div>
+ <div class="card-footer">
+ <f:link.action action="installDistribution" controller="Download" arguments="{extension:distribution}" class="btn btn-default t3-button-action-installdistribution">
+ <core:icon identifier="actions-system-extension-import" /> <f:translate key="extensionList.installDistribution">Install</f:translate>
+ </f:link.action>
+ <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}" class="btn btn-link">
+ <f:translate key="button.details">Show Details</f:translate>
+ </f:link.action>
+ </div>
</div>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPaginator.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPaginator.html
index 218bb228b83d..fbf2c4bf2394 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPaginator.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPaginator.html
@@ -1,12 +1,12 @@
<f:be.widget.paginate objects="{extensions}" as="paginatedExtensions" configuration="{itemsPerPage: 10, maximumNumberOfLinks: 2}">
- <table id="terTable" class="table table-striped table-hover typo3-extension-list">
- <f:if condition="{showVersionList}">
- <f:then>
- <f:render partial="List/TerShowVersionsTable.html" arguments="{paginatedExtensions:paginatedExtensions}" />
- </f:then>
- <f:else>
- <f:render partial="List/TerTable.html" arguments="{paginatedExtensions:paginatedExtensions, availableAndInstalled:availableAndInstalled}" />
- </f:else>
- </f:if>
- </table>
+ <table id="terTable" class="table table-striped table-hover typo3-extension-list">
+ <f:if condition="{showVersionList}">
+ <f:then>
+ <f:render partial="List/TerShowVersionsTable.html" arguments="{paginatedExtensions:paginatedExtensions}" />
+ </f:then>
+ <f:else>
+ <f:render partial="List/TerTable.html" arguments="{paginatedExtensions:paginatedExtensions, availableAndInstalled:availableAndInstalled}" />
+ </f:else>
+ </f:if>
+ </table>
</f:be.widget.paginate>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
index da269437a016..ba91ea266521 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
@@ -1,19 +1,19 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<td>
- <em:downloadExtension extension="{extension}" />
+ <em:downloadExtension extension="{extension}" />
</td>
<td>
- {extension.title}
+ {extension.title}
</td>
<td>
- {extension.version}
+ {extension.version}
</td>
<td>
- <f:format.nl2br>{extension.updateComment}</f:format.nl2br>
+ <f:format.nl2br>{extension.updateComment}</f:format.nl2br>
</td>
<td>
- <f:format.date>{extension.lastUpdated}</f:format.date>
+ <f:format.date>{extension.lastUpdated}</f:format.date>
</td>
<td class="{extension.stateString}">
- {extension.stateString}
+ {extension.stateString}
</td>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
index 20008c3716a9..f96a75dc31c2 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
@@ -1,20 +1,20 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<thead>
- <tr>
- <th><f:translate key="extensionList.header.extensionActions"/></th>
- <th><f:translate key="extensionList.header.extensionName"/></th>
- <th><f:translate key="extensionList.header.version"/></th>
- <th><f:translate key="extensionList.header.uploadComment"/></th>
- <th><f:translate key="extensionList.header.lastUpdate"/></th>
- <th><f:translate key="extensionList.header.extensionState"/></th>
- </tr>
+ <tr>
+ <th><f:translate key="extensionList.header.extensionActions"/></th>
+ <th><f:translate key="extensionList.header.extensionName"/></th>
+ <th><f:translate key="extensionList.header.version"/></th>
+ <th><f:translate key="extensionList.header.uploadComment"/></th>
+ <th><f:translate key="extensionList.header.lastUpdate"/></th>
+ <th><f:translate key="extensionList.header.extensionState"/></th>
+ </tr>
</thead>
<tbody>
- <f:for each="{extensions}" as="extension">
- <f:cycle values="{0: 'odd', 1: 'even'}" as="zebraClass">
- <tr class="{zebraClass}">
- </f:cycle>
- <f:render partial="List/TerShowVersionsSingleLine" arguments="{extension:extension}" />
- </tr>
- </f:for>
-</tbody>
\ No newline at end of file
+ <f:for each="{extensions}" as="extension">
+ <f:cycle values="{0: 'odd', 1: 'even'}" as="zebraClass">
+ <tr class="{zebraClass}">
+ </f:cycle>
+ <f:render partial="List/TerShowVersionsSingleLine" arguments="{extension:extension}" />
+ </tr>
+ </f:for>
+</tbody>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerSingleLine.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerSingleLine.html
index 89d5e59647cd..ec68a3199fc1 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerSingleLine.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerSingleLine.html
@@ -1,36 +1,36 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<td>
- <em:downloadExtension extension="{extension}" />
+ <em:downloadExtension extension="{extension}" />
</td>
<td>
- <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
- {extension.title}
- </f:link.action>
- <em:showExtensionVersions extension="{extension}" />
+ <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
+ {extension.title}
+ </f:link.action>
+ <em:showExtensionVersions extension="{extension}" />
</td>
<td>
- <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
- {extension.extensionKey}
- </f:link.action>
+ <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
+ {extension.extensionKey}
+ </f:link.action>
</td>
<td>
- <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
- {extension.version}
- </f:link.action>
- <em:showExtensionVersions extension="{extension}" />
+ <f:link.action action="showAllVersions" arguments="{extensionKey: extension.extensionKey}" title="{f:translate(key:'extensionList.showAllVersions.label')}">
+ {extension.version}
+ </f:link.action>
+ <em:showExtensionVersions extension="{extension}" />
</td>
<td>
- <f:format.date>{extension.lastUpdated}</f:format.date>
+ <f:format.date>{extension.lastUpdated}</f:format.date>
</td>
<td title="{extension.description}">
- <f:format.crop maxCharacters="50" respectWordBoundaries="true" respectHtml="false">{extension.description}</f:format.crop>
+ <f:format.crop maxCharacters="50" respectWordBoundaries="true" respectHtml="false">{extension.description}</f:format.crop>
- <div class="author">
- <div class="author-name">{extension.authorName}</div>
- <div class="author-email">{extension.authorEmail}</div>
- </div>
+ <div class="author">
+ <div class="author-name">{extension.authorName}</div>
+ <div class="author-email">{extension.authorEmail}</div>
+ </div>
</td>
<td>
- <span class="label label-{extension.stateString}">{extension.stateString}</span>
+ <span class="label label-{extension.stateString}">{extension.stateString}</span>
</td>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
index 61dbe1243877..3a9ec76e3998 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
@@ -1,19 +1,19 @@
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<thead>
- <tr>
- <th><f:translate key="extensionList.header.extensionActions"/></th>
- <th><f:translate key="extensionList.header.extensionName"/></th>
- <th><f:translate key="extensionList.header.extensionKey"/></th>
- <th><f:translate key="extensionList.header.version"/></th>
- <th><f:translate key="extensionList.header.lastUpdate"/></th>
- <th><f:translate key="extensionList.header.description"/></th>
- <th><f:translate key="extensionList.header.extensionState"/></th>
- </tr>
+ <tr>
+ <th><f:translate key="extensionList.header.extensionActions"/></th>
+ <th><f:translate key="extensionList.header.extensionName"/></th>
+ <th><f:translate key="extensionList.header.extensionKey"/></th>
+ <th><f:translate key="extensionList.header.version"/></th>
+ <th><f:translate key="extensionList.header.lastUpdate"/></th>
+ <th><f:translate key="extensionList.header.description"/></th>
+ <th><f:translate key="extensionList.header.extensionState"/></th>
+ </tr>
</thead>
<tbody>
<f:for each="{paginatedExtensions}" as="extension">
- <tr class="{em:installationStateCssClass(needle:extension.extensionKey, haystack:availableAndInstalled)}">
- <f:render partial="List/TerSingleLine.html" arguments="{extension:extension}" />
- </tr>
+ <tr class="{em:installationStateCssClass(needle:extension.extensionKey, haystack:availableAndInstalled)}">
+ <f:render partial="List/TerSingleLine.html" arguments="{extension:extension}" />
+ </tr>
</f:for>
</tbody>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependencies.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependencies.html
index f2ecf2d2ad88..27286b1c3688 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependencies.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependencies.html
@@ -1,22 +1,22 @@
<p><f:translate key="dependencyCheck.headline" arguments="{0: extension.extensionKey}" />:</p>
<ul>
- <f:for each="{unresolvedDependencies}" key="key" as="messages">
- <f:if condition="{key} == {extension.extensionKey}">
- <f:for each="{messages}" as="message">
- <li>{message.message -> f:format.htmlspecialchars()}</li>
- </f:for>
- </f:if>
- </f:for>
- <f:for each="{unresolvedDependencies}" key="key" as="messages">
- <f:if condition="{key} != {extension.extensionKey}">
- <li>
- <strong>{f:translate(key: 'dependencyCheck.requiredExtension', arguments: {key: key}) -> f:format.htmlspecialchars()}</strong>
- <ul>
- <f:for each="{messages}" as="message">
- <li>{message.message -> f:format.htmlspecialchars()}</li>
- </f:for>
- </ul>
- </li>
- </f:if>
- </f:for>
+ <f:for each="{unresolvedDependencies}" key="key" as="messages">
+ <f:if condition="{key} == {extension.extensionKey}">
+ <f:for each="{messages}" as="message">
+ <li>{message.message -> f:format.htmlspecialchars()}</li>
+ </f:for>
+ </f:if>
+ </f:for>
+ <f:for each="{unresolvedDependencies}" key="key" as="messages">
+ <f:if condition="{key} != {extension.extensionKey}">
+ <li>
+ <strong>{f:translate(key: 'dependencyCheck.requiredExtension', arguments: {key: key}) -> f:format.htmlspecialchars()}</strong>
+ <ul>
+ <f:for each="{messages}" as="message">
+ <li>{message.message -> f:format.htmlspecialchars()}</li>
+ </f:for>
+ </ul>
+ </li>
+ </f:if>
+ </f:for>
</ul>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependenciesMessage.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependenciesMessage.html
index 0ff11dcac359..7151d556039b 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependenciesMessage.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UnresolvedDependenciesMessage.html
@@ -1,6 +1,6 @@
<p>{f:translate(key: 'dependencyCheck.unresolvedDependencies.message') -> f:format.raw()}</p>
<div class="checkbox">
- <label>
- <input type="checkbox" name="unlockDependencyIgnoreButton"> <f:translate key="label.resolveDependenciesEnableButton" />
- </label>
-</div>
\ No newline at end of file
+ <label>
+ <input type="checkbox" name="unlockDependencyIgnoreButton"> <f:translate key="label.resolveDependenciesEnableButton" />
+ </label>
+</div>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UpdateFromTer.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UpdateFromTer.html
index d85cbdbf3e29..d5ccab889a2c 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UpdateFromTer.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UpdateFromTer.html
@@ -1,15 +1,15 @@
<f:form
- action="updateExtensionListFromTer"
- controller="UpdateFromTer"
- format="json"
- class="update-from-ter"
- >
- {f:translate(key: 'extensionList.updateFromTer.lastUpdate.timeSinceLastUpdateLabel')}
- <span class="time-since-last-update" title="{f:translate(key: 'extensionList.updateFromTer.lastUpdate.noTimeOfLastUpdate')}">
- {f:translate(key: 'extensionList.updateFromTer.lastUpdate.noInfo')}
- </span>
- <input
- class="btn btn-default"
- type="submit"
- value="{f:translate(key: 'extensionList.updateFromTer.buttonLabel')}" />
+ action="updateExtensionListFromTer"
+ controller="UpdateFromTer"
+ format="json"
+ class="update-from-ter"
+ >
+ {f:translate(key: 'extensionList.updateFromTer.lastUpdate.timeSinceLastUpdateLabel')}
+ <span class="time-since-last-update" title="{f:translate(key: 'extensionList.updateFromTer.lastUpdate.noTimeOfLastUpdate')}">
+ {f:translate(key: 'extensionList.updateFromTer.lastUpdate.noInfo')}
+ </span>
+ <input
+ class="btn btn-default"
+ type="submit"
+ value="{f:translate(key: 'extensionList.updateFromTer.buttonLabel')}" />
</f:form>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UploadForm.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UploadForm.html
index e6a689cdc1b2..5a6f69f0abc7 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UploadForm.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/UploadForm.html
@@ -1,4 +1,4 @@
<div class="uploadForm" style="display: none;">
- <i class="fa fa-circle-o-notch fa-spin"></i>
- <f:translate key="extensionList.loading"/>
-</div>
\ No newline at end of file
+ <i class="fa fa-circle-o-notch fa-spin"></i>
+ <f:translate key="extensionList.loading"/>
+</div>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
index f0e5a87c2c06..58d9fb2dd3c1 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -5,79 +5,79 @@
</f:section>
<f:section name="content">
- <div class="distribution-detail">
- <div class="distribution-detail-previewpane">
- <em:distributionImage extensionkey="{extension.extensionKey}" alt="{extension.title}" height="225" width="300" />
- </div>
- <div class="distribution-detail-body">
- <div class="distribution-detail-header">
- <h1>{extension.title}</h1>
- <p>{extension.description}</p>
- </div>
+ <div class="distribution-detail">
+ <div class="distribution-detail-previewpane">
+ <em:distributionImage extensionkey="{extension.extensionKey}" alt="{extension.title}" height="225" width="300" />
+ </div>
+ <div class="distribution-detail-body">
+ <div class="distribution-detail-header">
+ <h1>{extension.title}</h1>
+ <p>{extension.description}</p>
+ </div>
- <ul class="distribution-detail-actions">
- <f:if condition="{distributionActive}">
- <f:else>
- <li>
- <f:link.action action="installDistribution" controller="Download" arguments="{extension:extension}" class="btn btn-default t3-button-action-installdistribution">
- <core:icon identifier="actions-system-extension-import" /> <f:translate key="extensionList.installDistribution">Install</f:translate>
- </f:link.action>
- </li>
- </f:else>
- <f:then>
- <li>
- <button class="btn btn-default distribution-openViewModule" onclick="top.goToModule('web_ViewpageView');">
- <core:icon identifier="actions-document-view" /> <f:translate key="distribution.welcome.openViewModule" />
- </button>
- </li>
- <li>
- <button class="btn btn-default distribution-openPageModule" onclick="top.goToModule('web_layout');">
- <core:icon identifier="actions-open" /> <f:translate key="distribution.welcome.openPageModule" />
- </button>
- </li>
- </f:then>
- </f:if>
- </ul>
+ <ul class="distribution-detail-actions">
+ <f:if condition="{distributionActive}">
+ <f:else>
+ <li>
+ <f:link.action action="installDistribution" controller="Download" arguments="{extension:extension}" class="btn btn-default t3-button-action-installdistribution">
+ <core:icon identifier="actions-system-extension-import" /> <f:translate key="extensionList.installDistribution">Install</f:translate>
+ </f:link.action>
+ </li>
+ </f:else>
+ <f:then>
+ <li>
+ <button class="btn btn-default distribution-openViewModule" onclick="top.goToModule('web_ViewpageView');">
+ <core:icon identifier="actions-document-view" /> <f:translate key="distribution.welcome.openViewModule" />
+ </button>
+ </li>
+ <li>
+ <button class="btn btn-default distribution-openPageModule" onclick="top.goToModule('web_layout');">
+ <core:icon identifier="actions-open" /> <f:translate key="distribution.welcome.openPageModule" />
+ </button>
+ </li>
+ </f:then>
+ </f:if>
+ </ul>
- <dl class="dl-horizontal dl-horizontal-wide distribution-detail-summary">
- <dt><f:translate key="extensionList.distribution.title" /></dt>
- <dd>{extension.title}</dd>
- <dt><f:translate key="extensionList.distribution.key" /></dt>
- <dd>{extension.extensionKey}</dd>
- <dt><f:translate key="extensionList.distribution.version" /></dt>
- <dd>{extension.version} (<f:format.date format="d.m.Y">{extension.lastUpdated}</f:format.date>)<br><span class="{extension.stateString}">{extension.stateString}</span></dd>
- <dt><f:translate key="extensionList.distribution.author" /></dt>
- <dd>{extension.authorName}</dd>
- <dt><f:translate key="extensionList.distribution.downloads" /></dt>
- <dd>{extension.alldownloadcounter}</dd>
- </dl>
+ <dl class="dl-horizontal dl-horizontal-wide distribution-detail-summary">
+ <dt><f:translate key="extensionList.distribution.title" /></dt>
+ <dd>{extension.title}</dd>
+ <dt><f:translate key="extensionList.distribution.key" /></dt>
+ <dd>{extension.extensionKey}</dd>
+ <dt><f:translate key="extensionList.distribution.version" /></dt>
+ <dd>{extension.version} (<f:format.date format="d.m.Y">{extension.lastUpdated}</f:format.date>)<br><span class="{extension.stateString}">{extension.stateString}</span></dd>
+ <dt><f:translate key="extensionList.distribution.author" /></dt>
+ <dd>{extension.authorName}</dd>
+ <dt><f:translate key="extensionList.distribution.downloads" /></dt>
+ <dd>{extension.alldownloadcounter}</dd>
+ </dl>
- <f:if condition="{extension.dependencies}">
- <h2><f:translate key="distribution.dependency.headline" /></h2>
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <td><f:translate key="distribution.dependency.identifier" /></td>
- <td><f:translate key="distribution.dependency.type" /></td>
- <td><f:translate key="distribution.dependency.version" /></td>
- </tr>
- </thead>
- <tbody>
- <f:for each="{extension.dependencies}" as="dependency">
- <tr>
- <td>{dependency.identifier}</td>
- <td>{dependency.type}</td>
- <td>
- {dependency.lowestVersion}<f:if condition="{dependency.highestVersion}">-{dependency.highestVersion}</f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </f:if>
+ <f:if condition="{extension.dependencies}">
+ <h2><f:translate key="distribution.dependency.headline" /></h2>
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <td><f:translate key="distribution.dependency.identifier" /></td>
+ <td><f:translate key="distribution.dependency.type" /></td>
+ <td><f:translate key="distribution.dependency.version" /></td>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{extension.dependencies}" as="dependency">
+ <tr>
+ <td>{dependency.identifier}</td>
+ <td>{dependency.type}</td>
+ <td>
+ {dependency.lowestVersion}<f:if condition="{dependency.highestVersion}">-{dependency.highestVersion}</f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:if>
- </div>
- </div>
+ </div>
+ </div>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
index be31e61775fa..bc61edc2b01c 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
@@ -3,39 +3,39 @@
<f:layout name="main"/>
<f:section name="headline">
- <h1><f:translate key="distributions">Get Distributions</f:translate></h1>
+ <h1><f:translate key="distributions">Get Distributions</f:translate></h1>
</f:section>
<f:section name="content">
- <f:if condition="{enableDistributionsView}">
- <f:then>
- <f:if condition="{showUnsuitableDistributions} == 0">
- <div class="row">
- <div class="col-sm-6">
- <f:form class="typo3-extensionmanager-unsuitable-dist" action="distributions" arguments="{showUnsuitableDistributions: 1}" >
- <div class="input-group">
- <span class="input-group-btn">
- <f:form.submit class="btn btn-default" value="{f:translate(key:'extensionList.showUnsuitableDistributions')}"/>
- </span>
- </div>
- </f:form>
- </div>
- </div>
- </f:if>
- <div class="card-container">
- <f:for each="{officialDistributions}" as="distribution">
- <f:render partial="List/Distribution" arguments="{distribution: distribution, official: 1}" />
- </f:for>
- <f:for each="{communityDistributions}" as="distribution">
- <f:render partial="List/Distribution" arguments="{distribution: distribution, official: 0}" />
- </f:for>
- </div>
- </f:then>
- <f:else>
- <p>{f:translate(key: 'extensionList.installImpexp')}</p>
- <f:link.action action="toggleExtensionInstallationState" controller="Action" arguments="{extensionKey: 'impexp'}" class="btn btn-default t3-button-action-installdistribution">
- <span class="fa fa-cloud-download"> </span><f:translate key="distribution.installImpexp">Install impexp</f:translate>
- </f:link.action>
- </f:else>
- </f:if>
+ <f:if condition="{enableDistributionsView}">
+ <f:then>
+ <f:if condition="{showUnsuitableDistributions} == 0">
+ <div class="row">
+ <div class="col-sm-6">
+ <f:form class="typo3-extensionmanager-unsuitable-dist" action="distributions" arguments="{showUnsuitableDistributions: 1}" >
+ <div class="input-group">
+ <span class="input-group-btn">
+ <f:form.submit class="btn btn-default" value="{f:translate(key:'extensionList.showUnsuitableDistributions')}"/>
+ </span>
+ </div>
+ </f:form>
+ </div>
+ </div>
+ </f:if>
+ <div class="card-container">
+ <f:for each="{officialDistributions}" as="distribution">
+ <f:render partial="List/Distribution" arguments="{distribution: distribution, official: 1}" />
+ </f:for>
+ <f:for each="{communityDistributions}" as="distribution">
+ <f:render partial="List/Distribution" arguments="{distribution: distribution, official: 0}" />
+ </f:for>
+ </div>
+ </f:then>
+ <f:else>
+ <p>{f:translate(key: 'extensionList.installImpexp')}</p>
+ <f:link.action action="toggleExtensionInstallationState" controller="Action" arguments="{extensionKey: 'impexp'}" class="btn btn-default t3-button-action-installdistribution">
+ <span class="fa fa-cloud-download"> </span><f:translate key="distribution.installImpexp">Install impexp</f:translate>
+ </f:link.action>
+ </f:else>
+ </f:if>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index ff1b2befeae4..eb96c6a0f9e1 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -2,100 +2,100 @@
<f:layout name="main" />
<f:section name="headline">
- <h1><f:translate key="installedExtensions" /></h1>
+ <h1><f:translate key="installedExtensions" /></h1>
</f:section>
<f:section name="content">
- <f:render partial="List/UploadForm" />
+ <f:render partial="List/UploadForm" />
- <form class="form-inline">
- <div class="form-group">
- <f:form.textfield name="Tx_Extensionmanager_extensionkey" placeholder="{f:translate(key:'extensionList.search')}" id="Tx_Extensionmanager_extensionkey" value="{search}" class="form-control" />
- </div>
- </form>
- <br>
- <div class="table-fit">
- <table id="typo3-extension-list" class="table table-striped table-hover typo3-extension-list">
- <thead>
- <tr>
- <th title="{f:translate(key:'extensionList.header.title.update')}"><f:translate key="extensionList.header.update"/></th>
- <th title="{f:translate(key:'extensionList.header.title.activate')}"><f:translate key="extensionList.header.activate"/></th>
- <th><f:translate key="extensionList.header.extensionName"/></th>
- <th><f:translate key="extensionList.header.extensionKey"/></th>
- <th><f:translate key="extensionList.header.extensionVersion"/></th>
- <th><f:translate key="extensionList.header.extensionState"/></th>
- <th><f:translate key="extensionList.header.extensionType"/></th>
- <th><f:translate key="extensionList.header.extensionActions"/></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{extensions}" as="extension" key="extensionKey">
- <f:if condition="{extension.terObject}">
- <f:then>
- <tr id="{extensionKey}" class="{f:if(condition:'{extension.terObject.reviewState} == -1', then:'insecure')}{f:if(condition:'{extension.terObject.reviewState} == -2', then:'outdated')} {f:if(condition:'{extension.installed}', then: '', else: 'inactive')}">
- </f:then>
- <f:else>
- <tr id="{extensionKey}" class="{f:if(condition:'{extension.installed}', then: '', else: 'inactive')}">
- </f:else>
- </f:if>
- <td>
- <f:if condition="{extension.updateAvailable}">
- <f:if condition="{isComposerMode} || {settings.offlineMode} || {extension.state} == 'excludeFromUpdates'">
- <f:then>
- <span class="btn btn-default disabled" title="{f:translate(key:'extensionList.updateDisabled')}">
- <core:icon identifier="actions-system-extension-update" />
- </span>
- </f:then>
- <f:else>
- <f:link.action action="updateCommentForUpdatableVersions"
- class="btn btn-default"
- additionalAttributes="{data-action:'update-extension'}"
- format="json" controller="Download"
- arguments="{extension:extension.key, integerVersionStart: extension.terObject.integerVersion, integerVersionStop: extension.updateToVersion.integerVersion}"
- title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}"
- >
- <core:icon identifier="actions-system-extension-update" />
- </f:link.action>
- </f:else>
- </f:if>
- </f:if>
- </td>
- <td data-order="{f:if(condition: extension.installed, then: 'active', else: 'inactive')}">
- <em:toggleExtensionInstallationState extension="{extension}" />
- </td>
- <td>
- <f:if condition="{extension.ext_icon}">
- <img class="ext-icon" src="../{extension.siteRelPath}{extension.ext_icon}" alt="{extension.title}" />
- </f:if>
- <span title="{extension.description}">{extension.title}</span>
- </td>
- <td>
- {extensionKey}
- </td>
- <td>
- {extension.version}
- </td>
- <td>
- <span class="label label-{extension.state}">{extension.state}</span>
- </td>
- <td>
- {extension.type}
- </td>
- <td>
- <div class="btn-group">
- <em:processAvailableActions extension="{extension}">
- <em:updateScript class="btn btn-default" extensionKey="{extension.key}" />
- <em:removeExtension class="btn btn-default" extension="{extension}" />
- <f:link.action action="downloadExtensionZip" controller="Action" arguments="{extension:extension.key}" title="{f:translate(key:'extensionList.downloadzip')}" class="btn btn-default">
- <core:icon identifier="actions-system-extension-download" />
- </f:link.action>
- <em:reloadSqlData class="btn btn-default" extension="{extension}" />
- </em:processAvailableActions>
- </div>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
+ <form class="form-inline">
+ <div class="form-group">
+ <f:form.textfield name="Tx_Extensionmanager_extensionkey" placeholder="{f:translate(key:'extensionList.search')}" id="Tx_Extensionmanager_extensionkey" value="{search}" class="form-control" />
+ </div>
+ </form>
+ <br>
+ <div class="table-fit">
+ <table id="typo3-extension-list" class="table table-striped table-hover typo3-extension-list">
+ <thead>
+ <tr>
+ <th title="{f:translate(key:'extensionList.header.title.update')}"><f:translate key="extensionList.header.update"/></th>
+ <th title="{f:translate(key:'extensionList.header.title.activate')}"><f:translate key="extensionList.header.activate"/></th>
+ <th><f:translate key="extensionList.header.extensionName"/></th>
+ <th><f:translate key="extensionList.header.extensionKey"/></th>
+ <th><f:translate key="extensionList.header.extensionVersion"/></th>
+ <th><f:translate key="extensionList.header.extensionState"/></th>
+ <th><f:translate key="extensionList.header.extensionType"/></th>
+ <th><f:translate key="extensionList.header.extensionActions"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{extensions}" as="extension" key="extensionKey">
+ <f:if condition="{extension.terObject}">
+ <f:then>
+ <tr id="{extensionKey}" class="{f:if(condition:'{extension.terObject.reviewState} == -1', then:'insecure')}{f:if(condition:'{extension.terObject.reviewState} == -2', then:'outdated')} {f:if(condition:'{extension.installed}', then: '', else: 'inactive')}">
+ </f:then>
+ <f:else>
+ <tr id="{extensionKey}" class="{f:if(condition:'{extension.installed}', then: '', else: 'inactive')}">
+ </f:else>
+ </f:if>
+ <td>
+ <f:if condition="{extension.updateAvailable}">
+ <f:if condition="{isComposerMode} || {settings.offlineMode} || {extension.state} == 'excludeFromUpdates'">
+ <f:then>
+ <span class="btn btn-default disabled" title="{f:translate(key:'extensionList.updateDisabled')}">
+ <core:icon identifier="actions-system-extension-update" />
+ </span>
+ </f:then>
+ <f:else>
+ <f:link.action action="updateCommentForUpdatableVersions"
+ class="btn btn-default"
+ additionalAttributes="{data-action:'update-extension'}"
+ format="json" controller="Download"
+ arguments="{extension:extension.key, integerVersionStart: extension.terObject.integerVersion, integerVersionStop: extension.updateToVersion.integerVersion}"
+ title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}"
+ >
+ <core:icon identifier="actions-system-extension-update" />
+ </f:link.action>
+ </f:else>
+ </f:if>
+ </f:if>
+ </td>
+ <td data-order="{f:if(condition: extension.installed, then: 'active', else: 'inactive')}">
+ <em:toggleExtensionInstallationState extension="{extension}" />
+ </td>
+ <td>
+ <f:if condition="{extension.ext_icon}">
+ <img class="ext-icon" src="../{extension.siteRelPath}{extension.ext_icon}" alt="{extension.title}" />
+ </f:if>
+ <span title="{extension.description}">{extension.title}</span>
+ </td>
+ <td>
+ {extensionKey}
+ </td>
+ <td>
+ {extension.version}
+ </td>
+ <td>
+ <span class="label label-{extension.state}">{extension.state}</span>
+ </td>
+ <td>
+ {extension.type}
+ </td>
+ <td>
+ <div class="btn-group">
+ <em:processAvailableActions extension="{extension}">
+ <em:updateScript class="btn btn-default" extensionKey="{extension.key}" />
+ <em:removeExtension class="btn btn-default" extension="{extension}" />
+ <f:link.action action="downloadExtensionZip" controller="Action" arguments="{extension:extension.key}" title="{f:translate(key:'extensionList.downloadzip')}" class="btn btn-default">
+ <core:icon identifier="actions-system-extension-download" />
+ </f:link.action>
+ <em:reloadSqlData class="btn btn-default" extension="{extension}" />
+ </em:processAvailableActions>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
index 132d489843e9..892b434db046 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
@@ -2,66 +2,64 @@
<f:layout name="main" />
<f:section name="docheader-buttons">
- <a href="{f:uri.action(action: 'ter')}" title="{f:translate(key:'extConfTemplate.backToList')}">
- <core:icon identifier="actions-view-go-back" />
- </a>
+ <a href="{f:uri.action(action: 'ter')}" title="{f:translate(key:'extConfTemplate.backToList')}">
+ <core:icon identifier="actions-view-go-back" />
+ </a>
</f:section>
<f:section name="headline">
- <h1><f:translate key="showAllVersions" /> {extensionKey}</h1>
+ <h1><f:translate key="showAllVersions" /> {extensionKey}</h1>
</f:section>
<f:section name="content">
- <f:if condition="{currentVersion}">
- <p><f:format.nl2br>{currentVersion.description}</f:format.nl2br></p>
+ <f:if condition="{currentVersion}">
+ <p><f:format.nl2br>{currentVersion.description}</f:format.nl2br></p>
- <table cellpadding="0" cellspacing="0" class="currentVersionInfo">
- <tr class="ter-ext-single-info-key">
- <th><f:translate key="extensionList.showAllVersions.extensionKey" /></th>
- <td><strong>{currentVersion.extensionKey}</strong></td>
- </tr>
- <tr>
- <th><f:translate key="extensionList.showAllVersions.version" /></th>
- <td>
- {currentVersion.version}
- <span class="ter-ext-state ter-ext-state-{currentVersion.stateString}">{currentVersion.stateString}</span>
- </td>
- </tr>
- <tr>
- <th><f:translate key="extensionList.showAllVersions.lastUploaded" /></th>
- <td>
- <f:format.date>{currentVersion.lastUpdated}</f:format.date></td>
- </tr>
- <tr>
- <th><f:translate key="extensionList.showAllVersions.downloads" /></th>
- <td>
- <f:format.number decimals="0">
- {currentVersion.alldownloadcounter}
- </f:format.number>
- </td>
- </tr>
- <tr>
- <th><f:translate key="extensionList.showAllVersions.category" /></th>
- <td>{currentVersion.categoryString}</td>
- </tr>
- <tr class="ter-ext-single-info-manual">
- <th><f:translate key="extensionList.showAllVersions.manual" /></th>
- <td>
- <a href="https://docs.typo3.org/typo3cms/extensions/{currentVersion.extensionKey}/" target="_blank">
- <f:translate key="extensionList.showAllVersions.readOnline" />
- </a>
- </td>
- </tr>
- <tr>
- <th><f:translate key="extensionList.showAllVersions.author" /></th>
- <td>{currentVersion.authorName}</td>
- </tr>
- </table>
- </f:if>
+ <table cellpadding="0" cellspacing="0" class="currentVersionInfo">
+ <tr class="ter-ext-single-info-key">
+ <th><f:translate key="extensionList.showAllVersions.extensionKey" /></th>
+ <td><strong>{currentVersion.extensionKey}</strong></td>
+ </tr>
+ <tr>
+ <th><f:translate key="extensionList.showAllVersions.version" /></th>
+ <td>
+ {currentVersion.version}
+ <span class="ter-ext-state ter-ext-state-{currentVersion.stateString}">{currentVersion.stateString}</span>
+ </td>
+ </tr>
+ <tr>
+ <th><f:translate key="extensionList.showAllVersions.lastUploaded" /></th>
+ <td>
+ <f:format.date>{currentVersion.lastUpdated}</f:format.date></td>
+ </tr>
+ <tr>
+ <th><f:translate key="extensionList.showAllVersions.downloads" /></th>
+ <td>
+ <f:format.number decimals="0">
+ {currentVersion.alldownloadcounter}
+ </f:format.number>
+ </td>
+ </tr>
+ <tr>
+ <th><f:translate key="extensionList.showAllVersions.category" /></th>
+ <td>{currentVersion.categoryString}</td>
+ </tr>
+ <tr class="ter-ext-single-info-manual">
+ <th><f:translate key="extensionList.showAllVersions.manual" /></th>
+ <td>
+ <a href="https://docs.typo3.org/typo3cms/extensions/{currentVersion.extensionKey}/" target="_blank">
+ <f:translate key="extensionList.showAllVersions.readOnline" />
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <th><f:translate key="extensionList.showAllVersions.author" /></th>
+ <td>{currentVersion.authorName}</td>
+ </tr>
+ </table>
+ </f:if>
- <table id="terVersionTable" class="table table-striped table-hover typo3-extension-list">
- <f:render partial="List/TerShowVersionsTable" arguments="{extensions: extensions}" />
- </table>
+ <table id="terVersionTable" class="table table-striped table-hover typo3-extension-list">
+ <f:render partial="List/TerShowVersionsTable" arguments="{extensions: extensions}" />
+ </table>
</f:section>
-
-
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
index 03e0c0c9b11e..5ab5b8389e55 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
@@ -3,42 +3,42 @@
<f:layout name="main" />
<f:section name="headline">
- <h1><f:translate key="getExtensions">Get Extensions</f:translate></h1>
+ <h1><f:translate key="getExtensions">Get Extensions</f:translate></h1>
</f:section>
<f:section name="content">
- <f:render partial="List/UploadForm" />
+ <f:render partial="List/UploadForm" />
- <div class="row">
- <div class="col-sm-6">
- <f:form class="typo3-extensionmanager-searchTerForm form-inline" action="ter">
- <div class="input-group">
- <f:form.textfield name="search" value="{search}" class="form-control" />
- <span class="input-group-btn">
- <f:form.submit class="btn btn-default" value="{f:translate(key:'searchTemplate.submitButton')}"/>
- </span>
- </div>
- </f:form>
- </div>
- <div class="col-sm-6">
- <div class="pull-right">
- <f:render partial="List/UpdateFromTer" />
- </div>
- </div>
- </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <f:form class="typo3-extensionmanager-searchTerForm form-inline" action="ter">
+ <div class="input-group">
+ <f:form.textfield name="search" value="{search}" class="form-control" />
+ <span class="input-group-btn">
+ <f:form.submit class="btn btn-default" value="{f:translate(key:'searchTemplate.submitButton')}"/>
+ </span>
+ </div>
+ </f:form>
+ </div>
+ <div class="col-sm-6">
+ <div class="pull-right">
+ <f:render partial="List/UpdateFromTer" />
+ </div>
+ </div>
+ </div>
- <div id="terTableWrapper">
- <f:if condition="{search}">
- <f:then>
- <table id="terSearchTable" class="table table-striped table-hover typo3-extension-list">
- <f:render partial="List/TerTable" arguments="{paginatedExtensions:extensions, availableAndInstalled:availableAndInstalled}" />
- </table>
- </f:then>
- <f:else>
- <f:render partial="List/TerPaginator" arguments="{extensions:extensions, showVersionList:showVersionList, availableAndInstalled:availableAndInstalled}" />
- </f:else>
- </f:if>
- <div class="splash-receivedata x-mask-loading"><core:icon identifier="spinner-circle-dark" /> <f:translate key="extensionList.updateFromTer.label"/></div>
- </div>
+ <div id="terTableWrapper">
+ <f:if condition="{search}">
+ <f:then>
+ <table id="terSearchTable" class="table table-striped table-hover typo3-extension-list">
+ <f:render partial="List/TerTable" arguments="{paginatedExtensions:extensions, availableAndInstalled:availableAndInstalled}" />
+ </table>
+ </f:then>
+ <f:else>
+ <f:render partial="List/TerPaginator" arguments="{extensions:extensions, showVersionList:showVersionList, availableAndInstalled:availableAndInstalled}" />
+ </f:else>
+ </f:if>
+ <div class="splash-receivedata x-mask-loading"><core:icon identifier="spinner-circle-dark" /> <f:translate key="extensionList.updateFromTer.label"/></div>
+ </div>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
index c071141e311e..f86877a836d7 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
@@ -3,18 +3,18 @@
<f:layout name="main" />
<f:section name="headline">
- <h1><f:translate key="installExtension">Install extension</f:translate> <small>{f:translate(key: 'downloadExtension.dependencies.errorTitle')}</small></h1>
+ <h1><f:translate key="installExtension">Install extension</f:translate> <small>{f:translate(key: 'downloadExtension.dependencies.errorTitle')}</small></h1>
</f:section>
<f:section name="content">
- <f:render partial="List/UnresolvedDependencies" arguments="{_all}" />
- <f:be.infobox title="{f:translate(key: 'dependencyCheck.unresolvedDependencies.title')}" state="1">
- <f:render partial="List/UnresolvedDependenciesMessage" />
- </f:be.infobox>
- <f:link.action action="index" class="btn btn-default onClickMaskExtensionManager">
- Go back
- </f:link.action>
- <f:link.action action="installExtensionWithoutSystemDependencyCheck" controller="Action" arguments="{extensionKey: extension.extensionKey}" class="btn btn-danger t3js-dependencies disabled onClickMaskExtensionManager">
- <f:translate key="dependencyCheck.unresolvedDependencies.proceed" />
- </f:link.action>
+ <f:render partial="List/UnresolvedDependencies" arguments="{_all}" />
+ <f:be.infobox title="{f:translate(key: 'dependencyCheck.unresolvedDependencies.title')}" state="1">
+ <f:render partial="List/UnresolvedDependenciesMessage" />
+ </f:be.infobox>
+ <f:link.action action="index" class="btn btn-default onClickMaskExtensionManager">
+ Go back
+ </f:link.action>
+ <f:link.action action="installExtensionWithoutSystemDependencyCheck" controller="Action" arguments="{extensionKey: extension.extensionKey}" class="btn btn-danger t3js-dependencies disabled onClickMaskExtensionManager">
+ <f:translate key="dependencyCheck.unresolvedDependencies.proceed" />
+ </f:link.action>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
index 46ff7d5a576f..10e36cd541ba 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
@@ -3,18 +3,18 @@
<f:layout name="main" />
<f:section name="headline">
- <h1><f:translate key="updateScript.headline" arguments="{0: extensionKey}" /></h1>
+ <h1><f:translate key="updateScript.headline" arguments="{0: extensionKey}" /></h1>
</f:section>
<f:section name="content">
- <div class="update-script">
- <f:if condition="{updateScriptResult}">
- <f:then>
- <f:format.raw>{updateScriptResult}</f:format.raw>
- </f:then>
- <f:else>
- <f:translate key="updateScript.none" />
- </f:else>
- </f:if>
- </div>
+ <div class="update-script">
+ <f:if condition="{updateScriptResult}">
+ <f:then>
+ <f:format.raw>{updateScriptResult}</f:format.raw>
+ </f:then>
+ <f:else>
+ <f:translate key="updateScript.none" />
+ </f:else>
+ </f:if>
+ </div>
</f:section>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/UploadExtensionFile/Form.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/UploadExtensionFile/Form.html
index a8cba084c888..fdc03c74ba02 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/UploadExtensionFile/Form.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/UploadExtensionFile/Form.html
@@ -1,27 +1,27 @@
<f:form enctype="multipart/form-data" id="extensionUploadForm" method="post" controller="UploadExtensionFile" action="extract" class="form-horizontal">
- <div class="form-group">
- <label for="extensionFile" class="col-sm-2 control-label">
- <f:translate key="uploadTemplate.extensionLabel" />
- </label>
- <div class="col-sm-4">
- <f:form.upload name="extensionFile" id="extensionFile" class="form-control"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="extensionFile" class="col-sm-2 control-label">
+ <f:translate key="uploadTemplate.extensionLabel" />
+ </label>
+ <div class="col-sm-4">
+ <f:form.upload name="extensionFile" id="extensionFile" class="form-control"/>
+ </div>
+ </div>
- <div class="form-group">
- <div class="col-sm-10 col-sm-offset-2">
- <div class="checkbox">
- <label for="extensionOverwrite">
- <f:form.checkbox name="overwrite" id="extensionOverwrite" value="1" />
- {f:translate(key:'extensionList.overwriteExtension')}
- </label>
- </div>
- </div>
- </div>
+ <div class="form-group">
+ <div class="col-sm-10 col-sm-offset-2">
+ <div class="checkbox">
+ <label for="extensionOverwrite">
+ <f:form.checkbox name="overwrite" id="extensionOverwrite" value="1" />
+ {f:translate(key:'extensionList.overwriteExtension')}
+ </label>
+ </div>
+ </div>
+ </div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <f:form.submit value="{f:translate(key:'uploadTemplate.uploadButton')}" id="extensionUpload" class="btn btn-primary"/>
- </div>
- </div>
+ <div class="form-group">
+ <div class="col-sm-offset-2 col-sm-10">
+ <f:form.submit value="{f:translate(key:'uploadTemplate.uploadButton')}" id="extensionUpload" class="btn btn-primary"/>
+ </div>
+ </div>
</f:form>
diff --git a/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html b/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html
index 90d53053713a..eb11a8c57fb3 100644
--- a/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html
+++ b/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html
@@ -1,8 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>Templates for felogin</title>
+ <title>Templates for felogin</title>
</head>
<body>
@@ -11,35 +11,35 @@
<h2>Markers</h2>
<ul>
- <li>###ACTION_URI### - URI of the request for the login/logout form</li>
- <li>###EXTRA_HIDDEN### - Hook required (additional hidden field used by kb_md5fepw extension by Kraft Bernhard)</li>
- <li>###ON_SUBMIT### - Hook required (used by kb_md5fepw extension by Kraft Bernhard)</li>
- <li>###PREFIXID### - Same as class name ('tx_felogin_pi1') useful to get a unique classname prefix</li>
- <li>###REDIRECT_URL### - URL of redirection upon login</li>
- <li>###NOREDIRECT### - if set, no redirect will be done</li>
- <li>###STORAGE_PID### - explicit enough I guess (if not : id of the page where user are stored)</li>
- <li>###STATUS_HEADER### - depends of the template</li>
- <li>###STATUS_MESSAGE### - depends of the template</li>
+ <li>###ACTION_URI### - URI of the request for the login/logout form</li>
+ <li>###EXTRA_HIDDEN### - Hook required (additional hidden field used by kb_md5fepw extension by Kraft Bernhard)</li>
+ <li>###ON_SUBMIT### - Hook required (used by kb_md5fepw extension by Kraft Bernhard)</li>
+ <li>###PREFIXID### - Same as class name ('tx_felogin_pi1') useful to get a unique classname prefix</li>
+ <li>###REDIRECT_URL### - URL of redirection upon login</li>
+ <li>###NOREDIRECT### - if set, no redirect will be done</li>
+ <li>###STORAGE_PID### - explicit enough I guess (if not : id of the page where user are stored)</li>
+ <li>###STATUS_HEADER### - depends of the template</li>
+ <li>###STATUS_MESSAGE### - depends of the template</li>
</ul>
<h2>Wrap parts</h2>
<ul>
- <li>###HEADER_VALID### - useful to define what to show/hide</li>
- <li>###MESSAGE_VALID### - useful to define what to show/hide</li>
- <li>###FORGOTP_VALID### - useful to define what to show/hide</li>
- <li>###PERMALOGIN_VALID### - useful to define what to show/hide</li>
+ <li>###HEADER_VALID### - useful to define what to show/hide</li>
+ <li>###MESSAGE_VALID### - useful to define what to show/hide</li>
+ <li>###FORGOTP_VALID### - useful to define what to show/hide</li>
+ <li>###PERMALOGIN_VALID### - useful to define what to show/hide</li>
</ul>
<h2>felogin Language Markers (see pi/locallang.xlf)</h2>
<ul>
- <li>###EMAIL_LABEL### - corresponding to 'your_email'</li>
- <li>###FORGOT_PASSWORD### - corresponding to 'forgot_password'</li>
- <li>###FORGOT_PASSWORD_BACKTOLOGIN### - corresponding to 'forgot_password_backToLogin'</li>
- <li>###FORGOT_PASSWORD_ENTEREMAIL### - corresponding to 'forgot_password_enterEmail'</li>
- <li>###LOGIN_LABEL### - corresponding to 'login'</li>
- <li>###PASSWORD_LABEL### - corresponding to 'password'</li>
- <li>###SEND_PASSWORD### - corresponding to 'send_password'</li>
- <li>###USERNAME_LABEL### - corresponding to 'username'</li>
+ <li>###EMAIL_LABEL### - corresponding to 'your_email'</li>
+ <li>###FORGOT_PASSWORD### - corresponding to 'forgot_password'</li>
+ <li>###FORGOT_PASSWORD_BACKTOLOGIN### - corresponding to 'forgot_password_backToLogin'</li>
+ <li>###FORGOT_PASSWORD_ENTEREMAIL### - corresponding to 'forgot_password_enterEmail'</li>
+ <li>###LOGIN_LABEL### - corresponding to 'login'</li>
+ <li>###PASSWORD_LABEL### - corresponding to 'password'</li>
+ <li>###SEND_PASSWORD### - corresponding to 'send_password'</li>
+ <li>###USERNAME_LABEL### - corresponding to 'username'</li>
</ul>
<!--###TEMPLATE_LOGIN###-->
@@ -48,37 +48,37 @@
###STATUS_MESSAGE###
<!-- ###LOGIN_FORM### -->
<form action="###ACTION_URI###" target="_top" method="post" onsubmit="###ON_SUBMIT###">
- <fieldset>
- <legend>###LEGEND###</legend>
- <div>
- <label for="user">###USERNAME_LABEL###</label>
- <input type="text" id="user" name="user" value="" />
- </div>
- <div>
- <label for="pass">###PASSWORD_LABEL###</label>
- <input type="password" id="pass" name="pass" value="" data-rsa-encryption="" />
- </div>
-
- <!--###PERMALOGIN_VALID###-->
- <div>
- <label for="permalogin">###PERMALOGIN###</label>
- <input name="permalogin" value="0" type="hidden" ###PERMALOGIN_HIDDENFIELD_ATTRIBUTES### id="permaloginHiddenField" />
- <input name="permalogin" value="1" type="checkbox" ###PERMALOGIN_CHECKBOX_ATTRIBUTES### id="permalogin" onclick="document.getElementById('permaloginHiddenField').disabled = this.checked;" />
- </div>
- <!--###PERMALOGIN_VALID###-->
-
- <div>
- <input type="submit" name="submit" value="###LOGIN_LABEL###" />
- </div>
-
- <div class="felogin-hidden">
- <input type="hidden" name="logintype" value="login" />
- <input type="hidden" name="pid" value="###STORAGE_PID###" />
- <input type="hidden" name="redirect_url" value="###REDIRECT_URL###" />
- <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
- ###EXTRA_HIDDEN###
- </div>
- </fieldset>
+ <fieldset>
+ <legend>###LEGEND###</legend>
+ <div>
+ <label for="user">###USERNAME_LABEL###</label>
+ <input type="text" id="user" name="user" value="" />
+ </div>
+ <div>
+ <label for="pass">###PASSWORD_LABEL###</label>
+ <input type="password" id="pass" name="pass" value="" data-rsa-encryption="" />
+ </div>
+
+ <!--###PERMALOGIN_VALID###-->
+ <div>
+ <label for="permalogin">###PERMALOGIN###</label>
+ <input name="permalogin" value="0" type="hidden" ###PERMALOGIN_HIDDENFIELD_ATTRIBUTES### id="permaloginHiddenField" />
+ <input name="permalogin" value="1" type="checkbox" ###PERMALOGIN_CHECKBOX_ATTRIBUTES### id="permalogin" onclick="document.getElementById('permaloginHiddenField').disabled = this.checked;" />
+ </div>
+ <!--###PERMALOGIN_VALID###-->
+
+ <div>
+ <input type="submit" name="submit" value="###LOGIN_LABEL###" />
+ </div>
+
+ <div class="felogin-hidden">
+ <input type="hidden" name="logintype" value="login" />
+ <input type="hidden" name="pid" value="###STORAGE_PID###" />
+ <input type="hidden" name="redirect_url" value="###REDIRECT_URL###" />
+ <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
+ ###EXTRA_HIDDEN###
+ </div>
+ </fieldset>
</form>
<!--###FORGOTP_VALID###-->
@@ -95,22 +95,22 @@
###STATUS_MESSAGE###
<form action="###ACTION_URI###" target="_top" method="post">
- <fieldset>
- <legend>###LEGEND###</legend>
- <div>
- <label>###USERNAME_LABEL###</label>
- ###USERNAME###
+ <fieldset>
+ <legend>###LEGEND###</legend>
+ <div>
+ <label>###USERNAME_LABEL###</label>
+ ###USERNAME###
</div>
- <div>
- <input type="submit" name="submit" value="###LOGOUT_LABEL###" />
- </div>
-
- <div class="felogin-hidden">
- <input type="hidden" name="logintype" value="logout" />
- <input type="hidden" name="pid" value="###STORAGE_PID###" />
- <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
- </div>
- </fieldset>
+ <div>
+ <input type="submit" name="submit" value="###LOGOUT_LABEL###" />
+ </div>
+
+ <div class="felogin-hidden">
+ <input type="hidden" name="logintype" value="logout" />
+ <input type="hidden" name="pid" value="###STORAGE_PID###" />
+ <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
+ </div>
+ </fieldset>
</form>
<!--###TEMPLATE_LOGOUT###-->
@@ -124,18 +124,18 @@
<!-- ###FORGOT_FORM### -->
<form action="###ACTION_URI###" method="post">
<div class="felogin-hidden">
- <input type="hidden" name="tx_felogin_pi1[forgot_hash]" value="###FORGOTHASH###" />
- </div>
- <fieldset>
- <legend>###LEGEND###</legend>
- <div>
- <label for="tx_felogin_pi1-forgot-email">###DATA_LABEL###</label>
- <input type="text" name="###FORGOT_EMAIL###" id="tx_felogin_pi1-forgot-email" />
- </div>
- <div>
- <input type="submit" name="submit" value="###SEND_PASSWORD###" />
- </div>
- </fieldset>
+ <input type="hidden" name="tx_felogin_pi1[forgot_hash]" value="###FORGOTHASH###" />
+ </div>
+ <fieldset>
+ <legend>###LEGEND###</legend>
+ <div>
+ <label for="tx_felogin_pi1-forgot-email">###DATA_LABEL###</label>
+ <input type="text" name="###FORGOT_EMAIL###" id="tx_felogin_pi1-forgot-email" />
+ </div>
+ <div>
+ <input type="submit" name="submit" value="###SEND_PASSWORD###" />
+ </div>
+ </fieldset>
</form>
<!-- ###FORGOT_FORM### -->
<p>###BACKLINK_LOGIN### </p>
@@ -149,22 +149,22 @@
<!-- ###CHANGEPASSWORD_FORM### -->
<form action="###ACTION_URI###" method="post">
- <fieldset>
- <legend>###LEGEND###</legend>
- <div>
- <label for="tx_felogin_pi1-newpassword1">###NEWPASSWORD1_LABEL###</label>
- <input type="password" name="###NEWPASSWORD1###" id="tx_felogin_pi1-newpassword1" />
- </div>
- <div>
- <label for="tx_felogin_pi1-newpassword2">###NEWPASSWORD2_LABEL###</label>
- <input type="password" name="###NEWPASSWORD2###" id="tx_felogin_pi1-newpassword2" />
- </div>
- <div>
- <input type="submit" name="tx_felogin_pi1[changepasswordsubmit]" value="###SEND_PASSWORD###" />
- </div>
- </fieldset>
+ <fieldset>
+ <legend>###LEGEND###</legend>
+ <div>
+ <label for="tx_felogin_pi1-newpassword1">###NEWPASSWORD1_LABEL###</label>
+ <input type="password" name="###NEWPASSWORD1###" id="tx_felogin_pi1-newpassword1" />
+ </div>
+ <div>
+ <label for="tx_felogin_pi1-newpassword2">###NEWPASSWORD2_LABEL###</label>
+ <input type="password" name="###NEWPASSWORD2###" id="tx_felogin_pi1-newpassword2" />
+ </div>
+ <div>
+ <input type="submit" name="tx_felogin_pi1[changepasswordsubmit]" value="###SEND_PASSWORD###" />
+ </div>
+ </fieldset>
</form>
<!-- ###CHANGEPASSWORD_FORM### -->
###BACKLINK_LOGIN###
-<!--###TEMPLATE_CHANGEPASSWORD###-->
\ No newline at end of file
+<!--###TEMPLATE_CHANGEPASSWORD###-->
diff --git a/typo3/sysext/filelist/Resources/Private/Layouts/Default.html b/typo3/sysext/filelist/Resources/Private/Layouts/Default.html
index d0c3279270d4..b3430535b35b 100644
--- a/typo3/sysext/filelist/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/filelist/Resources/Private/Layouts/Default.html
@@ -2,6 +2,6 @@
<f:render section="content" />
<div class="t3js-drag-uploader" data-target-folder="{folderIdentifier}" data-progress-container="#typo3-filelist"
- data-dropzone-trigger=".t3js-drag-uploader-trigger" data-dropzone-target=".t3js-module-body h1:first"
- data-file-deny-pattern="{fileDenyPattern}" data-max-file-size="{maxFileSize}"
- ></div>
\ No newline at end of file
+ data-dropzone-trigger=".t3js-drag-uploader-trigger" data-dropzone-target=".t3js-module-body h1:first"
+ data-file-deny-pattern="{fileDenyPattern}" data-max-file-size="{maxFileSize}"
+ ></div>
diff --git a/typo3/sysext/filelist/Resources/Private/Partials/SearchForm.html b/typo3/sysext/filelist/Resources/Private/Partials/SearchForm.html
index 38e672084cf8..041df5eaa63c 100644
--- a/typo3/sysext/filelist/Resources/Private/Partials/SearchForm.html
+++ b/typo3/sysext/filelist/Resources/Private/Partials/SearchForm.html
@@ -1,11 +1,11 @@
<f:form action="search" class="form-inline form-inline-spaced">
- <div class="form-group">
- <div class="input-group">
- <input type="hidden" name="cmd" class="form-control" value="search">
- <f:form.textfield type="text" name="searchWord" class="form-control" value="{searchWord}"/>
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit"><f:translate id="search">Search</f:translate></button>
- </span>
- </div>
- </div>
+ <div class="form-group">
+ <div class="input-group">
+ <input type="hidden" name="cmd" class="form-control" value="search">
+ <f:form.textfield type="text" name="searchWord" class="form-control" value="{searchWord}"/>
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit"><f:translate id="search">Search</f:translate></button>
+ </span>
+ </div>
+ </div>
</f:form>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFolder.html b/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFolder.html
index c2fc5cc238a0..b6aaf95fab5c 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFolder.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFolder.html
@@ -49,7 +49,7 @@
<label for="newMedia"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:online_media.new_media.label" /></label> {cshFileNewMedia -> f:format.raw()}
<div class="form-control-wrap">
<input class="form-control" type="text" id="newMedia" name="data[newMedia][0][url]"
- placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:online_media.new_media.placeholder')}" />
+ placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:online_media.new_media.placeholder')}" />
<input type="hidden" name="data[newMedia][0][target]" value="{target}" />
</div>
<div class="help-block">
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/File/ReplaceFile.html b/typo3/sysext/filelist/Resources/Private/Templates/File/ReplaceFile.html
index 734caa4dd776..13b7f96b9e19 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/File/ReplaceFile.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/File/ReplaceFile.html
@@ -18,11 +18,11 @@
</div>
<script>
- require(['jquery'], function($) {
- $('#file_replace').change(function() {
- $('#fakefile').val($(this).val());
+ require(['jquery'], function($) {
+ $('#file_replace').change(function() {
+ $('#fakefile').val($(this).val());
+ });
});
- });
</script>
<input type="hidden" name="overwriteExistingFiles" value="replace" />
@@ -32,7 +32,7 @@
<div class="form-group">
<input class="btn btn-primary" type="submit" value="{f:translate(key: 'LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:file_replace.php.submit')}" />
<input class="btn btn-danger" type="submit" value="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')}"
- onclick="backToList(); return false;" />
+ onclick="backToList(); return false;" />
<input type="hidden" name="data[replace][1][redirect]" value="{returnUrl}" />
</div>
</form>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Index.html b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Index.html
index a1ba7a76c41d..18e327a9de06 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Index.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Index.html
@@ -1,53 +1,53 @@
<f:layout name="Default" />
<f:section name="headline">
- <h1>{headline}</h1>
+ <h1>{headline}</h1>
</f:section>
<f:section name="content">
- <f:render partial="SearchForm" arguments="{searchWord:''}" />
+ <f:render partial="SearchForm" arguments="{searchWord:''}" />
- <f:form method="post" name="dblistForm">
- {listHtml -> f:format.raw()}
- <input type="hidden" name="cmd"/>
- </f:form>
+ <f:form method="post" name="dblistForm">
+ {listHtml -> f:format.raw()}
+ <input type="hidden" name="cmd"/>
+ </f:form>
- <f:if condition="{listHtml}">
- <!--
- Listing options for extended view, clipboard and thumbnails
- -->
- <div class="typo3-listOptions">
- <f:if condition="{checkboxes.bigControlPanel.enabled}">
- <div class="checkbox">
- <label for="bigControlPanel">
- {checkboxes.bigControlPanel.html -> f:format.raw()}
- {checkboxes.bigControlPanel.label}
- </label>
- </div>
- </f:if>
- <f:if condition="{checkboxes.displayThumbs.enabled}">
- <div class="checkbox">
- <label for="checkDisplayThumbs">
- {checkboxes.displayThumbs.html -> f:format.raw()}
- {checkboxes.displayThumbs.label}
- </label>
- </div>
- </f:if>
- <f:if condition="{checkboxes.enableClipBoard.enabled}">
- <div class="checkbox">
- <label for="checkClipBoard">
- {checkboxes.enableClipBoard.html -> f:format.raw()}
- {checkboxes.enableClipBoard.label}
- </label>
- </div>
- </f:if>
- </div>
+ <f:if condition="{listHtml}">
+ <!--
+ Listing options for extended view, clipboard and thumbnails
+ -->
+ <div class="typo3-listOptions">
+ <f:if condition="{checkboxes.bigControlPanel.enabled}">
+ <div class="checkbox">
+ <label for="bigControlPanel">
+ {checkboxes.bigControlPanel.html -> f:format.raw()}
+ {checkboxes.bigControlPanel.label}
+ </label>
+ </div>
+ </f:if>
+ <f:if condition="{checkboxes.displayThumbs.enabled}">
+ <div class="checkbox">
+ <label for="checkDisplayThumbs">
+ {checkboxes.displayThumbs.html -> f:format.raw()}
+ {checkboxes.displayThumbs.label}
+ </label>
+ </div>
+ </f:if>
+ <f:if condition="{checkboxes.enableClipBoard.enabled}">
+ <div class="checkbox">
+ <label for="checkClipBoard">
+ {checkboxes.enableClipBoard.html -> f:format.raw()}
+ {checkboxes.enableClipBoard.label}
+ </label>
+ </div>
+ </f:if>
+ </div>
- <f:if condition="{showClipBoard}">
- {clipBoardHtml -> f:format.raw()}
+ <f:if condition="{showClipBoard}">
+ {clipBoardHtml -> f:format.raw()}
- <f:be.buttons.csh table="xMOD_csh_corebe" field="filelist_clipboard" wrap="<span class='btn btn-sm btn-default'>|</span>" />
- </f:if>
- </f:if>
+ <f:be.buttons.csh table="xMOD_csh_corebe" field="filelist_clipboard" wrap="<span class='btn btn-sm btn-default'>|</span>" />
+ </f:if>
+ </f:if>
</f:section>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
index 1913e84c9e65..346d6c4e38c1 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
@@ -1,226 +1,226 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:fl="http://typo3.org/ns/TYPO3/CMS/Filelist/ViewHelpers">
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:fl="http://typo3.org/ns/TYPO3/CMS/Filelist/ViewHelpers">
<f:layout name="Default"/>
<f:section name="headline">
- <h1><f:translate id="search">Search</f:translate>: "{searchWord}"</h1>
+ <h1><f:translate id="search">Search</f:translate>: "{searchWord}"</h1>
</f:section>
<f:section name="content">
- <f:render partial="SearchForm" arguments="{searchWord:searchWord}" />
+ <f:render partial="SearchForm" arguments="{searchWord:searchWord}" />
- <f:if condition="{files->f:count()} > 0">
- <div class="table-fit">
- <table class="table table-striped table-hover" id="typo3-filelist">
- <thead>
- <tr data-uid="0" data-l10nparent="0">
- <th class="col-icon nowrap"></th>
- <th class="col-path nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
- <th class="col-title nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
- <th class="col-control"></th>
- <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
- <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
- <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
- <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
- <th class="nowrap">{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels._REF_' )}</th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{files}" as="file">
- <tr data-uid="0" data-l10nparent="0">
- <td class="col-icon nowrap">
- <a class="t3js-contextmenutrigger" data-uid="{file.identifier}" data-table="sys_file" href="#">
- <core:iconForResource resource="{file.resource}" />
- </a>
- </td>
- <td class="col-path nowrap">
- {file.path}
- </td>
- <td class="col-title col-responsive nowrap">
- <f:if condition="{file.isMetadataEditable}">
- <f:then>
- <a href="#" class="filelist-file-title"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
- data-url="{be:uri.editRecord( uid:file.metadataUid, table:'sys_file_metadata', returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
- >
- {file.name}
- </a>
- </f:then>
- <f:else>
- {file.name}
- </f:else>
- </f:if>
- <f:if condition="{file.isImage}">
- <br>
- <be:thumbnail image="{file.resource}" maxWidth="{thumbnail.width}" maxHeight="{thumbnail.height}" />
- </f:if>
- </td>
- <td class="col-control nowrap">
- <div class="btn-group">
- <f:if condition="{file.isEditable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-edit"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
- data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
- >
- <core:icon identifier="actions-page-open" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{files->f:count()} > 0">
+ <div class="table-fit">
+ <table class="table table-striped table-hover" id="typo3-filelist">
+ <thead>
+ <tr data-uid="0" data-l10nparent="0">
+ <th class="col-icon nowrap"></th>
+ <th class="col-path nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+ <th class="col-title nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+ <th class="col-control"></th>
+ <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+ <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+ <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+ <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+ <th class="nowrap">{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels._REF_' )}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{files}" as="file">
+ <tr data-uid="0" data-l10nparent="0">
+ <td class="col-icon nowrap">
+ <a class="t3js-contextmenutrigger" data-uid="{file.identifier}" data-table="sys_file" href="#">
+ <core:iconForResource resource="{file.resource}" />
+ </a>
+ </td>
+ <td class="col-path nowrap">
+ {file.path}
+ </td>
+ <td class="col-title col-responsive nowrap">
+ <f:if condition="{file.isMetadataEditable}">
+ <f:then>
+ <a href="#" class="filelist-file-title"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+ data-url="{be:uri.editRecord( uid:file.metadataUid, table:'sys_file_metadata', returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
+ >
+ {file.name}
+ </a>
+ </f:then>
+ <f:else>
+ {file.name}
+ </f:else>
+ </f:if>
+ <f:if condition="{file.isImage}">
+ <br>
+ <be:thumbnail image="{file.resource}" maxWidth="{thumbnail.width}" maxHeight="{thumbnail.height}" />
+ </f:if>
+ </td>
+ <td class="col-control nowrap">
+ <div class="btn-group">
+ <f:if condition="{file.isEditable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-edit"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+ data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
+ >
+ <core:icon identifier="actions-page-open" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.IsMetadataEditable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-edit"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
- data-url="{be:uri.editRecord(uid:file.metadataUid, table:'sys_file_metadata', returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
- >
- <core:icon identifier="actions-open" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.IsMetadataEditable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-edit"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+ data-url="{be:uri.editRecord(uid:file.metadataUid, table:'sys_file_metadata', returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
+ >
+ <core:icon identifier="actions-open" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.publicUrl}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-view"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
- data-url="{file.publicUrl}"
- >
- <core:icon identifier="actions-document-view" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.publicUrl}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-view"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+ data-url="{file.publicUrl}"
+ >
+ <core:icon identifier="actions-document-view" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.isReplaceable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-replace"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
- data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
- >
- <core:icon identifier="actions-edit-replace" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.isReplaceable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-replace"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+ data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
+ >
+ <core:icon identifier="actions-edit-replace" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.isRenamable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-rename"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
- data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
- >
- <core:icon identifier="actions-edit-rename" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.isRenamable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-rename"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+ data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
+ >
+ <core:icon identifier="actions-edit-rename" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.isReadable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-info"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
- data-identifier="{file.identifier}"
- >
- <core:icon identifier="actions-document-info" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.isReadable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-info"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+ data-identifier="{file.identifier}"
+ >
+ <core:icon identifier="actions-document-info" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.copyable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-copy"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy' )}"
- data-url="{fl:uri.copyCutFile( file:file.resource, copyOrCut: 'copy' )}"
- data-redirect-url="{f:uri.action( action:'search', arguments:{ searchWord:'{searchWord->f:format.htmlentities()}' } )}"
- >
- <f:if condition="{file.selected} == 'copy'">
- <f:then><core:icon identifier="actions-edit-copy-release" /></f:then>
- <f:else><core:icon identifier="actions-edit-copy" /></f:else>
- </f:if>
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
- <f:if condition="{file.cuttable}">
- <f:then>
- <a href="#" class="btn btn-default filelist-file-cut"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cut' )}"
- data-url="{fl:uri.copyCutFile( file:file.resource, copyOrCut: 'cut' )}"
- >
- <f:if condition="{file.selected} == 'cut'">
- <f:then><core:icon identifier="actions-edit-cut-release" /></f:then>
- <f:else><core:icon identifier="actions-edit-cut" /></f:else>
- </f:if>
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
+ <f:if condition="{file.copyable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-copy"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy' )}"
+ data-url="{fl:uri.copyCutFile( file:file.resource, copyOrCut: 'copy' )}"
+ data-redirect-url="{f:uri.action( action:'search', arguments:{ searchWord:'{searchWord->f:format.htmlentities()}' } )}"
+ >
+ <f:if condition="{file.selected} == 'copy'">
+ <f:then><core:icon identifier="actions-edit-copy-release" /></f:then>
+ <f:else><core:icon identifier="actions-edit-copy" /></f:else>
+ </f:if>
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
+ <f:if condition="{file.cuttable}">
+ <f:then>
+ <a href="#" class="btn btn-default filelist-file-cut"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cut' )}"
+ data-url="{fl:uri.copyCutFile( file:file.resource, copyOrCut: 'cut' )}"
+ >
+ <f:if condition="{file.selected} == 'cut'">
+ <f:then><core:icon identifier="actions-edit-cut-release" /></f:then>
+ <f:else><core:icon identifier="actions-edit-cut" /></f:else>
+ </f:if>
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
- <f:if condition="{file.isDeletable}">
- <f:then>
- <a href="#" class="btn btn-default t3js-filelist-delete"
- title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
- data-identifier="{file.identifier}"
- data-title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
- data-content="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
- data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
- data-delete-url="{deleteUrl}"
- data-delete-type="delete_file"
- data-redirect-url="{f:uri.action( action:'search', arguments:{ searchWord:'{searchWord->f:format.htmlentities()}' } )}"
- >
- <core:icon identifier="actions-edit-delete" />
- </a>
- </f:then>
- <f:else>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:else>
- </f:if>
- </div>
- </td>
- <td class="nowrap">{file.extension}</td>
- <td class="nowrap">{file.lastModified}</td>
- <td class="nowrap">{file.size}</td>
- <td class="nowrap">
- <f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
- </td>
- <td class="nowrap">
- <f:if condition="{file.referenceCount} > 0">
- <f:then>
- <a href="#" class="filelist-file-references" data-identifier="{file.identifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </f:if>
+ <f:if condition="{file.isDeletable}">
+ <f:then>
+ <a href="#" class="btn btn-default t3js-filelist-delete"
+ title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+ data-identifier="{file.identifier}"
+ data-title="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+ data-content="{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+ data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
+ data-delete-url="{deleteUrl}"
+ data-delete-type="delete_file"
+ data-redirect-url="{f:uri.action( action:'search', arguments:{ searchWord:'{searchWord->f:format.htmlentities()}' } )}"
+ >
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </f:then>
+ <f:else>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:else>
+ </f:if>
+ </div>
+ </td>
+ <td class="nowrap">{file.extension}</td>
+ <td class="nowrap">{file.lastModified}</td>
+ <td class="nowrap">{file.size}</td>
+ <td class="nowrap">
+ <f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+ </td>
+ <td class="nowrap">
+ <f:if condition="{file.referenceCount} > 0">
+ <f:then>
+ <a href="#" class="filelist-file-references" data-identifier="{file.identifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
index 4c58d7da4a1e..a7923bf813f6 100644
--- a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
+++ b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
@@ -1,116 +1,116 @@
<f:if condition="{configuration.insertAbove}">
- <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
+ <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
</f:if>
<f:if condition="{configuration.insertAbove} || {configuration.insertBelow}">
- <script type="text/javascript">
- function goToPage(formObject) {
- var formField = formObject.elements['paginator-target-page'];
- var url = formField.dataset.url;
- var numberOfPages = parseInt(formField.dataset.numberOfPages);
- var page = parseInt(formField.value);
- if (page > numberOfPages) {
- page = numberOfPages;
- } else if (page < 1) {
- page = 1;
- }
- url = url.replace('987654321', page);
- self.location.href = url;
- return false;
- }
- </script>
+ <script type="text/javascript">
+ function goToPage(formObject) {
+ var formField = formObject.elements['paginator-target-page'];
+ var url = formField.dataset.url;
+ var numberOfPages = parseInt(formField.dataset.numberOfPages);
+ var page = parseInt(formField.value);
+ if (page > numberOfPages) {
+ page = numberOfPages;
+ } else if (page < 1) {
+ page = 1;
+ }
+ url = url.replace('987654321', page);
+ self.location.href = url;
+ return false;
+ }
+ </script>
</f:if>
<f:renderChildren arguments="{contentArguments}" />
<f:if condition="{configuration.insertBelow}">
- <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
+ <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
</f:if>
<f:section name="paginator">
- <nav class="pagination-wrap">
- <ul class="pagination pagination-block">
- <f:if condition="{pagination.hasLessPages}">
- <f:then>
- <li>
- <a href="{f:widget.uri(arguments:{currentPage: 1})}" title="{f:translate(key:'widget.pagination.first')}">
- <core:icon identifier="actions-view-paging-first" />
- </a>
- </li>
- <li>
- <a href="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}" title="{f:translate(key:'widget.pagination.previous')}">
- <core:icon identifier="actions-view-paging-previous" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li>
- <span>
- <f:if condition="{recordsLabel}">
- <f:then>
- {recordsLabel}
- </f:then>
- <f:else>
- <f:translate key="widget.pagination.records" />
- </f:else>
- </f:if>
- {pagination.startRecord} - {pagination.endRecord}
- </span>
- </li>
- <li>
- <span>
- <f:translate key="widget.pagination.page" />
+ <nav class="pagination-wrap">
+ <ul class="pagination pagination-block">
+ <f:if condition="{pagination.hasLessPages}">
+ <f:then>
+ <li>
+ <a href="{f:widget.uri(arguments:{currentPage: 1})}" title="{f:translate(key:'widget.pagination.first')}">
+ <core:icon identifier="actions-view-paging-first" />
+ </a>
+ </li>
+ <li>
+ <a href="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}" title="{f:translate(key:'widget.pagination.previous')}">
+ <core:icon identifier="actions-view-paging-previous" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li>
+ <span>
+ <f:if condition="{recordsLabel}">
+ <f:then>
+ {recordsLabel}
+ </f:then>
+ <f:else>
+ <f:translate key="widget.pagination.records" />
+ </f:else>
+ </f:if>
+ {pagination.startRecord} - {pagination.endRecord}
+ </span>
+ </li>
+ <li>
+ <span>
+ <f:translate key="widget.pagination.page" />
- <form onsubmit="return goToPage(this);" style="display:inline;">
- <f:form.textfield additionalAttributes="{min: '1', data-number-of-pages: '{pagination.numberOfPages}', data-url: '{f:widget.uri(arguments:{currentPage: 987654321})}'}" name="paginator-target-page" class="form-control input-sm paginator-input" size="5" value="{pagination.current}" type="number" />
- </form>
+ <form onsubmit="return goToPage(this);" style="display:inline;">
+ <f:form.textfield additionalAttributes="{min: '1', data-number-of-pages: '{pagination.numberOfPages}', data-url: '{f:widget.uri(arguments:{currentPage: 987654321})}'}" name="paginator-target-page" class="form-control input-sm paginator-input" size="5" value="{pagination.current}" type="number" />
+ </form>
- / {pagination.numberOfPages}
- </span>
- </li>
- <f:if condition="{pagination.hasMorePages}">
- <f:then>
- <li>
- <a href="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}" title="{f:translate(key:'widget.pagination.next')}">
- <core:icon identifier="actions-view-paging-next" />
- </a>
- </li>
- <li>
- <a href="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}" title="{f:translate(key:'widget.pagination.last')}">
- <core:icon identifier="actions-view-paging-last" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li>
- <a href="{f:widget.uri(arguments:{currentPage: pagination.current})}" title="{f:translate(key:'widget.pagination.refresh')}">
- <core:icon identifier="actions-refresh" />
- </a>
- </li>
- </ul>
- </nav>
-</f:section>
\ No newline at end of file
+ / {pagination.numberOfPages}
+ </span>
+ </li>
+ <f:if condition="{pagination.hasMorePages}">
+ <f:then>
+ <li>
+ <a href="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}" title="{f:translate(key:'widget.pagination.next')}">
+ <core:icon identifier="actions-view-paging-next" />
+ </a>
+ </li>
+ <li>
+ <a href="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}" title="{f:translate(key:'widget.pagination.last')}">
+ <core:icon identifier="actions-view-paging-last" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li>
+ <a href="{f:widget.uri(arguments:{currentPage: pagination.current})}" title="{f:translate(key:'widget.pagination.refresh')}">
+ <core:icon identifier="actions-refresh" />
+ </a>
+ </li>
+ </ul>
+ </nav>
+</f:section>
diff --git a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Autocomplete/Index.html b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Autocomplete/Index.html
index 9b92fba37273..4c9810249896 100644
--- a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Autocomplete/Index.html
+++ b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Autocomplete/Index.html
@@ -1,8 +1,8 @@
<script type="text/javascript">
jQuery(function() {
- jQuery("#{id}").autocomplete(<f:format.raw value="{" />
- source: "{f:widget.uri(action:'autocomplete', ajax: 1)}",
- minLength: 2
- });
+ jQuery("#{id}").autocomplete(<f:format.raw value="{" />
+ source: "{f:widget.uri(action:'autocomplete', ajax: 1)}",
+ minLength: 2
+ });
});
</script>
diff --git a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html
index ccd862f6b7da..963b8f10f266 100644
--- a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html
+++ b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html
@@ -1,68 +1,68 @@
<f:if condition="{configuration.insertAbove}">
- <f:render section="paginator" arguments="{pagination: pagination, configuration: configuration}" />
+ <f:render section="paginator" arguments="{pagination: pagination, configuration: configuration}" />
</f:if>
<f:renderChildren arguments="{contentArguments}" />
<f:if condition="{configuration.insertBelow}">
- <f:render section="paginator" arguments="{pagination: pagination, configuration: configuration}" />
+ <f:render section="paginator" arguments="{pagination: pagination, configuration: configuration}" />
</f:if>
<f:section name="paginator">
- <ul class="f3-widget-paginator">
- <f:if condition="{pagination.previousPage}">
- <li class="previous">
- <f:if condition="{pagination.previousPage} > 1">
- <f:then>
- <f:widget.link rel="prev" arguments="{currentPage: pagination.previousPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" ><f:translate key="widget.pagination.previous" /></f:widget.link>
- </f:then>
- <f:else>
- <f:widget.link rel="prev" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.previous" /></f:widget.link>
- </f:else>
- </f:if>
- </li>
- </f:if>
- <f:if condition="{pagination.displayRangeStart} > 1">
- <li class="first">
- <f:widget.link addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">1</f:widget.link>
- </li>
- </f:if>
- <f:if condition="{pagination.hasLessPages}">
- <li>…</li>
- </f:if>
- <f:for each="{pagination.pages}" as="page">
- <f:if condition="{page.isCurrent}">
- <f:then>
- <li class="current">
- {page.number}
- </li>
- </f:then>
- <f:else>
- <li>
- <f:if condition="{page.number} > 1">
- <f:then>
- <f:widget.link arguments="{currentPage: page.number}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
- </f:then>
- <f:else>
- <f:widget.link addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
- </f:else>
- </f:if>
- </li>
- </f:else>
- </f:if>
- </f:for>
- <f:if condition="{pagination.hasMorePages}">
- <li>…</li>
- </f:if>
- <f:if condition="{pagination.displayRangeEnd} < {pagination.numberOfPages}">
- <li class="last">
- <f:widget.link arguments="{currentPage: pagination.numberOfPages}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{pagination.numberOfPages}</f:widget.link>
- </li>
- </f:if>
- <f:if condition="{pagination.nextPage}">
- <li class="next">
- <f:widget.link rel="next" arguments="{currentPage: pagination.nextPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.next" /></f:widget.link>
- </li>
- </f:if>
- </ul>
+ <ul class="f3-widget-paginator">
+ <f:if condition="{pagination.previousPage}">
+ <li class="previous">
+ <f:if condition="{pagination.previousPage} > 1">
+ <f:then>
+ <f:widget.link rel="prev" arguments="{currentPage: pagination.previousPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" ><f:translate key="widget.pagination.previous" /></f:widget.link>
+ </f:then>
+ <f:else>
+ <f:widget.link rel="prev" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.previous" /></f:widget.link>
+ </f:else>
+ </f:if>
+ </li>
+ </f:if>
+ <f:if condition="{pagination.displayRangeStart} > 1">
+ <li class="first">
+ <f:widget.link addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">1</f:widget.link>
+ </li>
+ </f:if>
+ <f:if condition="{pagination.hasLessPages}">
+ <li>…</li>
+ </f:if>
+ <f:for each="{pagination.pages}" as="page">
+ <f:if condition="{page.isCurrent}">
+ <f:then>
+ <li class="current">
+ {page.number}
+ </li>
+ </f:then>
+ <f:else>
+ <li>
+ <f:if condition="{page.number} > 1">
+ <f:then>
+ <f:widget.link arguments="{currentPage: page.number}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
+ </f:then>
+ <f:else>
+ <f:widget.link addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
+ </f:else>
+ </f:if>
+ </li>
+ </f:else>
+ </f:if>
+ </f:for>
+ <f:if condition="{pagination.hasMorePages}">
+ <li>…</li>
+ </f:if>
+ <f:if condition="{pagination.displayRangeEnd} < {pagination.numberOfPages}">
+ <li class="last">
+ <f:widget.link arguments="{currentPage: pagination.numberOfPages}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{pagination.numberOfPages}</f:widget.link>
+ </li>
+ </f:if>
+ <f:if condition="{pagination.nextPage}">
+ <li class="next">
+ <f:widget.link rel="next" arguments="{currentPage: pagination.nextPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.next" /></f:widget.link>
+ </li>
+ </f:if>
+ </ul>
</f:section>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Layouts/Default.html b/typo3/sysext/fluid_styled_content/Resources/Private/Layouts/Default.html
index bbea64ff937d..a31ba3908ca2 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Layouts/Default.html
@@ -1,55 +1,55 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:spaceless>
- <f:if condition="{data.frame_class} != none">
- <f:then>
+ <f:if condition="{data.frame_class} != none">
+ <f:then>
- <div id="c{data.uid}" class="frame frame-{data.frame_class} frame-type-{data.CType} frame-layout-{data.layout}{f:if(condition: data.space_before_class, then: ' frame-space-before-{data.space_before_class}')}{f:if(condition: data.space_after_class, then: ' frame-space-after-{data.space_after_class}')}">
- <f:if condition="{data._LOCALIZED_UID}">
- <a id="c{data._LOCALIZED_UID}"></a>
- </f:if>
- <f:render section="Before" optional="true">
- <f:render partial="DropIn/Before/All" arguments="{_all}" />
- </f:render>
- <f:render section="Header" optional="true">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:render>
- <f:render section="Main" optional="true" />
- <f:render section="Footer" optional="true">
- <f:render partial="Footer/All" arguments="{_all}" />
- </f:render>
- <f:render section="After" optional="true">
- <f:render partial="DropIn/After/All" arguments="{_all}" />
- </f:render>
- </div>
+ <div id="c{data.uid}" class="frame frame-{data.frame_class} frame-type-{data.CType} frame-layout-{data.layout}{f:if(condition: data.space_before_class, then: ' frame-space-before-{data.space_before_class}')}{f:if(condition: data.space_after_class, then: ' frame-space-after-{data.space_after_class}')}">
+ <f:if condition="{data._LOCALIZED_UID}">
+ <a id="c{data._LOCALIZED_UID}"></a>
+ </f:if>
+ <f:render section="Before" optional="true">
+ <f:render partial="DropIn/Before/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="Header" optional="true">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="Main" optional="true" />
+ <f:render section="Footer" optional="true">
+ <f:render partial="Footer/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="After" optional="true">
+ <f:render partial="DropIn/After/All" arguments="{_all}" />
+ </f:render>
+ </div>
- </f:then>
- <f:else>
+ </f:then>
+ <f:else>
- <a id="c{data.uid}"></a>
- <f:if condition="{data._LOCALIZED_UID}">
- <a id="c{data._LOCALIZED_UID}"></a>
- </f:if>
- <f:if condition="{data.space_before_class}">
- <div class="frame-space-before-{data.space_before_class}"></div>
- </f:if>
- <f:render section="Before" optional="true">
- <f:render partial="DropIn/Before/All" arguments="{_all}" />
- </f:render>
- <f:render section="Header" optional="true">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:render>
- <f:render section="Main" optional="true" />
- <f:render section="Footer" optional="true">
- <f:render partial="Footer/All" arguments="{_all}" />
- </f:render>
- <f:render section="After" optional="true">
- <f:render partial="DropIn/After/All" arguments="{_all}" />
- </f:render>
- <f:if condition="{data.space_after_class}">
- <div class="frame-space-after-{data.space_after_class}"></div>
- </f:if>
+ <a id="c{data.uid}"></a>
+ <f:if condition="{data._LOCALIZED_UID}">
+ <a id="c{data._LOCALIZED_UID}"></a>
+ </f:if>
+ <f:if condition="{data.space_before_class}">
+ <div class="frame-space-before-{data.space_before_class}"></div>
+ </f:if>
+ <f:render section="Before" optional="true">
+ <f:render partial="DropIn/Before/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="Header" optional="true">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="Main" optional="true" />
+ <f:render section="Footer" optional="true">
+ <f:render partial="Footer/All" arguments="{_all}" />
+ </f:render>
+ <f:render section="After" optional="true">
+ <f:render partial="DropIn/After/All" arguments="{_all}" />
+ </f:render>
+ <f:if condition="{data.space_after_class}">
+ <div class="frame-space-after-{data.space_after_class}"></div>
+ </f:if>
- </f:else>
- </f:if>
+ </f:else>
+ </f:if>
</f:spaceless>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-0.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-0.html
index f669b7a9e35a..45b564af0da2 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-0.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-0.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{bullets}">
- <ul class="ce-bullets">
- <f:for each="{bullets}" as="bullet">
- <li>{bullet}</li>
- </f:for>
- </ul>
+ <ul class="ce-bullets">
+ <f:for each="{bullets}" as="bullet">
+ <li>{bullet}</li>
+ </f:for>
+ </ul>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-1.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-1.html
index 420a60ccfa2a..175d8c26a92d 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-1.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-1.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{bullets}">
- <ol class="ce-bullets">
- <f:for each="{bullets}" as="bullet">
- <li>{bullet}</li>
- </f:for>
- </ol>
+ <ol class="ce-bullets">
+ <f:for each="{bullets}" as="bullet">
+ <li>{bullet}</li>
+ </f:for>
+ </ol>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-2.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-2.html
index 6cdd7ad18a29..cb9d73900091 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-2.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Bullets/Type-2.html
@@ -1,18 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{bullets}">
- <dl class="ce-bullets">
- <f:for each="{bullets}" as="definitionListItem">
- <f:for each="{definitionListItem}" as="termDescription" iteration="termDescriptionIterator">
- <f:if condition="{termDescriptionIterator.isFirst}">
- <f:then>
- <dt>{termDescription}</dt>
- </f:then>
- <f:else>
- <dd>{termDescription}</dd>
- </f:else>
- </f:if>
- </f:for>
- </f:for>
- </dl>
+ <dl class="ce-bullets">
+ <f:for each="{bullets}" as="definitionListItem">
+ <f:for each="{definitionListItem}" as="termDescription" iteration="termDescriptionIterator">
+ <f:if condition="{termDescriptionIterator.isFirst}">
+ <f:then>
+ <dt>{termDescription}</dt>
+ </f:then>
+ <f:else>
+ <dd>{termDescription}</dd>
+ </f:else>
+ </f:if>
+ </f:for>
+ </f:for>
+ </dl>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Footer/All.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Footer/All.html
index 833d07e2b7c8..20a9779b9dc8 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Footer/All.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Footer/All.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{data.linkToTop}">
- <p>
- <a href="#top"><f:translate key="toTop" extensionName="fluid_styled_content" /></a>
- </p>
+ <p>
+ <a href="#top"><f:translate key="toTop" extensionName="fluid_styled_content" /></a>
+ </p>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/All.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/All.html
index 681711be779c..957ea5a885b7 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/All.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/All.html
@@ -1,22 +1,22 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{data.header_layout} != 100">
- <f:if condition="{data.header} || {data.subheader} || {data.date}">
- <header>
- <f:render partial="Header/Header" arguments="{
- header: data.header,
- layout: data.header_layout,
- positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
- link: data.header_link,
- default: settings.defaultHeaderType}" />
- <f:render partial="Header/SubHeader" arguments="{
- subheader: data.subheader,
- layout: data.header_layout,
- positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
- default: settings.defaultHeaderType}" />
- <f:render partial="Header/Date" arguments="{
- date: data.date,
- positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}'}" />
- </header>
- </f:if>
+ <f:if condition="{data.header} || {data.subheader} || {data.date}">
+ <header>
+ <f:render partial="Header/Header" arguments="{
+ header: data.header,
+ layout: data.header_layout,
+ positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
+ link: data.header_link,
+ default: settings.defaultHeaderType}" />
+ <f:render partial="Header/SubHeader" arguments="{
+ subheader: data.subheader,
+ layout: data.header_layout,
+ positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
+ default: settings.defaultHeaderType}" />
+ <f:render partial="Header/Date" arguments="{
+ date: data.date,
+ positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}'}" />
+ </header>
+ </f:if>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Date.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Date.html
index d205a871054d..7c23ff0f6811 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Date.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Date.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{date}">
- <p class="{positionClass}">
- <time datetime="{date -> f:format.date(format: '%Y-%m-%d')}">
- <f:format.date format="%B %e, %Y">{date}</f:format.date>
- </time>
- </p>
+ <p class="{positionClass}">
+ <time datetime="{date -> f:format.date(format: '%Y-%m-%d')}">
+ <f:format.date format="%B %e, %Y">{date}</f:format.date>
+ </time>
+ </p>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Header.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Header.html
index c9fa8a8ccc6d..c7d8dd839be8 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Header.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/Header.html
@@ -1,48 +1,48 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{header}">
- <f:switch expression="{layout}">
- <f:case value="1">
- <h1 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h1>
- </f:case>
- <f:case value="2">
- <h2 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h2>
- </f:case>
- <f:case value="3">
- <h3 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h3>
- </f:case>
- <f:case value="4">
- <h4 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h4>
- </f:case>
- <f:case value="5">
- <h5 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h5>
- </f:case>
- <f:case value="6">
- <h6 class="{positionClass}">
- <f:link.typolink parameter="{link}">{header}</f:link.typolink>
- </h6>
- </f:case>
- <f:case value="100">
- <f:comment> -- do not show header -- </f:comment>
- </f:case>
- <f:defaultCase>
- <f:if condition="{default}">
- <f:render partial="Header/Header" arguments="{
- header: header,
- layout: default,
- positionClass: positionClass,
- link: link}" />
- </f:if>
- </f:defaultCase>
- </f:switch>
+ <f:switch expression="{layout}">
+ <f:case value="1">
+ <h1 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h1>
+ </f:case>
+ <f:case value="2">
+ <h2 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h2>
+ </f:case>
+ <f:case value="3">
+ <h3 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h3>
+ </f:case>
+ <f:case value="4">
+ <h4 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h4>
+ </f:case>
+ <f:case value="5">
+ <h5 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h5>
+ </f:case>
+ <f:case value="6">
+ <h6 class="{positionClass}">
+ <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+ </h6>
+ </f:case>
+ <f:case value="100">
+ <f:comment> -- do not show header -- </f:comment>
+ </f:case>
+ <f:defaultCase>
+ <f:if condition="{default}">
+ <f:render partial="Header/Header" arguments="{
+ header: header,
+ layout: default,
+ positionClass: positionClass,
+ link: link}" />
+ </f:if>
+ </f:defaultCase>
+ </f:switch>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/SubHeader.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/SubHeader.html
index 357d2d21ca6b..bbcfdd0898a0 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/SubHeader.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Header/SubHeader.html
@@ -1,39 +1,39 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{subheader}">
- <f:switch expression="{layout}">
- <f:case value="1">
- <h2 class="{positionClass}">
- {subheader}
- </h2>
- </f:case>
- <f:case value="2">
- <h3 class="{positionClass}">
- {subheader}
- </h3>
- </f:case>
- <f:case value="3">
- <h4 class="{positionClass}">
- {subheader}
- </h4>
- </f:case>
- <f:case value="4">
- <h5 class="{positionClass}">
- {subheader}
- </h5>
- </f:case>
- <f:case value="5">
- <h6 class="{positionClass}">
- {subheader}
- </h6>
- </f:case>
- <f:defaultCase>
- <f:if condition="{default}">
- <f:render partial="Header/SubHeader" arguments="{
- subheader: subheader,
- positionClass: positionClass,
- layout: default}" />
- </f:if>
- </f:defaultCase>
- </f:switch>
+ <f:switch expression="{layout}">
+ <f:case value="1">
+ <h2 class="{positionClass}">
+ {subheader}
+ </h2>
+ </f:case>
+ <f:case value="2">
+ <h3 class="{positionClass}">
+ {subheader}
+ </h3>
+ </f:case>
+ <f:case value="3">
+ <h4 class="{positionClass}">
+ {subheader}
+ </h4>
+ </f:case>
+ <f:case value="4">
+ <h5 class="{positionClass}">
+ {subheader}
+ </h5>
+ </f:case>
+ <f:case value="5">
+ <h6 class="{positionClass}">
+ {subheader}
+ </h6>
+ </f:case>
+ <f:defaultCase>
+ <f:if condition="{default}">
+ <f:render partial="Header/SubHeader" arguments="{
+ subheader: subheader,
+ positionClass: positionClass,
+ layout: default}" />
+ </f:if>
+ </f:defaultCase>
+ </f:switch>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Gallery.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Gallery.html
index 33824fc886b9..224735a58bc2 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Gallery.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Gallery.html
@@ -1,25 +1,25 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{gallery.rows}">
- <div class="ce-gallery{f:if(condition: data.imageborder, then: ' ce-border')}" data-ce-columns="{gallery.count.columns}" data-ce-images="{gallery.count.files}">
- <f:if condition="{gallery.position.horizontal} == 'center'">
- <div class="ce-outer">
- <div class="ce-inner">
- </f:if>
- <f:for each="{gallery.rows}" as="row">
- <div class="ce-row">
- <f:for each="{row.columns}" as="column">
- <f:if condition="{column.media}">
- <div class="ce-column">
- <f:render partial="Media/Type" arguments="{file: column.media, dimensions: column.dimensions, data: data, settings: settings}" />
- </div>
- </f:if>
- </f:for>
- </div>
- </f:for>
- <f:if condition="{gallery.position.horizontal} == 'center'">
- </div>
- </div>
- </f:if>
- </div>
+ <div class="ce-gallery{f:if(condition: data.imageborder, then: ' ce-border')}" data-ce-columns="{gallery.count.columns}" data-ce-images="{gallery.count.files}">
+ <f:if condition="{gallery.position.horizontal} == 'center'">
+ <div class="ce-outer">
+ <div class="ce-inner">
+ </f:if>
+ <f:for each="{gallery.rows}" as="row">
+ <div class="ce-row">
+ <f:for each="{row.columns}" as="column">
+ <f:if condition="{column.media}">
+ <div class="ce-column">
+ <f:render partial="Media/Type" arguments="{file: column.media, dimensions: column.dimensions, data: data, settings: settings}" />
+ </div>
+ </f:if>
+ </f:for>
+ </div>
+ </f:for>
+ <f:if condition="{gallery.position.horizontal} == 'center'">
+ </div>
+ </div>
+ </f:if>
+ </div>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type.html
index 1c7161cd49d4..a60dd3af5a07 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:switch expression="{file.type}">
- <f:case value="3">
- <f:render partial="Media/Type/Audio" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
- </f:case>
- <f:case value="4">
- <f:render partial="Media/Type/Video" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
- </f:case>
- <f:defaultCase>
- <f:render partial="Media/Type/Image" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
- </f:defaultCase>
+ <f:case value="3">
+ <f:render partial="Media/Type/Audio" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
+ </f:case>
+ <f:case value="4">
+ <f:render partial="Media/Type/Video" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
+ </f:case>
+ <f:defaultCase>
+ <f:render partial="Media/Type/Image" arguments="{file: file, dimensions: dimensions, data: data, settings: settings}" />
+ </f:defaultCase>
</f:switch>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Audio.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Audio.html
index 5f9cbc3e640c..0e73409435e9 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Audio.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Audio.html
@@ -1,12 +1,12 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<figure class="audio">
- <div class="audio-embed">
- <f:render partial="Media/Rendering/Audio" arguments="{file: file, dimensions: dimensions, settings: settings}" />
- </div>
- <f:if condition="{file.description}">
- <figcaption class="audio-caption">
- {file.description}
- </figcaption>
- </f:if>
+ <div class="audio-embed">
+ <f:render partial="Media/Rendering/Audio" arguments="{file: file, dimensions: dimensions, settings: settings}" />
+ </div>
+ <f:if condition="{file.description}">
+ <figcaption class="audio-caption">
+ {file.description}
+ </figcaption>
+ </f:if>
</figure>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Image.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Image.html
index 6824a681a197..e4bce7564e67 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Image.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Image.html
@@ -1,28 +1,28 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers" data-namespace-typo3-fluid="true">
<figure class="image">
- <f:if condition="{file.link}">
- <f:then>
- <f:link.typolink parameter="{file.link}" title="{file.title}">
- <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
- </f:link.typolink>
- </f:then>
- <f:else>
- <f:if condition="{data.image_zoom}">
- <f:then>
- <ce:link.clickEnlarge image="{file}" configuration="{settings.media.popup}">
- <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
- </ce:link.clickEnlarge>
- </f:then>
- <f:else>
- <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- <f:if condition="{file.description}">
- <figcaption class="image-caption">
- {file.description}
- </figcaption>
- </f:if>
+ <f:if condition="{file.link}">
+ <f:then>
+ <f:link.typolink parameter="{file.link}" title="{file.title}">
+ <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
+ </f:link.typolink>
+ </f:then>
+ <f:else>
+ <f:if condition="{data.image_zoom}">
+ <f:then>
+ <ce:link.clickEnlarge image="{file}" configuration="{settings.media.popup}">
+ <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
+ </ce:link.clickEnlarge>
+ </f:then>
+ <f:else>
+ <f:render partial="Media/Rendering/Image" arguments="{file: file, dimensions: dimensions, settings: settings}" />
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ <f:if condition="{file.description}">
+ <figcaption class="image-caption">
+ {file.description}
+ </figcaption>
+ </f:if>
</figure>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Video.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Video.html
index 0af68bb96adf..cbb8c9d9caeb 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Video.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Media/Type/Video.html
@@ -1,12 +1,12 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<figure class="video">
- <div class="video-embed">
- <f:render partial="Media/Rendering/Video" arguments="{file: file, dimensions: dimensions, settings: settings}" />
- </div>
- <f:if condition="{file.description}">
- <figcaption class="video-caption">
- {file.description}
- </figcaption>
- </f:if>
+ <div class="video-embed">
+ <f:render partial="Media/Rendering/Video" arguments="{file: file, dimensions: dimensions, settings: settings}" />
+ </div>
+ <f:if condition="{file.description}">
+ <figcaption class="video-caption">
+ {file.description}
+ </figcaption>
+ </f:if>
</figure>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Table/Columns.html b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Table/Columns.html
index 01478d898481..342c7fd285f2 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Table/Columns.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Partials/Table/Columns.html
@@ -1,98 +1,98 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{rowIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 1">
- <f:then>
- <th>
- </f:then>
- <f:else>
- <f:if condition="{columnIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 2">
- <f:then>
- <th>
- </f:then>
- <f:else>
- <td>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <td>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:if condition="{columnIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 2">
- <f:then>
- <th>
- </f:then>
- <f:else>
- <td>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <td>
- </f:else>
- </f:if>
- </f:else>
+ <f:then>
+ <f:if condition="{data.table_header_position} == 1">
+ <f:then>
+ <th>
+ </f:then>
+ <f:else>
+ <f:if condition="{columnIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 2">
+ <f:then>
+ <th>
+ </f:then>
+ <f:else>
+ <td>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <td>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:if condition="{columnIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 2">
+ <f:then>
+ <th>
+ </f:then>
+ <f:else>
+ <td>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <td>
+ </f:else>
+ </f:if>
+ </f:else>
</f:if>
<f:if condition="{cell}">
- <f:then>
- <f:format.nl2br>{cell}</f:format.nl2br>
- </f:then>
- <f:else>
-
- </f:else>
+ <f:then>
+ <f:format.nl2br>{cell}</f:format.nl2br>
+ </f:then>
+ <f:else>
+
+ </f:else>
</f:if>
<f:if condition="{rowIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 1">
- <f:then>
- </th>
- </f:then>
- <f:else>
- <f:if condition="{columnIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 2">
- <f:then>
- </th>
- </f:then>
- <f:else>
- </td>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- </td>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:if condition="{columnIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 2">
- <f:then>
- </th>
- </f:then>
- <f:else>
- </td>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- </td>
- </f:else>
- </f:if>
- </f:else>
+ <f:then>
+ <f:if condition="{data.table_header_position} == 1">
+ <f:then>
+ </th>
+ </f:then>
+ <f:else>
+ <f:if condition="{columnIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 2">
+ <f:then>
+ </th>
+ </f:then>
+ <f:else>
+ </td>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ </td>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:if condition="{columnIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 2">
+ <f:then>
+ </th>
+ </f:then>
+ <f:else>
+ </td>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ </td>
+ </f:else>
+ </f:if>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html
index eed5562e116f..149f92a7c9f0 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html
@@ -2,7 +2,7 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:render partial="Bullets/Type-{data.bullets_type}" arguments="{_all}" />
+ <f:render partial="Bullets/Type-{data.bullets_type}" arguments="{_all}" />
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html
index ebb5d198a75d..abc68d3536e8 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html
@@ -3,7 +3,7 @@
<f:section name="Header" />
<f:section name="Main">
- <hr class="ce-div" />
+ <hr class="ce-div" />
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Generic.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Generic.html
index 17622b935175..919c485aae07 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Generic.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Generic.html
@@ -2,11 +2,11 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:comment>This templates is used to provide nessesary functionality for external processed content and could be used across multiple sources, for example the frontend login content element.</f:comment>
- <f:if condition="{content}">
- <f:then>{content -> f:format.raw()}</f:then>
- <f:else><f:cObject typoscriptObjectPath="tt_content.{data.CType}.20" data="{data}" table="tt_content" /></f:else>
- </f:if>
+ <f:comment>This templates is used to provide nessesary functionality for external processed content and could be used across multiple sources, for example the frontend login content element.</f:comment>
+ <f:if condition="{content}">
+ <f:then>{content -> f:format.raw()}</f:then>
+ <f:else><f:cObject typoscriptObjectPath="tt_content.{data.CType}.20" data="{data}" table="tt_content" /></f:else>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
index a75d6be1532c..22fe35a1c21e 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
@@ -3,7 +3,7 @@
<f:section name="Header" />
<f:section name="Main">
- <f:format.raw>{data.bodytext}</f:format.raw>
+ <f:format.raw>{data.bodytext}</f:format.raw>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Image.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Image.html
index 56f658cc851c..cbef07430a12 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Image.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Image.html
@@ -2,9 +2,9 @@
<f:layout name="Default" />
<f:section name="Main">
- <div class="ce-image ce-{gallery.position.horizontal} ce-{gallery.position.vertical}">
- <f:render partial="Media/Gallery" arguments="{_all}" />
- </div>
+ <div class="ce-image ce-{gallery.position.horizontal} ce-{gallery.position.vertical}">
+ <f:render partial="Media/Gallery" arguments="{_all}" />
+ </div>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html
index 35bac83ff80c..5daa22ff27ba 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html
@@ -2,7 +2,7 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" table="tt_content" />
+ <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" table="tt_content" />
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
index 5e003d74bf79..2e58d1cceb52 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
@@ -2,20 +2,20 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- <f:if condition="{page.data.abstract}">
- <f:format.html>{page.data.abstract}</f:format.html>
- </f:if>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ <f:if condition="{page.data.abstract}">
+ <f:format.html>{page.data.abstract}</f:format.html>
+ </f:if>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedContent.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedContent.html
index c25faae4ae41..155946c70db1 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedContent.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedContent.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{content}">
- <ul>
- <f:for each="{content}" as="element">
- <li>
- <f:link.page pageUid="{element.data.pid}" section="{element.data.uid}" title="{element.data.header}">
- <span>{element.data.header}</span>
- </f:link.page>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{content}">
+ <ul>
+ <f:for each="{content}" as="element">
+ <li>
+ <f:link.page pageUid="{element.data.pid}" section="{element.data.uid}" title="{element.data.header}">
+ <span>{element.data.header}</span>
+ </f:link.page>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedPages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedPages.html
index 128bb4a25538..1cf2bf92a779 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedPages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuCategorizedPages.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuPages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuPages.html
index 128bb4a25538..1cf2bf92a779 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuPages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuPages.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRecentlyUpdated.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRecentlyUpdated.html
index 128bb4a25538..1cf2bf92a779 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRecentlyUpdated.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRecentlyUpdated.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRelatedPages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRelatedPages.html
index 128bb4a25538..1cf2bf92a779 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRelatedPages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuRelatedPages.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSection.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSection.html
index e4fc0e82fc63..9535a4b3d476 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSection.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSection.html
@@ -2,30 +2,30 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- <f:if condition="{page.content}">
- <ul>
- <f:for each="{page.content}" as="element">
- <f:if condition="{element.data.header}">
- <li>
- <a href="{page.link}#c{element.data.uid}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{element.data.header}">
- <span>{element.data.header}</span>
- </a>
- </li>
- </f:if>
- </f:for>
- </ul>
- </f:if>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ <f:if condition="{page.content}">
+ <ul>
+ <f:for each="{page.content}" as="element">
+ <f:if condition="{element.data.header}">
+ <li>
+ <a href="{page.link}#c{element.data.uid}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{element.data.header}">
+ <span>{element.data.header}</span>
+ </a>
+ </li>
+ </f:if>
+ </f:for>
+ </ul>
+ </f:if>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSectionPages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSectionPages.html
index c3d3bf9f2cd8..a94abe4a3f49 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSectionPages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSectionPages.html
@@ -2,28 +2,28 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- <f:if condition="{page.content}">
- <ul>
- <f:for each="{page.content}" as="element">
- <li>
- <a href="{page.link}#c{element.data.uid}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{element.data.header}">
- <span>{element.data.header}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ <f:if condition="{page.content}">
+ <ul>
+ <f:for each="{page.content}" as="element">
+ <li>
+ <a href="{page.link}#c{element.data.uid}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{element.data.header}">
+ <span>{element.data.header}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemap.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemap.html
index 59b2786c070d..7be942afc8ac 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemap.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemap.html
@@ -2,23 +2,23 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:render section="Menu" arguments="{menu: menu}" />
+ <f:render section="Menu" arguments="{menu: menu}" />
</f:section>
<f:section name="Menu">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- <f:render section="Menu" arguments="{menu: page.children}" />
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ <f:render section="Menu" arguments="{menu: page.children}" />
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemapPages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemapPages.html
index 59b2786c070d..7be942afc8ac 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemapPages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSitemapPages.html
@@ -2,23 +2,23 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:render section="Menu" arguments="{menu: menu}" />
+ <f:render section="Menu" arguments="{menu: menu}" />
</f:section>
<f:section name="Menu">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- <f:render section="Menu" arguments="{menu: page.children}" />
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ <f:render section="Menu" arguments="{menu: page.children}" />
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSubpages.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSubpages.html
index 128bb4a25538..1cf2bf92a779 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSubpages.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuSubpages.html
@@ -2,17 +2,17 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{menu}">
- <ul>
- <f:for each="{menu}" as="page">
- <li>
- <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
- <span>{page.title}</span>
- </a>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{menu}">
+ <ul>
+ <f:for each="{menu}" as="page">
+ <li>
+ <a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')} title="{page.title}">
+ <span>{page.title}</span>
+ </a>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
index 8ed17b2366aa..78f4b8a1c7d1 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
@@ -3,7 +3,7 @@
<f:section name="Header" />
<f:section name="Main">
- <f:format.raw>{shortcuts}</f:format.raw>
+ <f:format.raw>{shortcuts}</f:format.raw>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html
index 49abe2fad7ab..da8f360b599a 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html
@@ -2,60 +2,60 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{table}">
- <table class="ce-table{f:if(condition: data.table_class, then: ' ce-table-{data.table_class}')}">
- <f:if condition="{data.table_caption}">
- <caption>{data.table_caption}</caption>
- </f:if>
- <f:for each="{table}" as="row" iteration="rowIterator">
- <f:if condition="{rowIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 1">
- <f:then>
- <thead>
- </f:then>
- <f:else>
- <tbody>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:if condition="{rowIterator.isLast}">
- <f:if condition="{data.table_tfoot}">
- </tbody>
- <tfoot>
- </f:if>
- </f:if>
- </f:else>
- </f:if>
- <tr>
- <f:for each="{row}" as="cell" iteration="columnIterator">
- <f:render partial="Table/Columns" arguments="{_all}" />
- </f:for>
- </tr>
- <f:if condition="{rowIterator.isFirst}">
- <f:then>
- <f:if condition="{data.table_header_position} == 1">
- </thead>
- <tbody>
- </f:if>
- </f:then>
- <f:else>
- <f:if condition="{rowIterator.isLast}">
- <f:if condition="{data.table_tfoot}">
- <f:then>
- </tfoot>
- </f:then>
- <f:else>
- </tbody>
- </f:else>
- </f:if>
- </f:if>
- </f:else>
- </f:if>
- </f:for>
- </table>
- </f:if>
+ <f:if condition="{table}">
+ <table class="ce-table{f:if(condition: data.table_class, then: ' ce-table-{data.table_class}')}">
+ <f:if condition="{data.table_caption}">
+ <caption>{data.table_caption}</caption>
+ </f:if>
+ <f:for each="{table}" as="row" iteration="rowIterator">
+ <f:if condition="{rowIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 1">
+ <f:then>
+ <thead>
+ </f:then>
+ <f:else>
+ <tbody>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:if condition="{rowIterator.isLast}">
+ <f:if condition="{data.table_tfoot}">
+ </tbody>
+ <tfoot>
+ </f:if>
+ </f:if>
+ </f:else>
+ </f:if>
+ <tr>
+ <f:for each="{row}" as="cell" iteration="columnIterator">
+ <f:render partial="Table/Columns" arguments="{_all}" />
+ </f:for>
+ </tr>
+ <f:if condition="{rowIterator.isFirst}">
+ <f:then>
+ <f:if condition="{data.table_header_position} == 1">
+ </thead>
+ <tbody>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:if condition="{rowIterator.isLast}">
+ <f:if condition="{data.table_tfoot}">
+ <f:then>
+ </tfoot>
+ </f:then>
+ <f:else>
+ </tbody>
+ </f:else>
+ </f:if>
+ </f:if>
+ </f:else>
+ </f:if>
+ </f:for>
+ </table>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
index 82d210347612..57bbcf451f57 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
@@ -2,7 +2,7 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:format.html>{data.bodytext}</f:format.html>
+ <f:format.html>{data.bodytext}</f:format.html>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
index b377d1dcafb3..1af772743b44 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
@@ -2,42 +2,42 @@
<f:layout name="Default" />
<f:section name="Header">
- <f:if condition="{gallery.position.noWrap} != 1">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:if>
+ <f:if condition="{gallery.position.noWrap} != 1">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:if>
</f:section>
<f:section name="Main">
- <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
- <f:if condition="{gallery.position.vertical} != 'below'">
- <f:render partial="Media/Gallery" arguments="{_all}" />
- </f:if>
+ <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
+ <f:if condition="{gallery.position.vertical} != 'below'">
+ <f:render partial="Media/Gallery" arguments="{_all}" />
+ </f:if>
- <f:if condition="{data.bodytext}">
- <f:then>
- <div class="ce-bodytext">
- <f:if condition="{gallery.position.noWrap}">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:if>
- <f:format.html>{data.bodytext}</f:format.html>
- </div>
- </f:then>
- <f:else>
- <f:if condition="{gallery.position.noWrap}">
- <f:if condition="{data.header}">
- <div class="ce-bodytext">
- <f:render partial="Header/All" arguments="{_all}" />
- </div>
- </f:if>
- </f:if>
- </f:else>
- </f:if>
+ <f:if condition="{data.bodytext}">
+ <f:then>
+ <div class="ce-bodytext">
+ <f:if condition="{gallery.position.noWrap}">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:if>
+ <f:format.html>{data.bodytext}</f:format.html>
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{gallery.position.noWrap}">
+ <f:if condition="{data.header}">
+ <div class="ce-bodytext">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </div>
+ </f:if>
+ </f:if>
+ </f:else>
+ </f:if>
- <f:if condition="{gallery.position.vertical} == 'below'">
- <f:render partial="Media/Gallery" arguments="{_all}" />
- </f:if>
- </div>
+ <f:if condition="{gallery.position.vertical} == 'below'">
+ <f:render partial="Media/Gallery" arguments="{_all}" />
+ </f:if>
+ </div>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
index b377d1dcafb3..1af772743b44 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
@@ -2,42 +2,42 @@
<f:layout name="Default" />
<f:section name="Header">
- <f:if condition="{gallery.position.noWrap} != 1">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:if>
+ <f:if condition="{gallery.position.noWrap} != 1">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:if>
</f:section>
<f:section name="Main">
- <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
- <f:if condition="{gallery.position.vertical} != 'below'">
- <f:render partial="Media/Gallery" arguments="{_all}" />
- </f:if>
+ <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
+ <f:if condition="{gallery.position.vertical} != 'below'">
+ <f:render partial="Media/Gallery" arguments="{_all}" />
+ </f:if>
- <f:if condition="{data.bodytext}">
- <f:then>
- <div class="ce-bodytext">
- <f:if condition="{gallery.position.noWrap}">
- <f:render partial="Header/All" arguments="{_all}" />
- </f:if>
- <f:format.html>{data.bodytext}</f:format.html>
- </div>
- </f:then>
- <f:else>
- <f:if condition="{gallery.position.noWrap}">
- <f:if condition="{data.header}">
- <div class="ce-bodytext">
- <f:render partial="Header/All" arguments="{_all}" />
- </div>
- </f:if>
- </f:if>
- </f:else>
- </f:if>
+ <f:if condition="{data.bodytext}">
+ <f:then>
+ <div class="ce-bodytext">
+ <f:if condition="{gallery.position.noWrap}">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </f:if>
+ <f:format.html>{data.bodytext}</f:format.html>
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{gallery.position.noWrap}">
+ <f:if condition="{data.header}">
+ <div class="ce-bodytext">
+ <f:render partial="Header/All" arguments="{_all}" />
+ </div>
+ </f:if>
+ </f:if>
+ </f:else>
+ </f:if>
- <f:if condition="{gallery.position.vertical} == 'below'">
- <f:render partial="Media/Gallery" arguments="{_all}" />
- </f:if>
- </div>
+ <f:if condition="{gallery.position.vertical} == 'below'">
+ <f:render partial="Media/Gallery" arguments="{_all}" />
+ </f:if>
+ </div>
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
index e78099449b8e..00bbd90d9a59 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
@@ -2,44 +2,44 @@
<f:layout name="Default" />
<f:section name="Main">
- <f:if condition="{files}">
- <ul class="ce-uploads">
- <f:for each="{files}" as="file" iteration="fileIterator">
- <li>
- <f:if condition="{data.uploads_type} == 1">
- <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
- </f:if>
- <f:if condition="{data.uploads_type} == 2">
- <f:if condition="{file.type} > 1">
- <f:if condition="{f:uri.image(src: 'file:{f:if(condition: file.originalFile, then: \'file:{file.originalFile.uid}\', else: \'file:{file.uid}\')}')} != '/'">
- <f:then>
- <a href="{file.publicUrl}" {f:if(condition:data.target,then: ' target="{data.target}"')}{f:if(condition: file.title, then: ' title="{file.title}"')}>
- <f:media file="{file}" width="150" alt="{file.properties.alternative}" />
- </a>
- </f:then>
- <f:else>
- <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
- </f:else>
- </f:if>
- </f:if>
- </f:if>
- <div>
- <a href="{file.publicUrl}" {f:if(condition:data.target,then: ' target="{data.target}"')}{f:if(condition: file.title, then: ' title="{file.title}"')}>
- <span class="ce-uploads-fileName">{f:if(condition: file.properties.title, then: file.properties.title, else: file.name) -> f:format.htmlspecialchars()}</span>
- </a>
- <f:if condition="{file.properties.description}">
- <f:if condition="{data.uploads_description}">
- <span class="ce-uploads-description">{file.properties.description}</span>
- </f:if>
- </f:if>
- <f:if condition="{data.filelink_size}">
- <span class="ce-uploads-filesize"><f:format.bytes value="{file.properties.size}" /></span>
- </f:if>
- </div>
- </li>
- </f:for>
- </ul>
- </f:if>
+ <f:if condition="{files}">
+ <ul class="ce-uploads">
+ <f:for each="{files}" as="file" iteration="fileIterator">
+ <li>
+ <f:if condition="{data.uploads_type} == 1">
+ <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+ </f:if>
+ <f:if condition="{data.uploads_type} == 2">
+ <f:if condition="{file.type} > 1">
+ <f:if condition="{f:uri.image(src: 'file:{f:if(condition: file.originalFile, then: \'file:{file.originalFile.uid}\', else: \'file:{file.uid}\')}')} != '/'">
+ <f:then>
+ <a href="{file.publicUrl}" {f:if(condition:data.target,then: ' target="{data.target}"')}{f:if(condition: file.title, then: ' title="{file.title}"')}>
+ <f:media file="{file}" width="150" alt="{file.properties.alternative}" />
+ </a>
+ </f:then>
+ <f:else>
+ <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+ </f:else>
+ </f:if>
+ </f:if>
+ </f:if>
+ <div>
+ <a href="{file.publicUrl}" {f:if(condition:data.target,then: ' target="{data.target}"')}{f:if(condition: file.title, then: ' title="{file.title}"')}>
+ <span class="ce-uploads-fileName">{f:if(condition: file.properties.title, then: file.properties.title, else: file.name) -> f:format.htmlspecialchars()}</span>
+ </a>
+ <f:if condition="{file.properties.description}">
+ <f:if condition="{data.uploads_description}">
+ <span class="ce-uploads-description">{file.properties.description}</span>
+ </f:if>
+ </f:if>
+ <f:if condition="{data.filelink_size}">
+ <span class="ce-uploads-filesize"><f:format.bytes value="{file.properties.size}" /></span>
+ </f:if>
+ </div>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Layouts/FormEditor.html b/typo3/sysext/form/Resources/Private/Backend/Layouts/FormEditor.html
index 7de0949673b8..1c54638143d3 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Layouts/FormEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Layouts/FormEditor.html
@@ -1,37 +1,37 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.pageRenderer includeCssFiles="{stylesheets}" addInlineSettings="{addInlineSettings}" includeJsFiles="{0: 'EXT:backend/Resources/Public/JavaScript/jsfunc.tbe_editor.js'}" />
<div data-identifier="moduleLoadingIndicator" class="form-editor-loading-spinner">
- <core:icon identifier="spinner-circle-dark" size="default" />
- <div class="form-editor-loading-spinner-label"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.loading" /></div>
+ <core:icon identifier="spinner-circle-dark" size="default" />
+ <div class="form-editor-loading-spinner-label"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.loading" /></div>
</div>
<div data-identifier="moduleWrapper" class="hidden">
- <f:format.raw>{formEditorTemplates}</f:format.raw>
- <section id="t3-form-navigation-component" class="t3-form-x-component" data-identifier="structureSection">
- <div id="t3-form-structure-panel">
- <f:render section="ElementSidebarTree" />
- </div>
- </section>
- <section id="t3-form-stage-container" data-identifier="stageContainer">
- <div id="t3-form-stage-inner-container" data-identifier="stageContainerInner">
- <header id="t3-form-stage-header">
- <f:render section="Header" />
- </header>
- <div id="t3-form-stage-content">
- <f:render section="Stage" />
- </div>
- </div>
- </section>
- <section id="t3-form-inspector-panels-container" class="t3-form-x-component" data-identifier="inspectorSection">
- <f:render section="Inspector" />
- </section>
+ <f:format.raw>{formEditorTemplates}</f:format.raw>
+ <section id="t3-form-navigation-component" class="t3-form-x-component" data-identifier="structureSection">
+ <div id="t3-form-structure-panel">
+ <f:render section="ElementSidebarTree" />
+ </div>
+ </section>
+ <section id="t3-form-stage-container" data-identifier="stageContainer">
+ <div id="t3-form-stage-inner-container" data-identifier="stageContainerInner">
+ <header id="t3-form-stage-header">
+ <f:render section="Header" />
+ </header>
+ <div id="t3-form-stage-content">
+ <f:render section="Stage" />
+ </div>
+ </div>
+ </section>
+ <section id="t3-form-inspector-panels-container" class="t3-form-x-component" data-identifier="inspectorSection">
+ <f:render section="Inspector" />
+ </section>
</div>
<script type="text/javascript">
- require(['{dynamicRequireJsModules.app}', '{dynamicRequireJsModules.mediator}', '{dynamicRequireJsModules.viewModel}'], function (formEditorApp, mediator, viewModel) {
- window.TYPO3.FORMEDITOR_APP = formEditorApp.getInstance(
- <f:format.htmlentitiesDecode>{formEditorAppInitialData}</f:format.htmlentitiesDecode>,
- mediator,
- viewModel
- ).run();
- });
+ require(['{dynamicRequireJsModules.app}', '{dynamicRequireJsModules.mediator}', '{dynamicRequireJsModules.viewModel}'], function (formEditorApp, mediator, viewModel) {
+ window.TYPO3.FORMEDITOR_APP = formEditorApp.getInstance(
+ <f:format.htmlentitiesDecode>{formEditorAppInitialData}</f:format.htmlentitiesDecode>,
+ mediator,
+ viewModel
+ ).run();
+ });
</script>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
index f3b2eedb3726..04677617a3ed 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
@@ -1,12 +1,12 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
- <span data-template-property="label" />
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
- </div>
- </label>
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+ <span data-template-property="label" />
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
+ </div>
+ </label>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
index 4db571c76acc..579e647815ed 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3-form-validator-editor">
- <h4 data-template-property="header-label">
- <span data-template-property="label" />
- </h4>
+ <h4 data-template-property="header-label">
+ <span data-template-property="label" />
+ </h4>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
index 5ff36f9fcbff..5584791242fb 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
- <span data-template-property="label" />
- </label>
- <div id="t3-form-add-finisher" class="t3-form-add-collection-element">
- <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
- </div>
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+ <span data-template-property="label" />
+ </label>
+ <div id="t3-form-add-finisher" class="t3-form-add-collection-element">
+ <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+ </div>
+ </div>
</div>
<div id="t3-form-inspector-finishers" class="t3-form-collection-container" data-identifier="inspectorFinishers">
</div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FormElementHeaderEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FormElementHeaderEditor.html
index 0d0da171b9f0..fc4d0713fe06 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FormElementHeaderEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FormElementHeaderEditor.html
@@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <h2 class="t3-form-inspector-formelement-header-editor" data-template-property="header-label" data-identifier="inspectorFormElementHeaderEditor"></h2>
+ <h2 class="t3-form-inspector-formelement-header-editor" data-template-property="header-label" data-identifier="inspectorFormElementHeaderEditor"></h2>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
index c04a723f7491..13e34e1308c6 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
@@ -1,17 +1,17 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label><br>
- <div class="t3-form-controls btn-group" data-identifier="inspectorEditorControlsWrapper">
- <button type="button" class="btn btn-default" data-identifier="viewportButton"></button>
- </div>
- </div>
- <div class="t3-form-control-group form-group" data-template-property="numbersOfColumnsToUse">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label" /></label>
- <div class="t3-form-controls" data-identifier="numbersOfColumnsToUse-inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="number" value="" data-template-property="numbersOfColumnsToUse-propertyPath" class="form-control">
- </div>
- <span data-template-property="numbersOfColumnsToUse-fieldExplanationText" />
- </div>
+ <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label><br>
+ <div class="t3-form-controls btn-group" data-identifier="inspectorEditorControlsWrapper">
+ <button type="button" class="btn btn-default" data-identifier="viewportButton"></button>
+ </div>
+ </div>
+ <div class="t3-form-control-group form-group" data-template-property="numbersOfColumnsToUse">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label" /></label>
+ <div class="t3-form-controls" data-identifier="numbersOfColumnsToUse-inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="number" value="" data-template-property="numbersOfColumnsToUse-propertyPath" class="form-control">
+ </div>
+ <span data-template-property="numbersOfColumnsToUse-fieldExplanationText" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
index a82e44c03c31..6f00359206ca 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
@@ -1,8 +1,8 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple" />
- </div>
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
index 064ab17e975a..e133235c694b 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
@@ -1,45 +1,45 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group property-grid">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div data-editor="new-property-grid" data-template-property="newPropertyPath">
- <table class="table table-hover" data-identifier="propertyGridContainer">
- <thead>
- <tr>
- <th></th>
- <th>Label</th>
- <th>Value</th>
- <th>Selected</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr data-identifier="rowItem">
- <td><span class="sort-row-field" data-identifier="sortRow"><core:icon identifier="actions-move-move" /></span></td>
- <td><input type="text" class="form-control" value="" data-identifier="label" /></td>
- <td><input type="text" class="form-control" value="" data-identifier="value" /></td>
- <td><input type="checkbox" data-identifier="selectValue" /></td>
- <td>
- <div class="btn-group btn-group-sm" role="group">
- <button class="btn btn-default" title="Remove this row" data-identifier="deleteRow"><core:icon identifier="actions-delete" /></button>
- </div>
- </td>
- </tr>
- <tr data-identifier="addRowItem">
- <td>
- <div class="btn-group btn-group-sm" role="group">
- <button data-random-id data-random-id-attribute="id" data-random-id-number="1" class="btn btn-default" title="Add a new row" data-identifier="addRow"><core:icon identifier="actions-add" /></button>
- </div>
- </td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- </tbody>
- </table>
- </div>
- <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid" />
- </div>
+ <div class="t3-form-control-group form-group property-grid">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div data-editor="new-property-grid" data-template-property="newPropertyPath">
+ <table class="table table-hover" data-identifier="propertyGridContainer">
+ <thead>
+ <tr>
+ <th></th>
+ <th>Label</th>
+ <th>Value</th>
+ <th>Selected</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr data-identifier="rowItem">
+ <td><span class="sort-row-field" data-identifier="sortRow"><core:icon identifier="actions-move-move" /></span></td>
+ <td><input type="text" class="form-control" value="" data-identifier="label" /></td>
+ <td><input type="text" class="form-control" value="" data-identifier="value" /></td>
+ <td><input type="checkbox" data-identifier="selectValue" /></td>
+ <td>
+ <div class="btn-group btn-group-sm" role="group">
+ <button class="btn btn-default" title="Remove this row" data-identifier="deleteRow"><core:icon identifier="actions-delete" /></button>
+ </div>
+ </td>
+ </tr>
+ <tr data-identifier="addRowItem">
+ <td>
+ <div class="btn-group btn-group-sm" role="group">
+ <button data-random-id data-random-id-attribute="id" data-random-id-number="1" class="btn btn-default" title="Add a new row" data-identifier="addRow"><core:icon identifier="actions-add" /></button>
+ </div>
+ </td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RemoveElementEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RemoveElementEditor.html
index af4f05508ffb..277e55b37efe 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RemoveElementEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RemoveElementEditor.html
@@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3-form-control-group form-group btn-group-sm">
- <button class="btn btn-default" title="Remove this Element"><core:icon identifier="actions-delete" alternativeMarkupIdentifier="inline" /></button>
+ <button class="btn btn-default" title="Remove this Element"><core:icon identifier="actions-delete" alternativeMarkupIdentifier="inline" /></button>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
index 7dc478603760..31a2d16d0895 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
@@ -1,19 +1,19 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
- <span data-template-property="label" />
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
- </div>
- </label>
- </div>
- <div class="t3-form-control-group form-group" data-template-property="validationErrorMessage">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label" /></label>
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="2" type="text" value="" data-template-property="validationErrorMessage-propertyPath" class="form-control">
- </div>
- <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint" />
- </div>
+ <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+ <span data-template-property="label" />
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
+ </div>
+ </label>
+ </div>
+ <div class="t3-form-control-group form-group" data-template-property="validationErrorMessage">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label" /></label>
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="2" type="text" value="" data-template-property="validationErrorMessage-propertyPath" class="form-control">
+ </div>
+ <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
index 9e187918e1ad..78bfc16f4f97 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
@@ -1,8 +1,8 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
- </div>
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
index c846d8826304..791bdbaa8ff7 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
@@ -1,24 +1,24 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div class="input-group" data-identifier="inspectorEditorControlsGroup">
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
- </div>
- <span class="input-group-btn" role="group" data-identifier="inspectorEditorFormElementSelectorControlsWrapper">
- <span class="btn-group t3-form-dropdown-buttons" data-identifier="inspectorEditorFormElementSelectorSplitButtonContainer">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.inspector.editor.formelement_selector.title')}">
- <core:icon identifier="actions-variable-select" />
- <span class="caret"></span>
- <span class="sr-only">Toggle Dropdown</span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right" data-identifier="inspectorEditorFormElementSelectorSplitButtonListContainer"></ul>
- </span>
- </span>
- </div>
- <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
- <span data-template-property="validationErrors" />
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div class="input-group" data-identifier="inspectorEditorControlsGroup">
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
+ </div>
+ <span class="input-group-btn" role="group" data-identifier="inspectorEditorFormElementSelectorControlsWrapper">
+ <span class="btn-group t3-form-dropdown-buttons" data-identifier="inspectorEditorFormElementSelectorSplitButtonContainer">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.inspector.editor.formelement_selector.title')}">
+ <core:icon identifier="actions-variable-select" />
+ <span class="caret"></span>
+ <span class="sr-only">Toggle Dropdown</span>
+ </button>
+ <ul class="dropdown-menu dropdown-menu-right" data-identifier="inspectorEditorFormElementSelectorSplitButtonListContainer"></ul>
+ </span>
+ </span>
+ </div>
+ <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+ <span data-template-property="validationErrors" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
index 7a6e12a881e5..070c38e854c4 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
@@ -1,11 +1,11 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control" />
- </div>
- <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control" />
+ </div>
+ <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
index 5f6a681e04f2..e2deef3c0067 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
@@ -1,19 +1,19 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control" data-insert-target="">
- <div class="help-block">
- <a href="#" data-template-property="onclick" class="btn btn-default">
- <span class="t3js-icon icon icon-size-small icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">
- <span class="icon-markup" data-template-property="image" />
- </span> <span data-template-property="buttonLabel" />
- </a>
- </div>
- <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
- <span data-template-property="validationErrors" />
- </div>
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control" data-insert-target="">
+ <div class="help-block">
+ <a href="#" data-template-property="onclick" class="btn btn-default">
+ <span class="t3js-icon icon icon-size-small icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">
+ <span class="icon-markup" data-template-property="image" />
+ </span> <span data-template-property="buttonLabel" />
+ </a>
+ </div>
+ <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+ <span data-template-property="validationErrors" />
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
index 03d303850e01..92af367a41be 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
- <div data-identifier="inspectorEditorControlsGroup">
- <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
- <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
- </div>
- </div>
- <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+ <div data-identifier="inspectorEditorControlsGroup">
+ <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+ <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
+ </div>
+ </div>
+ <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
index 50dae91cacb4..67c20125d64d 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="form-editor">
- <div class="t3-form-control-group form-group">
- <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
- <span data-template-property="label" />
- </label>
- <div id="t3-form-add-validator" class="t3-form-add-collection-element" data-template-property="selectOptionsContainer">
- <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
- </div>
- </div>
+ <div class="t3-form-control-group form-group">
+ <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+ <span data-template-property="label" />
+ </label>
+ <div id="t3-form-add-validator" class="t3-form-add-collection-element" data-template-property="selectOptionsContainer">
+ <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+ </div>
+ </div>
</div>
<div id="t3-form-inspector-validators" class="t3-form-collection-container" data-identifier="inspectorValidators">
</div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertElements.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertElements.html
index 31b432d1d546..746855872a12 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertElements.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertElements.html
@@ -1,28 +1,28 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div id="t3-form-insert-elements-panel">
- <div class="t3-form-x-component-inner-wrapper">
- <f:for each="{insertRenderablesPanelConfiguration}" as="insertRenderablePanelConfiguration">
- <f:if condition="{insertRenderablePanelConfiguration.key} != 'page'">
- <div class="row media">
- <div class="col-sm-12">
- <h4 class="t3-form-group-{insertRenderablePanelConfiguration.key}">
- <span>{insertRenderablePanelConfiguration.label}</span>
- </h4>
- </div>
- <f:for each="{insertRenderablePanelConfiguration.elements}" as="element">
- <div class="col-sm-4 form-group">
- <a class="t3-form-group-{insertRenderablePanelConfiguration.key} t3-form-type-{element.cssKey} btn btn-default btn-block" title="{element.key}" data-element-type="{element.key}">
- <span class="pull-left">
- <core:icon identifier="{element.iconIdentifier}" alternativeMarkupIdentifier="inline" />
- <span>{element.label}</span>
- </span>
- <span class="clearfix"></span>
- </a>
- </div>
- </f:for>
- </div>
- </f:if>
- </f:for>
- </div>
+ <div class="t3-form-x-component-inner-wrapper">
+ <f:for each="{insertRenderablesPanelConfiguration}" as="insertRenderablePanelConfiguration">
+ <f:if condition="{insertRenderablePanelConfiguration.key} != 'page'">
+ <div class="row media">
+ <div class="col-sm-12">
+ <h4 class="t3-form-group-{insertRenderablePanelConfiguration.key}">
+ <span>{insertRenderablePanelConfiguration.label}</span>
+ </h4>
+ </div>
+ <f:for each="{insertRenderablePanelConfiguration.elements}" as="element">
+ <div class="col-sm-4 form-group">
+ <a class="t3-form-group-{insertRenderablePanelConfiguration.key} t3-form-type-{element.cssKey} btn btn-default btn-block" title="{element.key}" data-element-type="{element.key}">
+ <span class="pull-left">
+ <core:icon identifier="{element.iconIdentifier}" alternativeMarkupIdentifier="inline" />
+ <span>{element.label}</span>
+ </span>
+ <span class="clearfix"></span>
+ </a>
+ </div>
+ </f:for>
+ </div>
+ </f:if>
+ </f:for>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertPages.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertPages.html
index f07a4b05bec4..a3b5243e1530 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertPages.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/InsertPages.html
@@ -1,29 +1,29 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div id="t3-form-insert-pages-panel">
- <div class="t3-form-x-component-inner-wrapper">
- <f:for each="{insertRenderablesPanelConfiguration}" as="insertRenderablePanelConfiguration">
- <f:if condition="{insertRenderablePanelConfiguration.key} == 'page'">
- <div class="row">
- <div class="col-sm-12">
- <h3 class="t3-form-group-{insertRenderablePanelConfiguration.key}">
- <span>{insertRenderablePanelConfiguration.label}</span>
- </h3>
- </div>
- <f:for each="{insertRenderablePanelConfiguration.elements}" as="element">
- <div class="col-sm-4 btn-group">
- <a class="t3-form-group-{insertRenderablePanelConfiguration.key} t3-form-type-{element.cssKey} btn btn-default btn-block" title="{element.key}" data-element-type="{element.key}">
- <span class="pull-left">
- <core:icon identifier="{element.iconIdentifier}" alternativeMarkupIdentifier="inline" />
- <span>{element.label}</span>
- </span>
- <span class="clearfix"></span>
- </a>
- <hr>
- </div>
- </f:for>
- </div>
- </f:if>
- </f:for>
- </div>
+ <div class="t3-form-x-component-inner-wrapper">
+ <f:for each="{insertRenderablesPanelConfiguration}" as="insertRenderablePanelConfiguration">
+ <f:if condition="{insertRenderablePanelConfiguration.key} == 'page'">
+ <div class="row">
+ <div class="col-sm-12">
+ <h3 class="t3-form-group-{insertRenderablePanelConfiguration.key}">
+ <span>{insertRenderablePanelConfiguration.label}</span>
+ </h3>
+ </div>
+ <f:for each="{insertRenderablePanelConfiguration.elements}" as="element">
+ <div class="col-sm-4 btn-group">
+ <a class="t3-form-group-{insertRenderablePanelConfiguration.key} t3-form-type-{element.cssKey} btn btn-default btn-block" title="{element.key}" data-element-type="{element.key}">
+ <span class="pull-left">
+ <core:icon identifier="{element.iconIdentifier}" alternativeMarkupIdentifier="inline" />
+ <span>{element.label}</span>
+ </span>
+ <span class="clearfix"></span>
+ </a>
+ <hr>
+ </div>
+ </f:for>
+ </div>
+ </f:if>
+ </f:for>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/ValidationErrors.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/ValidationErrors.html
index a10d7bee939f..211b292f949d 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/ValidationErrors.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Modals/ValidationErrors.html
@@ -1,18 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div id="t3-form-validation-errors-panel">
- <div class="t3-form-x-component-inner-wrapper">
- <div class="row">
- <div class="col-sm-12">
- <p><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.modals.validationErrors.dialogMessage" /></p>
- </div>
- <div class="col-sm-12">
- <dl class="t3-overview-list" data-identifier="rowsContainer">
- <dt data-identifier="rowItem">
- <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> <a data-identifier="rowLink"></a>
- </dt>
- </dl>
- </div>
- </div>
- </div>
+ <div class="t3-form-x-component-inner-wrapper">
+ <div class="row">
+ <div class="col-sm-12">
+ <p><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.modals.validationErrors.dialogMessage" /></p>
+ </div>
+ <div class="col-sm-12">
+ <dl class="t3-overview-list" data-identifier="rowsContainer">
+ <dt data-identifier="rowItem">
+ <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> <a data-identifier="rowLink"></a>
+ </dt>
+ </dl>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
index e24665f8d36e..188e8f39c0e5 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
@@ -1,29 +1,29 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
</div>
<div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- <div class="element-content">
- <div data-template-property="properties.contentElementUid" />
- </div>
- </div>
- <div class="t3-form-validator-info" data-identifier="validators">
- <span data-identifier="validatorIcon"></span>
- <div class="t3-form-validator-list">
- <div data-identifier="validatorsContainer">
- <div class="validator-label" data-template-property="_label"></div>
- </div>
- </div>
- </div>
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ <div class="element-content">
+ <div data-template-property="properties.contentElementUid" />
+ </div>
+ </div>
+ <div class="t3-form-validator-info" data-identifier="validators">
+ <span data-identifier="validatorIcon"></span>
+ <div class="t3-form-validator-list">
+ <div data-identifier="validatorsContainer">
+ <div class="validator-label" data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/Fieldset.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/Fieldset.html
index f1e2ebb45cb6..c188bf1ad117 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/Fieldset.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/Fieldset.html
@@ -1,18 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
</div>
<div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- </div>
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
index e18de8e8c8ea..36064f4177bb 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
</div>
<div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- <div class="element-content">
- <div data-template-property="properties.saveToFileMount" />
- <div data-identifier="multiValueContainer" data-template-property="properties.allowedMimeTypes">
- <div data-template-property="_value" />
- </div>
- </div>
- </div>
- <div class="t3-form-validator-info" data-identifier="validators">
- <span data-identifier="validatorIcon"></span>
- <div class="t3-form-validator-list">
- <div data-identifier="validatorsContainer">
- <div class="validator-label" data-template-property="_label"></div>
- </div>
- </div>
- </div>
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ <div class="element-content">
+ <div data-template-property="properties.saveToFileMount" />
+ <div data-identifier="multiValueContainer" data-template-property="properties.allowedMimeTypes">
+ <div data-template-property="_value" />
+ </div>
+ </div>
+ </div>
+ <div class="t3-form-validator-info" data-identifier="validators">
+ <span data-identifier="validatorIcon"></span>
+ <div class="t3-form-validator-list">
+ <div data-identifier="validatorsContainer">
+ <div class="validator-label" data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SelectTemplate.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SelectTemplate.html
index e52931d31c92..b8215ef54e61 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SelectTemplate.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SelectTemplate.html
@@ -1,31 +1,31 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
</div>
<div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- <div class="element-content">
- <div data-identifier="multiValueContainer" data-template-property="properties.options">
- <div data-template-property="_label"></div>
- </div>
- </div>
- </div>
- <div class="t3-form-validator-info" data-identifier="validators">
- <span data-identifier="validatorIcon"></span>
- <div class="t3-form-validator-list">
- <div data-identifier="validatorsContainer">
- <div class="validator-label" data-template-property="_label"></div>
- </div>
- </div>
- </div>
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ <div class="element-content">
+ <div data-identifier="multiValueContainer" data-template-property="properties.options">
+ <div data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
+ <div class="t3-form-validator-info" data-identifier="validators">
+ <span data-identifier="validatorIcon"></span>
+ <div class="t3-form-validator-list">
+ <div data-identifier="validatorsContainer">
+ <div class="validator-label" data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SimpleTemplate.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SimpleTemplate.html
index 57e2d197afc8..c807c10dcdd5 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SimpleTemplate.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/SimpleTemplate.html
@@ -1,26 +1,26 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
- <div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
- </div>
- <div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- </div>
- <div class="t3-form-validator-info" data-identifier="validators">
- <span data-identifier="validatorIcon"></span>
- <div class="t3-form-validator-list">
- <div data-identifier="validatorsContainer">
- <div class="validator-label" data-template-property="_label"></div>
- </div>
- </div>
- </div>
- </div>
+ <div class="meta-label">
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ </div>
+ <div class="t3-form-form-element-body">
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ </div>
+ <div class="t3-form-validator-info" data-identifier="validators">
+ <span data-identifier="validatorIcon"></span>
+ <div class="t3-form-validator-list">
+ <div data-identifier="validatorsContainer">
+ <div class="validator-label" data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
+ </div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
index 721a5a113e8e..0294a305d905 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
@@ -1,29 +1,29 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="meta-label">
- <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
+ <span data-template-property="_type"></span>: <span data-template-property="_identifier"></span>
</div>
<div class="t3-form-form-element-body">
- <div class="t3-form-icon-container">
- <span data-identifier="elementIcon"></span>
- </div>
- <div class="t3-form-element-info">
- <div class="element-label-container">
- <div class="element-label">
- <span data-template-property="label"></span>
- <span data-template-property="_required"></span>
- </div>
- </div>
- <div class="element-content">
- <div data-template-property="properties.text" />
- </div>
- </div>
- <div class="t3-form-validator-info" data-identifier="validators">
- <span data-identifier="validatorIcon"></span>
- <div class="t3-form-validator-list">
- <div data-identifier="validatorsContainer">
- <div class="validator-label" data-template-property="_label"></div>
- </div>
- </div>
- </div>
+ <div class="t3-form-icon-container">
+ <span data-identifier="elementIcon"></span>
+ </div>
+ <div class="t3-form-element-info">
+ <div class="element-label-container">
+ <div class="element-label">
+ <span data-template-property="label"></span>
+ <span data-template-property="_required"></span>
+ </div>
+ </div>
+ <div class="element-content">
+ <div data-template-property="properties.text" />
+ </div>
+ </div>
+ <div class="t3-form-validator-info" data-identifier="validators">
+ <span data-identifier="validatorIcon"></span>
+ <div class="t3-form-validator-list">
+ <div data-identifier="validatorsContainer">
+ <div class="validator-label" data-template-property="_label"></div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/_ElementToolbar.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/_ElementToolbar.html
index ce20ca9e45be..a3b7005ee124 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/_ElementToolbar.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/_ElementToolbar.html
@@ -1,35 +1,35 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="btn-toolbar-container" data-identifier="elementToolbar">
- <div class="btn-toolbar" data-identifier="elementToolbarButtons">
- <div class="btn-group btn-group-sm" role="group">
- <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}" data-identifier="stageElementToolbarNewElement"><core:icon identifier="actions-document-new" alternativeMarkupIdentifier="inline" /></a>
- </div>
- <div class="btn-group btn-group-sm" role="group">
- <div class="btn-group t3-form-dropdown-buttons" data-identifier="stageElementToolbarNewElementSplitButton">
- <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}">
- <core:icon identifier="actions-document-new" alternativeMarkupIdentifier="inline" />
- <span class="caret"></span>
- <span class="sr-only">Toggle Dropdown</span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right">
- <li data-no-sorting>
- <a href="#" data-identifier="stageElementToolbarNewElementSplitButtonInside">
- <core:icon identifier="actions-form-insert-in" alternativeMarkupIdentifier="inline" />
- <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element.inside" />
- </a>
- </li>
- <li data-no-sorting>
- <a href="#" data-identifier="stageElementToolbarNewElementSplitButtonAfter">
- <core:icon identifier="actions-form-insert-after" alternativeMarkupIdentifier="inline" />
- <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element.after" />
- </a>
- </li>
- </ul>
- </div>
- </div>
- <div class="btn-group btn-group-sm" role="group">
- <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.remove')}" data-identifier="stageElementToolbarRemoveElement"><core:icon identifier="actions-edit-delete" alternativeMarkupIdentifier="inline" /></a>
- </div>
- </div>
+ <div class="btn-toolbar" data-identifier="elementToolbarButtons">
+ <div class="btn-group btn-group-sm" role="group">
+ <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}" data-identifier="stageElementToolbarNewElement"><core:icon identifier="actions-document-new" alternativeMarkupIdentifier="inline" /></a>
+ </div>
+ <div class="btn-group btn-group-sm" role="group">
+ <div class="btn-group t3-form-dropdown-buttons" data-identifier="stageElementToolbarNewElementSplitButton">
+ <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}">
+ <core:icon identifier="actions-document-new" alternativeMarkupIdentifier="inline" />
+ <span class="caret"></span>
+ <span class="sr-only">Toggle Dropdown</span>
+ </button>
+ <ul class="dropdown-menu dropdown-menu-right">
+ <li data-no-sorting>
+ <a href="#" data-identifier="stageElementToolbarNewElementSplitButtonInside">
+ <core:icon identifier="actions-form-insert-in" alternativeMarkupIdentifier="inline" />
+ <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element.inside" />
+ </a>
+ </li>
+ <li data-no-sorting>
+ <a href="#" data-identifier="stageElementToolbarNewElementSplitButtonAfter">
+ <core:icon identifier="actions-form-insert-after" alternativeMarkupIdentifier="inline" />
+ <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element.after" />
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="btn-group btn-group-sm" role="group">
+ <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.remove')}" data-identifier="stageElementToolbarRemoveElement"><core:icon identifier="actions-edit-delete" alternativeMarkupIdentifier="inline" /></a>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Index.html b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Index.html
index 922d06e88d74..e0d1f7ff2c36 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Index.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Index.html
@@ -2,67 +2,67 @@
<f:layout name="FormEditor" />
<f:section name="ElementSidebarTree">
- <div class="t3-form-x-component-inner-wrapper">
- <div id="t3-form-navigation-component-tree-root-container" data-identifier="treeRootContainer">
- <core:icon identifier="content-form" />
- <span id="t3-form-navigation-component-tree-root" data-identifier="treeRootElement"></span>
- </div>
- <div class="tree" data-identifier="structure-element"></div>
- <div class="form-group col-sm-12">
- <div class="btn-group btn-group-sm" role="group">
- <a class="btn btn-default t3-form-element-new-page-button" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.new_page_button')}" data-identifier="treeNewPageBottom"><core:icon identifier="actions-page-new" /> {f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.new_page_button')}</a>
- </div>
- </div>
- </div>
+ <div class="t3-form-x-component-inner-wrapper">
+ <div id="t3-form-navigation-component-tree-root-container" data-identifier="treeRootContainer">
+ <core:icon identifier="content-form" />
+ <span id="t3-form-navigation-component-tree-root" data-identifier="treeRootElement"></span>
+ </div>
+ <div class="tree" data-identifier="structure-element"></div>
+ <div class="form-group col-sm-12">
+ <div class="btn-group btn-group-sm" role="group">
+ <a class="btn btn-default t3-form-element-new-page-button" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.new_page_button')}" data-identifier="treeNewPageBottom"><core:icon identifier="actions-page-new" /> {f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.new_page_button')}</a>
+ </div>
+ </div>
+ </div>
</f:section>
<f:section name="Header">
- <h1><span id="t3-form-form-definition-label" data-identifier="formDefinitionLabel"></span></h1>
+ <h1><span id="t3-form-form-definition-label" data-identifier="formDefinitionLabel"></span></h1>
</f:section>
<f:section name="Stage">
- <div class="panel panel-default" data-identifier="stagePanel">
- <div class="panel-heading" data-identifier="panelHeading">
- <span data-identifier="stageHeaderToolbar">
- <div class="btn-group">
- <button class="btn btn-default" title="" data-identifier="buttonViewModePreview"><core:icon identifier="actions-document-view" alternativeMarkupIdentifier="inline" /></button>
- <button class="btn btn-default" title="" data-identifier="buttonViewModeAbstract"><core:icon identifier="actions-document-open" alternativeMarkupIdentifier="inline" /></button>
- </div>
- <div class="pull-right">
- <span class="paginiation-label" data-identifier="paginationTitle"></span>
- <div class="btn-group">
- <button class="btn btn-default" title="" data-identifier="buttonPaginationPrevious"><core:icon identifier="actions-view-paging-previous" alternativeMarkupIdentifier="inline" /></button>
- <button class="btn btn-default" title="" data-identifier="buttonPaginationNext"><core:icon identifier="actions-view-paging-next" alternativeMarkupIdentifier="inline" /></button>
- </div>
- </div>
- </span>
- </div>
- <div class="form-section" data-identifier="stageSection">
- <div class="row">
- <div id="t3-form-stage" class="form-group col-sm-12" data-identifier="stageArea"></div>
- </div>
- <div class="row" data-identifier="stageNewElementRow">
- <div class="form-group col-sm-12">
- <div class="t3-form-new-element-container">
- <div class="btn-group btn-group-sm" role="group">
- <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}" data-identifier="stageNewElementBottom"><core:icon identifier="actions-document-new" /> {f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}</a>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <div class="panel panel-default" data-identifier="stagePanel">
+ <div class="panel-heading" data-identifier="panelHeading">
+ <span data-identifier="stageHeaderToolbar">
+ <div class="btn-group">
+ <button class="btn btn-default" title="" data-identifier="buttonViewModePreview"><core:icon identifier="actions-document-view" alternativeMarkupIdentifier="inline" /></button>
+ <button class="btn btn-default" title="" data-identifier="buttonViewModeAbstract"><core:icon identifier="actions-document-open" alternativeMarkupIdentifier="inline" /></button>
+ </div>
+ <div class="pull-right">
+ <span class="paginiation-label" data-identifier="paginationTitle"></span>
+ <div class="btn-group">
+ <button class="btn btn-default" title="" data-identifier="buttonPaginationPrevious"><core:icon identifier="actions-view-paging-previous" alternativeMarkupIdentifier="inline" /></button>
+ <button class="btn btn-default" title="" data-identifier="buttonPaginationNext"><core:icon identifier="actions-view-paging-next" alternativeMarkupIdentifier="inline" /></button>
+ </div>
+ </div>
+ </span>
+ </div>
+ <div class="form-section" data-identifier="stageSection">
+ <div class="row">
+ <div id="t3-form-stage" class="form-group col-sm-12" data-identifier="stageArea"></div>
+ </div>
+ <div class="row" data-identifier="stageNewElementRow">
+ <div class="form-group col-sm-12">
+ <div class="t3-form-new-element-container">
+ <div class="btn-group btn-group-sm" role="group">
+ <a class="btn btn-default" href="#" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}" data-identifier="stageNewElementBottom"><core:icon identifier="actions-document-new" /> {f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.stage.toolbar.new_element')}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</f:section>
<f:section name="Inspector">
- <div id="t3-form-inspector-panels">
- <div class="t3-form-x-component-inner-wrapper">
- <div id="t3-form-inspector" data-identifier="inspector"></div>
- </div>
- </div>
+ <div id="t3-form-inspector-panels">
+ <div class="t3-form-x-component-inner-wrapper">
+ <div id="t3-form-inspector" data-identifier="inspector"></div>
+ </div>
+ </div>
</f:section>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/InlineTemplates.html b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/InlineTemplates.html
index 2d71b52aba0f..f64c9f016db0 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/InlineTemplates.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/InlineTemplates.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:for each="{formEditorPartials}" key="formEditorTemplateName" as="formEditorPartial">
- <script type="text/x-formeditor-template" data-template-name="{formEditorTemplateName}">
- <f:render partial="{formEditorPartial}" arguments="{insertRenderablesPanelConfiguration: insertRenderablesPanelConfiguration}" />
- </script>
+ <script type="text/x-formeditor-template" data-template-name="{formEditorTemplateName}">
+ <f:render partial="{formEditorPartial}" arguments="{insertRenderablesPanelConfiguration: insertRenderablesPanelConfiguration}" />
+ </script>
</f:for>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html b/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
index 057a911f76d7..211b6481ca99 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
@@ -2,119 +2,119 @@
<f:layout name="FormManager" />
<f:section name="MainContent">
- <script type="text/javascript">
- require(['{dynamicRequireJsModules.app}', '{dynamicRequireJsModules.viewModel}'], function (formManagerApp, viewModel) {
- var FORMMANAGER_APP = formManagerApp.getInstance(
- <f:format.htmlentitiesDecode>{formManagerAppInitialData}</f:format.htmlentitiesDecode>,
- viewModel
- ).run();
- });
- </script>
- <h1><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.headline" /></h1>
- <f:if condition="{forms}">
- <f:then>
- <div class="panel panel-space panel-default recordlist">
- <div class="panel-heading">
- <span><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_existing_forms" /></span>
- </div>
- <div class="collapse in">
- <div class="table-fit">
- <table id="forms" class="table table-striped table-hover">
- <thead>
- <tr>
- <th class="col-icon nowrap"><a class="btn btn-default" data-identifier="newForm" href="#"><core:icon identifier="actions-add" /></a></th>
- <th class="col-title col-responsive nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.form_name" /></th>
- <th class="col-control nowrap"></th>
- <th class="nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.location" /></th>
- <th class="nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.references" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{forms}" as="form">
- <tr>
- <td class="col-icon nowrap">
- <f:if condition="{form.invalid}">
- <f:then>
- <span title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.invalid')}" data-toggle="tooltip" data-placement="top">
- <core:icon identifier="overlay-missing" />
- </span>
- </f:then>
- <f:else if="{form.duplicateIdentifier}">
- <span title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_identifier')} {form.identifier}" data-toggle="tooltip" data-placement="top">
- <core:icon identifier="overlay-missing" />
- </span>
- </f:else>
- <f:else>
- <span title="id={form.identifier}" data-toggle="tooltip" data-placement="right">
- <core:icon identifier="content-form" />
- </span>
- </f:else>
- </f:if>
- </td>
- <td class="col-title col-responsive nowrap">
- <f:if condition="{form.invalid} || {form.readOnly}">
- <f:then>
- <div title="{form.name}">{form.name}</div>
- </f:then>
- <f:else>
- <f:link.action controller="FormEditor" action="index" arguments="{formPersistenceIdentifier: form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form')}" data="{toggle: 'tooltip', placement: 'right'}">{form.name}</f:link.action>
- </f:else>
- </f:if>
- </td>
- <td class="col-control nowrap">
- <div class="btn-group" role="group">
- <f:if condition="{form.invalid} || {form.readOnly}">
- <f:then>
- <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form_not_allowed')}"><core:icon identifier="actions-open" /></button>
- </f:then>
- <f:else>
- <f:link.action controller="FormEditor" action="index" arguments="{formPersistenceIdentifier: form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form')}" class="btn btn-default form-record-open"><core:icon identifier="actions-open" /></f:link.action>
- </f:else>
- </f:if>
- <f:if condition="{form.invalid}">
- <f:then>
- <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_form_not_allowed')}"><core:icon identifier="actions-duplicate" /></button>
- <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form_not_allowed')}"><core:icon identifier="actions-edit-delete" /></button>
- </f:then>
- <f:else>
- <a href="#" data-identifier="duplicateForm" data-form-persistence-identifier="{form.persistenceIdentifier}" data-form-name="{form.name}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_this_form')}" class="btn btn-default form-record-duplicate"><core:icon identifier="actions-duplicate" /></a>
- <f:if condition="{form.removable}">
- <f:then>
- <a href="#" data-identifier="removeForm" data-form-persistence-identifier="{form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form')}" class="btn btn-default form-record-delete"><core:icon identifier="actions-edit-delete" /></a>
- </f:then>
- <f:else>
- <button class="btn btn-default form-record-delete" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form_not_allowed')}"><core:icon identifier="actions-edit-delete" /></button>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </div>
- </td>
- <td class="nowrap">{form.persistenceIdentifier}</td>
- <td class="nowrap">
- <f:if condition="{form.referenceCount}">
- <f:then>
- <a href="#" data-identifier="showReferences" data-form-persistence-identifier="{form.persistenceIdentifier}" data-form-name="{form.name}">{form.referenceCount}</a>
- </f:then>
- <f:else>
- {form.referenceCount}
- </f:else>
- </f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </f:then>
- <f:else>
- <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.forms_not_found.title')}">
- <p><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.forms_not_found.message" /></p>
- <a class="btn btn-primary" href="#" data-identifier="newForm"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.create_new_form" /></a>
- </f:be.infobox>
- </f:else>
+ <script type="text/javascript">
+ require(['{dynamicRequireJsModules.app}', '{dynamicRequireJsModules.viewModel}'], function (formManagerApp, viewModel) {
+ var FORMMANAGER_APP = formManagerApp.getInstance(
+ <f:format.htmlentitiesDecode>{formManagerAppInitialData}</f:format.htmlentitiesDecode>,
+ viewModel
+ ).run();
+ });
+ </script>
+ <h1><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.headline" /></h1>
+ <f:if condition="{forms}">
+ <f:then>
+ <div class="panel panel-space panel-default recordlist">
+ <div class="panel-heading">
+ <span><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_existing_forms" /></span>
+ </div>
+ <div class="collapse in">
+ <div class="table-fit">
+ <table id="forms" class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th class="col-icon nowrap"><a class="btn btn-default" data-identifier="newForm" href="#"><core:icon identifier="actions-add" /></a></th>
+ <th class="col-title col-responsive nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.form_name" /></th>
+ <th class="col-control nowrap"></th>
+ <th class="nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.location" /></th>
+ <th class="nowrap"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.references" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{forms}" as="form">
+ <tr>
+ <td class="col-icon nowrap">
+ <f:if condition="{form.invalid}">
+ <f:then>
+ <span title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.invalid')}" data-toggle="tooltip" data-placement="top">
+ <core:icon identifier="overlay-missing" />
+ </span>
+ </f:then>
+ <f:else if="{form.duplicateIdentifier}">
+ <span title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_identifier')} {form.identifier}" data-toggle="tooltip" data-placement="top">
+ <core:icon identifier="overlay-missing" />
+ </span>
+ </f:else>
+ <f:else>
+ <span title="id={form.identifier}" data-toggle="tooltip" data-placement="right">
+ <core:icon identifier="content-form" />
+ </span>
+ </f:else>
+ </f:if>
+ </td>
+ <td class="col-title col-responsive nowrap">
+ <f:if condition="{form.invalid} || {form.readOnly}">
+ <f:then>
+ <div title="{form.name}">{form.name}</div>
+ </f:then>
+ <f:else>
+ <f:link.action controller="FormEditor" action="index" arguments="{formPersistenceIdentifier: form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form')}" data="{toggle: 'tooltip', placement: 'right'}">{form.name}</f:link.action>
+ </f:else>
+ </f:if>
+ </td>
+ <td class="col-control nowrap">
+ <div class="btn-group" role="group">
+ <f:if condition="{form.invalid} || {form.readOnly}">
+ <f:then>
+ <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form_not_allowed')}"><core:icon identifier="actions-open" /></button>
+ </f:then>
+ <f:else>
+ <f:link.action controller="FormEditor" action="index" arguments="{formPersistenceIdentifier: form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.edit_form')}" class="btn btn-default form-record-open"><core:icon identifier="actions-open" /></f:link.action>
+ </f:else>
+ </f:if>
+ <f:if condition="{form.invalid}">
+ <f:then>
+ <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_form_not_allowed')}"><core:icon identifier="actions-duplicate" /></button>
+ <button class="btn btn-default form-record-readonly" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form_not_allowed')}"><core:icon identifier="actions-edit-delete" /></button>
+ </f:then>
+ <f:else>
+ <a href="#" data-identifier="duplicateForm" data-form-persistence-identifier="{form.persistenceIdentifier}" data-form-name="{form.name}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.duplicate_this_form')}" class="btn btn-default form-record-duplicate"><core:icon identifier="actions-duplicate" /></a>
+ <f:if condition="{form.removable}">
+ <f:then>
+ <a href="#" data-identifier="removeForm" data-form-persistence-identifier="{form.persistenceIdentifier}" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form')}" class="btn btn-default form-record-delete"><core:icon identifier="actions-edit-delete" /></a>
+ </f:then>
+ <f:else>
+ <button class="btn btn-default form-record-delete" disabled="disabled" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.delete_form_not_allowed')}"><core:icon identifier="actions-edit-delete" /></button>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </div>
+ </td>
+ <td class="nowrap">{form.persistenceIdentifier}</td>
+ <td class="nowrap">
+ <f:if condition="{form.referenceCount}">
+ <f:then>
+ <a href="#" data-identifier="showReferences" data-form-persistence-identifier="{form.persistenceIdentifier}" data-form-name="{form.name}">{form.referenceCount}</a>
+ </f:then>
+ <f:else>
+ {form.referenceCount}
+ </f:else>
+ </f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.forms_not_found.title')}">
+ <p><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.forms_not_found.message" /></p>
+ <a class="btn btn-primary" href="#" data-identifier="newForm"><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.create_new_form" /></a>
+ </f:be.infobox>
+ </f:else>
</f:if>
</f:section>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/AdvancedPassword.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/AdvancedPassword.html
index c92b1039e89f..a1f34e1d24aa 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/AdvancedPassword.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/AdvancedPassword.html
@@ -1,30 +1,30 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <div class="form-group">
- <f:form.password
- property="{element.identifier}.password"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- <f:if condition="{formvh:translateElementProperty(element: element, property: 'passwordDescription')}">
- <span class="help-block">{formvh:translateElementProperty(element: element, property: 'passwordDescription')}</span>
- </f:if>
- </div>
- <div class="form-group">
- <f:if condition="{formvh:translateElementProperty(element: element, property: 'confirmationLabel')}">
- <label for="{element.uniqueIdentifier}-confirmation">{formvh:translateElementProperty(element: element, property: 'confirmationLabel')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
- </f:if>
- <f:form.password
- property="{element.identifier}.confirmation"
- id="{element.uniqueIdentifier}-confirmation"
- class="{element.properties.confirmationClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </div>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <div class="form-group">
+ <f:form.password
+ property="{element.identifier}.password"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ <f:if condition="{formvh:translateElementProperty(element: element, property: 'passwordDescription')}">
+ <span class="help-block">{formvh:translateElementProperty(element: element, property: 'passwordDescription')}</span>
+ </f:if>
+ </div>
+ <div class="form-group">
+ <f:if condition="{formvh:translateElementProperty(element: element, property: 'confirmationLabel')}">
+ <label for="{element.uniqueIdentifier}-confirmation">{formvh:translateElementProperty(element: element, property: 'confirmationLabel')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
+ </f:if>
+ <f:form.password
+ property="{element.identifier}.confirmation"
+ id="{element.uniqueIdentifier}-confirmation"
+ class="{element.properties.confirmationClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </div>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Checkbox.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Checkbox.html
index bfb7e82d5283..77844c1850ed 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Checkbox.html
@@ -1,19 +1,19 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
- <div class="form-check">
- <label class="{element.properties.elementClassAttribute} form-check-label" for="{element.uniqueIdentifier}">
- <f:form.checkbox
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute}"
- value="{element.properties.value}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- <span>{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></span>
- </label>
- </div>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
+ <div class="form-check">
+ <label class="{element.properties.elementClassAttribute} form-check-label" for="{element.uniqueIdentifier}">
+ <f:form.checkbox
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute}"
+ value="{element.properties.value}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ <span>{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></span>
+ </label>
+ </div>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/ContentElement.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/ContentElement.html
index 001663e08ffb..64febb53df3b 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/ContentElement.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/ContentElement.html
@@ -1,25 +1,25 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:if condition="{element.rootForm.renderingOptions.previewMode}">
- <f:then>
- <div class="clearfix">
- <f:if condition="{element.properties.contentElementUid}">
- <f:then>
- <formvh:be.renderContentElementPreview contentElementUid="{element.properties.contentElementUid}" />
- </f:then>
- <f:else>
- <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.elements.ContentElement.selectContentElement" />
- </f:else>
- </f:if>
- </div>
- </f:then>
- <f:else>
- <f:if condition="{element.properties.contentElementUid}">
- <div class="clearfix{f:if(condition: element.properties.elementClassAttribute, then: ' {element.properties.elementClassAttribute}')}">
- <f:cObject typoscriptObjectPath="lib.tx_form.contentElementRendering">{element.properties.contentElementUid}</f:cObject>
- </div>
- </f:if>
- </f:else>
- </f:if>
+ <f:if condition="{element.rootForm.renderingOptions.previewMode}">
+ <f:then>
+ <div class="clearfix">
+ <f:if condition="{element.properties.contentElementUid}">
+ <f:then>
+ <formvh:be.renderContentElementPreview contentElementUid="{element.properties.contentElementUid}" />
+ </f:then>
+ <f:else>
+ <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.elements.ContentElement.selectContentElement" />
+ </f:else>
+ </f:if>
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{element.properties.contentElementUid}">
+ <div class="clearfix{f:if(condition: element.properties.elementClassAttribute, then: ' {element.properties.elementClassAttribute}')}">
+ <f:cObject typoscriptObjectPath="lib.tx_form.contentElementRendering">{element.properties.contentElementUid}</f:cObject>
+ </div>
+ </f:if>
+ </f:else>
+ </f:if>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Date.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Date.html
index 126a51a560c9..659ad319a737 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Date.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Date.html
@@ -1,14 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- type="date"
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ type="date"
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/DatePicker.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/DatePicker.html
index 993df6590633..805518b54f41 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/DatePicker.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/DatePicker.html
@@ -1,47 +1,47 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <div class="form-inline">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <formvh:form.datePicker
- id="{element.uniqueIdentifier}"
- property="{element.identifier}"
- dateFormat="{element.properties.dateFormat}"
- initialDate="{element.properties.initialDate}"
- enableDatePicker="{element.properties.enableDatePicker}"
- class="{element.properties.elementClassAttribute}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- previewMode="{element.rootForm.renderingOptions.previewMode}"
- />
- </f:render>
- <f:if condition="{element.properties.displayTimeSelector}">
- <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
- <label class="control-label" for="{element.uniqueIdentifier}-time">{formvh:translateElementProperty(element: element, property: 'timeSelectorHourLabel')}</label>
- <div class="{element.properties.containerClassAttribute}">
- <formvh:form.timePicker
- id="{element.uniqueIdentifier}-time"
- property="{element.identifier}"
- initialDate="{element.properties.initialDate}"
- class="{element.properties.timeSelectorClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- timeType="hour"
- />
- </div>
- </div>
- <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
- <label class="control-label" for="{element.uniqueIdentifier}-time-minute">{formvh:translateElementProperty(element: element, property: 'timeSelectorMinuteLabel')}</label>
- <div class="{element.properties.containerClassAttribute}">
- <formvh:form.timePicker
- id="{element.uniqueIdentifier}-time-minute"
- property="{element.identifier}"
- initialDate="{element.properties.initialDate}"
- class="{element.properties.timeSelectorClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- timeType="minute"
- />
- </div>
- </div>
- </f:if>
- </div>
+ <div class="form-inline">
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <formvh:form.datePicker
+ id="{element.uniqueIdentifier}"
+ property="{element.identifier}"
+ dateFormat="{element.properties.dateFormat}"
+ initialDate="{element.properties.initialDate}"
+ enableDatePicker="{element.properties.enableDatePicker}"
+ class="{element.properties.elementClassAttribute}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ previewMode="{element.rootForm.renderingOptions.previewMode}"
+ />
+ </f:render>
+ <f:if condition="{element.properties.displayTimeSelector}">
+ <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
+ <label class="control-label" for="{element.uniqueIdentifier}-time">{formvh:translateElementProperty(element: element, property: 'timeSelectorHourLabel')}</label>
+ <div class="{element.properties.containerClassAttribute}">
+ <formvh:form.timePicker
+ id="{element.uniqueIdentifier}-time"
+ property="{element.identifier}"
+ initialDate="{element.properties.initialDate}"
+ class="{element.properties.timeSelectorClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ timeType="hour"
+ />
+ </div>
+ </div>
+ <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
+ <label class="control-label" for="{element.uniqueIdentifier}-time-minute">{formvh:translateElementProperty(element: element, property: 'timeSelectorMinuteLabel')}</label>
+ <div class="{element.properties.containerClassAttribute}">
+ <formvh:form.timePicker
+ id="{element.uniqueIdentifier}-time-minute"
+ property="{element.identifier}"
+ initialDate="{element.properties.initialDate}"
+ class="{element.properties.timeSelectorClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ timeType="minute"
+ />
+ </div>
+ </div>
+ </f:if>
+ </div>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Email.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Email.html
index ef990d2f09fc..bf73704516f4 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Email.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Email.html
@@ -1,14 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- type="email"
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ type="email"
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Field/Field.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Field/Field.html
index 2f993fea7cd7..a732424712ff 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Field/Field.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Field/Field.html
@@ -1,25 +1,25 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:form.validationResults for="{element.rootForm.identifier}.{element.identifier}">
- <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
- <f:if condition="{doNotShowLabel} != 1">
- <label class="control-label" for="{element.uniqueIdentifier}">{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
- </f:if>
- <div class="{element.properties.containerClassAttribute}">
- <f:format.raw>
- {elementContent}
- <f:if condition="{validationResults.flattenedErrors}">
- <span class="error help-block" role="alert">
- <f:for each="{validationResults.errors}" as="error">
- {formvh:translateElementError(element: element, error: error)}
- <br />
- </f:for>
- </span>
- </f:if>
- </f:format.raw>
- <f:if condition="{element.properties.elementDescription}">
- <span class="help-block">{formvh:translateElementProperty(element: element, property: 'elementDescription')}</span>
- </f:if>
- </div>
- </div>
+ <div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
+ <f:if condition="{doNotShowLabel} != 1">
+ <label class="control-label" for="{element.uniqueIdentifier}">{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
+ </f:if>
+ <div class="{element.properties.containerClassAttribute}">
+ <f:format.raw>
+ {elementContent}
+ <f:if condition="{validationResults.flattenedErrors}">
+ <span class="error help-block" role="alert">
+ <f:for each="{validationResults.errors}" as="error">
+ {formvh:translateElementError(element: element, error: error)}
+ <br />
+ </f:for>
+ </span>
+ </f:if>
+ </f:format.raw>
+ <f:if condition="{element.properties.elementDescription}">
+ <span class="help-block">{formvh:translateElementProperty(element: element, property: 'elementDescription')}</span>
+ </f:if>
+ </div>
+ </div>
</f:form.validationResults>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Fieldset.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Fieldset.html
index eb999fb27e96..d39c2d7ffe5d 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Fieldset.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Fieldset.html
@@ -1,12 +1,12 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <fieldset id="{element.uniqueIdentifier}" class="form-group{f:if(condition: element.properties.elementClassAttribute, then: ' {element.properties.elementClassAttribute}')}">
- <f:if condition="{element.label}">
- <legend>{formvh:translateElementProperty(element: element, property: 'label')}</legend>
- </f:if>
- <f:for each="{element.elements}" as="element">
- <f:render partial="{element.templateName}" arguments="{element: element}" />
- </f:for>
- </fieldset>
+ <fieldset id="{element.uniqueIdentifier}" class="form-group{f:if(condition: element.properties.elementClassAttribute, then: ' {element.properties.elementClassAttribute}')}">
+ <f:if condition="{element.label}">
+ <legend>{formvh:translateElementProperty(element: element, property: 'label')}</legend>
+ </f:if>
+ <f:for each="{element.elements}" as="element">
+ <f:render partial="{element.templateName}" arguments="{element: element}" />
+ </f:for>
+ </fieldset>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/FileUpload.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/FileUpload.html
index e115f680f744..1750c1bcb672 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/FileUpload.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/FileUpload.html
@@ -1,21 +1,21 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <formvh:form.uploadedResource
- property="{element.identifier}"
- as="resource"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- accept="{element.properties.allowedMimeTypes}"
- >
- <f:if condition="{resource}">
- <div id="{element.uniqueIdentifier}-preview">
- {resource.originalResource.originalFile.name}
- </div>
- </f:if>
- </formvh:form.uploadedResource>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <formvh:form.uploadedResource
+ property="{element.identifier}"
+ as="resource"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ accept="{element.properties.allowedMimeTypes}"
+ >
+ <f:if condition="{resource}">
+ <div id="{element.uniqueIdentifier}-preview">
+ {resource.originalResource.originalFile.name}
+ </div>
+ </f:if>
+ </formvh:form.uploadedResource>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Form/Navigation.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Form/Navigation.html
index 5c4d33eb2e4d..0f71d5705f6d 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Form/Navigation.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Form/Navigation.html
@@ -1,28 +1,28 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<nav class="form-navigation">
- <div class="btn-toolbar" role="toolbar">
- <div class="btn-group" role="group">
- <f:if condition="{form.previousPage}">
- <span class="btn-group previous">
- <f:form.hidden property="__currentPage" value="{form.previousPage.index}" />
- <f:form.button type="button" onclick="document.forms['{form.formDefinition.identifier}'].submit();" class="btn btn-cancel" formnovalidate="formnovalidate">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'previousButtonLabel')}</f:form.button>
- </span>
- </f:if>
- <f:if condition="{form.nextPage}">
- <f:then>
- <span class="btn-group next">
- <f:form.button property="__currentPage" value="{form.nextPage.index}" class="btn btn-primary">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'nextButtonLabel')}</f:form.button>
- </span>
- </f:then>
- <f:else>
- <span class="btn-group next submit">
- <f:form.button property="__currentPage" value="{form.pages -> f:count()}" class="btn btn-primary">
- {formvh:translateElementProperty(element: form, renderingOptionProperty: 'submitButtonLabel')}
- </f:form.button>
- </span>
- </f:else>
- </f:if>
- </div>
- </div>
+ <div class="btn-toolbar" role="toolbar">
+ <div class="btn-group" role="group">
+ <f:if condition="{form.previousPage}">
+ <span class="btn-group previous">
+ <f:form.hidden property="__currentPage" value="{form.previousPage.index}" />
+ <f:form.button type="button" onclick="document.forms['{form.formDefinition.identifier}'].submit();" class="btn btn-cancel" formnovalidate="formnovalidate">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'previousButtonLabel')}</f:form.button>
+ </span>
+ </f:if>
+ <f:if condition="{form.nextPage}">
+ <f:then>
+ <span class="btn-group next">
+ <f:form.button property="__currentPage" value="{form.nextPage.index}" class="btn btn-primary">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'nextButtonLabel')}</f:form.button>
+ </span>
+ </f:then>
+ <f:else>
+ <span class="btn-group next submit">
+ <f:form.button property="__currentPage" value="{form.pages -> f:count()}" class="btn btn-primary">
+ {formvh:translateElementProperty(element: form, renderingOptionProperty: 'submitButtonLabel')}
+ </f:form.button>
+ </span>
+ </f:else>
+ </f:if>
+ </div>
+ </div>
</nav>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/GridContainer.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/GridContainer.html
index 35fdcad33df4..277bf9a8ca57 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/GridContainer.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/GridContainer.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <div class="{f:if(condition: element.properties.elementClassAttribute, then: '{element.properties.elementClassAttribute}')}">
- <f:for each="{element.elements}" as="element">
- <f:render partial="{element.templateName}" arguments="{element: element}" />
- </f:for>
- </div>
+ <div class="{f:if(condition: element.properties.elementClassAttribute, then: '{element.properties.elementClassAttribute}')}">
+ <f:for each="{element.elements}" as="element">
+ <f:render partial="{element.templateName}" arguments="{element: element}" />
+ </f:for>
+ </div>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/GridRow.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/GridRow.html
index 4770cbc90de0..058c9232dc73 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/GridRow.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/GridRow.html
@@ -1,11 +1,11 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <div class="{f:if(condition: element.properties.elementClassAttribute, then: '{element.properties.elementClassAttribute}')}">
- <f:for each="{element.elements}" as="element">
- <div class="{formvh:gridColumnClassAutoConfiguration(element: element)}">
- <f:render partial="{element.templateName}" arguments="{element: element}" />
- </div>
- </f:for>
- </div>
+ <div class="{f:if(condition: element.properties.elementClassAttribute, then: '{element.properties.elementClassAttribute}')}">
+ <f:for each="{element.elements}" as="element">
+ <div class="{formvh:gridColumnClassAutoConfiguration(element: element)}">
+ <f:render partial="{element.templateName}" arguments="{element: element}" />
+ </div>
+ </f:for>
+ </div>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Hidden.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Hidden.html
index 05110639ba2f..ec4fd0d43e28 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Hidden.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Hidden.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:form.hidden
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
+ <f:form.hidden
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Honeypot.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Honeypot.html
index 40927ed9aebb..cc9a1c7ac322 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Honeypot.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Honeypot.html
@@ -1,10 +1,10 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{element.properties.renderAsHiddenField}">
- <f:then>
- <f:form.hidden property="{element.identifier}" id="{element.uniqueIdentifier}" additionalAttributes="{autocomplete: 'off'}" />
- </f:then>
- <f:else>
- <f:form.textfield property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" additionalAttributes="{autocomplete: 'off', aria-hidden: 'true'}" tabindex="-1" style="{element.properties.styleAttribute}" />
- </f:else>
+ <f:then>
+ <f:form.hidden property="{element.identifier}" id="{element.uniqueIdentifier}" additionalAttributes="{autocomplete: 'off'}" />
+ </f:then>
+ <f:else>
+ <f:form.textfield property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" additionalAttributes="{autocomplete: 'off', aria-hidden: 'true'}" tabindex="-1" style="{element.properties.styleAttribute}" />
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/ImageUpload.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/ImageUpload.html
index 8df613a6ee48..44f94824a86c 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/ImageUpload.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/ImageUpload.html
@@ -1,23 +1,23 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <formvh:form.uploadedResource
- property="{element.identifier}"
- as="image"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- accept="{element.properties.allowedMimeTypes}"
- >
- <f:if condition="{image}">
- <div id="{element.uniqueIdentifier}-preview">
- <a href="{f:uri.image(image: image, maxWidth: element.properties.imageLinkMaxWidth)}" class="{element.properties.elementClassAttribute}">
- <f:image image="{image}" maxWidth="{element.properties.imageMaxWidth}" maxHeight="{element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: element, property: 'altText')}" />
- </a>
- </div>
- </f:if>
- </formvh:form.uploadedResource>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <formvh:form.uploadedResource
+ property="{element.identifier}"
+ as="image"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ accept="{element.properties.allowedMimeTypes}"
+ >
+ <f:if condition="{image}">
+ <div id="{element.uniqueIdentifier}-preview">
+ <a href="{f:uri.image(image: image, maxWidth: element.properties.imageLinkMaxWidth)}" class="{element.properties.elementClassAttribute}">
+ <f:image image="{image}" maxWidth="{element.properties.imageMaxWidth}" maxHeight="{element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: element, property: 'altText')}" />
+ </a>
+ </div>
+ </f:if>
+ </formvh:form.uploadedResource>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiCheckbox.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiCheckbox.html
index cce2ead6ee17..57ce3286a3fa 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiCheckbox.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiCheckbox.html
@@ -1,24 +1,24 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <div id="{element.uniqueIdentifier}" class="inputs-list">
- <f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
- <div class="form-check">
- <label class="form-check-label" for="{element.uniqueIdentifier}-{idIterator.index}">
- <f:form.checkbox
- property="{element.identifier}"
- multiple="1"
- id="{element.uniqueIdentifier}-{idIterator.index}"
- class="{element.properties.elementClassAttribute}"
- value="{value}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- <span>{formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}</span>
- </label>
- </div>
- </f:for>
- </div>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <div id="{element.uniqueIdentifier}" class="inputs-list">
+ <f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
+ <div class="form-check">
+ <label class="form-check-label" for="{element.uniqueIdentifier}-{idIterator.index}">
+ <f:form.checkbox
+ property="{element.identifier}"
+ multiple="1"
+ id="{element.uniqueIdentifier}-{idIterator.index}"
+ class="{element.properties.elementClassAttribute}"
+ value="{value}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ <span>{formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}</span>
+ </label>
+ </div>
+ </f:for>
+ </div>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiSelect.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiSelect.html
index 0e60910ae0a5..116c48f89bce 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiSelect.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/MultiSelect.html
@@ -1,33 +1,33 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:if condition="{element.properties.prependOptionLabel}">
- <f:then>
- <f:form.select
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- options="{formvh:translateElementProperty(element: element, property: 'options')}"
- multiple="multiple"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- prependOptionLabel="{formvh:translateElementProperty(element: element, property: 'prependOptionLabel')}"
- prependOptionValue="{formvh:translateElementProperty(element: element, property: 'prependOptionValue')}"
- />
- </f:then>
- <f:else>
- <f:form.select
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- options="{formvh:translateElementProperty(element: element, property: 'options')}"
- multiple="multiple"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:else>
- </f:if>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:if condition="{element.properties.prependOptionLabel}">
+ <f:then>
+ <f:form.select
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ options="{formvh:translateElementProperty(element: element, property: 'options')}"
+ multiple="multiple"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ prependOptionLabel="{formvh:translateElementProperty(element: element, property: 'prependOptionLabel')}"
+ prependOptionValue="{formvh:translateElementProperty(element: element, property: 'prependOptionValue')}"
+ />
+ </f:then>
+ <f:else>
+ <f:form.select
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ options="{formvh:translateElementProperty(element: element, property: 'options')}"
+ multiple="multiple"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:else>
+ </f:if>
- </f:render>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Number.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Number.html
index b33884e12f6a..0792460b13ed 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Number.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Number.html
@@ -1,14 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- type="number"
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ type="number"
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Page.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Page.html
index 190d01ca3464..487abdf764c0 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Page.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Page.html
@@ -1,10 +1,10 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{page}">
- <f:if condition="{page.label}">
- <h2>{formvh:translateElementProperty(element: page, property: 'label')}</h2>
- </f:if>
- <f:for each="{page.elements}" as="element">
- <f:render partial="{element.templateName}" arguments="{element: element}" />
- </f:for>
+ <f:if condition="{page.label}">
+ <h2>{formvh:translateElementProperty(element: page, property: 'label')}</h2>
+ </f:if>
+ <f:for each="{page.elements}" as="element">
+ <f:render partial="{element.templateName}" arguments="{element: element}" />
+ </f:for>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Password.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Password.html
index b43f5fdbfcbb..2d3cf90bf6ea 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Password.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Password.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.password
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.password
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/RadioButton.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/RadioButton.html
index 2f60429446aa..8e635c882d08 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/RadioButton.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/RadioButton.html
@@ -1,28 +1,28 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
- <label class="control-label">{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
- <div class="{element.properties.containerClassAttribute}">
- <div id="{element.uniqueIdentifier}" class="inputs-list">
- <div class="form-group">
- <f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
- <div class="radio">
- <label for="{element.uniqueIdentifier}-{idIterator.index}">
- <f:form.radio
- property="{element.identifier}"
- id="{element.uniqueIdentifier}-{idIterator.index}"
- class="{element.properties.elementClassAttribute} form-check-input"
- value="{value}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- <span>{formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}</span>
- </label>
- </div>
- </f:for>
- </div>
- </div>
- </div>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
+ <label class="control-label">{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
+ <div class="{element.properties.containerClassAttribute}">
+ <div id="{element.uniqueIdentifier}" class="inputs-list">
+ <div class="form-group">
+ <f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
+ <div class="radio">
+ <label for="{element.uniqueIdentifier}-{idIterator.index}">
+ <f:form.radio
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}-{idIterator.index}"
+ class="{element.properties.elementClassAttribute} form-check-input"
+ value="{value}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ <span>{formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}</span>
+ </label>
+ </div>
+ </f:for>
+ </div>
+ </div>
+ </div>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/SingleSelect.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/SingleSelect.html
index 73a68ff5dfb5..d917ba290786 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/SingleSelect.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/SingleSelect.html
@@ -1,30 +1,30 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:if condition="{element.properties.prependOptionLabel}">
- <f:then>
- <f:form.select
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- options="{formvh:translateElementProperty(element: element, property: 'options')}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- prependOptionLabel="{formvh:translateElementProperty(element: element, property: 'prependOptionLabel')}"
- prependOptionValue="{formvh:translateElementProperty(element: element, property: 'prependOptionValue')}"
- />
- </f:then>
- <f:else>
- <f:form.select
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- options="{formvh:translateElementProperty(element: element, property: 'options')}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:else>
- </f:if>
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:if condition="{element.properties.prependOptionLabel}">
+ <f:then>
+ <f:form.select
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ options="{formvh:translateElementProperty(element: element, property: 'options')}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ prependOptionLabel="{formvh:translateElementProperty(element: element, property: 'prependOptionLabel')}"
+ prependOptionValue="{formvh:translateElementProperty(element: element, property: 'prependOptionValue')}"
+ />
+ </f:then>
+ <f:else>
+ <f:form.select
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ options="{formvh:translateElementProperty(element: element, property: 'options')}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:else>
+ </f:if>
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/StaticText.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/StaticText.html
index 1241e9c73ea7..02ac607f2586 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/StaticText.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/StaticText.html
@@ -1,12 +1,12 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <div class="clearfix">
- <f:if condition="{element.label}">
- <h2>{formvh:translateElementProperty(element: element, property: 'label')}</h2>
- </f:if>
- <f:if condition="{element.properties.text}">
- <p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>{formvh:translateElementProperty(element: element, property: 'text') -> f:format.nl2br()}</p>
- </f:if>
- </div>
+ <div class="clearfix">
+ <f:if condition="{element.label}">
+ <h2>{formvh:translateElementProperty(element: element, property: 'label')}</h2>
+ </f:if>
+ <f:if condition="{element.properties.text}">
+ <p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>{formvh:translateElementProperty(element: element, property: 'text') -> f:format.nl2br()}</p>
+ </f:if>
+ </div>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/SummaryPage.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/SummaryPage.html
index 3ef043d8989f..cb7954df3134 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/SummaryPage.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/SummaryPage.html
@@ -1,46 +1,46 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{page}">
- <fieldset class="form-group">
- <f:if condition="{page.label}">
- <legend>{formvh:translateElementProperty(element: page, property: 'label')}</legend>
- </f:if>
- <div class="table-responsive">
- <table class="table">
- <formvh:renderAllFormValues renderable="{page.rootForm}" as="formValue">
- <tr>
- <td class="summary-table-first-col">{formvh:translateElementProperty(element: formValue.element, property: 'label')}</td>
- <td>
- <f:if condition="{formValue.value}">
- <f:then>
- <f:if condition="{0: formValue.element.type} == {0: 'ImageUpload'}">
- <f:then>
- <f:image image="{formValue.value}" maxWidth="{formValue.element.properties.imageMaxWidth}" maxHeight="{formValue.element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: formValue.element, property: 'altText')}" />
- </f:then>
- <f:else>
- <f:if condition="{formValue.isMultiValue}">
- <f:then>
- <ul>
- <f:for each="{formValue.processedValue}" as="value">
- <li>{value}</li>
- </f:for>
- </ul>
- </f:then>
- <f:else>
- <f:format.nl2br>{formValue.processedValue}</f:format.nl2br>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </tr>
- </formvh:renderAllFormValues>
- </table>
- </div>
- </fieldset>
+ <fieldset class="form-group">
+ <f:if condition="{page.label}">
+ <legend>{formvh:translateElementProperty(element: page, property: 'label')}</legend>
+ </f:if>
+ <div class="table-responsive">
+ <table class="table">
+ <formvh:renderAllFormValues renderable="{page.rootForm}" as="formValue">
+ <tr>
+ <td class="summary-table-first-col">{formvh:translateElementProperty(element: formValue.element, property: 'label')}</td>
+ <td>
+ <f:if condition="{formValue.value}">
+ <f:then>
+ <f:if condition="{0: formValue.element.type} == {0: 'ImageUpload'}">
+ <f:then>
+ <f:image image="{formValue.value}" maxWidth="{formValue.element.properties.imageMaxWidth}" maxHeight="{formValue.element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: formValue.element, property: 'altText')}" />
+ </f:then>
+ <f:else>
+ <f:if condition="{formValue.isMultiValue}">
+ <f:then>
+ <ul>
+ <f:for each="{formValue.processedValue}" as="value">
+ <li>{value}</li>
+ </f:for>
+ </ul>
+ </f:then>
+ <f:else>
+ <f:format.nl2br>{formValue.processedValue}</f:format.nl2br>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </tr>
+ </formvh:renderAllFormValues>
+ </table>
+ </div>
+ </fieldset>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Telephone.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Telephone.html
index 61abe450e611..44e3d1cba7a5 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Telephone.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Telephone.html
@@ -1,14 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- type="tel"
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ type="tel"
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Text.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Text.html
index b997ec6b1748..2a21557d0ef5 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Text.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Text.html
@@ -1,13 +1,13 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Textarea.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Textarea.html
index 757f3e881e56..814b9160265d 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Textarea.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Textarea.html
@@ -1,15 +1,15 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textarea
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- rows="{element.properties.rows}"
- cols="{element.properties.cols}"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textarea
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ rows="{element.properties.rows}"
+ cols="{element.properties.cols}"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Partials/Url.html b/typo3/sysext/form/Resources/Private/Frontend/Partials/Url.html
index a62891b13949..33f6b223d899 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Partials/Url.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Partials/Url.html
@@ -1,14 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
- <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
- <f:form.textfield
- type="url"
- property="{element.identifier}"
- id="{element.uniqueIdentifier}"
- class="{element.properties.elementClassAttribute} form-control"
- errorClass="{element.properties.elementErrorClassAttribute}"
- additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
- />
- </f:render>
+ <f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+ <f:form.textfield
+ type="url"
+ property="{element.identifier}"
+ id="{element.uniqueIdentifier}"
+ class="{element.properties.elementClassAttribute} form-control"
+ errorClass="{element.properties.elementErrorClassAttribute}"
+ additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+ />
+ </f:render>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Html.html b/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Html.html
index 7edd598e69e6..84714539e97f 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Html.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Html.html
@@ -2,44 +2,44 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title></title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="format-detection" content="telephone=no">
+ <title></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="format-detection" content="telephone=no">
</head>
<body>
- <table width="600" cellpadding="0" cellspacing="0" border="0">
- <formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue">
- <tr>
- <td width="600" valign="top" align="left">{formvh:translateElementProperty(element: formValue.element, property: 'label')}</td>
- <td width="600" valign="top" align="left">
- <f:if condition="{formValue.value}">
- <f:then>
- <f:if condition="{formValue.isMultiValue}">
- <f:then>
- <table cellspacing="0" border="0">
- <f:for each="{formValue.processedValue}" as="value">
- <tr>
- <td>{value}</td>
- </tr>
- </f:for>
- </table>
- </f:then>
- <f:else>
- <table cellspacing="0" border="0">
- <tr>
- <td><f:format.nl2br>{formValue.processedValue}</f:format.nl2br></td>
- </tr>
- </table>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- -
- </f:else>
- </f:if>
- </td>
- </tr>
- </formvh:renderAllFormValues>
- </table>
+ <table width="600" cellpadding="0" cellspacing="0" border="0">
+ <formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue">
+ <tr>
+ <td width="600" valign="top" align="left">{formvh:translateElementProperty(element: formValue.element, property: 'label')}</td>
+ <td width="600" valign="top" align="left">
+ <f:if condition="{formValue.value}">
+ <f:then>
+ <f:if condition="{formValue.isMultiValue}">
+ <f:then>
+ <table cellspacing="0" border="0">
+ <f:for each="{formValue.processedValue}" as="value">
+ <tr>
+ <td>{value}</td>
+ </tr>
+ </f:for>
+ </table>
+ </f:then>
+ <f:else>
+ <table cellspacing="0" border="0">
+ <tr>
+ <td><f:format.nl2br>{formValue.processedValue}</f:format.nl2br></td>
+ </tr>
+ </table>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ -
+ </f:else>
+ </f:if>
+ </td>
+ </tr>
+ </formvh:renderAllFormValues>
+ </table>
</body>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Templates/Form.html b/typo3/sysext/form/Resources/Private/Frontend/Templates/Form.html
index 0f9551b5a7e7..e9c7fc402649 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Templates/Form.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Templates/Form.html
@@ -1,20 +1,20 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{form}">
- <formvh:form
- object="{form}"
- action="{form.renderingOptions.controllerAction}"
- method="{form.renderingOptions.httpMethod}"
- id="{form.identifier}"
- section="{form.identifier}"
- enctype="{form.renderingOptions.httpEnctype}"
- addQueryString="{form.renderingOptions.addQueryString}"
- argumentsToBeExcludedFromQueryString="{form.renderingOptions.argumentsToBeExcludedFromQueryString}"
- additionalParams="{form.renderingOptions.additionalParams}"
- >
- <f:render partial="{form.currentPage.templateName}" arguments="{page: form.currentPage}" />
- <div class="actions">
- <f:render partial="Form/Navigation" arguments="{form: form}" />
- </div>
- </formvh:form>
+ <formvh:form
+ object="{form}"
+ action="{form.renderingOptions.controllerAction}"
+ method="{form.renderingOptions.httpMethod}"
+ id="{form.identifier}"
+ section="{form.identifier}"
+ enctype="{form.renderingOptions.httpEnctype}"
+ addQueryString="{form.renderingOptions.addQueryString}"
+ argumentsToBeExcludedFromQueryString="{form.renderingOptions.argumentsToBeExcludedFromQueryString}"
+ additionalParams="{form.renderingOptions.additionalParams}"
+ >
+ <f:render partial="{form.currentPage.templateName}" arguments="{page: form.currentPage}" />
+ <div class="actions">
+ <f:render partial="Form/Navigation" arguments="{form: form}" />
+ </div>
+ </formvh:form>
</formvh:renderRenderable>
</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Templates/Render.html b/typo3/sysext/form/Resources/Private/Frontend/Templates/Render.html
index f814ff3e7134..cc038bdbd981 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Templates/Render.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Templates/Render.html
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:flashMessages />
<f:if condition="{formConfiguration}">
- <formvh:render overrideConfiguration="{formConfiguration}" />
+ <formvh:render overrideConfiguration="{formConfiguration}" />
</f:if>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Layouts/Default.html b/typo3/sysext/impexp/Resources/Private/Layouts/Default.html
index 58f06163d621..0d9fa7416b80 100644
--- a/typo3/sysext/impexp/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/impexp/Resources/Private/Layouts/Default.html
@@ -1,8 +1,8 @@
<form action="{moduleUrl}" method="post" id="ImportExportController" enctype="multipart/form-data" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
- <f:form.hidden name="id" value="{id}" />
+ <f:form.hidden name="id" value="{id}" />
- <h3><f:translate key="title_{inData.action}" /></h3>
+ <h3><f:translate key="title_{inData.action}" /></h3>
- <f:render section="content" />
+ <f:render section="content" />
</form>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/ContentOverview.html b/typo3/sysext/impexp/Resources/Private/Partials/ContentOverview.html
index 65e3965582ee..89ce31f0822a 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/ContentOverview.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/ContentOverview.html
@@ -1,98 +1,98 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{import.mode} == 'import'">
- <f:then>
- <h2>
- <f:if condition="{inData.import_file}">
- <f:then><f:translate key="importdata_structureHasBeenImported" /></f:then>
- <f:else>
- <f:if condition="{inData.file}">
- <f:translate key="filterpage_structureToBeImported" />
- </f:if>
- </f:else>
- </f:if>
- </h2>
- </f:then>
- <f:else>
- <f:if condition="{inData.action} == 'export'">
- <h2><f:translate key="execlistqu_structureToBeExported" /></h2>
- </f:if>
- </f:else>
+ <f:then>
+ <h2>
+ <f:if condition="{inData.import_file}">
+ <f:then><f:translate key="importdata_structureHasBeenImported" /></f:then>
+ <f:else>
+ <f:if condition="{inData.file}">
+ <f:translate key="filterpage_structureToBeImported" />
+ </f:if>
+ </f:else>
+ </f:if>
+ </h2>
+ </f:then>
+ <f:else>
+ <f:if condition="{inData.action} == 'export'">
+ <h2><f:translate key="execlistqu_structureToBeExported" /></h2>
+ </f:if>
+ </f:else>
</f:if>
<div>
- <f:if condition="{inData.excludeDisabled}">
- <f:else>
- <f:if condition="{inData.action} == 'export'">
- <f:form.button class="btn btn-default t3js-impexp-toggledisabled" type="button">
- <f:translate key="impexpcore_toggle_all_disabled_records" />
- </f:form.button>
- </f:if>
- </f:else>
- </f:if>
- <f:if condition="{contentOverview.dat.header.pagetree -> f:count()} > 0">
- <h3><f:translate key="impexpcore_displaycon_insidePagetree" /></h3>
- <table class="table table-striped table-hover t3js-impexp-preview">
- <tbody>
- <tr>
- <th><f:translate key="impexpcore_displaycon_controls" /></th>
- <th><f:translate key="impexpcore_displaycon_title" /></th>
- <th><f:translate key="impexpcore_displaycon_message" /></th>
- <f:if condition="{contentOverview.update}">
- <th><f:translate key="impexpcore_displaycon_updateMode" /></th>
- <th><f:translate key="impexpcore_displaycon_currentPath" /></th>
- </f:if>
- <f:if condition="{contentOverview.showDiff}">
- <th><f:translate key="impexpcore_displaycon_result" /></th>
- </f:if>
- </tr>
- <f:for each="{contentOverview.pagetreeLines}" as="line">
- <tr data-active="{line.active}">
- <td><f:format.raw>{line.controls}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.preCode}{line.title}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.message}</f:format.raw></td>
- <f:if condition="{contentOverview.update}">
- <td class="col-nowrap"><f:format.raw>{line.updateMode}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.updatePath}</f:format.raw></td>
- </f:if>
- <f:if condition="{contentOverview.showDiff}">
- <td><f:format.raw>{line.showDiffContent}</f:format.raw></td>
- </f:if>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
- <f:if condition="{contentOverview.remainingRecords -> f:count()} > 0">
- <h3><f:translate key="impexpcore_singlereco_outsidePagetree" /></h3>
- <table class="table table-striped table-hover t3js-impexp-preview">
- <tbody>
- <tr data-active="{line.active}">
- <th><f:translate key="impexpcore_displaycon_controls" /></th>
- <th><f:translate key="impexpcore_displaycon_title" /></th>
- <th><f:translate key="impexpcore_displaycon_message" /></th>
- <f:if condition="{contentOverview.update}">
- <th><f:translate key="impexpcore_displaycon_updateMode" /></th>
- <th><f:translate key="impexpcore_displaycon_currentPath" /></th>
- </f:if>
- <f:if condition="{contentOverview.showDiff}">
- <th><f:translate key="impexpcore_displaycon_result" /></th>
- </f:if>
- </tr>
- <f:for each="{contentOverview.remainingRecords}" as="line">
- <tr>
- <td><f:format.raw>{line.controls}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.preCode}{line.title}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.message}</f:format.raw></td>
- <f:if condition="{contentOverview.update}">
- <td class="col-nowrap"><f:format.raw>{line.updateMode}</f:format.raw></td>
- <td class="col-nowrap"><f:format.raw>{line.updatePath}</f:format.raw></td>
- </f:if>
- <f:if condition="{contentOverview.showDiff}">
- <td><f:format.raw>{line.showDiffContent}</f:format.raw></td>
- </f:if>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
+ <f:if condition="{inData.excludeDisabled}">
+ <f:else>
+ <f:if condition="{inData.action} == 'export'">
+ <f:form.button class="btn btn-default t3js-impexp-toggledisabled" type="button">
+ <f:translate key="impexpcore_toggle_all_disabled_records" />
+ </f:form.button>
+ </f:if>
+ </f:else>
+ </f:if>
+ <f:if condition="{contentOverview.dat.header.pagetree -> f:count()} > 0">
+ <h3><f:translate key="impexpcore_displaycon_insidePagetree" /></h3>
+ <table class="table table-striped table-hover t3js-impexp-preview">
+ <tbody>
+ <tr>
+ <th><f:translate key="impexpcore_displaycon_controls" /></th>
+ <th><f:translate key="impexpcore_displaycon_title" /></th>
+ <th><f:translate key="impexpcore_displaycon_message" /></th>
+ <f:if condition="{contentOverview.update}">
+ <th><f:translate key="impexpcore_displaycon_updateMode" /></th>
+ <th><f:translate key="impexpcore_displaycon_currentPath" /></th>
+ </f:if>
+ <f:if condition="{contentOverview.showDiff}">
+ <th><f:translate key="impexpcore_displaycon_result" /></th>
+ </f:if>
+ </tr>
+ <f:for each="{contentOverview.pagetreeLines}" as="line">
+ <tr data-active="{line.active}">
+ <td><f:format.raw>{line.controls}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.preCode}{line.title}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.message}</f:format.raw></td>
+ <f:if condition="{contentOverview.update}">
+ <td class="col-nowrap"><f:format.raw>{line.updateMode}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.updatePath}</f:format.raw></td>
+ </f:if>
+ <f:if condition="{contentOverview.showDiff}">
+ <td><f:format.raw>{line.showDiffContent}</f:format.raw></td>
+ </f:if>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
+ <f:if condition="{contentOverview.remainingRecords -> f:count()} > 0">
+ <h3><f:translate key="impexpcore_singlereco_outsidePagetree" /></h3>
+ <table class="table table-striped table-hover t3js-impexp-preview">
+ <tbody>
+ <tr data-active="{line.active}">
+ <th><f:translate key="impexpcore_displaycon_controls" /></th>
+ <th><f:translate key="impexpcore_displaycon_title" /></th>
+ <th><f:translate key="impexpcore_displaycon_message" /></th>
+ <f:if condition="{contentOverview.update}">
+ <th><f:translate key="impexpcore_displaycon_updateMode" /></th>
+ <th><f:translate key="impexpcore_displaycon_currentPath" /></th>
+ </f:if>
+ <f:if condition="{contentOverview.showDiff}">
+ <th><f:translate key="impexpcore_displaycon_result" /></th>
+ </f:if>
+ </tr>
+ <f:for each="{contentOverview.remainingRecords}" as="line">
+ <tr>
+ <td><f:format.raw>{line.controls}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.preCode}{line.title}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.message}</f:format.raw></td>
+ <f:if condition="{contentOverview.update}">
+ <td class="col-nowrap"><f:format.raw>{line.updateMode}</f:format.raw></td>
+ <td class="col-nowrap"><f:format.raw>{line.updatePath}</f:format.raw></td>
+ </f:if>
+ <f:if condition="{contentOverview.showDiff}">
+ <td><f:format.raw>{line.showDiffContent}</f:format.raw></td>
+ </f:if>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Export/AdvancedOptions.html b/typo3/sysext/impexp/Resources/Private/Partials/Export/AdvancedOptions.html
index deb86f09be28..2548f6f744c8 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Export/AdvancedOptions.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Export/AdvancedOptions.html
@@ -1,30 +1,30 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h4><f:translate key="makeadvanc_softReferences" /></h4>
<div class="form-group">
- <f:be.buttons.csh table="xMOD_tx_impexp" field="htmlCssResources"><f:translate key="makeadvanc_excludeHtmlCssFile" /></f:be.buttons.csh>
- <label for="checkExcludeHTMLfileResources">
- <f:form.checkbox name="tx_impexp[excludeHTMLfileResources]" id="checkExcludeHTMLfileResources" value="1" checked="{inData.excludeHTMLfileResources} == 1" />
- </label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="htmlCssResources"><f:translate key="makeadvanc_excludeHtmlCssFile" /></f:be.buttons.csh>
+ <label for="checkExcludeHTMLfileResources">
+ <f:form.checkbox name="tx_impexp[excludeHTMLfileResources]" id="checkExcludeHTMLfileResources" value="1" checked="{inData.excludeHTMLfileResources} == 1" />
+ </label>
</div>
<h4><f:translate key="makeadvanc_files" /></h4>
<div class="form-group">
- <label for="saveFilesOutsideExportFile">
- <f:form.checkbox name="tx_impexp[saveFilesOutsideExportFile]" id="saveFilesOutsideExportFile" value="1" checked="{inData.saveFilesOutsideExportFile} == 1" />
- <f:translate key="makeadvanc_saveFilesOutsideExportFile" />
- <f:translate key="makeadvanc_saveFilesOutsideExportFile_limit" />
- </label>
+ <label for="saveFilesOutsideExportFile">
+ <f:form.checkbox name="tx_impexp[saveFilesOutsideExportFile]" id="saveFilesOutsideExportFile" value="1" checked="{inData.saveFilesOutsideExportFile} == 1" />
+ <f:translate key="makeadvanc_saveFilesOutsideExportFile" />
+ <f:translate key="makeadvanc_saveFilesOutsideExportFile_limit" />
+ </label>
</div>
<h4><f:translate key="makeadvanc_extensionDependencies" /></h4>
<div class="form-group">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="extensionDependencies"><f:translate key="makeadvanc_selectExtensionsThatThe" /></f:be.buttons.csh>
- </label>
- <f:form.select class="form-control" name="tx_impexp[extension_dep]" multiple="multiple"
- size="{f:if(condition: '{extensions -> f:count()} > 9', then: '10', else: '5')}"
- options="{extensions}" value="{inData.extension_dep}"/>
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="extensionDependencies"><f:translate key="makeadvanc_selectExtensionsThatThe" /></f:be.buttons.csh>
+ </label>
+ <f:form.select class="form-control" name="tx_impexp[extension_dep]" multiple="multiple"
+ size="{f:if(condition: '{extensions -> f:count()} > 9', then: '10', else: '5')}"
+ options="{extensions}" value="{inData.extension_dep}"/>
</div>
<div class="form-group">
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_update')}" />
- <f:form.hidden name="tx_impexp[download_export_name]" value="{nameSuggestion -> f:format.crop(maxCharacters: 30, append: '')}" />
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_update')}" />
+ <f:form.hidden name="tx_impexp[download_export_name]" value="{nameSuggestion -> f:format.crop(maxCharacters: 30, append: '')}" />
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html b/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
index 38c937a48a63..08e3f8e5c733 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
@@ -1,139 +1,139 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h3>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeCfg"><f:translate key="makeconfig_exportPagetreeConfiguration" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeCfg"><f:translate key="makeconfig_exportPagetreeConfiguration" /></f:be.buttons.csh>
</h3>
<div class="row">
- <div class="col-sm-2">
- <label class="control-label"><f:translate key="makeconfig_pageId" /></label>
- </div>
- <div class="col-sm-10">
- {inData.pagetree.id}
- <f:form.hidden value="{inData.pagetree.id}" name="tx_impexp[pagetree][id]" />
- </div>
+ <div class="col-sm-2">
+ <label class="control-label"><f:translate key="makeconfig_pageId" /></label>
+ </div>
+ <div class="col-sm-10">
+ {inData.pagetree.id}
+ <f:form.hidden value="{inData.pagetree.id}" name="tx_impexp[pagetree][id]" />
+ </div>
</div>
<div class="row">
- <div class="col-sm-2">
- <label class="control-label">
- <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeDisplay"><f:translate key="makeconfig_tree" /></f:be.buttons.csh>
- </label>
- </div>
- <div class="col-sm-10">
- <f:if condition="{treeHTML}">
- <f:then><f:format.raw>{treeHTML}</f:format.raw></f:then>
- <f:else><f:translate key="makeconfig_noTreeExportedOnly" /></f:else>
- </f:if>
- </div>
+ <div class="col-sm-2">
+ <label class="control-label">
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeDisplay"><f:translate key="makeconfig_tree" /></f:be.buttons.csh>
+ </label>
+ </div>
+ <div class="col-sm-10">
+ <f:if condition="{treeHTML}">
+ <f:then><f:format.raw>{treeHTML}</f:format.raw></f:then>
+ <f:else><f:translate key="makeconfig_noTreeExportedOnly" /></f:else>
+ </f:if>
+ </div>
</div>
<div class="form-group">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeMode"><f:translate key="makeconfig_levels" /></f:be.buttons.csh>
- </label>
- <f:form.select class="form-control" name="tx_impexp[pagetree][levels]" options="{levelSelectOptions}" value="{inData.pagetree.levels}" />
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeMode"><f:translate key="makeconfig_levels" /></f:be.buttons.csh>
+ </label>
+ <f:form.select class="form-control" name="tx_impexp[pagetree][levels]" options="{levelSelectOptions}" value="{inData.pagetree.levels}" />
</div>
<div class="form-group">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeRecordLimit"><f:translate key="makeconfig_includeTables" /></f:be.buttons.csh>
- </label>
- <f:form.select class="form-control" name="tx_impexp[pagetree][tables]"
- options="{tableSelectOptions}" multiple="multiple" value="{inData.pagetree.tables}"
- size="{f:if(condition: '{tableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeRecordLimit"><f:translate key="makeconfig_includeTables" /></f:be.buttons.csh>
+ </label>
+ <f:form.select class="form-control" name="tx_impexp[pagetree][tables]"
+ options="{tableSelectOptions}" multiple="multiple" value="{inData.pagetree.tables}"
+ size="{f:if(condition: '{tableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
</div>
<f:if condition="{records -> f:count()} > 0">
- <h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="singleRecord"><f:translate key="makeconfig_exportSingleRecord" /></f:be.buttons.csh>
- </h4>
- <div class="row">
- <div class="col-sm-2">
- <label><f:translate key="makeconfig_record" /></label>
- </div>
- <div class="col-sm-10">
- <f:for each="{records}" as="record">
- <f:format.raw>{record.icon}</f:format.raw>
- {record.title}
- <f:form.hidden name="tx_impexp[record][]" value="{record.tableName}:{record.recordUid}" />
- <br />
- </f:for>
- </div>
- </div>
+ <h4>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="singleRecord"><f:translate key="makeconfig_exportSingleRecord" /></f:be.buttons.csh>
+ </h4>
+ <div class="row">
+ <div class="col-sm-2">
+ <label><f:translate key="makeconfig_record" /></label>
+ </div>
+ <div class="col-sm-10">
+ <f:for each="{records}" as="record">
+ <f:format.raw>{record.icon}</f:format.raw>
+ {record.title}
+ <f:form.hidden name="tx_impexp[record][]" value="{record.tableName}:{record.recordUid}" />
+ <br />
+ </f:for>
+ </div>
+ </div>
</f:if>
<f:if condition="{tableList -> f:count()} > 0">
- <h4><f:translate key="makeconfig_exportTablesFromPages" /></h4>
- <div class="row">
- <div class="col-sm-2">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="tableList"><f:translate key="makeconfig_tablePids" /></f:be.buttons.csh>
- </label>
- </div>
- <div class="col-sm-10">
- <f:for each="{tableList}" as="table">
- <f:format.raw>{table.iconAndTitle}</f:format.raw>
- <f:form.hidden name="tx_impexp[list][]" value="{table.reference}" />
- <br />
- </f:for>
- </div>
- </div>
+ <h4><f:translate key="makeconfig_exportTablesFromPages" /></h4>
+ <div class="row">
+ <div class="col-sm-2">
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="tableList"><f:translate key="makeconfig_tablePids" /></f:be.buttons.csh>
+ </label>
+ </div>
+ <div class="col-sm-10">
+ <f:for each="{tableList}" as="table">
+ <f:format.raw>{table.iconAndTitle}</f:format.raw>
+ <f:form.hidden name="tx_impexp[list][]" value="{table.reference}" />
+ <br />
+ </f:for>
+ </div>
+ </div>
</f:if>
<h4><f:translate key="makeconfig_relationsAndExclusions" /></h4>
<div class="form-group">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="inclRelations"><f:translate key="makeconfig_includeRelationsToTables" /></f:be.buttons.csh>
- </label>
- <f:form.select class="form-control" name="tx_impexp[external_ref][tables]"
- options="{externalReferenceTableSelectOptions}" multiple="multiple" value="{inData.external_ref.tables}"
- size="{f:if(condition: '{externalReferenceTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="inclRelations"><f:translate key="makeconfig_includeRelationsToTables" /></f:be.buttons.csh>
+ </label>
+ <f:form.select class="form-control" name="tx_impexp[external_ref][tables]"
+ options="{externalReferenceTableSelectOptions}" multiple="multiple" value="{inData.external_ref.tables}"
+ size="{f:if(condition: '{externalReferenceTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
</div>
<div class="form-group">
- <label>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="staticRelations"><f:translate key="makeconfig_useStaticRelationsFor" /></f:be.buttons.csh>
- </label>
- <f:form.select class="form-control" name="tx_impexp[external_static][tables]"
- options="{externalStaticTableSelectOptions}" multiple="multiple" value="{inData.external_static.tables}"
- size="{f:if(condition: '{externalStaticTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
+ <label>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="staticRelations"><f:translate key="makeconfig_useStaticRelationsFor" /></f:be.buttons.csh>
+ </label>
+ <f:form.select class="form-control" name="tx_impexp[external_static][tables]"
+ options="{externalStaticTableSelectOptions}" multiple="multiple" value="{inData.external_static.tables}"
+ size="{f:if(condition: '{externalStaticTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
</div>
<div class="form-group">
- <label for="checkShowStaticRelations">
- <f:form.checkbox name="tx_impexp[showStaticRelations]" id="checkShowStaticRelations" value="1"
- checked="{inData.showStaticRelations} == 1" />
- <f:translate key="makeconfig_showStaticRelations" />
- </label>
+ <label for="checkShowStaticRelations">
+ <f:form.checkbox name="tx_impexp[showStaticRelations]" id="checkShowStaticRelations" value="1"
+ checked="{inData.showStaticRelations} == 1" />
+ <f:translate key="makeconfig_showStaticRelations" />
+ </label>
</div>
<div class="form-group">
- <label class="control-label">
- <f:be.buttons.csh table="xMOD_tx_impexp" field="excludedElements"><f:translate key="makeconfig_excludeElements" /></f:be.buttons.csh>
- </label>
- <p class="form-control-static">
- <f:if condition="{inData.exclude -> f:count()} > 0">
- <f:then>
- <f:for each="{inData.exclude}" key="key" as="value" iteration="index">
- <f:form.hidden name="tx_impexp[exclude][{key}]" value="1" />
- <f:if condition="{index.isLast}">
- <f:then>{key}</f:then>
- <f:else>{key}, </f:else>
- </f:if>
- </f:for>
- <label for="checkExclude">
- <input type="checkbox" name="tx_impexp[exclude]" id="checkExclude" value="1" />
- <f:translate key="makeconfig_clearAllExclusions" />
- </label>
- </f:then>
- <f:else>
- <f:translate key="makeconfig_noManuallyExcludedElementsYet" />
- </f:else>
- </f:if>
- </p>
- <p class="form-control-static">
- <label for="checkExcludeDisabled">
- <f:form.checkbox name="tx_impexp[excludeDisabled]" id="checkExcludeDisabled" value="1" checked="{inData.excludeDisabled}" />
- <f:translate key="makeconfig_excludeDisabledElements" />
- </label>
- </p>
+ <label class="control-label">
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="excludedElements"><f:translate key="makeconfig_excludeElements" /></f:be.buttons.csh>
+ </label>
+ <p class="form-control-static">
+ <f:if condition="{inData.exclude -> f:count()} > 0">
+ <f:then>
+ <f:for each="{inData.exclude}" key="key" as="value" iteration="index">
+ <f:form.hidden name="tx_impexp[exclude][{key}]" value="1" />
+ <f:if condition="{index.isLast}">
+ <f:then>{key}</f:then>
+ <f:else>{key}, </f:else>
+ </f:if>
+ </f:for>
+ <label for="checkExclude">
+ <input type="checkbox" name="tx_impexp[exclude]" id="checkExclude" value="1" />
+ <f:translate key="makeconfig_clearAllExclusions" />
+ </label>
+ </f:then>
+ <f:else>
+ <f:translate key="makeconfig_noManuallyExcludedElementsYet" />
+ </f:else>
+ </f:if>
+ </p>
+ <p class="form-control-static">
+ <label for="checkExcludeDisabled">
+ <f:form.checkbox name="tx_impexp[excludeDisabled]" id="checkExcludeDisabled" value="1" checked="{inData.excludeDisabled}" />
+ <f:translate key="makeconfig_excludeDisabledElements" />
+ </label>
+ </p>
</div>
<div class="form-group">
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'makeadvanc_update')}" />
- <f:form.hidden
- name="tx_impexp[download_export_name]"
- value="{nameSuggestion -> f:format.crop(maxCharacters: 30, append: '')}" />
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'makeadvanc_update')}" />
+ <f:form.hidden
+ name="tx_impexp[download_export_name]"
+ value="{nameSuggestion -> f:format.crop(maxCharacters: 30, append: '')}" />
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Export/Save.html b/typo3/sysext/impexp/Resources/Private/Partials/Export/Save.html
index e2b37d4c2cb7..2da3729380c9 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Export/Save.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Export/Save.html
@@ -1,75 +1,75 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h3>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="presets"><f:translate key="makesavefo_presets" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="presets"><f:translate key="makesavefo_presets" /></f:be.buttons.csh>
</h3>
<div class="form-group">
- <label for="preset-select"><f:translate key="makesavefo_selectPreset" /></label>
- <f:form.select class="form-control" id="preset-select" name="preset[select]" options="{presetSelectOptions}" />
+ <label for="preset-select"><f:translate key="makesavefo_selectPreset" /></label>
+ <f:form.select class="form-control" id="preset-select" name="preset[select]" options="{presetSelectOptions}" />
</div>
<div class="form-group">
- <f:form.hidden name="not-set" value="1" id="t3js-submit-field" />
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_load')}" name="preset[load]" />
- <f:form.button class="btn btn-default t3js-confirm-trigger"
- type="button" name="preset[save]"
- data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
- <f:translate key="makesavefo_save" />
- </f:form.button>
- <f:form.button class="btn btn-default t3js-confirm-trigger"
- type="button" name="preset[delete]"
- data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
- <f:translate key="makesavefo_delete" />
- </f:form.button>
- <f:form.button class="btn btn-default t3js-confirm-trigger"
- type="button" name="preset[merge]"
- data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
- <f:translate key="makesavefo_merge" />
- </f:form.button>
+ <f:form.hidden name="not-set" value="1" id="t3js-submit-field" />
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_load')}" name="preset[load]" />
+ <f:form.button class="btn btn-default t3js-confirm-trigger"
+ type="button" name="preset[save]"
+ data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
+ <f:translate key="makesavefo_save" />
+ </f:form.button>
+ <f:form.button class="btn btn-default t3js-confirm-trigger"
+ type="button" name="preset[delete]"
+ data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
+ <f:translate key="makesavefo_delete" />
+ </f:form.button>
+ <f:form.button class="btn btn-default t3js-confirm-trigger"
+ type="button" name="preset[merge]"
+ data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
+ <f:translate key="makesavefo_merge" />
+ </f:form.button>
</div>
<div class="form-group">
- <label for="preset-title"><f:translate key="makesavefo_titleOfNewPreset" /></label>
- <f:form.textfield class="form-control" id="preset-title" name="tx_impexp[preset][title]" value="{inData.preset.title}" />
+ <label for="preset-title"><f:translate key="makesavefo_titleOfNewPreset" /></label>
+ <f:form.textfield class="form-control" id="preset-title" name="tx_impexp[preset][title]" value="{inData.preset.title}" />
</div>
<div class="form-group">
- <label for="checkPresetPublic">
- <f:form.checkbox name="tx_impexp[preset][public]" id="checkPresetPublic" value="1"
- checked="{inData.preset.public} == 1" />
- <f:translate key="makesavefo_public" />
- </label>
+ <label for="checkPresetPublic">
+ <f:form.checkbox name="tx_impexp[preset][public]" id="checkPresetPublic" value="1"
+ checked="{inData.preset.public} == 1" />
+ <f:translate key="makesavefo_public" />
+ </label>
</div>
<h3><f:translate key="makesavefo_outputOptions" /></h3>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="metadata"><f:translate key="makesavefo_metaData" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="metadata"><f:translate key="makesavefo_metaData" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <label for="meta-title"><f:translate key="makesavefo_title" /></label>
- <f:form.textfield class="form-control" name="tx_impexp[meta][title]" id="meta-title" value="{inData.meta.title}" />
+ <label for="meta-title"><f:translate key="makesavefo_title" /></label>
+ <f:form.textfield class="form-control" name="tx_impexp[meta][title]" id="meta-title" value="{inData.meta.title}" />
</div>
<div class="form-group">
- <label for="meta-description"><f:translate key="makesavefo_description" /></label>
- <f:form.textfield class="form-control" name="tx_impexp[meta][description]" id="meta-description" value="{inData.meta.description}" />
+ <label for="meta-description"><f:translate key="makesavefo_description" /></label>
+ <f:form.textfield class="form-control" name="tx_impexp[meta][description]" id="meta-description" value="{inData.meta.description}" />
</div>
<div class="form-group">
- <label for="meta-notes"><f:translate key="makesavefo_notes" /></label>
- <f:form.textarea class="form-control" name="tx_impexp[meta][notes]" id="meta-notes" value="{inData.meta.notes}" />
+ <label for="meta-notes"><f:translate key="makesavefo_notes" /></label>
+ <f:form.textarea class="form-control" name="tx_impexp[meta][notes]" id="meta-notes" value="{inData.meta.notes}" />
</div>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="fileFormat"><f:translate key="makesavefo_fileFormat" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="fileFormat"><f:translate key="makesavefo_fileFormat" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <f:form.select class="form-control" name="tx_impexp[filetype]" options="{filetypeSelectOptions}" value="{inData.filetype}" />
+ <f:form.select class="form-control" name="tx_impexp[filetype]" options="{filetypeSelectOptions}" value="{inData.filetype}" />
</div>
<div class="form-group">
- <label for="impexp-filename"><f:translate key="makesavefo_filenameSavedInS" arguments="{0: saveFolder}" /></label>
- <f:form.textfield class="form-control" name="tx_impexp[filename]" id="impexp-filename" value="{inData.filename}" />
+ <label for="impexp-filename"><f:translate key="makesavefo_filenameSavedInS" arguments="{0: saveFolder}" /></label>
+ <f:form.textfield class="form-control" name="tx_impexp[filename]" id="impexp-filename" value="{inData.filename}" />
</div>
<div class="form-group">
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_update')}" /> -
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_downloadExport')}" name="tx_impexp[download_export]" />
- <f:if condition="{hasSaveFolder}">
- - <f:form.submit class="btn btn-default" value="{f:translate(key: 'importdata_saveToFilename')}" name="tx_impexp[save_export]" />
- </f:if>
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_update')}" /> -
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_downloadExport')}" name="tx_impexp[download_export]" />
+ <f:if condition="{hasSaveFolder}">
+ - <f:form.submit class="btn btn-default" value="{f:translate(key: 'importdata_saveToFilename')}" name="tx_impexp[save_export]" />
+ </f:if>
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Import/Import.html b/typo3/sysext/impexp/Resources/Private/Partials/Import/Import.html
index d89f6ee8b83d..76df2de25724 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Import/Import.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Import/Import.html
@@ -1,110 +1,110 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h3><f:translate key="importdata_selectFileToImport" /></h3>
<div class="form-group">
- <label for="impexp-file">
- <f:be.buttons.csh table="xMOD_tx_impexp" field="importFile"><f:translate key="importdata_file" /></f:be.buttons.csh>
- </label>
- <f:form.select name="tx_impexp[file]" class="form-control" id="impexp-file" value="{inData.file}" options="{fileSelectOptions}" />
- <p class="help-block">{importPath}</p>
- <f:if condition="{import.compress}">
- <f:else><span class="text-danger"><f:translate key="importdata_noteNoDecompressorAvailable" /></span></f:else>
- </f:if>
+ <label for="impexp-file">
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="importFile"><f:translate key="importdata_file" /></f:be.buttons.csh>
+ </label>
+ <f:form.select name="tx_impexp[file]" class="form-control" id="impexp-file" value="{inData.file}" options="{fileSelectOptions}" />
+ <p class="help-block">{importPath}</p>
+ <f:if condition="{import.compress}">
+ <f:else><span class="text-danger"><f:translate key="importdata_noteNoDecompressorAvailable" /></span></f:else>
+ </f:if>
</div>
<h3><f:translate key="importdata_importOptions" /></h3>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="update"><f:translate key="importdata_update" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="update"><f:translate key="importdata_update" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <label for="checkDo_update">
- <f:form.checkbox name="tx_impexp[do_update]" id="checkDo_update" value="1" checked="{inData.do_update} == 1" />
- <f:translate key="importdata_updateRecords" />
- </label>
- <p class="help-block">(<f:translate key="importdata_thisOptionRequiresThat" />)</p>
+ <label for="checkDo_update">
+ <f:form.checkbox name="tx_impexp[do_update]" id="checkDo_update" value="1" checked="{inData.do_update} == 1" />
+ <f:translate key="importdata_updateRecords" />
+ </label>
+ <p class="help-block">(<f:translate key="importdata_thisOptionRequiresThat" />)</p>
</div>
<f:if condition="{inData.do_update}">
- <div class="form-group">
- <label for="checkGlobal_ignore_pid">
- <f:form.checkbox name="tx_impexp[global_ignore_pid]" id="checkGlobal_ignore_pid" value="1" checked="{inData.global_ignore_pid} == 1" />
- <f:translate key="importdata_ignorePidDifferencesGlobally" />
- </label>
- <p class="help-block">(<f:translate key="importdata_ifYouSetThis" />)</p>
- </div>
+ <div class="form-group">
+ <label for="checkGlobal_ignore_pid">
+ <f:form.checkbox name="tx_impexp[global_ignore_pid]" id="checkGlobal_ignore_pid" value="1" checked="{inData.global_ignore_pid} == 1" />
+ <f:translate key="importdata_ignorePidDifferencesGlobally" />
+ </label>
+ <p class="help-block">(<f:translate key="importdata_ifYouSetThis" />)</p>
+ </div>
</f:if>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="options"><f:translate key="importdata_options" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="options"><f:translate key="importdata_options" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <label for="checkNotShowDiff">
- <f:form.checkbox name="tx_impexp[notShowDiff]" id="checkNotShowDiff" value="1" checked="{inData.notShowDiff} == 1" />
- <f:translate key="importdata_doNotShowDifferences" />
- </label>
- <p class="help-block">(<f:translate key="importdata_greenValuesAreFrom" />)</p>
+ <label for="checkNotShowDiff">
+ <f:form.checkbox name="tx_impexp[notShowDiff]" id="checkNotShowDiff" value="1" checked="{inData.notShowDiff} == 1" />
+ <f:translate key="importdata_doNotShowDifferences" />
+ </label>
+ <p class="help-block">(<f:translate key="importdata_greenValuesAreFrom" />)</p>
</div>
<f:if condition="{isAdmin}">
- <div class="form-group">
- <label for="checkAllowPHPScripts">
- <f:form.checkbox name="tx_impexp[allowPHPScripts]" id="checkAllowPHPScripts" value="1"
- checked="{inData.allowPHPScripts} == 1" />
- <f:translate key="importdata_allowToWriteBanned" />
- </label>
- </div>
- <f:if condition="!{inData.do_update}">
- <div class="form-group">
- <label for="checkForce_all_UIDS">
- <f:form.checkbox name="tx_impexp[force_all_UIDS]" id="checkForce_all_UIDS" value="1"
- checked="{inData.force_all_UIDS} == 1" />
- <span class="text-danger">
- <f:translate key="importdata_force_all_UIDS" />
- </span>
- </label>
- <p class="help-block">(<f:translate key="importdata_force_all_UIDS_descr" />)</p>
- </div>
- </f:if>
+ <div class="form-group">
+ <label for="checkAllowPHPScripts">
+ <f:form.checkbox name="tx_impexp[allowPHPScripts]" id="checkAllowPHPScripts" value="1"
+ checked="{inData.allowPHPScripts} == 1" />
+ <f:translate key="importdata_allowToWriteBanned" />
+ </label>
+ </div>
+ <f:if condition="!{inData.do_update}">
+ <div class="form-group">
+ <label for="checkForce_all_UIDS">
+ <f:form.checkbox name="tx_impexp[force_all_UIDS]" id="checkForce_all_UIDS" value="1"
+ checked="{inData.force_all_UIDS} == 1" />
+ <span class="text-danger">
+ <f:translate key="importdata_force_all_UIDS" />
+ </span>
+ </label>
+ <p class="help-block">(<f:translate key="importdata_force_all_UIDS_descr" />)</p>
+ </div>
+ </f:if>
</f:if>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="action"><f:translate key="importdata_action" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="action"><f:translate key="importdata_action" /></f:be.buttons.csh>
</h4>
<f:if condition="{inData.import_file}">
- <f:then>
- <f:form.submit class="btn btn-default" name="tx_impexp[new_import]" value="{f:translate(key: 'importdata_newImport')}" />
- </f:then>
- <f:else>
- <f:form.submit class="btn btn-default" value="{f:translate(key: 'importdata_preview')}" />
- <f:if condition="{inData.file}">
- - <f:form.hidden name="not-set" value="1" id="t3js-submit-field" />
- <f:if condition="{inData.do_update}">
- <f:then>
- <f:form.button class="btn btn-default t3js-confirm-trigger"
- type="button" name="tx_impexp[import_file]"
- data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
- <f:translate key="importdata_update_299e" />
- </f:form.button>
- </f:then>
- <f:else>
- <f:form.button class="btn btn-default t3js-confirm-trigger"
- type="button" name="tx_impexp[import_file]"
- data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
- <f:translate key="importdata_import" />
- </f:form.button>
- </f:else>
- </f:if>
- </f:if>
- </f:else>
+ <f:then>
+ <f:form.submit class="btn btn-default" name="tx_impexp[new_import]" value="{f:translate(key: 'importdata_newImport')}" />
+ </f:then>
+ <f:else>
+ <f:form.submit class="btn btn-default" value="{f:translate(key: 'importdata_preview')}" />
+ <f:if condition="{inData.file}">
+ - <f:form.hidden name="not-set" value="1" id="t3js-submit-field" />
+ <f:if condition="{inData.do_update}">
+ <f:then>
+ <f:form.button class="btn btn-default t3js-confirm-trigger"
+ type="button" name="tx_impexp[import_file]"
+ data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
+ <f:translate key="importdata_update_299e" />
+ </f:form.button>
+ </f:then>
+ <f:else>
+ <f:form.button class="btn btn-default t3js-confirm-trigger"
+ type="button" name="tx_impexp[import_file]"
+ data="{title: '{f:translate(key: \'pleaseConfirm\')}', message: '{f:translate(key: \'makesavefo_areYouSure\')}'}">
+ <f:translate key="importdata_import" />
+ </f:form.button>
+ </f:else>
+ </f:if>
+ </f:if>
+ </f:else>
</f:if>
<f:form.hidden name="tx_impexp[action]" value="import" />
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="enableLogging"><f:translate key="importdata_enableLogging" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="enableLogging"><f:translate key="importdata_enableLogging" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <label for="checkEnableLogging">
- <f:form.checkbox name="tx_impexp[enableLogging]" id="checkEnableLogging" value="1"
- checked="{inData.enableLogging} == 1" />
- <f:translate key="importdata_writeIndividualDbActions" />
- </label>
- <p class="help-block">(<f:translate key="importdata_thisIsDisabledBy" />)</p>
+ <label for="checkEnableLogging">
+ <f:form.checkbox name="tx_impexp[enableLogging]" id="checkEnableLogging" value="1"
+ checked="{inData.enableLogging} == 1" />
+ <f:translate key="importdata_writeIndividualDbActions" />
+ </label>
+ <p class="help-block">(<f:translate key="importdata_thisIsDisabledBy" />)</p>
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html b/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
index 458341e3ceab..793b8cd5ee18 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
@@ -1,29 +1,29 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h3><f:translate key="importdata_metaData" /></h3>
<div class="table-fit table-fit-wrap">
- <table class="table table-striped table-hover">
- <tbody>
- <tr>
- <th class="col-nowrap"><f:translate key="importdata_title" /></th>
- <td><f:format.nl2br>{import.dat.header.meta.title}</f:format.nl2br></td>
- </tr>
- <tr>
- <th class="col-nowrap"><f:translate key="importdata_description" /></th>
- <td><f:format.nl2br>{import.dat.header.meta.description}</f:format.nl2br></td>
- </tr>
- <tr>
- <th class="col-nowrap"><f:translate key="importdata_notes" /></th>
- <td><f:format.nl2br>{import.dat.header.meta.notes}</f:format.nl2br></td>
- </tr>
- <tr>
- <th class="col-nowrap"><f:translate key="importdata_packager" /></th>
- <td>
- <f:format.nl2br>{import.dat.header.meta.packager_name} ({import.dat.header.meta.packager_username})</f:format.nl2br>
- <br/>
- <f:translate key="importdata_email" /> {import.dat.header.meta.packager_email}
- </td>
- </tr>
- </tbody>
- </table>
+ <table class="table table-striped table-hover">
+ <tbody>
+ <tr>
+ <th class="col-nowrap"><f:translate key="importdata_title" /></th>
+ <td><f:format.nl2br>{import.dat.header.meta.title}</f:format.nl2br></td>
+ </tr>
+ <tr>
+ <th class="col-nowrap"><f:translate key="importdata_description" /></th>
+ <td><f:format.nl2br>{import.dat.header.meta.description}</f:format.nl2br></td>
+ </tr>
+ <tr>
+ <th class="col-nowrap"><f:translate key="importdata_notes" /></th>
+ <td><f:format.nl2br>{import.dat.header.meta.notes}</f:format.nl2br></td>
+ </tr>
+ <tr>
+ <th class="col-nowrap"><f:translate key="importdata_packager" /></th>
+ <td>
+ <f:format.nl2br>{import.dat.header.meta.packager_name} ({import.dat.header.meta.packager_username})</f:format.nl2br>
+ <br/>
+ <f:translate key="importdata_email" /> {import.dat.header.meta.packager_email}
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html b/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
index 32dfdadc53a9..c09ff9a20fca 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
@@ -1,31 +1,31 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h3><f:translate key="importdata_uploadFileFromLocal" /></h3>
<h4>
- <f:be.buttons.csh table="xMOD_tx_impexp" field="upload"><f:translate key="importdata_browse" /></f:be.buttons.csh>
+ <f:be.buttons.csh table="xMOD_tx_impexp" field="upload"><f:translate key="importdata_browse" /></f:be.buttons.csh>
</h4>
<div class="form-group">
- <f:form.upload name="upload_1" />
- <f:form.hidden name="file[upload][1][target]" value="{tempFolder}" />
- <f:form.hidden name="file[upload][1][data]" value="1" />
+ <f:form.upload name="upload_1" />
+ <f:form.hidden name="file[upload][1][target]" value="{tempFolder}" />
+ <f:form.hidden name="file[upload][1][data]" value="1" />
</div>
<div class="form-group">
- <f:form.submit class="btn btn-default" name="_upload" value="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')}" />
+ <f:form.submit class="btn btn-default" name="_upload" value="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')}" />
</div>
<div class="form-group">
- <label for="checkOverwriteExistingFiles">
- <f:form.checkbox name="overwriteExistingFiles" id="checkOverwriteExistingFiles" value="replace" checked="checked" />
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:overwriteExistingFiles" />
- </label>
+ <label for="checkOverwriteExistingFiles">
+ <f:form.checkbox name="overwriteExistingFiles" id="checkOverwriteExistingFiles" value="replace" checked="checked" />
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:overwriteExistingFiles" />
+ </label>
</div>
<f:if condition="{submitted}">
- <h4><f:translate key="importdata_uploadStatus" /></h4>
- <f:if condition="{noFileUploaded}">
- <f:then>
- <f:be.infobox title="{f:translate(key: 'importdata_success')} {uploadedFile}" state="0" />
- </f:then>
- <f:else>
- <f:be.infobox title="{f:translate(key: 'importdata_failureNoFileUploaded')}" state="2" />
- </f:else>
- </f:if>
+ <h4><f:translate key="importdata_uploadStatus" /></h4>
+ <f:if condition="{noFileUploaded}">
+ <f:then>
+ <f:be.infobox title="{f:translate(key: 'importdata_success')} {uploadedFile}" state="0" />
+ </f:then>
+ <f:else>
+ <f:be.infobox title="{f:translate(key: 'importdata_failureNoFileUploaded')}" state="2" />
+ </f:else>
+ </f:if>
</f:if>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Export.html b/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Export.html
index bee1301a137a..119bf50aaa2f 100644
--- a/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Export.html
+++ b/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Export.html
@@ -1,71 +1,71 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
+ xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
<f:layout name="Default" />
<f:section name="content">
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="active">
- <a class="text-capitalize" href="#export-configuration" aria-controls="export-configuration" role="tab" data-toggle="tab">
- <f:translate key="tableselec_configuration" />
- </a>
- </li>
- <li role="presentation">
- <a class="text-capitalize" href="#export-filepreset" aria-controls="export-filepreset" role="tab" data-toggle="tab">
- <f:translate key="exportdata_filePreset" />
- </a>
- </li>
- <li role="presentation">
- <a class="text-capitalize" href="#export-advancedoptions" aria-controls="export-advancedoptions" role="tab" data-toggle="tab">
- <f:translate key="exportdata_advancedOptions" />
- </a>
- </li>
- <f:if condition="{errors -> f:count()} > 0">
- <li role="presentation">
- <a class="text-capitalize" href="#export-errors" aria-controls="export-errors" role="tab" data-toggle="tab">
- <f:translate key="exportdata_messages" />
- <core:icon identifier="status-dialog-warning" />
- </a>
- </li>
- </f:if>
- </ul>
- <div class="tab-content">
- <div role="tabpanel" class="tab-pane active" id="export-configuration">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Export/Configuration" arguments="{_all}"/>
- </div>
- </div>
- </div>
- <div role="tabpanel" class="tab-pane" id="export-filepreset">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Export/Save" arguments="{_all}"/>
- </div>
- </div>
- </div>
- <div role="tabpanel" class="tab-pane" id="export-advancedoptions">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Export/AdvancedOptions" arguments="{_all}"/>
- </div>
- </div>
- </div>
- <f:if condition="{errors -> f:count()} > 0">
- <div role="tabpanel" class="tab-pane" id="export-errors">
- <div class="panel panel-tab">
- <div class="panel-body">
- <div class="callout callout-danger">
- <f:for each="{errors}" as="error">
- <p>{error}</p>
- </f:for>
- </div>
- </div>
- </div>
- </div>
- </f:if>
- </div>
- <f:form.hidden name="tx_impexp[action]" value="export" />
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="active">
+ <a class="text-capitalize" href="#export-configuration" aria-controls="export-configuration" role="tab" data-toggle="tab">
+ <f:translate key="tableselec_configuration" />
+ </a>
+ </li>
+ <li role="presentation">
+ <a class="text-capitalize" href="#export-filepreset" aria-controls="export-filepreset" role="tab" data-toggle="tab">
+ <f:translate key="exportdata_filePreset" />
+ </a>
+ </li>
+ <li role="presentation">
+ <a class="text-capitalize" href="#export-advancedoptions" aria-controls="export-advancedoptions" role="tab" data-toggle="tab">
+ <f:translate key="exportdata_advancedOptions" />
+ </a>
+ </li>
+ <f:if condition="{errors -> f:count()} > 0">
+ <li role="presentation">
+ <a class="text-capitalize" href="#export-errors" aria-controls="export-errors" role="tab" data-toggle="tab">
+ <f:translate key="exportdata_messages" />
+ <core:icon identifier="status-dialog-warning" />
+ </a>
+ </li>
+ </f:if>
+ </ul>
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="export-configuration">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Export/Configuration" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="export-filepreset">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Export/Save" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="export-advancedoptions">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Export/AdvancedOptions" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ <f:if condition="{errors -> f:count()} > 0">
+ <div role="tabpanel" class="tab-pane" id="export-errors">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <div class="callout callout-danger">
+ <f:for each="{errors}" as="error">
+ <p>{error}</p>
+ </f:for>
+ </div>
+ </div>
+ </div>
+ </div>
+ </f:if>
+ </div>
+ <f:form.hidden name="tx_impexp[action]" value="export" />
- <f:render partial="ContentOverview" arguments="{_all}"/>
+ <f:render partial="ContentOverview" arguments="{_all}"/>
</f:section>
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Import.html b/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Import.html
index 4da03ca76f7d..29dada24163a 100644
--- a/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Import.html
+++ b/typo3/sysext/impexp/Resources/Private/Templates/ImportExport/Import.html
@@ -1,79 +1,79 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
+ xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
<f:layout name="Default" />
<f:section name="content">
- <f:flashMessages queueIdentifier="impexp.errors" />
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="active">
- <a class="text-capitalize" href="#import-import" aria-controls="import-import" role="tab" data-toggle="tab">
- <f:translate key="importdata_import" />
- </a>
- </li>
- <f:if condition="{hasTempUploadFolder}">
- <li role="presentation">
- <a class="text-capitalize" href="#import-upload" aria-controls="import-upload" role="tab" data-toggle="tab">
- <f:translate key="importdata_upload" />
- </a>
- </li>
- </f:if>
- <f:if condition="{metaDataInFileExists}">
- <li role="presentation">
- <a class="text-capitalize" href="#import-metadata" aria-controls="import-metadata" role="tab" data-toggle="tab">
- <f:translate key="importdata_metaData_1387" />
- </a>
- </li>
- </f:if>
- <f:if condition="{errors -> f:count()} > 0">
- <li role="presentation">
- <a class="text-capitalize" href="#import-errors" aria-controls="import-errors" role="tab" data-toggle="tab">
- <f:translate key="importdata_messages" />
- <core:icon identifier="status-dialog-warning" />
- </a>
- </li>
- </f:if>
- </ul>
- <div class="tab-content">
- <div role="tabpanel" class="tab-pane active" id="import-import">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Import/Import" arguments="{_all}"/>
- </div>
- </div>
- </div>
- <f:if condition="{hasTempUploadFolder}">
- <div role="tabpanel" class="tab-pane" id="import-upload">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Import/Upload" arguments="{_all}"/>
- </div>
- </div>
- </div>
- </f:if>
- <f:if condition="{metaDataInFileExists}">
- <div role="tabpanel" class="tab-pane" id="import-metadata">
- <div class="panel panel-tab">
- <div class="panel-body">
- <f:render partial="Import/MetaData" arguments="{_all}"/>
- </div>
- </div>
- </div>
- </f:if>
- <f:if condition="{errors -> f:count()} > 0">
- <div role="tabpanel" class="tab-pane" id="import-errors">
- <div class="panel panel-tab">
- <div class="panel-body">
- <div class="callout callout-danger">
- <f:for each="{errors}" as="error">
- <p>{error}</p>
- </f:for>
- </div>
- </div>
- </div>
- </div>
- </f:if>
- </div>
+ <f:flashMessages queueIdentifier="impexp.errors" />
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="active">
+ <a class="text-capitalize" href="#import-import" aria-controls="import-import" role="tab" data-toggle="tab">
+ <f:translate key="importdata_import" />
+ </a>
+ </li>
+ <f:if condition="{hasTempUploadFolder}">
+ <li role="presentation">
+ <a class="text-capitalize" href="#import-upload" aria-controls="import-upload" role="tab" data-toggle="tab">
+ <f:translate key="importdata_upload" />
+ </a>
+ </li>
+ </f:if>
+ <f:if condition="{metaDataInFileExists}">
+ <li role="presentation">
+ <a class="text-capitalize" href="#import-metadata" aria-controls="import-metadata" role="tab" data-toggle="tab">
+ <f:translate key="importdata_metaData_1387" />
+ </a>
+ </li>
+ </f:if>
+ <f:if condition="{errors -> f:count()} > 0">
+ <li role="presentation">
+ <a class="text-capitalize" href="#import-errors" aria-controls="import-errors" role="tab" data-toggle="tab">
+ <f:translate key="importdata_messages" />
+ <core:icon identifier="status-dialog-warning" />
+ </a>
+ </li>
+ </f:if>
+ </ul>
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="import-import">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Import/Import" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ <f:if condition="{hasTempUploadFolder}">
+ <div role="tabpanel" class="tab-pane" id="import-upload">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Import/Upload" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ </f:if>
+ <f:if condition="{metaDataInFileExists}">
+ <div role="tabpanel" class="tab-pane" id="import-metadata">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <f:render partial="Import/MetaData" arguments="{_all}"/>
+ </div>
+ </div>
+ </div>
+ </f:if>
+ <f:if condition="{errors -> f:count()} > 0">
+ <div role="tabpanel" class="tab-pane" id="import-errors">
+ <div class="panel panel-tab">
+ <div class="panel-body">
+ <div class="callout callout-danger">
+ <f:for each="{errors}" as="error">
+ <p>{error}</p>
+ </f:for>
+ </div>
+ </div>
+ </div>
+ </div>
+ </f:if>
+ </div>
- <f:render partial="ContentOverview" arguments="{_all}"/>
+ <f:render partial="ContentOverview" arguments="{_all}"/>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
index 0a57c964c1b5..c1c6426756f7 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
@@ -1,102 +1,102 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="tx-indexedsearch-searchbox">
- <f:form action="search" method="post" id="tx_indexedsearch" pageUid="{settings.targetPid}">
- <div class="tx-indexedsearch-hidden-fields">
- <f:form.hidden name="search[_sections]" value="0" />
- <f:form.hidden name="search[_freeIndexUid]" id="tx_indexedsearch_freeIndexUid" value="_" />
- <f:form.hidden name="search[pointer]" id="tx_indexedsearch_pointer" value="0" />
- <f:form.hidden name="search[ext]" value="{searchParams.ext}" />
- <f:form.hidden name="search[searchType]" value="{searchParams.searchType}" />
- <f:form.hidden name="search[defaultOperand]" value="{searchParams.defaultOperand}" />
- <f:form.hidden name="search[mediaType]" value="{searchParams.mediaType}" />
- <f:form.hidden name="search[sortOrder]" value="{searchParams.sortOrder}" />
- <f:form.hidden name="search[group]" value="{searchParams.group}" />
- <f:form.hidden name="search[languageUid]" value="{searchParams.languageUid}" />
- <f:form.hidden name="search[desc]" value="{searchParams.desc}" />
- <f:form.hidden name="search[numberOfResults]" value="{searchParams.numberOfResults}" />
- <f:form.hidden name="search[extendedSearch]" value="{searchParams.extendedSearch}" />
- </div>
- <fieldset>
- <legend><f:translate key="form.legend" /></legend>
- <div class="tx-indexedsearch-form">
- <label for="tx-indexedsearch-searchbox-sword"><f:translate key="form.searchFor" />:</label>
- <f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="tx-indexedsearch-searchbox-sword" />
- </div>
- <f:if condition="{searchParams.extendedSearch}">
- <f:if condition="{showTypeSearch}">
- <div class="tx-indexedsearch-search-for">
- <label for="tx-indexedsearch-selectbox-searchtype"><f:translate key="form.match" />:</label>
- <f:if condition="{allSearchTypes}">
- <f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="tx-indexedsearch-selectbox-searchtype" />
- </f:if>
- <f:if condition="{allDefaultOperands}">
- <f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="tx-indexedsearch-selectbox-defaultoperand" />
- </f:if>
- </div>
- </f:if>
- <f:if condition="{showMediaAndLanguageSearch}">
- <div class="tx-indexedsearch-search-in">
- <label for="tx-indexedsearch-selectbox-media"><f:translate key="form.searchIn" />:</label>
- <f:if condition="{allMediaTypes}">
- <f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="tx-indexedsearch-selectbox-media media" />
- </f:if>
- <f:if condition="{allLanguageUids}">
- <f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="tx-indexedsearch-selectbox-lang lang" />
- </f:if>
- </div>
- </f:if>
- <f:if condition="{allSections}">
- <div class="tx-indexedsearch-search-select-section">
- <label for="tx-indexedsearch-selectbox-sections"><f:translate key="form.fromSection" />:</label>
- <f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="tx-indexedsearch-selectbox-sections" />
- </div>
- </f:if>
- <f:if condition="{allIndexConfigurations}">
- <div class="tx-indexedsearch-search-freeindexuid">
- <label for="tx-indexedsearch-selectbox-freeIndexUid"><f:translate key="form.freeIndexUid" />:</label>
- <f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="tx-indexedsearch-selectbox-freeIndexUid" />
- </div>
- </f:if>
- <f:if condition="{showSortOrders}">
- <div class="tx-indexedsearch-search-select-order">
- <label for="tx-indexedsearch-selectbox-order"><f:translate key="form.orderBy" />:</label>
- <f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="tx-indexedsearch-selectbox-order" />
- <f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="tx-indexedsearch-selectbox-desc" />
- </div>
- </f:if>
- <f:if condition="{allNumberOfResults}">
- <div class="tx-indexedsearch-search-select-results">
- <label for="tx-indexedsearch-selectbox-results"><f:translate key="form.atATime" /></label>
- <f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="tx-indexedsearch-selectbox-results" />
- </div>
- </f:if>
- <f:if condition="{allGroups}">
- <div class="tx-indexedsearch-search-select-group">
- <label for="tx-indexedsearch-selectbox-group"><f:translate key="form.style" />:</label>
- <f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="tx-indexedsearch-selectbox-group" />
- <f:if condition="{settings.blind.extResume} == 0">
- <f:form.checkbox name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
- </f:if>
- </div>
- </f:if>
- </f:if>
- <div class="tx-indexedsearch-search-submit">
- <f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="tx-indexedsearch-searchbox-button" />
- </div>
- </fieldset>
- <f:if condition="{settings.displayAdvancedSearchLink}">
- <p>
- <f:if condition="{searchParams.extendedSearch}">
- <f:then>
- <f:link.action action="form" arguments="{search: {extendedSearch: 0}}"><f:translate key="form.linkToRegularSearch" /></f:link.action>
- </f:then>
- <f:else>
- <f:link.action action="form" arguments="{search: {extendedSearch: 1}}"><f:translate key="form.linkToAdvancedSearch" /></f:link.action>
- </f:else>
- </f:if>
- </p>
- </f:if>
- </f:form>
+ <f:form action="search" method="post" id="tx_indexedsearch" pageUid="{settings.targetPid}">
+ <div class="tx-indexedsearch-hidden-fields">
+ <f:form.hidden name="search[_sections]" value="0" />
+ <f:form.hidden name="search[_freeIndexUid]" id="tx_indexedsearch_freeIndexUid" value="_" />
+ <f:form.hidden name="search[pointer]" id="tx_indexedsearch_pointer" value="0" />
+ <f:form.hidden name="search[ext]" value="{searchParams.ext}" />
+ <f:form.hidden name="search[searchType]" value="{searchParams.searchType}" />
+ <f:form.hidden name="search[defaultOperand]" value="{searchParams.defaultOperand}" />
+ <f:form.hidden name="search[mediaType]" value="{searchParams.mediaType}" />
+ <f:form.hidden name="search[sortOrder]" value="{searchParams.sortOrder}" />
+ <f:form.hidden name="search[group]" value="{searchParams.group}" />
+ <f:form.hidden name="search[languageUid]" value="{searchParams.languageUid}" />
+ <f:form.hidden name="search[desc]" value="{searchParams.desc}" />
+ <f:form.hidden name="search[numberOfResults]" value="{searchParams.numberOfResults}" />
+ <f:form.hidden name="search[extendedSearch]" value="{searchParams.extendedSearch}" />
+ </div>
+ <fieldset>
+ <legend><f:translate key="form.legend" /></legend>
+ <div class="tx-indexedsearch-form">
+ <label for="tx-indexedsearch-searchbox-sword"><f:translate key="form.searchFor" />:</label>
+ <f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="tx-indexedsearch-searchbox-sword" />
+ </div>
+ <f:if condition="{searchParams.extendedSearch}">
+ <f:if condition="{showTypeSearch}">
+ <div class="tx-indexedsearch-search-for">
+ <label for="tx-indexedsearch-selectbox-searchtype"><f:translate key="form.match" />:</label>
+ <f:if condition="{allSearchTypes}">
+ <f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="tx-indexedsearch-selectbox-searchtype" />
+ </f:if>
+ <f:if condition="{allDefaultOperands}">
+ <f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="tx-indexedsearch-selectbox-defaultoperand" />
+ </f:if>
+ </div>
+ </f:if>
+ <f:if condition="{showMediaAndLanguageSearch}">
+ <div class="tx-indexedsearch-search-in">
+ <label for="tx-indexedsearch-selectbox-media"><f:translate key="form.searchIn" />:</label>
+ <f:if condition="{allMediaTypes}">
+ <f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="tx-indexedsearch-selectbox-media media" />
+ </f:if>
+ <f:if condition="{allLanguageUids}">
+ <f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="tx-indexedsearch-selectbox-lang lang" />
+ </f:if>
+ </div>
+ </f:if>
+ <f:if condition="{allSections}">
+ <div class="tx-indexedsearch-search-select-section">
+ <label for="tx-indexedsearch-selectbox-sections"><f:translate key="form.fromSection" />:</label>
+ <f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="tx-indexedsearch-selectbox-sections" />
+ </div>
+ </f:if>
+ <f:if condition="{allIndexConfigurations}">
+ <div class="tx-indexedsearch-search-freeindexuid">
+ <label for="tx-indexedsearch-selectbox-freeIndexUid"><f:translate key="form.freeIndexUid" />:</label>
+ <f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="tx-indexedsearch-selectbox-freeIndexUid" />
+ </div>
+ </f:if>
+ <f:if condition="{showSortOrders}">
+ <div class="tx-indexedsearch-search-select-order">
+ <label for="tx-indexedsearch-selectbox-order"><f:translate key="form.orderBy" />:</label>
+ <f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="tx-indexedsearch-selectbox-order" />
+ <f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="tx-indexedsearch-selectbox-desc" />
+ </div>
+ </f:if>
+ <f:if condition="{allNumberOfResults}">
+ <div class="tx-indexedsearch-search-select-results">
+ <label for="tx-indexedsearch-selectbox-results"><f:translate key="form.atATime" /></label>
+ <f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="tx-indexedsearch-selectbox-results" />
+ </div>
+ </f:if>
+ <f:if condition="{allGroups}">
+ <div class="tx-indexedsearch-search-select-group">
+ <label for="tx-indexedsearch-selectbox-group"><f:translate key="form.style" />:</label>
+ <f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="tx-indexedsearch-selectbox-group" />
+ <f:if condition="{settings.blind.extResume} == 0">
+ <f:form.checkbox name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
+ </f:if>
+ </div>
+ </f:if>
+ </f:if>
+ <div class="tx-indexedsearch-search-submit">
+ <f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="tx-indexedsearch-searchbox-button" />
+ </div>
+ </fieldset>
+ <f:if condition="{settings.displayAdvancedSearchLink}">
+ <p>
+ <f:if condition="{searchParams.extendedSearch}">
+ <f:then>
+ <f:link.action action="form" arguments="{search: {extendedSearch: 0}}"><f:translate key="form.linkToRegularSearch" /></f:link.action>
+ </f:then>
+ <f:else>
+ <f:link.action action="form" arguments="{search: {extendedSearch: 1}}"><f:translate key="form.linkToAdvancedSearch" /></f:link.action>
+ </f:else>
+ </f:if>
+ </p>
+ </f:if>
+ </f:form>
</div>
<f:render partial="Rules" />
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
index 20048d8b82f1..986dd49041ca 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
@@ -1,8 +1,8 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{settings.displayRules}">
- <div class="tx-indexedsearch-rules">
- <h2><f:translate key="rules.headline" /></h2>
- <p><f:format.raw><f:translate key="rules.text" /></f:format.raw></p>
- </div>
+ <div class="tx-indexedsearch-rules">
+ <h2><f:translate key="rules.headline" /></h2>
+ <p><f:format.raw><f:translate key="rules.text" /></f:format.raw></p>
+ </div>
</f:if>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
index 5a1955998dcd..c6db4603b809 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
@@ -1,33 +1,33 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="tx-indexedsearch-res">
- <h3>
- <span class="tx-indexedsearch-icon">{row.icon -> f:format.raw()}</span>
- <f:if condition="{settings.displayResultNumber}"><span class="tx-indexedsearch-result-number">{row.result_number}</span></f:if>
- <span class="tx-indexedsearch-title{row.CSSsuffix}">{row.title -> f:format.raw()}</span>
- <span class="tx-indexedsearch-percent">{row.rating}</span>
- </h3>
- <f:if condition="{row.headerOnly} == 0">
- <p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
- <dl class="tx-indexedsearch-info">
- <dt class="tx-indexedsearch-text-item-size"><f:translate key="result.size" /> </dt>
- <dd class="tx-indexedsearch-text-item-size">{row.size}</dd>
- <dt class="tx-indexedsearch-text-item-crdate"><f:translate key="result.created" /> </dt>
- <dd class="tx-indexedsearch-text-item-crdate"><f:format.date>@{row.created}</f:format.date></dd>
- <dt class="tx-indexedsearch-text-item-mtime"><f:translate key="result.modified" /> </dt>
- <dd class="tx-indexedsearch-text-item-mtime"><f:format.date>@{row.modified}</f:format.date></dd>
- <dt class="tx-indexedsearch-text-item-path"><f:translate key="result.path" /> </dt>
- <dd class="tx-indexedsearch-text-item-path"><f:format.html>{row.path}</f:format.html></dd>
- </dl>
- </f:if>
- <f:if condition="{row.headerOnly} == 1">
- <p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
- </f:if>
- <f:if condition="{row.subresults}">
- <p class="tx-indexedsearch-list">
- <f:for each="{row.subresults.items}" as="subrow">
- <f:render partial="Searchresult" arguments="{row: subrow}" />
- </f:for>
- </p>
- </f:if>
+ <h3>
+ <span class="tx-indexedsearch-icon">{row.icon -> f:format.raw()}</span>
+ <f:if condition="{settings.displayResultNumber}"><span class="tx-indexedsearch-result-number">{row.result_number}</span></f:if>
+ <span class="tx-indexedsearch-title{row.CSSsuffix}">{row.title -> f:format.raw()}</span>
+ <span class="tx-indexedsearch-percent">{row.rating}</span>
+ </h3>
+ <f:if condition="{row.headerOnly} == 0">
+ <p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
+ <dl class="tx-indexedsearch-info">
+ <dt class="tx-indexedsearch-text-item-size"><f:translate key="result.size" /> </dt>
+ <dd class="tx-indexedsearch-text-item-size">{row.size}</dd>
+ <dt class="tx-indexedsearch-text-item-crdate"><f:translate key="result.created" /> </dt>
+ <dd class="tx-indexedsearch-text-item-crdate"><f:format.date>@{row.created}</f:format.date></dd>
+ <dt class="tx-indexedsearch-text-item-mtime"><f:translate key="result.modified" /> </dt>
+ <dd class="tx-indexedsearch-text-item-mtime"><f:format.date>@{row.modified}</f:format.date></dd>
+ <dt class="tx-indexedsearch-text-item-path"><f:translate key="result.path" /> </dt>
+ <dd class="tx-indexedsearch-text-item-path"><f:format.html>{row.path}</f:format.html></dd>
+ </dl>
+ </f:if>
+ <f:if condition="{row.headerOnly} == 1">
+ <p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
+ </f:if>
+ <f:if condition="{row.subresults}">
+ <p class="tx-indexedsearch-list">
+ <f:for each="{row.subresults.items}" as="subrow">
+ <f:render partial="Searchresult" arguments="{row: subrow}" />
+ </f:for>
+ </p>
+ </f:if>
</div>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
index 95e3bd4808c1..f0db443aff10 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
@@ -2,68 +2,68 @@
<f:layout name="Administration" />
<f:section name="Content">
- <h2><f:translate key="administration.external.title" /></h2>
- <f:if condition="{records}">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="field.fileName" /></th>
- <th><f:translate key="field.fileSize" /></th>
- <th><f:translate key="field.wordCount" /></th>
- <th><f:translate key="field.mtime" /></th>
- <th><f:translate key="field.indexed" /></th>
- <th><f:translate key="field.updated" /></th>
- <th><f:translate key="field.parseTime" /></th>
- <th><f:translate key="field.groups" /></th>
- <th><f:translate key="field.sub" /></th>
- <th><f:translate key="field.cHash" /></th>
- <th><f:translate key="field.pHash" /></th>
- <th><f:translate key="field.path" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{records}" as="data">
- <tr>
- <td>
- <f:format.crop maxCharacters="30">{data.item_title}</f:format.crop>
- </td>
- <td>
- <f:format.bytes decimals="1">{data.item_size}</f:format.bytes>
- </td>
- <td>{data.numberOfWords}</td>
- <td>
- <is:format.dateTime>{data.item_mtime}</is:format.dateTime>
- </td>
- <td>
- <is:format.dateTime>{data.crdate}</is:format.dateTime>
- </td>
- <td>
- <f:if condition="{date.tstamp}=={date.crdate}">
- <f:then></f:then>
- <f:else>
- <is:format.dateTime>{data.tstamp}</is:format.dateTime>
- </f:else>
- </f:if>
- </td>
- <td>{data.parsetime}</td>
- <td>{data.numberOfSections}/{data.grList.0.pcount}/{data.numberOfFulltext}</td>
- <td>{data.pcount}</td>
- <td>
- <f:if condition="{data.cHashParams}">
- <f:for each="{data.cHashParams}" as="value" key="key">
- {key}={value}<br>
- </f:for>
- </f:if>
- </td>
- <td>{data.phash}</td>
- <td>
- <f:format.crop maxCharacters="100">{data.data_filename}</f:format.crop>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
+ <h2><f:translate key="administration.external.title" /></h2>
+ <f:if condition="{records}">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="field.fileName" /></th>
+ <th><f:translate key="field.fileSize" /></th>
+ <th><f:translate key="field.wordCount" /></th>
+ <th><f:translate key="field.mtime" /></th>
+ <th><f:translate key="field.indexed" /></th>
+ <th><f:translate key="field.updated" /></th>
+ <th><f:translate key="field.parseTime" /></th>
+ <th><f:translate key="field.groups" /></th>
+ <th><f:translate key="field.sub" /></th>
+ <th><f:translate key="field.cHash" /></th>
+ <th><f:translate key="field.pHash" /></th>
+ <th><f:translate key="field.path" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{records}" as="data">
+ <tr>
+ <td>
+ <f:format.crop maxCharacters="30">{data.item_title}</f:format.crop>
+ </td>
+ <td>
+ <f:format.bytes decimals="1">{data.item_size}</f:format.bytes>
+ </td>
+ <td>{data.numberOfWords}</td>
+ <td>
+ <is:format.dateTime>{data.item_mtime}</is:format.dateTime>
+ </td>
+ <td>
+ <is:format.dateTime>{data.crdate}</is:format.dateTime>
+ </td>
+ <td>
+ <f:if condition="{date.tstamp}=={date.crdate}">
+ <f:then></f:then>
+ <f:else>
+ <is:format.dateTime>{data.tstamp}</is:format.dateTime>
+ </f:else>
+ </f:if>
+ </td>
+ <td>{data.parsetime}</td>
+ <td>{data.numberOfSections}/{data.grList.0.pcount}/{data.numberOfFulltext}</td>
+ <td>{data.pcount}</td>
+ <td>
+ <f:if condition="{data.cHashParams}">
+ <f:for each="{data.cHashParams}" as="value" key="key">
+ {key}={value}<br>
+ </f:for>
+ </f:if>
+ </td>
+ <td>{data.phash}</td>
+ <td>
+ <f:format.crop maxCharacters="100">{data.data_filename}</f:format.crop>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
index edb19abd2da4..05c6a6499705 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
@@ -2,116 +2,116 @@
<f:layout name="Administration" />
<f:section name="Content">
- <p class="lead"><f:translate key="administration.index.description" /></p>
- <div class="row">
- <div class="col-md-6">
- <h4><f:translate key="administration.statistics.header" /></h4>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="administration.statistics.name" /></th>
- <th><f:translate key="administration.statistics.count" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{records}" as="count" key="name">
- <tr>
- <td>{name}</td>
- <td>{count}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- <div class="col-md-6">
- <h4><f:translate key="administration.statistics.headerTypes" /></h4>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="administration.statistics.name" /></th>
- <th><f:translate key="administration.statistics.count" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{phash}" as="data">
- <tr>
- <td>{data.name} ({data.type})</td>
- <td>{data.count} / {data.uniqueCount}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- </div>
- <h3>
- <f:translate key="administration.statistics.mostSearched.title" />
- </h3>
- <p>
- <f:translate key="administration.statistics.mostSearched.description" />
- </p>
- <f:if condition="{pageUid}">
- <f:then>
- <f:if condition="{all}">
- <f:then>
- <div class="row">
- <div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:all,title:'all'}" />
- </div>
- <div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:last24hours,title:'last24hours'}" />
- </div>
- <div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:last30days,title:'last30days'}" />
- </div>
- </div>
- </f:then>
- <f:else>
- <f:be.infobox>
- <f:translate key="administration.statistics.noResultForPage" />
- </f:be.infobox>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:be.infobox state="-1">
- <f:translate key="administration.statistics.selectPage" />
- </f:be.infobox>
- </f:else>
- </f:if>
+ <p class="lead"><f:translate key="administration.index.description" /></p>
+ <div class="row">
+ <div class="col-md-6">
+ <h4><f:translate key="administration.statistics.header" /></h4>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="administration.statistics.name" /></th>
+ <th><f:translate key="administration.statistics.count" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{records}" as="count" key="name">
+ <tr>
+ <td>{name}</td>
+ <td>{count}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ <div class="col-md-6">
+ <h4><f:translate key="administration.statistics.headerTypes" /></h4>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="administration.statistics.name" /></th>
+ <th><f:translate key="administration.statistics.count" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{phash}" as="data">
+ <tr>
+ <td>{data.name} ({data.type})</td>
+ <td>{data.count} / {data.uniqueCount}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <h3>
+ <f:translate key="administration.statistics.mostSearched.title" />
+ </h3>
+ <p>
+ <f:translate key="administration.statistics.mostSearched.description" />
+ </p>
+ <f:if condition="{pageUid}">
+ <f:then>
+ <f:if condition="{all}">
+ <f:then>
+ <div class="row">
+ <div class="col-md-4">
+ <f:render section="statistic" arguments="{statistic:all,title:'all'}" />
+ </div>
+ <div class="col-md-4">
+ <f:render section="statistic" arguments="{statistic:last24hours,title:'last24hours'}" />
+ </div>
+ <div class="col-md-4">
+ <f:render section="statistic" arguments="{statistic:last30days,title:'last30days'}" />
+ </div>
+ </div>
+ </f:then>
+ <f:else>
+ <f:be.infobox>
+ <f:translate key="administration.statistics.noResultForPage" />
+ </f:be.infobox>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="-1">
+ <f:translate key="administration.statistics.selectPage" />
+ </f:be.infobox>
+ </f:else>
+ </f:if>
</f:section>
<f:section name="statistic">
- <h4>
- <f:translate key="administration.statistics.mostSearched.{title}" />
- </h4>
- <f:if condition="{statistic}">
- <f:then>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th class="nowrap"> </th>
- <th><f:translate key="administration.statistics.word" /></th>
- <th><f:translate key="administration.statistics.count" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{statistic}" as="line" iteration="i">
- <tr>
- <td class="nowrap"><strong>{i.cycle}.</strong></td>
- <td>{line.word}</td>
- <td>{line.c}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:then>
- <f:else>
- <f:be.infobox state="2">
- <f:translate key="administration.statistics.noResult" />
- </f:be.infobox>
- </f:else>
- </f:if>
+ <h4>
+ <f:translate key="administration.statistics.mostSearched.{title}" />
+ </h4>
+ <f:if condition="{statistic}">
+ <f:then>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th class="nowrap"> </th>
+ <th><f:translate key="administration.statistics.word" /></th>
+ <th><f:translate key="administration.statistics.count" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{statistic}" as="line" iteration="i">
+ <tr>
+ <td class="nowrap"><strong>{i.cycle}.</strong></td>
+ <td>{line.word}</td>
+ <td>{line.c}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="2">
+ <f:translate key="administration.statistics.noResult" />
+ </f:be.infobox>
+ </f:else>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
index bdd2b93debd1..10f4ae31589b 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
@@ -2,84 +2,84 @@
<f:layout name="Administration" />
<f:section name="Content">
- <h2>Pages</h2>
- <f:if condition="{records}">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="field.id" />/<f:translate key="field.type" /></th>
- <th><f:translate key="field.title" /></th>
- <th><f:translate key="field.fileSize" /></th>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <th><f:translate key="field.wordCount" /></th>
- </f:if>
- <th><f:translate key="field.mtime" /></th>
- <th><f:translate key="field.indexed" /></th>
- <th><f:translate key="field.updated" /></th>
- <th><f:translate key="field.parseTime" /></th>
- <th><f:translate key="field.groups" /></th>
- <th><f:translate key="field.sub" /></th>
- <th><f:translate key="field.language" /></th>
- <th><f:translate key="field.cHash" /></th>
- <th><f:translate key="field.staticPageArguments" /></th>
- <th><f:translate key="field.pHash" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{records}" as="data">
- <tr>
- <td>
- {data.data_page_id}
- <f:if condition="{data.data_page_type}">/ {data.data_page_type}</f:if>
- {data.0}
- </td>
- <td>
- <f:format.crop maxCharacters="30">{data.item_title}</f:format.crop>
- </td>
- <td>
- <f:format.bytes decimals="1">{data.item_size}</f:format.bytes>
- </td>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <td>{data.numberOfWords}</td>
- </f:if>
- <td>
- <is:format.dateTime>{data.item_mtime}</is:format.dateTime>
- </td>
- <td>
- <is:format.dateTime>{data.crdate}</is:format.dateTime>
- </td>
- <td>
- <f:if condition="{date.tstamp}=={date.crdate}">
- <f:then></f:then>
- <f:else>
- <is:format.dateTime>{data.tstamp}</is:format.dateTime>
- </f:else>
- </f:if>
- </td>
- <td>{data.parsetime}</td>
- <td>{data.numberOfSections}/{data.grList.0.pcount}/{data.numberOfFulltext}</td>
- <td>{data.pcount} / {is:format.groupList(groups:data.grList)}</td>
- <td>{data.sys_language_uid}</td>
- <td>
- <f:if condition="{data.cHashParams}">
- <f:for each="{data.cHashParams}" as="value" key="key">
- {key}={value}<br>
- </f:for>
- </f:if>
- </td>
- <td>
- <f:if condition="{data.static_page_arguments}">
- <f:for each="{data.static_page_arguments}" as="value" key="key">
- {key}={value}<br>
- </f:for>
- </f:if>
- </td>
- <td>{data.phash}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
+ <h2>Pages</h2>
+ <f:if condition="{records}">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="field.id" />/<f:translate key="field.type" /></th>
+ <th><f:translate key="field.title" /></th>
+ <th><f:translate key="field.fileSize" /></th>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <th><f:translate key="field.wordCount" /></th>
+ </f:if>
+ <th><f:translate key="field.mtime" /></th>
+ <th><f:translate key="field.indexed" /></th>
+ <th><f:translate key="field.updated" /></th>
+ <th><f:translate key="field.parseTime" /></th>
+ <th><f:translate key="field.groups" /></th>
+ <th><f:translate key="field.sub" /></th>
+ <th><f:translate key="field.language" /></th>
+ <th><f:translate key="field.cHash" /></th>
+ <th><f:translate key="field.staticPageArguments" /></th>
+ <th><f:translate key="field.pHash" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{records}" as="data">
+ <tr>
+ <td>
+ {data.data_page_id}
+ <f:if condition="{data.data_page_type}">/ {data.data_page_type}</f:if>
+ {data.0}
+ </td>
+ <td>
+ <f:format.crop maxCharacters="30">{data.item_title}</f:format.crop>
+ </td>
+ <td>
+ <f:format.bytes decimals="1">{data.item_size}</f:format.bytes>
+ </td>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <td>{data.numberOfWords}</td>
+ </f:if>
+ <td>
+ <is:format.dateTime>{data.item_mtime}</is:format.dateTime>
+ </td>
+ <td>
+ <is:format.dateTime>{data.crdate}</is:format.dateTime>
+ </td>
+ <td>
+ <f:if condition="{date.tstamp}=={date.crdate}">
+ <f:then></f:then>
+ <f:else>
+ <is:format.dateTime>{data.tstamp}</is:format.dateTime>
+ </f:else>
+ </f:if>
+ </td>
+ <td>{data.parsetime}</td>
+ <td>{data.numberOfSections}/{data.grList.0.pcount}/{data.numberOfFulltext}</td>
+ <td>{data.pcount} / {is:format.groupList(groups:data.grList)}</td>
+ <td>{data.sys_language_uid}</td>
+ <td>
+ <f:if condition="{data.cHashParams}">
+ <f:for each="{data.cHashParams}" as="value" key="key">
+ {key}={value}<br>
+ </f:for>
+ </f:if>
+ </td>
+ <td>
+ <f:if condition="{data.static_page_arguments}">
+ <f:for each="{data.static_page_arguments}" as="value" key="key">
+ {key}={value}<br>
+ </f:for>
+ </f:if>
+ </td>
+ <td>{data.phash}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
index a19b18e6c6aa..b8961f0e5927 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
@@ -2,133 +2,133 @@
<f:layout name="Administration" />
<f:section name="Content">
- <f:if condition="{tree}">
- <f:then>
- <f:form name="statistic" action="statistic" class="form-horizontal" arguments="{id:pageUid}">
- <div class="form-group">
- <div class="col-sm-12">
- <f:form.select name="mode" options="{
- overview:'{f:translate(key:\'administration.statistics.view.overview\')}',
- content:'{f:translate(key:\'administration.statistics.view.content\')}'
- }" value="{mode}" additionalAttributes="{onchange:'this.form.submit();'}" />
- <f:form.select name="depth" options="{levelTranslations}" value="{depth}" additionalAttributes="{onchange:'this.form.submit();'}" />
- </div>
- </div>
- </f:form>
- <table class="table table-striped table-hover table-vertical-top">
- <thead>
- <tr>
- <th></th>
- <th>
- <a href="{f:uri.action(action:'deleteIndexedItem', arguments:'{id:\'ALL\', depth:depth, mode:mode}')}" title="{f:translate(key:'administration.removeAllEntries')}">
- <core:icon identifier="actions-edit-delete" />
- </a>
- </th>
- <th>
- <f:translate key="field.fileName" />
- </th>
- <f:switch expression="{mode}">
- <f:case value="content">
- <th>
- <f:translate key="field.content" />
- </th>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <th>
- <f:translate key="field.words" />
- </th>
- </f:if>
- </f:case>
- <f:defaultCase>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <th>
- <f:translate key="field.wordCount" />
- </th>
- </f:if>
- <th>
- <f:translate key="field.fileSize" />
- </th>
- <th>
- <f:translate key="field.indexed" />
- </th>
- </f:defaultCase>
- </f:switch>
- </tr>
- </thead>
- <tbody>
- <f:for each="{tree}" as="line">
- <f:if condition="{line.lines}">
- <f:then>
- <f:for each="{line.lines}" as="l" iteration="i">
- <tr>
- <td class="nowrap">
- {line.HTML -> f:format.raw()}
- <f:if condition="{i.index} == 0"> {line.row.title}</f:if>
- </td>
- <td>
- <a href="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}" title="{f:translate(key:'administration.removeEntry')}">
- <core:icon identifier="actions-edit-delete" />
- </a>
- </td>
- <td>
- <f:image src="{l.icon}" />
- <f:link.action action="statisticDetails" arguments="{pageHash:l.phash}">{l.item_title}</f:link.action>
- </td>
- <f:switch expression="{mode}">
- <f:case value="content">
- <td>
- {l.fulltextData.fulltextdata}
- </td>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <td>
- <f:for each="{l.allWords}" as="w">
- {w}
- </f:for>
- <br><br>
- <em>{f:translate(key:'administration.statistics.count')}: {f:count(subject:l.allWords)}</em>
- </td>
- </f:if>
- </f:case>
- <f:defaultCase>
- <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <td>{l.wordCount}</td>
- </f:if>
- <td>
- <f:format.bytes decimals="1">{l.item_size}</f:format.bytes>
- </td>
- <td>
- <is:format.dateTime>{l.tstamp}</is:format.dateTime>
- </td>
- </f:defaultCase>
- </f:switch>
- </tr>
- </f:for>
- </f:then>
- <f:else>
- <tr>
- <td class="nowrap">{line.HTML -> f:format.raw()} {line.row.title}</td>
- <f:switch expression="{mode}">
- <f:case value="content">
- <td colspan="5">
- <f:translate key="administration.notIndexed" />
- </td>
- </f:case>
- <f:defaultCase>
- <td colspan="5">
- <f:translate key="administration.notIndexed" />
- </td>
- </f:defaultCase>
- </f:switch>
- </tr>
- </f:else>
- </f:if>
- </f:for>
- </tbody>
- </table>
- </f:then>
- <f:else>
- <h2><f:translate key="administration.noPageSelected" /></h2>
- </f:else>
- </f:if>
+ <f:if condition="{tree}">
+ <f:then>
+ <f:form name="statistic" action="statistic" class="form-horizontal" arguments="{id:pageUid}">
+ <div class="form-group">
+ <div class="col-sm-12">
+ <f:form.select name="mode" options="{
+ overview:'{f:translate(key:\'administration.statistics.view.overview\')}',
+ content:'{f:translate(key:\'administration.statistics.view.content\')}'
+ }" value="{mode}" additionalAttributes="{onchange:'this.form.submit();'}" />
+ <f:form.select name="depth" options="{levelTranslations}" value="{depth}" additionalAttributes="{onchange:'this.form.submit();'}" />
+ </div>
+ </div>
+ </f:form>
+ <table class="table table-striped table-hover table-vertical-top">
+ <thead>
+ <tr>
+ <th></th>
+ <th>
+ <a href="{f:uri.action(action:'deleteIndexedItem', arguments:'{id:\'ALL\', depth:depth, mode:mode}')}" title="{f:translate(key:'administration.removeAllEntries')}">
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </th>
+ <th>
+ <f:translate key="field.fileName" />
+ </th>
+ <f:switch expression="{mode}">
+ <f:case value="content">
+ <th>
+ <f:translate key="field.content" />
+ </th>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <th>
+ <f:translate key="field.words" />
+ </th>
+ </f:if>
+ </f:case>
+ <f:defaultCase>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <th>
+ <f:translate key="field.wordCount" />
+ </th>
+ </f:if>
+ <th>
+ <f:translate key="field.fileSize" />
+ </th>
+ <th>
+ <f:translate key="field.indexed" />
+ </th>
+ </f:defaultCase>
+ </f:switch>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{tree}" as="line">
+ <f:if condition="{line.lines}">
+ <f:then>
+ <f:for each="{line.lines}" as="l" iteration="i">
+ <tr>
+ <td class="nowrap">
+ {line.HTML -> f:format.raw()}
+ <f:if condition="{i.index} == 0"> {line.row.title}</f:if>
+ </td>
+ <td>
+ <a href="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}" title="{f:translate(key:'administration.removeEntry')}">
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </td>
+ <td>
+ <f:image src="{l.icon}" />
+ <f:link.action action="statisticDetails" arguments="{pageHash:l.phash}">{l.item_title}</f:link.action>
+ </td>
+ <f:switch expression="{mode}">
+ <f:case value="content">
+ <td>
+ {l.fulltextData.fulltextdata}
+ </td>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <td>
+ <f:for each="{l.allWords}" as="w">
+ {w}
+ </f:for>
+ <br><br>
+ <em>{f:translate(key:'administration.statistics.count')}: {f:count(subject:l.allWords)}</em>
+ </td>
+ </f:if>
+ </f:case>
+ <f:defaultCase>
+ <f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
+ <td>{l.wordCount}</td>
+ </f:if>
+ <td>
+ <f:format.bytes decimals="1">{l.item_size}</f:format.bytes>
+ </td>
+ <td>
+ <is:format.dateTime>{l.tstamp}</is:format.dateTime>
+ </td>
+ </f:defaultCase>
+ </f:switch>
+ </tr>
+ </f:for>
+ </f:then>
+ <f:else>
+ <tr>
+ <td class="nowrap">{line.HTML -> f:format.raw()} {line.row.title}</td>
+ <f:switch expression="{mode}">
+ <f:case value="content">
+ <td colspan="5">
+ <f:translate key="administration.notIndexed" />
+ </td>
+ </f:case>
+ <f:defaultCase>
+ <td colspan="5">
+ <f:translate key="administration.notIndexed" />
+ </td>
+ </f:defaultCase>
+ </f:switch>
+ </tr>
+ </f:else>
+ </f:if>
+ </f:for>
+ </tbody>
+ </table>
+ </f:then>
+ <f:else>
+ <h2><f:translate key="administration.noPageSelected" /></h2>
+ </f:else>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
index 7aa782796111..25b91dfa74e0 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
@@ -2,188 +2,188 @@
<f:layout name="Administration" />
<f:section name="Content">
- <p class="lead"><f:translate key="administration.document.description" /></p>
- <f:if condition="{phashRow}">
- <f:then>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th colspan="2"><f:translate key="administration.phash.tableHeader" /></th>
- </tr>
- </thead>
- <f:for each="{phashRow}" as="value" key="key">
- <tr>
- <td><strong>{key}</strong></td>
- <td>{value}</td>
- </tr>
- </f:for>
- </table>
- <div class="row">
- <div class="col-md-12">
- <f:render section="wordlisting" arguments="{words:words,phash:phash,page:page,keywords:keywords,title:'words'}" />
- </div>
- </div>
- <div class="row">
- <div class="col-md-6">
- <f:render section="wordlisting" arguments="{words:topCount,phash:phash,title:'topCount'}" />
- </div>
- <div class="col-md-6">
- <f:render section="wordlisting" arguments="{words:topFrequency,phash:phash,title:'topFrequency'}" />
- </div>
- </div>
- <f:if condition="{debug}">
- <h4>
- <f:translate key="administration.statistics.debug" />
- </h4>
- <f:debug inline="1" title="">{debug}</f:debug>
- </f:if>
- <f:if condition="{lexer}">
- <h4>
- <f:translate key="administration.statistics.lexer" />
- </h4>
- <f:format.raw>{lexer}</f:format.raw>
- </f:if>
+ <p class="lead"><f:translate key="administration.document.description" /></p>
+ <f:if condition="{phashRow}">
+ <f:then>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th colspan="2"><f:translate key="administration.phash.tableHeader" /></th>
+ </tr>
+ </thead>
+ <f:for each="{phashRow}" as="value" key="key">
+ <tr>
+ <td><strong>{key}</strong></td>
+ <td>{value}</td>
+ </tr>
+ </f:for>
+ </table>
+ <div class="row">
+ <div class="col-md-12">
+ <f:render section="wordlisting" arguments="{words:words,phash:phash,page:page,keywords:keywords,title:'words'}" />
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6">
+ <f:render section="wordlisting" arguments="{words:topCount,phash:phash,title:'topCount'}" />
+ </div>
+ <div class="col-md-6">
+ <f:render section="wordlisting" arguments="{words:topFrequency,phash:phash,title:'topFrequency'}" />
+ </div>
+ </div>
+ <f:if condition="{debug}">
+ <h4>
+ <f:translate key="administration.statistics.debug" />
+ </h4>
+ <f:debug inline="1" title="">{debug}</f:debug>
+ </f:if>
+ <f:if condition="{lexer}">
+ <h4>
+ <f:translate key="administration.statistics.lexer" />
+ </h4>
+ <f:format.raw>{lexer}</f:format.raw>
+ </f:if>
- <f:if condition="{metaphone}">
- <h4>
- <f:translate key="administration.statistics.metaphone" />
- </h4>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th>
- <f:translate key="field.metaphone" />
- </th>
- <th>
- <f:translate key="field.pHash" />
- </th>
- <th>
- <f:translate key="field.wordCount" />
- </th>
- <th>
- <f:translate key="field.words" />
- </th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{metaphone}" as="row">
- <tr>
- <td>{row.metaphone}</td>
- <td>{row.hash}</td>
- <td>{f:count(subject:row.words)}</td>
- <td><f:for each="{row.words}" as="word">
- {word},
- </f:for></td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
- <f:if condition="{sections}">
- <h4><f:translate key="administration.statistics.sectionRecords" /></h4>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="field.pHash" /></th>
- <th>rl0</th>
- <th>rl1</th>
- <th>rl2</th>
- <th><f:translate key="field.id" /></th>
- <th><f:translate key="field.uniqueId" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{sections}" as="row">
- <tr>
- <td>{row.phash}</td>
- <td>{row.rl0}</td>
- <td>{row.rl1}</td>
- <td>{row.rl2}</td>
- <td>{row.page_id}</td>
- <td>{row.uniqueid}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:if>
- </f:then>
- <f:else>
- <f:be.infobox state="2" message="no record found" />
- </f:else>
- </f:if>
+ <f:if condition="{metaphone}">
+ <h4>
+ <f:translate key="administration.statistics.metaphone" />
+ </h4>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th>
+ <f:translate key="field.metaphone" />
+ </th>
+ <th>
+ <f:translate key="field.pHash" />
+ </th>
+ <th>
+ <f:translate key="field.wordCount" />
+ </th>
+ <th>
+ <f:translate key="field.words" />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{metaphone}" as="row">
+ <tr>
+ <td>{row.metaphone}</td>
+ <td>{row.hash}</td>
+ <td>{f:count(subject:row.words)}</td>
+ <td><f:for each="{row.words}" as="word">
+ {word},
+ </f:for></td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
+ <f:if condition="{sections}">
+ <h4><f:translate key="administration.statistics.sectionRecords" /></h4>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="field.pHash" /></th>
+ <th>rl0</th>
+ <th>rl1</th>
+ <th>rl2</th>
+ <th><f:translate key="field.id" /></th>
+ <th><f:translate key="field.uniqueId" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{sections}" as="row">
+ <tr>
+ <td>{row.phash}</td>
+ <td>{row.rl0}</td>
+ <td>{row.rl1}</td>
+ <td>{row.rl2}</td>
+ <td>{row.page_id}</td>
+ <td>{row.uniqueid}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="2" message="no record found" />
+ </f:else>
+ </f:if>
</f:section>
<f:section name="wordlisting">
- <h4><f:translate key="administration.document.{title}" />
- <f:if condition="{title}=='words'">
- ({f:count(subject:words)})
- </f:if>
- </h4>
- <f:if condition="{words}">
- <f:form method="post" action="saveStopwordsKeywords" name="stopwordskeywords" arguments="{pageHash:phash}">
- <f:form.hidden name="pageHash" value="{phash}" />
- <f:form.hidden name="pageId" value="{page.uid}" />
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="administration.stopWords" /></th>
- <f:if condition="{title}=='words'">
- <f:if condition="{page}">
- <th><f:translate key="administration.keywords" /></th>
- </f:if>
- </f:if>
- <th><f:translate key="administration.statistics.word" /></th>
- <th><f:translate key="field.wordCount" /></th>
- <th><f:translate key="field.frequency" /></th>
- <th><f:translate key="field.flag" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{words}" as="word">
- <tr>
- <td>
- <f:form.checkbox name="stopwords[{word.wid}]" value="1" checked="{word.is_stopword}" />
- </td>
- <f:if condition="{title}=='words'">
- <f:if condition="{page}">
- <td>
- <f:form.checkbox name="keywords[{word.baseword}]" value="1" checked="{word.is_keyword}" />
- </td>
- </f:if>
- </f:if>
- <td>
- <f:link.action action="wordDetail" arguments="{id:word.wid,pageHash:phash}">{word.baseword}</f:link.action>
- </td>
- <td>{word.count}</td>
- <td>{word.freq}</td>
- <td>
- <f:if condition="{word.flags} > 0">
- {is:format.flagValue(flags:word.flags)} ({word.flags})
- </f:if>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- <f:if condition="{title}=='words'">
- <f:then>
- <f:if condition="{keywords}">
- <div>
- {f:translate(key:'administration.keywords.current')}:
- <f:for each="{keywords}" key="keyword" as="_" iteration="i">
- {f:if(condition:i.isFirst,then:'',else:', ')}<i>{keyword}</i>
- </f:for>
- </div>
- </f:if>
- <f:form.submit value="{f:translate(key:'administration.stopWordsKeywords.save')}" />
- </f:then>
- <f:else>
- <f:form.submit value="{f:translate(key:'administration.stopWords.save')}" />
- </f:else>
- </f:if>
- </f:form>
- </f:if>
+ <h4><f:translate key="administration.document.{title}" />
+ <f:if condition="{title}=='words'">
+ ({f:count(subject:words)})
+ </f:if>
+ </h4>
+ <f:if condition="{words}">
+ <f:form method="post" action="saveStopwordsKeywords" name="stopwordskeywords" arguments="{pageHash:phash}">
+ <f:form.hidden name="pageHash" value="{phash}" />
+ <f:form.hidden name="pageId" value="{page.uid}" />
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="administration.stopWords" /></th>
+ <f:if condition="{title}=='words'">
+ <f:if condition="{page}">
+ <th><f:translate key="administration.keywords" /></th>
+ </f:if>
+ </f:if>
+ <th><f:translate key="administration.statistics.word" /></th>
+ <th><f:translate key="field.wordCount" /></th>
+ <th><f:translate key="field.frequency" /></th>
+ <th><f:translate key="field.flag" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{words}" as="word">
+ <tr>
+ <td>
+ <f:form.checkbox name="stopwords[{word.wid}]" value="1" checked="{word.is_stopword}" />
+ </td>
+ <f:if condition="{title}=='words'">
+ <f:if condition="{page}">
+ <td>
+ <f:form.checkbox name="keywords[{word.baseword}]" value="1" checked="{word.is_keyword}" />
+ </td>
+ </f:if>
+ </f:if>
+ <td>
+ <f:link.action action="wordDetail" arguments="{id:word.wid,pageHash:phash}">{word.baseword}</f:link.action>
+ </td>
+ <td>{word.count}</td>
+ <td>{word.freq}</td>
+ <td>
+ <f:if condition="{word.flags} > 0">
+ {is:format.flagValue(flags:word.flags)} ({word.flags})
+ </f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ <f:if condition="{title}=='words'">
+ <f:then>
+ <f:if condition="{keywords}">
+ <div>
+ {f:translate(key:'administration.keywords.current')}:
+ <f:for each="{keywords}" key="keyword" as="_" iteration="i">
+ {f:if(condition:i.isFirst,then:'',else:', ')}<i>{keyword}</i>
+ </f:for>
+ </div>
+ </f:if>
+ <f:form.submit value="{f:translate(key:'administration.stopWordsKeywords.save')}" />
+ </f:then>
+ <f:else>
+ <f:form.submit value="{f:translate(key:'administration.stopWords.save')}" />
+ </f:else>
+ </f:if>
+ </f:form>
+ </f:if>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
index 7a9611b3f0b5..d8239acc17bc 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
@@ -2,51 +2,51 @@
<f:layout name="Administration" />
<f:section name="Content">
- <p class="lead">
- <f:translate key="administration.word.description" />
- </p>
- <f:if condition="{rows}">
- <f:then>
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="field.pHash" /></th>
- <th><f:translate key="field.id" /></th>
- <th><f:translate key="field.fileName" /></th>
- <th><f:translate key="field.count" /></th>
- <th><f:translate key="field.first" /></th>
- <th><f:translate key="field.frequency" /></th>
- <th><f:translate key="field.flag" /></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{rows}" as="row">
- <tr>
- <td>
- <f:link.action action="statisticDetails" arguments="{pageHash:row.phash}">{row.phash}</f:link.action>
- </td>
- <td>{row.page_id}</td>
- <td>{row.data_filename}</td>
- <td>{row.count}</td>
- <td>{row.first}</td>
- <td>{row.freq}</td>
- <td>{row.flags}</td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </f:then>
- <f:else>
- <div class="alert alert-danger">
- <div class="message-body">
- <f:translate key="administration.statistics.noResult" />
- </div>
- </div>
- </f:else>
- </f:if>
- <f:link.action action="statisticDetails" arguments="{pageHash:phash}">
- <f:translate key="administration.linkBack" />
- </f:link.action>
+ <p class="lead">
+ <f:translate key="administration.word.description" />
+ </p>
+ <f:if condition="{rows}">
+ <f:then>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="field.pHash" /></th>
+ <th><f:translate key="field.id" /></th>
+ <th><f:translate key="field.fileName" /></th>
+ <th><f:translate key="field.count" /></th>
+ <th><f:translate key="field.first" /></th>
+ <th><f:translate key="field.frequency" /></th>
+ <th><f:translate key="field.flag" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{rows}" as="row">
+ <tr>
+ <td>
+ <f:link.action action="statisticDetails" arguments="{pageHash:row.phash}">{row.phash}</f:link.action>
+ </td>
+ <td>{row.page_id}</td>
+ <td>{row.data_filename}</td>
+ <td>{row.count}</td>
+ <td>{row.first}</td>
+ <td>{row.freq}</td>
+ <td>{row.flags}</td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:then>
+ <f:else>
+ <div class="alert alert-danger">
+ <div class="message-body">
+ <f:translate key="administration.statistics.noResult" />
+ </div>
+ </div>
+ </f:else>
+ </f:if>
+ <f:link.action action="statisticDetails" arguments="{pageHash:phash}">
+ <f:translate key="administration.linkBack" />
+ </f:link.action>
</f:section>
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
index 10eadcac29d7..e0f5de0f1bd2 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
@@ -1,77 +1,77 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
<f:alias map="{sword: searchParams.sword}">
- <f:render partial="Form" arguments="{_all}" />
+ <f:render partial="Form" arguments="{_all}" />
</f:alias>
<f:for each="{resultsets}" as="result">
- <f:if condition="{result.categoryTitle}">
- <h1 class="tx-indexedsearch-category">{result.categoryTitle}</h1>
- </f:if>
- <f:if condition="{result.count} > 0">
- <div class="tx-indexedsearch-info-sword">
- <f:for each="{searchWords}" as="searchWord" key="key">
- <f:if condition="{key} > 0">
- <f:then>
- <f:translate key="searchFor.{searchWord.oper}" /> {searchWord.sword}
- </f:then>
- <f:else>
- <f:translate key="searchFor" /> {searchWord.sword}
- </f:else>
- </f:if>
- </f:for>
- </div>
- </f:if>
- {result.searchedInSectionInfo}
- <f:if condition="{result.count} > 0">
- <f:then>
- <div class="tx-indexedsearch-browsebox">
- <p>
- <is:pageBrowsingResults numberOfResults="{result.count}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
- {result.sectionText}
- </p>
- <!-- render the anchor-links to the sections inside the displayed result rows -->
- <f:if condition="{result.affectedSections}">
- <div class="tx-indexedsearch-sectionlinks">
- <table cellpadding="0" cellspacing="0" border="0" summary="Result links">
- <f:for each="{result.affectedSections}" as="sectionData" key="sectionId">
- <tr>
- <td width="100%">-->
- <f:link.page section="anchor_{sectionId}" addQueryString="1" noCacheHash="1"
- argumentsToBeExcludedFromQueryString="{0: 'id'}">
- <f:if condition="{sectionData.0}">
- <f:then>{sectionData.0}</f:then>
- <f:else><f:translate key="unnamedSection" /></f:else>
- </f:if>
- ({sectionData.1} <f:translate key="{f:if(condition: '{sectionData.1} > 1', then: 'result.pages', else: 'result.page')}" />)
- </f:link.page>
- </td>
- </tr>
- </f:for>
- </table>
- </div>
- </f:if>
- <is:pageBrowsing maximumNumberOfResultPages="{settings.page_links}" numberOfResults="{result.count}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
- </div>
- <f:for each="{result.rows}" as="row">
- <f:if condition="{row.isSectionHeader}">
- <f:then>
- <div id="anchor_{row.sectionId}" class="tx-indexedsearch-sectionhead">
- <h2 class="tx-indexedsearch-title"><f:format.html>{row.sectionTitle}</f:format.html> <span class="tx-indexedsearch-result-count">{row.numResultRows} <f:translate key="{f:if(condition: '{row.numResultRows} > 1', then: 'result.pages', else: 'result.page')}" /></span></h2>
- </div>
- </f:then>
- <f:else>
- <f:render partial="Searchresult" arguments="{row: row}" />
- </f:else>
- </f:if>
- </f:for>
- <div class="tx-indexedsearch-browsebox">
- <is:pageBrowsing numberOfResults="{result.count}" maximumNumberOfResultPages="{settings.page_links}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
- </div>
- </f:then>
- <f:else>
- <div class="tx-indexedsearch-info-noresult">
- <f:translate key="result.noResult" />
- </div>
- </f:else>
- </f:if>
+ <f:if condition="{result.categoryTitle}">
+ <h1 class="tx-indexedsearch-category">{result.categoryTitle}</h1>
+ </f:if>
+ <f:if condition="{result.count} > 0">
+ <div class="tx-indexedsearch-info-sword">
+ <f:for each="{searchWords}" as="searchWord" key="key">
+ <f:if condition="{key} > 0">
+ <f:then>
+ <f:translate key="searchFor.{searchWord.oper}" /> {searchWord.sword}
+ </f:then>
+ <f:else>
+ <f:translate key="searchFor" /> {searchWord.sword}
+ </f:else>
+ </f:if>
+ </f:for>
+ </div>
+ </f:if>
+ {result.searchedInSectionInfo}
+ <f:if condition="{result.count} > 0">
+ <f:then>
+ <div class="tx-indexedsearch-browsebox">
+ <p>
+ <is:pageBrowsingResults numberOfResults="{result.count}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
+ {result.sectionText}
+ </p>
+ <!-- render the anchor-links to the sections inside the displayed result rows -->
+ <f:if condition="{result.affectedSections}">
+ <div class="tx-indexedsearch-sectionlinks">
+ <table cellpadding="0" cellspacing="0" border="0" summary="Result links">
+ <f:for each="{result.affectedSections}" as="sectionData" key="sectionId">
+ <tr>
+ <td width="100%">-->
+ <f:link.page section="anchor_{sectionId}" addQueryString="1" noCacheHash="1"
+ argumentsToBeExcludedFromQueryString="{0: 'id'}">
+ <f:if condition="{sectionData.0}">
+ <f:then>{sectionData.0}</f:then>
+ <f:else><f:translate key="unnamedSection" /></f:else>
+ </f:if>
+ ({sectionData.1} <f:translate key="{f:if(condition: '{sectionData.1} > 1', then: 'result.pages', else: 'result.page')}" />)
+ </f:link.page>
+ </td>
+ </tr>
+ </f:for>
+ </table>
+ </div>
+ </f:if>
+ <is:pageBrowsing maximumNumberOfResultPages="{settings.page_links}" numberOfResults="{result.count}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
+ </div>
+ <f:for each="{result.rows}" as="row">
+ <f:if condition="{row.isSectionHeader}">
+ <f:then>
+ <div id="anchor_{row.sectionId}" class="tx-indexedsearch-sectionhead">
+ <h2 class="tx-indexedsearch-title"><f:format.html>{row.sectionTitle}</f:format.html> <span class="tx-indexedsearch-result-count">{row.numResultRows} <f:translate key="{f:if(condition: '{row.numResultRows} > 1', then: 'result.pages', else: 'result.page')}" /></span></h2>
+ </div>
+ </f:then>
+ <f:else>
+ <f:render partial="Searchresult" arguments="{row: row}" />
+ </f:else>
+ </f:if>
+ </f:for>
+ <div class="tx-indexedsearch-browsebox">
+ <is:pageBrowsing numberOfResults="{result.count}" maximumNumberOfResultPages="{settings.page_links}" currentPage="{searchParams.pointer}" resultsPerPage="{searchParams.numberOfResults}" />
+ </div>
+ </f:then>
+ <f:else>
+ <div class="tx-indexedsearch-info-noresult">
+ <f:translate key="result.noResult" />
+ </div>
+ </f:else>
+ </f:if>
</f:for>
</html>
diff --git a/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
index cacbce2515e3..a52bf0df72cb 100644
--- a/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
+++ b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
@@ -1,6 +1,6 @@
<h1>{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/locallang.xlf:tsconf_title')}</h1>
<f:if condition="{csh}">
- <span class="btn btn-default btn-sm"><f:format.raw>{csh}</f:format.raw></span>
+<span class="btn btn-default btn-sm"><f:format.raw>{csh}</f:format.raw></span>
</f:if>
<f:render partial="PageTsConfig/Menu" arguments="{_all}"/>
<f:if condition="{tsconfParts99}">
@@ -10,7 +10,7 @@
<div class="panel-heading">
<f:if condition="{line.defaultPageTSconfig}">
<f:then>
- <f:translate key="LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:editTSconfig_default" />
+ <f:translate key="LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:editTSconfig_default" />
</f:then>
<f:else>
<f:format.raw>{line.title}</f:format.raw>
diff --git a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html
index 283cf82f4068..e842257f7bcb 100644
--- a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html
+++ b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title></title>
- <meta http-equiv=Refresh Content="0; Url=/"/>
+ <title></title>
+ <meta http-equiv=Refresh Content="0; Url=/"/>
</head>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Card/Header.html b/typo3/sysext/install/Resources/Private/Partials/Card/Header.html
index 53d52b70dd8d..d3fbc17317c9 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Card/Header.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Card/Header.html
@@ -1,17 +1,17 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="card-header">
- <f:if condition="{icon}">
- <div class="card-icon">
- <img src="{f:uri.resource(path: icon)}" width="64" height="64" class="card-header-icon-image" />
- </div>
- </f:if>
- <div class="card-header-body">
- <f:if condition="{title}">
- <h1 class="card-title">{title}</h1>
- </f:if>
- <f:if condition="{subtitle}">
- <span class="card-subtitle">{subtitle}</span>
- </f:if>
- </div>
+ <f:if condition="{icon}">
+ <div class="card-icon">
+ <img src="{f:uri.resource(path: icon)}" width="64" height="64" class="card-header-icon-image" />
+ </div>
+ </f:if>
+ <div class="card-header-body">
+ <f:if condition="{title}">
+ <h1 class="card-title">{title}</h1>
+ </f:if>
+ <f:if condition="{subtitle}">
+ <span class="card-subtitle">{subtitle}</span>
+ </f:if>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Layout/MenuModuleLink.html b/typo3/sysext/install/Resources/Private/Partials/Layout/MenuModuleLink.html
index 630720782b15..acb612930b90 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Layout/MenuModuleLink.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Layout/MenuModuleLink.html
@@ -1,16 +1,16 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<li class="modulemenu-item t3js-mainmodule" data-controller="{controller}">
- <a class="modulemenu-item-link" href="{i:uri.action(controller: controller)}">
- <span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default">
- <span class="icon-markup">
- <img src="{f:uri.resource(path: 'Icons/module-install-{controller}.svg')}" width="32" height="32">
- </span>
- </span>
- </span>
- <span class="modulemenu-item-title">{label}</span>
- </a>
+ <a class="modulemenu-item-link" href="{i:uri.action(controller: controller)}">
+ <span class="modulemenu-icon modulemenu-item-icon">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
+ <span class="icon-markup">
+ <img src="{f:uri.resource(path: 'Icons/module-install-{controller}.svg')}" width="32" height="32">
+ </span>
+ </span>
+ </span>
+ <span class="modulemenu-item-title">{label}</span>
+ </a>
</li>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/ExtensionConfiguration/ExtensionForm.html b/typo3/sysext/install/Resources/Private/Partials/Settings/ExtensionConfiguration/ExtensionForm.html
index e3373d43268c..4730ae7d505e 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/ExtensionConfiguration/ExtensionForm.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/ExtensionConfiguration/ExtensionForm.html
@@ -1,69 +1,69 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat searchhit">
- <div class="panel-heading" role="tab" id="heading-{extensionKey}">
- <h3 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-{extensionKey}" aria-expanded="true" aria-controls="collapse-{extensionKey}" class="collapsed">
- <span class="caret"></span>
- <strong>{extensionData.packageInfo.packageKey}</strong>
- </a>
- </h3>
- </div>
- <div id="collapse-{extensionKey}" class="panel-collapse collapse search-item" role="tabpanel" aria-labelledby="heading-{extensionKey}">
- <div class="panel-body">
- <div role="tabpanel">
- <ul class="nav nav-tabs" role="tablist">
- <f:for each="{extensionData.configuration}" as="category" key="categoryName" iteration="iteration">
- <f:if condition="{categoryName}">
- <li role="presentation" class="{f:if(condition:'{iteration.isFirst}', then:'active')}">
- <a class="text-capitalize" href="#{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}" aria-controls="category-{extensionKey}-{categoryName}" role="tab" data-toggle="tab">{categoryName}</a>
- </li>
- </f:if>
- </f:for>
- </ul>
+ <div class="panel-heading" role="tab" id="heading-{extensionKey}">
+ <h3 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-{extensionKey}" aria-expanded="true" aria-controls="collapse-{extensionKey}" class="collapsed">
+ <span class="caret"></span>
+ <strong>{extensionData.packageInfo.packageKey}</strong>
+ </a>
+ </h3>
+ </div>
+ <div id="collapse-{extensionKey}" class="panel-collapse collapse search-item" role="tabpanel" aria-labelledby="heading-{extensionKey}">
+ <div class="panel-body">
+ <div role="tabpanel">
+ <ul class="nav nav-tabs" role="tablist">
+ <f:for each="{extensionData.configuration}" as="category" key="categoryName" iteration="iteration">
+ <f:if condition="{categoryName}">
+ <li role="presentation" class="{f:if(condition:'{iteration.isFirst}', then:'active')}">
+ <a class="text-capitalize" href="#{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}" aria-controls="category-{extensionKey}-{categoryName}" role="tab" data-toggle="tab">{categoryName}</a>
+ </li>
+ </f:if>
+ </f:for>
+ </ul>
- <form action="#" name="configurationform" class="t3js-extensionConfiguration-form extensionConfiguration-form" data-extensionKey="{extensionKey}">
- <div class="tab-content">
- <f:for each="{extensionData.configuration}" as="subcategories" key="categoryName" iteration="iteration">
- <f:if condition="{categoryName}">
- <div role="tabpanel" class="tab-pane {f:if(condition:'{iteration.isFirst}', then:'active')}" id="{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}">
- <f:for each="{subcategories}" as="subcategory">
- <div class="form-section">
- <f:for each="{subcategory}" as="configurationItem" iteration="itemIterator">
- <f:if condition="{itemIterator.isFirst}">
- <h2 class="h4 form-section-headline">{configurationItem.subcat_label}</h2>
- </f:if>
- <div class="form-group form-group-dashed">
- <label for="em-{configurationItem.name}">
- {configurationItem.labels.0}
- </label>
- <p>
- {categoryName}.{configurationItem.name}
- <f:if condition="{configurationItem.type} != 'user'">
- <f:if condition="{configurationItem.type}">
- ({configurationItem.type})
- </f:if>
- </f:if>
- </p>
- <div class="form-control-wrap">
- <i:form.typoScriptConstants configuration="{configurationItem}"/>
- </div>
- <f:if condition="{configurationItem.labels.1}">
- <div class="help-block">{configurationItem.labels.1 -> f:format.nl2br()}</div>
- </f:if>
- </div>
- </f:for>
- </div>
- </f:for>
- </div>
- </f:if>
- </f:for>
- </div>
- <button type="submit" class="btn btn-default" name="save">Save "{extensionKey}" configuration</button>
- </form>
- </div>
- </div>
- </div>
+ <form action="#" name="configurationform" class="t3js-extensionConfiguration-form extensionConfiguration-form" data-extensionKey="{extensionKey}">
+ <div class="tab-content">
+ <f:for each="{extensionData.configuration}" as="subcategories" key="categoryName" iteration="iteration">
+ <f:if condition="{categoryName}">
+ <div role="tabpanel" class="tab-pane {f:if(condition:'{iteration.isFirst}', then:'active')}" id="{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}">
+ <f:for each="{subcategories}" as="subcategory">
+ <div class="form-section">
+ <f:for each="{subcategory}" as="configurationItem" iteration="itemIterator">
+ <f:if condition="{itemIterator.isFirst}">
+ <h2 class="h4 form-section-headline">{configurationItem.subcat_label}</h2>
+ </f:if>
+ <div class="form-group form-group-dashed">
+ <label for="em-{configurationItem.name}">
+ {configurationItem.labels.0}
+ </label>
+ <p>
+ {categoryName}.{configurationItem.name}
+ <f:if condition="{configurationItem.type} != 'user'">
+ <f:if condition="{configurationItem.type}">
+ ({configurationItem.type})
+ </f:if>
+ </f:if>
+ </p>
+ <div class="form-control-wrap">
+ <i:form.typoScriptConstants configuration="{configurationItem}"/>
+ </div>
+ <f:if condition="{configurationItem.labels.1}">
+ <div class="help-block">{configurationItem.labels.1 -> f:format.nl2br()}</div>
+ </f:if>
+ </div>
+ </f:for>
+ </div>
+ </f:for>
+ </div>
+ </f:if>
+ </f:for>
+ </div>
+ <button type="submit" class="btn btn-default" name="save">Save "{extensionKey}" configuration</button>
+ </form>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html b/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html
index a2047293ce17..b97de074caf4 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html
@@ -1,132 +1,132 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat">
- <div class="panel-heading" role="tab" id="heading-{sectionName}">
- <h3 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-{sectionName}" aria-expanded="true" aria-controls="collapse-{sectionName}" class="collapsed">
- <span class="caret"></span>
- <strong>{sectionData.description}</strong> [{sectionName}]
- </a>
- </h3>
- </div>
- <div id="collapse-{sectionName}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-{sectionName}">
- <f:for each="{sectionData.items}" as="item">
- <a id="{sectionName}-{item.key}"></a>
- <div class="item">
- <div class="item-heading">
- <strong>[{sectionName}]{item.path} </strong>
- <f:if condition="{item.type} == 'checkbox'">
- <f:then>
- =
- <f:if condition="{item.value}">
- <f:then>true</f:then>
- <f:else>false</f:else>
- </f:if>
- </f:then>
- <f:else>
- <f:if condition="{item.value} && !{item.hideValue}">
- = {item.value -> f:format.crop(maxCharacters: 40, respectWordBoundaries:0, respectHtml:0)}
- </f:if>
- </f:else>
- </f:if>
- </div>
- <div class="item-body">
- <f:if condition="{item.differentValueInCurrentConfiguration}">
- <div class="t3js-infobox callout callout-sm callout-warning">
- <div class="callout-body">
- Note that <code>$GLOBALS['TYPO3_CONF_VARS']</code> currently contains a different value.
- This could mean that the value is overwritten in AdditionalConfiguration.php.
- </div>
- </div>
- </f:if>
- <f:if condition="{f:count(subject: item.allowedValues)} || {item.dataType} == 'dropdown'">
- <f:then>
- <div class="form-group">
- <span class="help-block">{item.description -> f:format.raw()}</span>
- <select data-path="{sectionName}/{item.key}" class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue">
- <f:for each="{item.allowedValues}" key="optionKey" as="optionLabel">
- <option value="{optionKey}" {f:if(condition: '{item.value} == {optionKey}', then: 'selected="selected"')}>{optionLabel} ({optionKey})</option>
- </f:for>
- </select>
- </div>
- </f:then>
- <f:else>
- <f:if condition="{item.type} == 'checkbox'">
- <div class="checkbox">
- <label>
- <input
- type="checkbox"
- value="1"
- class="t3js-localConfiguration-pathValue"
- data-path="{sectionName}/{item.key}"
- {f:if(condition: item.checked, then:'checked="checked"')}
- />
- {item.description -> f:format.raw()}
- </label>
- </div>
- </f:if>
- <f:if condition="{item.type} == 'input'">
- <div class="form-group">
- <span class="help-block">{item.description -> f:format.raw()}</span>
- <input
- type="text"
- value="{item.value}"
- data-path="{sectionName}/{item.key}"
- class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
- />
- </div>
- </f:if>
+ <div class="panel-heading" role="tab" id="heading-{sectionName}">
+ <h3 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-{sectionName}" aria-expanded="true" aria-controls="collapse-{sectionName}" class="collapsed">
+ <span class="caret"></span>
+ <strong>{sectionData.description}</strong> [{sectionName}]
+ </a>
+ </h3>
+ </div>
+ <div id="collapse-{sectionName}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-{sectionName}">
+ <f:for each="{sectionData.items}" as="item">
+ <a id="{sectionName}-{item.key}"></a>
+ <div class="item">
+ <div class="item-heading">
+ <strong>[{sectionName}]{item.path} </strong>
+ <f:if condition="{item.type} == 'checkbox'">
+ <f:then>
+ =
+ <f:if condition="{item.value}">
+ <f:then>true</f:then>
+ <f:else>false</f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:if condition="{item.value} && !{item.hideValue}">
+ = {item.value -> f:format.crop(maxCharacters: 40, respectWordBoundaries:0, respectHtml:0)}
+ </f:if>
+ </f:else>
+ </f:if>
+ </div>
+ <div class="item-body">
+ <f:if condition="{item.differentValueInCurrentConfiguration}">
+ <div class="t3js-infobox callout callout-sm callout-warning">
+ <div class="callout-body">
+ Note that <code>$GLOBALS['TYPO3_CONF_VARS']</code> currently contains a different value.
+ This could mean that the value is overwritten in AdditionalConfiguration.php.
+ </div>
+ </div>
+ </f:if>
+ <f:if condition="{f:count(subject: item.allowedValues)} || {item.dataType} == 'dropdown'">
+ <f:then>
+ <div class="form-group">
+ <span class="help-block">{item.description -> f:format.raw()}</span>
+ <select data-path="{sectionName}/{item.key}" class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue">
+ <f:for each="{item.allowedValues}" key="optionKey" as="optionLabel">
+ <option value="{optionKey}" {f:if(condition: '{item.value} == {optionKey}', then: 'selected="selected"')}>{optionLabel} ({optionKey})</option>
+ </f:for>
+ </select>
+ </div>
+ </f:then>
+ <f:else>
+ <f:if condition="{item.type} == 'checkbox'">
+ <div class="checkbox">
+ <label>
+ <input
+ type="checkbox"
+ value="1"
+ class="t3js-localConfiguration-pathValue"
+ data-path="{sectionName}/{item.key}"
+ {f:if(condition: item.checked, then:'checked="checked"')}
+ />
+ {item.description -> f:format.raw()}
+ </label>
+ </div>
+ </f:if>
+ <f:if condition="{item.type} == 'input'">
+ <div class="form-group">
+ <span class="help-block">{item.description -> f:format.raw()}</span>
+ <input
+ type="text"
+ value="{item.value}"
+ data-path="{sectionName}/{item.key}"
+ class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
+ />
+ </div>
+ </f:if>
- <f:if condition="{item.type} == 'password'">
- <div class="form-group">
- <span class="help-block">{item.description -> f:format.raw()}</span>
- <input
- type="password"
- value="{item.value}"
- data-path="{sectionName}/{item.key}"
- class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
- />
- </div>
- </f:if>
+ <f:if condition="{item.type} == 'password'">
+ <div class="form-group">
+ <span class="help-block">{item.description -> f:format.raw()}</span>
+ <input
+ type="password"
+ value="{item.value}"
+ data-path="{sectionName}/{item.key}"
+ class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
+ />
+ </div>
+ </f:if>
- <f:if condition="{item.type} == 'number'">
- <div class="form-group">
- <span class="help-block">{item.description -> f:format.raw()}</span>
- <input
- type="number"
- value="{item.value}"
- data-path="{sectionName}/{item.key}"
- class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
- />
- </div>
- </f:if>
+ <f:if condition="{item.type} == 'number'">
+ <div class="form-group">
+ <span class="help-block">{item.description -> f:format.raw()}</span>
+ <input
+ type="number"
+ value="{item.value}"
+ data-path="{sectionName}/{item.key}"
+ class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue"
+ />
+ </div>
+ </f:if>
- <f:if condition="{item.type} == 'textarea'">
- <span class="help-block">{item.description -> f:format.raw()}</span>
- <div class="form-group">
- <textarea
- rows="5"
- cols="60"
- data-path="{sectionName}/{item.key}"
- class="form-control t3js-localConfiguration-pathValue"
- >{item.value}</textarea>
- </div>
- </f:if>
- </f:else>
- </f:if>
+ <f:if condition="{item.type} == 'textarea'">
+ <span class="help-block">{item.description -> f:format.raw()}</span>
+ <div class="form-group">
+ <textarea
+ rows="5"
+ cols="60"
+ data-path="{sectionName}/{item.key}"
+ class="form-control t3js-localConfiguration-pathValue"
+ >{item.value}</textarea>
+ </div>
+ </f:if>
+ </f:else>
+ </f:if>
- <f:if condition="{item.phpErrorCode}">
- <div class="fieldNote">
- Current PHP error code <strong>{item.value}</strong> represents:<br/>
- <code>
- <i:format.phpErrorCode phpErrorCode="{item.value}"/>
- </code>
- </div>
- </f:if>
- </div>
- </div>
- </f:for>
- </div>
+ <f:if condition="{item.phpErrorCode}">
+ <div class="fieldNote">
+ Current PHP error code <strong>{item.value}</strong> represents:<br/>
+ <code>
+ <i:format.phpErrorCode phpErrorCode="{item.value}"/>
+ </code>
+ </div>
+ </f:if>
+ </div>
+ </div>
+ </f:for>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context.html
index 4a8dd447ea42..601aa5b3d435 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context.html
@@ -1,29 +1,29 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat">
- <div class="panel-heading" role="tab" id="headingTwo">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo" class="collapsed">
- <span class="caret"></span>
- Debug settings
- </a>
- </h4>
- </div>
- <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
- <div class="panel-body">
- <p>
- In this panel it is possible to select a configuration preset which optimizes multiple settings
- to be suited best for production or development environments.
- The "Live" preset configures your TYPO3 installation for maximum performance
- and suppresses debug and error messages, so that nothing is disclosed to website visitors.
- The "Debug" preset enables most debug and error messages which is helpful during development.
- As a third option it is possible to manually customize each setting for specific needs.
- </p>
- <f:for each="{feature.presetsOrderedByPriority}" as="preset">
- <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
- </f:for>
- </div>
- </div>
+ <div class="panel-heading" role="tab" id="headingTwo">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo" class="collapsed">
+ <span class="caret"></span>
+ Debug settings
+ </a>
+ </h4>
+ </div>
+ <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+ <div class="panel-body">
+ <p>
+ In this panel it is possible to select a configuration preset which optimizes multiple settings
+ to be suited best for production or development environments.
+ The "Live" preset configures your TYPO3 installation for maximum performance
+ and suppresses debug and error messages, so that nothing is disclosed to website visitors.
+ The "Debug" preset enables most debug and error messages which is helpful during development.
+ As a third option it is possible to manually customize each setting for specific needs.
+ </p>
+ <f:for each="{feature.presetsOrderedByPriority}" as="preset">
+ <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
+ </f:for>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html
index 3893151f2de3..ba1d946a5dc6 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html
@@ -1,34 +1,34 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="1" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-context-custom"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-context-custom" class="t3-install-tool-configuration-radio-label">
- <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>Custom configuration mixture if no other preset fits.</p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-context-custom"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-context-custom" class="t3-install-tool-configuration-radio-label">
+ <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>Custom configuration mixture if no other preset fits.</p>
- <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
- <div class="form-group">
- <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
- <div class="col-sm-8">
- <input
- id="{feature.name}{preset.name}{configurationKey}"
- type="text"
- name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
- value="{configurationValue}"
- class="form-control t3js-custom-preset"
- data-radio="t3-install-tool-configuration-context-custom"
- />
- </div>
- </div>
- </f:for>
+ <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
+ <div class="form-group">
+ <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
+ <div class="col-sm-8">
+ <input
+ id="{feature.name}{preset.name}{configurationKey}"
+ type="text"
+ name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+ value="{configurationValue}"
+ class="form-control t3js-custom-preset"
+ data-radio="t3-install-tool-configuration-context-custom"
+ />
+ </div>
+ </div>
+ </f:for>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Debug.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Debug.html
index b5807ee0e3a8..b3546775da0b 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Debug.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Debug.html
@@ -1,18 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="0" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-context-debug"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-context-debug" class="t3-install-tool-configuration-radio-label">
- <strong>Debug</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>Enable debug output, deprecation logs, and set logging to info level.</p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-context-debug"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-context-debug" class="t3-install-tool-configuration-radio-label">
+ <strong>Debug</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>Enable debug output, deprecation logs, and set logging to info level.</p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Live.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Live.html
index 5d5a184cd320..c9b4a1e28c8d 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Live.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Live.html
@@ -1,18 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="0" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-context-live"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-context-live" class="t3-install-tool-configuration-radio-label">
- <strong>Live</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>Turn off debug output, deprecation logs, and set logging to warnings and errors only.</p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-context-live"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-context-live" class="t3-install-tool-configuration-radio-label">
+ <strong>Live</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>Turn off debug output, deprecation logs, and set logging to warnings and errors only.</p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image.html
index 2705ceff9c98..4a7fe31040c7 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image.html
@@ -1,57 +1,57 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat">
- <div class="panel-heading" role="tab" id="headingFour">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour" class="collapsed">
- <span class="caret"></span>
- Image handling settings
- </a>
- </h4>
- </div>
- <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
- <div class="panel-body">
- <p>
- Advanced image handling in TYPO3 CMS uses the command line tool
- GraphicsMagick or ImageMagick. The tool needs to be configured
- correctly depending on the version that is available on the system.
- </p>
- <p>
- This module detects the available image handling versions and sets
- the system accordingly. If everything is correctly set up the image
- tests of the install tool section "Test setup" should be fine.
- </p>
+ <div class="panel-heading" role="tab" id="headingFour">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour" class="collapsed">
+ <span class="caret"></span>
+ Image handling settings
+ </a>
+ </h4>
+ </div>
+ <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
+ <div class="panel-body">
+ <p>
+ Advanced image handling in TYPO3 CMS uses the command line tool
+ GraphicsMagick or ImageMagick. The tool needs to be configured
+ correctly depending on the version that is available on the system.
+ </p>
+ <p>
+ This module detects the available image handling versions and sets
+ the system accordingly. If everything is correctly set up the image
+ tests of the install tool section "Test setup" should be fine.
+ </p>
- <p>
- If ImageMagick or GraphicsMagick executables are located in an unusual place,
- set the absolute directory name here.
- </p>
- <div class="form-group">
- <div class="col-sm-12">
- <div class="input-group">
- <input
- type="text"
- name="install[values][{feature.name}][additionalSearchPath]"
- value="{feature.additionalSearchPath}"
- class="form-control t3js-presets-image-executable"
- />
- <div class="input-group-btn">
- <button
- class="btn btn-default t3js-presets-image-executable-trigger"
- type="button"
- >
- Find executables in this directory
- </button>
- </div>
- </div>
- </div>
- </div>
+ <p>
+ If ImageMagick or GraphicsMagick executables are located in an unusual place,
+ set the absolute directory name here.
+ </p>
+ <div class="form-group">
+ <div class="col-sm-12">
+ <div class="input-group">
+ <input
+ type="text"
+ name="install[values][{feature.name}][additionalSearchPath]"
+ value="{feature.additionalSearchPath}"
+ class="form-control t3js-presets-image-executable"
+ />
+ <div class="input-group-btn">
+ <button
+ class="btn btn-default t3js-presets-image-executable-trigger"
+ type="button"
+ >
+ Find executables in this directory
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
- <f:for each="{feature.presetsOrderedByPriority}" as="preset">
- <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
- </f:for>
- </div>
- </div>
+ <f:for each="{feature.presetsOrderedByPriority}" as="preset">
+ <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
+ </f:for>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html
index ab8812ffee9b..dd468099e160 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html
@@ -1,35 +1,35 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="1" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-image-custom"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-image-custom" class="t3-install-tool-configuration-radio-label">
- <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-image-custom"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-image-custom" class="t3-install-tool-configuration-radio-label">
+ <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
- <p>Custom configuration mixture if no other preset fits.</p>
+ <p>Custom configuration mixture if no other preset fits.</p>
- <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
- <div class="form-group">
- <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
- <div class="col-sm-8">
- <input
- id="{feature.name}{preset.name}{configurationKey}"
- type="text"
- name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
- value="{configurationValue}"
- class="form-control t3js-custom-preset"
- data-radio="t3-install-tool-configuration-image-custom"
- />
- </div>
- </div>
- </f:for>
+ <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
+ <div class="form-group">
+ <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
+ <div class="col-sm-8">
+ <input
+ id="{feature.name}{preset.name}{configurationKey}"
+ type="text"
+ name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+ value="{configurationValue}"
+ class="form-control t3js-custom-preset"
+ data-radio="t3-install-tool-configuration-image-custom"
+ />
+ </div>
+ </div>
+ </f:for>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/GraphicsMagick.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/GraphicsMagick.html
index 4a9643cdc215..fd03012812e1 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/GraphicsMagick.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/GraphicsMagick.html
@@ -1,30 +1,30 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-image-graphicsmagick"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-image-graphicsmagick" class="t3-install-tool-configuration-radio-label">
- <strong>Graphics Magick</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- GraphicsMagick was found in path <code>{preset.foundPath}</code>.
- </f:then>
- <f:else>
- GraphicsMagick was not found in standard system paths. If it is
- installed in an unusual location on your system, set the path in the
- input box above and search again.
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-image-graphicsmagick"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-image-graphicsmagick" class="t3-install-tool-configuration-radio-label">
+ <strong>Graphics Magick</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ GraphicsMagick was found in path <code>{preset.foundPath}</code>.
+ </f:then>
+ <f:else>
+ GraphicsMagick was not found in standard system paths. If it is
+ installed in an unusual location on your system, set the path in the
+ input box above and search again.
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/ImageMagick6.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/ImageMagick6.html
index 8a2abd35742d..dd007ef1585b 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/ImageMagick6.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/ImageMagick6.html
@@ -1,30 +1,30 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-image-imagemagick6"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-image-imagemagick6" class="t3-install-tool-configuration-radio-label">
- <strong>Image Magick version 6 or higher</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- An ImageMagick version 6 or higher was found in path <code>{preset.foundPath}</code>.
- </f:then>
- <f:else>
- ImageMagick version 6 or higher was not found in standard system paths.
- If it is installed in an unusual location on your system, set the path in the
- input box above and search again.
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-image-imagemagick6"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-image-imagemagick6" class="t3-install-tool-configuration-radio-label">
+ <strong>Image Magick version 6 or higher</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ An ImageMagick version 6 or higher was found in path <code>{preset.foundPath}</code>.
+ </f:then>
+ <f:else>
+ ImageMagick version 6 or higher was not found in standard system paths.
+ If it is installed in an unusual location on your system, set the path in the
+ input box above and search again.
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail.html
index 1b215daa44e0..4b78a166a0f7 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail.html
@@ -1,31 +1,31 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat">
- <div class="panel-heading" role="tab" id="headingFive">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
- <span class="caret"></span>
- Mail handling settings
- </a>
- </h4>
- </div>
- <div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive">
- <div class="panel-body">
- <p>
- Mailer agent in TYPO3 CMS can use the sendmail command line tool
- if transport is configured to sendmail. The tool path needs to be
- configured correctly depending on the binary that is available
- on the system.
- </p>
- <p>
- This module detects the current sendmail path from PHP settings
- and allows to set the correct value in TYPO3 settings.
- </p>
- <f:for each="{feature.presetsOrderedByPriority}" as="preset">
- <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
- </f:for>
- </div>
- </div>
+ <div class="panel-heading" role="tab" id="headingFive">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
+ <span class="caret"></span>
+ Mail handling settings
+ </a>
+ </h4>
+ </div>
+ <div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive">
+ <div class="panel-body">
+ <p>
+ Mailer agent in TYPO3 CMS can use the sendmail command line tool
+ if transport is configured to sendmail. The tool path needs to be
+ configured correctly depending on the binary that is available
+ on the system.
+ </p>
+ <p>
+ This module detects the current sendmail path from PHP settings
+ and allows to set the correct value in TYPO3 settings.
+ </p>
+ <f:for each="{feature.presetsOrderedByPriority}" as="preset">
+ <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
+ </f:for>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html
index 200aa5a69a0a..3e185bbafe9c 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html
@@ -1,33 +1,33 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="1" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-mail-custom"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-mail-custom" class="t3-install-tool-configuration-radio-label">
- <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>Custom mail settings:</p>
- <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
- <div class="form-group">
- <label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
- <div class="col-sm-6">
- <input
- id="{feature.name}{preset.name}{configurationKey}"
- type="text"
- name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
- value="{configurationValue}"
- class="form-control t3js-custom-preset"
- data-radio="t3-install-tool-configuration-mail-custom"
- />
- </div>
- </div>
- </f:for>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-mail-custom"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-mail-custom" class="t3-install-tool-configuration-radio-label">
+ <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>Custom mail settings:</p>
+ <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
+ <div class="form-group">
+ <label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
+ <div class="col-sm-6">
+ <input
+ id="{feature.name}{preset.name}{configurationKey}"
+ type="text"
+ name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+ value="{configurationValue}"
+ class="form-control t3js-custom-preset"
+ data-radio="t3-install-tool-configuration-mail-custom"
+ />
+ </div>
+ </div>
+ </f:for>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Sendmail.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Sendmail.html
index 31879ed42c70..2e6af1cb242b 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Sendmail.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Sendmail.html
@@ -1,27 +1,27 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-mail-sendmail"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-mail-sendmail" class="t3-install-tool-configuration-radio-label">
- <strong>Import sendmail command from PHP settings</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- <p>If you enable this setting the sendmail command will be set to:</p>
- <p><pre>{preset.sendmailPath}</pre></p>
- </f:then>
- <f:else>
- <p>Sendmail was not found in your PHP settings.</p>
- </f:else>
- </f:if>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-mail-sendmail"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-mail-sendmail" class="t3-install-tool-configuration-radio-label">
+ <strong>Import sendmail command from PHP settings</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ <p>If you enable this setting the sendmail command will be set to:</p>
+ <p><pre>{preset.sendmailPath}</pre></p>
+ </f:then>
+ <f:else>
+ <p>Sendmail was not found in your PHP settings.</p>
+ </f:else>
+ </f:if>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Smtp.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Smtp.html
index 00a763a66703..bed6060d97d2 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Smtp.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Smtp.html
@@ -1,20 +1,20 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-mail-smtp"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-mail-smtp" class="t3-install-tool-configuration-radio-label">
- <strong>SMTP Settings</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>To set up the mailer agent in TYPO3 CMS to use SMTP it's necessary to configure a SMTP server that will take care of the delivery of your emails.
- Luckily, the configuration of a SMTP server is generally very easy. This option set some default values for you.</p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-mail-smtp"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-mail-smtp" class="t3-install-tool-configuration-radio-label">
+ <strong>SMTP Settings</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>To set up the mailer agent in TYPO3 CMS to use SMTP it's necessary to configure a SMTP server that will take care of the delivery of your emails.
+ Luckily, the configuration of a SMTP server is generally very easy. This option set some default values for you.</p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing.html
index c6c5c58cd4a9..76340c731737 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-default panel-flat">
- <div class="panel-heading" role="tab" id="headingSix">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapseSix" class="collapsed">
- <span class="caret"></span>
- Password hashing settings
- </a>
- </h4>
- </div>
- <div id="collapseSix" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSix">
- <div class="panel-body">
- <p>
- Passwords in TYPO3 for frontend and backend users are never stored in
- plain text in the database. A salted one-way hash algorithm is
- used.
- </p>
- <p>
- This module detects available password hash algorithms. If in doubt, select the first
- selectable one, it represents the most secure hash algorithm available
- on this system. The selected algorithm will be used for new frontend and backend users
- and existing users are upgraded to the selected algorithm upon their first successful login.
- </p>
- <f:for each="{feature.presetsOrderedByPriority}" as="preset">
- <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
- </f:for>
- </div>
- </div>
+ <div class="panel-heading" role="tab" id="headingSix">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapseSix" class="collapsed">
+ <span class="caret"></span>
+ Password hashing settings
+ </a>
+ </h4>
+ </div>
+ <div id="collapseSix" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSix">
+ <div class="panel-body">
+ <p>
+ Passwords in TYPO3 for frontend and backend users are never stored in
+ plain text in the database. A salted one-way hash algorithm is
+ used.
+ </p>
+ <p>
+ This module detects available password hash algorithms. If in doubt, select the first
+ selectable one, it represents the most secure hash algorithm available
+ on this system. The selected algorithm will be used for new frontend and backend users
+ and existing users are upgraded to the selected algorithm upon their first successful login.
+ </p>
+ <f:for each="{feature.presetsOrderedByPriority}" as="preset">
+ <f:render partial="Settings/Presets/{feature.name}/{preset.name}" arguments="{_all}" />
+ </f:for>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Argon2i.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Argon2i.html
index c2b9f9a5d279..f8661c032fed 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Argon2i.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Argon2i.html
@@ -1,33 +1,33 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-passwordHashing-argon2i"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-passwordHashing-argon2i" class="t3-install-tool-configuration-radio-label">
- <strong>Argon2i</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- Select this one if in doubt: Argon2i is a modern key derivation function that was selected as
- the winner of the Password Hashing Competition in July 2015.
- </f:then>
- <f:else>
- Argon2i is not available on this system. This is sad since it is a modern password hash
- algorithm and the winner of the Password Hashing Competition in July 2015. It is easily
- available on all platforms since PHP version 7.2. There is no sane reason to run PHP >7.2
- without argon2i. Please reach out to your hoster to fix this and select this hash algorithm
- as soon as it is available.
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-passwordHashing-argon2i"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-passwordHashing-argon2i" class="t3-install-tool-configuration-radio-label">
+ <strong>Argon2i</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ Select this one if in doubt: Argon2i is a modern key derivation function that was selected as
+ the winner of the Password Hashing Competition in July 2015.
+ </f:then>
+ <f:else>
+ Argon2i is not available on this system. This is sad since it is a modern password hash
+ algorithm and the winner of the Password Hashing Competition in July 2015. It is easily
+ available on all platforms since PHP version 7.2. There is no sane reason to run PHP >7.2
+ without argon2i. Please reach out to your hoster to fix this and select this hash algorithm
+ as soon as it is available.
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Bcrypt.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Bcrypt.html
index 3e5ea4326d17..c1f00735edcb 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Bcrypt.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Bcrypt.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-passwordHashing-bcrypt"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-passwordHashing-bcrypt" class="t3-install-tool-configuration-radio-label">
- <strong>bcrypt</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- bcrypt is a good password hashing algorithm. It however needs some additional quirks
- for long passwords in PHP and should only be used if Argon2i is not available.
- </f:then>
- <f:else>
- bcrypt is not available on this system. TYPO3 password storage not only requires bcrypt itself,
- but also sha384 to be availble to use this algorithm. One of these or both are missing. bcrypt however
- can be used as a fallback if Argon2i is not available, too. Ask reach out to your hoster to fix both
- and prefer Argon2i.
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-passwordHashing-bcrypt"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-passwordHashing-bcrypt" class="t3-install-tool-configuration-radio-label">
+ <strong>bcrypt</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ bcrypt is a good password hashing algorithm. It however needs some additional quirks
+ for long passwords in PHP and should only be used if Argon2i is not available.
+ </f:then>
+ <f:else>
+ bcrypt is not available on this system. TYPO3 password storage not only requires bcrypt itself,
+ but also sha384 to be availble to use this algorithm. One of these or both are missing. bcrypt however
+ can be used as a fallback if Argon2i is not available, too. Ask reach out to your hoster to fix both
+ and prefer Argon2i.
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html
index e1c7ff838f0f..0322ce3e039c 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html
@@ -1,37 +1,37 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="1" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-passwordHashing-custom"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- disabled="disabled"
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-passwordHashing-custom" class="t3-install-tool-configuration-radio-label">
- <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>Custom password hash settings. This interface does not allow modification of the values, they are just shown.
- Configuring custom hash settings is for advanced users who know exactly what they are doing. Refer to the
- core documentation for details.</p>
- <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
- <div class="form-group">
- <label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
- <div class="col-sm-6">
- <input
- id="{feature.name}{preset.name}{configurationKey}"
- type="text"
- name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
- value="{configurationValue}"
- disabled="disabled"
- class="form-control t3js-custom-preset"
- data-radio="t3-install-tool-configuration-passwordHashing-custom"
- />
- </div>
- </div>
- </f:for>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-passwordHashing-custom"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ disabled="disabled"
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-passwordHashing-custom" class="t3-install-tool-configuration-radio-label">
+ <strong>Custom configuration</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>Custom password hash settings. This interface does not allow modification of the values, they are just shown.
+ Configuring custom hash settings is for advanced users who know exactly what they are doing. Refer to the
+ core documentation for details.</p>
+ <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
+ <div class="form-group">
+ <label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
+ <div class="col-sm-6">
+ <input
+ id="{feature.name}{preset.name}{configurationKey}"
+ type="text"
+ name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+ value="{configurationValue}"
+ disabled="disabled"
+ class="form-control t3js-custom-preset"
+ data-radio="t3-install-tool-configuration-passwordHashing-custom"
+ />
+ </div>
+ </div>
+ </f:for>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Pbkdf2.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Pbkdf2.html
index 0fdf306c1d60..1fe200e6b33a 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Pbkdf2.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Pbkdf2.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-passwordHashing-pbkdf2"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-passwordHashing-pbkdf2" class="t3-install-tool-configuration-radio-label">
- <strong>PBKDF2</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- PBKDF2 is a key derivation function recommended by IETF in RFC 8018 as part of the PKCS series, even
- though newer password hashing functions such as Argon2i are designed to address weaknesses of PBKDF2.
- It could be a preferred password hash algorithm if storing passwords in a FIPS compliant way is necessary.
- Usually, selecting Argon2i as hash algorithm is good to go.
- </f:then>
- <f:else>
- PBKDF2 is not available on this system. This is very uncommon. If Argon2i and bcrypt are also not available,
- you should seriously question the quality of your current hoster and reach them out to fix this as soon as possible.
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-passwordHashing-pbkdf2"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-passwordHashing-pbkdf2" class="t3-install-tool-configuration-radio-label">
+ <strong>PBKDF2</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ PBKDF2 is a key derivation function recommended by IETF in RFC 8018 as part of the PKCS series, even
+ though newer password hashing functions such as Argon2i are designed to address weaknesses of PBKDF2.
+ It could be a preferred password hash algorithm if storing passwords in a FIPS compliant way is necessary.
+ Usually, selecting Argon2i as hash algorithm is good to go.
+ </f:then>
+ <f:else>
+ PBKDF2 is not available on this system. This is very uncommon. If Argon2i and bcrypt are also not available,
+ you should seriously question the quality of your current hoster and reach them out to fix this as soon as possible.
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Phpass.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Phpass.html
index af3d0d5dbf06..4989c378947c 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Phpass.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Phpass.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="{f:if(condition:'{preset.isAvailable}', then:'0', else:'2')}" disableIcon="true">
- <input
- type="radio"
- class="t3-install-tool-configuration-radio"
- id="t3-install-tool-configuration-passwordHashing-phpass"
- name="install[values][{feature.name}][enable]"
- value="{preset.name}"
- {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
- {f:if(condition: preset.isActive, then:'checked="checked"')}
- />
- <label for="t3-install-tool-configuration-passwordHashing-phpass" class="t3-install-tool-configuration-radio-label">
- <strong>phpass</strong> {f:if(condition: preset.isActive, then:' [Active]')}
- </label>
- <p>
- <f:if condition="{preset.isAvailable}">
- <f:then>
- In almost all cases, a modern hash algorithm like Argon2i should be preferred and is good to go.
- phpass is a portable public domain password hashing framework for use in PHP applications since 2005.
- The implementation should work on almost all PHP builds. It might be a suitable password storage hash
- method in seldom cases if third party systems must use the same password hash on a low database level
- and no sane different authentication service can be used for whatever reason.
- </f:then>
- <f:else>
- That's funny: phpass is always available!
- </f:else>
- </f:if>
- </p>
+ <input
+ type="radio"
+ class="t3-install-tool-configuration-radio"
+ id="t3-install-tool-configuration-passwordHashing-phpass"
+ name="install[values][{feature.name}][enable]"
+ value="{preset.name}"
+ {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
+ {f:if(condition: preset.isActive, then:'checked="checked"')}
+ />
+ <label for="t3-install-tool-configuration-passwordHashing-phpass" class="t3-install-tool-configuration-radio-label">
+ <strong>phpass</strong> {f:if(condition: preset.isActive, then:' [Active]')}
+ </label>
+ <p>
+ <f:if condition="{preset.isAvailable}">
+ <f:then>
+ In almost all cases, a modern hash algorithm like Argon2i should be preferred and is good to go.
+ phpass is a portable public domain password hashing framework for use in PHP applications since 2005.
+ The implementation should work on almost all PHP builds. It might be a suitable password storage hash
+ method in seldom cases if third party systems must use the same password hash on a low database level
+ and no sane different authentication service can be used for whatever reason.
+ </f:then>
+ <f:else>
+ That's funny: phpass is always available!
+ </f:else>
+ </f:if>
+ </p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html b/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
index 15e47c687484..245dafb801f5 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="panel panel-rst panel-{fileArray.class} risk-medium upgrade_analysis_item_to_filter item" data-item-tags="{fileArray.tagList}" data-item-version="{fileArray.version}" data-item-state="{state}" id="heading{id}">
- <div class="panel-heading" role="tab">
- <h3 class="panel-title">
- <f:if condition="{read}">
- <f:then>
- <a class="link-action t3js-upgradeDocs-unmarkRead pull-right" data-filepath="{fileArray.filepath}" data-toggle="tooltip" data-placement="top" title="Mark as not read">
- <i class="fa fa-lg fa-ban"></i>
- <span class="sr-only">restore this document</span>
- </a>
- </f:then>
- <f:else>
- <a class="link-action t3js-upgradeDocs-markRead pull-right" data-filepath="{fileArray.filepath}" data-toggle="tooltip" data-placement="top" title="Mark as read">
- <i class="fa fa-lg fa-check"></i>
- <span class="sr-only">ignore this document</span>
- </a>
- </f:else>
- </f:if>
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{id}" aria-expanded="true" aria-controls="collapse{id}" class="collapsed">
- <span class="caret"></span>
- <strong>{fileArray.headline}</strong>
- </a>
- </h3>
- </div>
- <div id="collapse{id}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{id}">
- <div class="rst-tags t3js-tags"></div>
- <pre><f:format.raw>{fileArray.parsedContent}</f:format.raw></pre>
- </div>
+ <div class="panel-heading" role="tab">
+ <h3 class="panel-title">
+ <f:if condition="{read}">
+ <f:then>
+ <a class="link-action t3js-upgradeDocs-unmarkRead pull-right" data-filepath="{fileArray.filepath}" data-toggle="tooltip" data-placement="top" title="Mark as not read">
+ <i class="fa fa-lg fa-ban"></i>
+ <span class="sr-only">restore this document</span>
+ </a>
+ </f:then>
+ <f:else>
+ <a class="link-action t3js-upgradeDocs-markRead pull-right" data-filepath="{fileArray.filepath}" data-toggle="tooltip" data-placement="top" title="Mark as read">
+ <i class="fa fa-lg fa-check"></i>
+ <span class="sr-only">ignore this document</span>
+ </a>
+ </f:else>
+ </f:if>
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{id}" aria-expanded="true" aria-controls="collapse{id}" class="collapsed">
+ <span class="caret"></span>
+ <strong>{fileArray.headline}</strong>
+ </a>
+ </h3>
+ </div>
+ <div id="collapse{id}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{id}">
+ <div class="rst-tags t3js-tags"></div>
+ <pre><f:format.raw>{fileArray.parsedContent}</f:format.raw></pre>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
index f9e9097ee8aa..9f7394ff3c47 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
@@ -3,60 +3,60 @@
<h1>Environment</h1>
<div class="card-container">
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Environment Overview', subtitle: 'Environment', icon: 'Icons/modules/install-show-environment.svg'}" />
- <div class="card-content">
- <p class="card-text">Gives an overview of your host environment including its web server, PHP version and selected database.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/SystemInformation">Show System Information</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Environment Status', subtitle: 'PHP', icon: 'Icons/modules/install-test-environment.svg'}" />
- <div class="card-content">
- <p class="card-text">Analyzes your host environment, identifying any issues that may prevent TYPO3 from running correctly.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/EnvironmentCheck">Check Environment</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Directory Status', subtitle: 'Permissions', icon: 'Icons/modules/install-check-directory.svg'}" />
- <div class="card-content">
- <p class="card-text">Analyzes your folder structure, checking files and directories for correct permissions and identifying any files or directories that may be missing from your installation.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/FolderStructure">Check Directory Status</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'PHP Info', subtitle: 'PHP', icon: 'Icons/modules/install-php-info.svg'}" />
- <div class="card-content">
- <p class="card-text">Outputs detailed information about your installation of PHP. Including version details and enabled PHP extensions.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/PhpInfo">View PHP Info</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Test Mail Setup', subtitle: 'Mail', icon: 'Icons/modules/install-test-mail.svg'}" />
- <div class="card-content">
- <p class="card-text">Test your mail configuration by sending out a dummy email via TYPO3.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/MailTest">Test Mail Setup</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Image Processing', subtitle: 'Image Processing', icon: 'Icons/modules/install-test-image.svg'}" />
- <div class="card-content">
- <p class="card-text">Creates test images and compares them against a set of reference images to help ensure that image processing is working correctly within your environment.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ImageProcessing">Test Images</a>
- </div>
- </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Environment Overview', subtitle: 'Environment', icon: 'Icons/modules/install-show-environment.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Gives an overview of your host environment including its web server, PHP version and selected database.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/SystemInformation">Show System Information</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Environment Status', subtitle: 'PHP', icon: 'Icons/modules/install-test-environment.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Analyzes your host environment, identifying any issues that may prevent TYPO3 from running correctly.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/EnvironmentCheck">Check Environment</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Directory Status', subtitle: 'Permissions', icon: 'Icons/modules/install-check-directory.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Analyzes your folder structure, checking files and directories for correct permissions and identifying any files or directories that may be missing from your installation.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/FolderStructure">Check Directory Status</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'PHP Info', subtitle: 'PHP', icon: 'Icons/modules/install-php-info.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Outputs detailed information about your installation of PHP. Including version details and enabled PHP extensions.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/PhpInfo">View PHP Info</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Test Mail Setup', subtitle: 'Mail', icon: 'Icons/modules/install-test-mail.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Test your mail configuration by sending out a dummy email via TYPO3.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/MailTest">Test Mail Setup</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Image Processing', subtitle: 'Image Processing', icon: 'Icons/modules/install-test-image.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Creates test images and compares them against a set of reference images to help ensure that image processing is working correctly within your environment.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ImageProcessing">Test Images</a>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/EnvironmentCheck.html b/typo3/sysext/install/Resources/Private/Templates/Environment/EnvironmentCheck.html
index 7f2bb5fb7ec7..f8ea8665259f 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/EnvironmentCheck.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/EnvironmentCheck.html
@@ -2,10 +2,10 @@
<p>A series of PHP settings and database checks.</p>
<button
- class="btn btn-default t3js-environmentCheck-execute"
- type="button"
+ class="btn btn-default t3js-environmentCheck-execute"
+ type="button"
>
- Run tests again
+ Run tests again
</button>
<hr>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/FolderStructure.html b/typo3/sysext/install/Resources/Private/Templates/Environment/FolderStructure.html
index e98163f482d3..9d3e8ea43629 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/FolderStructure.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/FolderStructure.html
@@ -5,15 +5,15 @@
<div class="t3js-folderStructure-output"></div>
<div class="t3js-folderStructure-errors" style="display:none">
- <hr/>
- <h3>These files or folders have errors and may be fixed automatically:</h3>
- <div class="t3js-folderStructure-errors-list"></div>
- <button
- class="btn btn-default t3js-folderStructure-errors-fix"
- type="button"
- >
- Try to fix file and folder permissions
- </button>
+ <hr/>
+ <h3>These files or folders have errors and may be fixed automatically:</h3>
+ <div class="t3js-folderStructure-errors-list"></div>
+ <button
+ class="btn btn-default t3js-folderStructure-errors-fix"
+ type="button"
+ >
+ Try to fix file and folder permissions
+ </button>
</div>
<hr/>
@@ -22,9 +22,9 @@
<div class="t3js-folderStructure-permissions"></div>
<div class="t3js-folderStructure-ok" style="display:none">
- <hr/>
- <h3>These structures don't need to be fixed:</h3>
- <div class="t3js-folderStructure-ok-list"></div>
+ <hr/>
+ <h3>These structures don't need to be fixed:</h3>
+ <div class="t3js-folderStructure-ok-list"></div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/ImageProcessing.html b/typo3/sysext/install/Resources/Private/Templates/Environment/ImageProcessing.html
index 537a13615ad8..b9862154639d 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/ImageProcessing.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/ImageProcessing.html
@@ -3,58 +3,58 @@
<p>A set of various image manipulation testing main processing aspects.</p>
<div style="display:none;">
- <div class="t3js-imageProcessing-twinImage-template">
- <div class="t3-install-displaytwinimageimages t3js-imageProcessing-images" style="display:none;">
- <div class="row">
- <div class="col-xs-12 col-md-6">
- <h4>Reference</h4>
- <div class="bg-transparent-emulation">
- <img class="reference"/>
- </div>
- </div>
- <div class="col-xs-12 col-md-6">
- <h4>Your system</h4>
- <div class="bg-transparent-emulation">
- <img class="result"/>
- </div>
- </div>
- </div>
- </div>
- <div class="t3-install-displaytwinimagetextarea t3js-imageProcessing-command" style="display:none;">
- <pre><code class="language-bash t3js-imageProcessing-command-text"></code></pre>
- </div>
- </div>
+ <div class="t3js-imageProcessing-twinImage-template">
+ <div class="t3-install-displaytwinimageimages t3js-imageProcessing-images" style="display:none;">
+ <div class="row">
+ <div class="col-xs-12 col-md-6">
+ <h4>Reference</h4>
+ <div class="bg-transparent-emulation">
+ <img class="reference"/>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6">
+ <h4>Your system</h4>
+ <div class="bg-transparent-emulation">
+ <img class="result"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="t3-install-displaytwinimagetextarea t3js-imageProcessing-command" style="display:none;">
+ <pre><code class="language-bash t3js-imageProcessing-command-text"></code></pre>
+ </div>
+ </div>
</div>
<button
- class="btn btn-default t3js-imageProcessing-execute"
- type="button"
+ class="btn btn-default t3js-imageProcessing-execute"
+ type="button"
>
- Run image tests again
+ Run image tests again
</button>
<hr>
<h3>True type font tests</h3>
<f:be.infobox title="FreeType2 hint" state="-1">
- <p>If the two images below do not look the same, please check your FreeType 2 module.</p>
+ <p>If the two images below do not look the same, please check your FreeType 2 module.</p>
</f:be.infobox>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingTrueType"></div>
<hr>
<h3>Convert image formats to jpg</h3>
<p>
- This verifies that your ImageMagick installation is able to read the default
- formats <code>jpg</code>, <code>gif</code>, <code>png</code>, <code>tif</code>, <code>pdf</code> and
- <code>ai</code>.
- The tool <code>identify</code> is used to read the pixeldimensions of non-web formats and 'convert' is used to
- read the image and convert it to <code>jpg</code>.
+ This verifies that your ImageMagick installation is able to read the default
+ formats <code>jpg</code>, <code>gif</code>, <code>png</code>, <code>tif</code>, <code>pdf</code> and
+ <code>ai</code>.
+ The tool <code>identify</code> is used to read the pixeldimensions of non-web formats and 'convert' is used to
+ read the image and convert it to <code>jpg</code>.
</p>
<f:be.infobox title="Dark images" state="-1">
- <p>
- In case the images appear remarkably darker than the reference images,
- try to set <code>$GLOBALS['TYPO3_CONF_VARS']['GFX']['colorspace'] = sRGB.</code>
- </p>
+ <p>
+ In case the images appear remarkably darker than the reference images,
+ try to set <code>$GLOBALS['TYPO3_CONF_VARS']['GFX']['colorspace'] = sRGB.</code>
+ </p>
</f:be.infobox>
<h4>Read jpg</h4>
@@ -78,9 +78,9 @@
<h3>Writing gif and png</h3>
<p>
- This verifies that ImageMagick is able to write GIF and PNG files.
- The GIF-file is attempted compressed with LZW by the
- <code>\TYPO3\CMS\Core\Imaging\GraphicalFunctions::gifCompress()</code> function.
+ This verifies that ImageMagick is able to write GIF and PNG files.
+ The GIF-file is attempted compressed with LZW by the
+ <code>\TYPO3\CMS\Core\Imaging\GraphicalFunctions::gifCompress()</code> function.
</p>
<h4>Write gif</h4>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingWriteGif"></div>
@@ -90,7 +90,7 @@
<h3>Scaling images</h3>
<p>
- This shows how ImageMagick reacts when scaling transparent GIF and PNG files.
+ This shows how ImageMagick reacts when scaling transparent GIF and PNG files.
</p>
<h4>gif to gif</h4>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingGifToGif"></div>
@@ -102,8 +102,8 @@
<h3>Combining images</h3>
<p>
- This verifies that the ImageMagick tools, <code>combine</code>, <code>composite</code>, are able to
- combine two images through a grayscale mask.
+ This verifies that the ImageMagick tools, <code>combine</code>, <code>composite</code>, are able to
+ combine two images through a grayscale mask.
</p>
<h4>Combine using a GIF mask with only black and white</h4>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingCombineGifMask"></div>
@@ -113,7 +113,7 @@
<h3>GDlib</h3>
<p>
- This verifies that the GDLib installation works properly.
+ This verifies that the GDLib installation works properly.
</p>
<h4>Create simple image</h4>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingGdlibSimple"></div>
@@ -126,183 +126,183 @@
<h4>Render text with TrueType font using 'niceText' option</h4>
<f:be.infobox title="Note on 'niceText'" state="-1">
- <p>
- 'niceText' is a concept that tries to improve the antialiasing of the rendered type by actually
- rendering the textstring in double size on a black/white mask, downscaling the mask and masking
- the text onto the image through this mask. This involves ImageMagick 'combine'/'composite' and 'convert'.
- </p>
+ <p>
+ 'niceText' is a concept that tries to improve the antialiasing of the rendered type by actually
+ rendering the textstring in double size on a black/white mask, downscaling the mask and masking
+ the text onto the image through this mask. This involves ImageMagick 'combine'/'composite' and 'convert'.
+ </p>
</f:be.infobox>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingGdlibNiceText"></div>
<h4>Render 'niceText' with a shadow under</h4>
<f:be.infobox title="Note on 'shadow'" state="-1">
- <p>
- This test makes sense only if the above test had a correct output. But if so, you may not see
- a soft dropshadow from the third text string as you should. In that case you are most likely using
- ImageMagick 5 and should set the flag <code>$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_effects']</code>.
- </p>
+ <p>
+ This test makes sense only if the above test had a correct output. But if so, you may not see
+ a soft dropshadow from the third text string as you should. In that case you are most likely using
+ ImageMagick 5 and should set the flag <code>$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_effects']</code>.
+ </p>
</f:be.infobox>
<div class="t3js-imageProcessing-twinContainer" data-test="imageProcessingGdlibNiceTextShadow"></div>
<hr>
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="headingConfiguration">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseConfiguration" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
- <span class="caret"></span>
- Current configuration
- </a>
- </h4>
- </div>
- <div id="collapseConfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingConfiguration">
- <div class="panel-body">
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingConfiguration">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseConfiguration" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
+ <span class="caret"></span>
+ Current configuration
+ </a>
+ </h4>
+ </div>
+ <div id="collapseConfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingConfiguration">
+ <div class="panel-body">
- <table class="table table-striped">
- <tr>
- <td>{imageProcessingProcessor} enabled:</td>
- <td>{f:if(condition:imageProcessingEnabled, then:'Yes', else:'No')}</td>
- </tr>
- <tr>
- <td>ImageMagick or GraphicsMagick:</td>
- <td>{imageProcessingProcessor}</td>
- </tr>
- <tr>
- <td>{imageProcessingProcessor} path:</td>
- <td>{imageProcessingPath}</td>
- </tr>
- <tr>
- <td>{imageProcessingProcessor} version:</td>
- <td>{imageProcessingVersion}</td>
- </tr>
- <tr>
- <td>{imageProcessingProcessor} effects enabled:</td>
- <td>{imageProcessingEffects} <span>(Blurring/Sharpening with {imageProcessingProcessor})</span></td>
- </tr>
- <tr>
- <td>GDLib enabled:</td>
- <td>{f:if(condition:imageProcessingGdlibEnabled, then:'Yes', else:'No')}</td>
- </tr>
- <tr>
- <td>GDLib using PNG:</td>
- <td>{f:if(condition:imageProcessingGdlibPng, then:'Yes', else:'No')}</td>
- </tr>
- <tr>
- <td>File Formats:</td>
- <td>{imageProcessingFileFormats}</td>
- </tr>
- </table>
- </div>
- </div>
- </div>
+ <table class="table table-striped">
+ <tr>
+ <td>{imageProcessingProcessor} enabled:</td>
+ <td>{f:if(condition:imageProcessingEnabled, then:'Yes', else:'No')}</td>
+ </tr>
+ <tr>
+ <td>ImageMagick or GraphicsMagick:</td>
+ <td>{imageProcessingProcessor}</td>
+ </tr>
+ <tr>
+ <td>{imageProcessingProcessor} path:</td>
+ <td>{imageProcessingPath}</td>
+ </tr>
+ <tr>
+ <td>{imageProcessingProcessor} version:</td>
+ <td>{imageProcessingVersion}</td>
+ </tr>
+ <tr>
+ <td>{imageProcessingProcessor} effects enabled:</td>
+ <td>{imageProcessingEffects} <span>(Blurring/Sharpening with {imageProcessingProcessor})</span></td>
+ </tr>
+ <tr>
+ <td>GDLib enabled:</td>
+ <td>{f:if(condition:imageProcessingGdlibEnabled, then:'Yes', else:'No')}</td>
+ </tr>
+ <tr>
+ <td>GDLib using PNG:</td>
+ <td>{f:if(condition:imageProcessingGdlibPng, then:'Yes', else:'No')}</td>
+ </tr>
+ <tr>
+ <td>File Formats:</td>
+ <td>{imageProcessingFileFormats}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="headingVerify">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseVerify" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
- <span class="caret"></span>
- Verify test results
- </a>
- </h4>
- </div>
- <div id="collapseVerify" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingVerify">
- <div class="panel-body">
- <h4>Verify test results</h4>
- <p>
- This page performs image processing and displays the result. It's a thorough check
- that everything you've configured is working correctly.
- </p>
- <p>
- It's quite simple to verify your installation; Just look down the page, the images
- in pairs should look like each other. If some images are not alike, something is
- wrong. You may also notice warnings and errors if this tool found signs of any problems.
- </p>
- <p>
- The image to the left is the reference image (how it should be) and to the right
- the image made by your server.
- </p>
- </div>
- </div>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingVerify">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseVerify" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
+ <span class="caret"></span>
+ Verify test results
+ </a>
+ </h4>
+ </div>
+ <div id="collapseVerify" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingVerify">
+ <div class="panel-body">
+ <h4>Verify test results</h4>
+ <p>
+ This page performs image processing and displays the result. It's a thorough check
+ that everything you've configured is working correctly.
+ </p>
+ <p>
+ It's quite simple to verify your installation; Just look down the page, the images
+ in pairs should look like each other. If some images are not alike, something is
+ wrong. You may also notice warnings and errors if this tool found signs of any problems.
+ </p>
+ <p>
+ The image to the left is the reference image (how it should be) and to the right
+ the image made by your server.
+ </p>
+ </div>
+ </div>
+ </div>
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="headingAbout">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAbout" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
- <span class="caret"></span>
- About image handling
- </a>
- </h4>
- </div>
- <div id="collapseAbout" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAbout">
- <div class="panel-body">
- <p>
- TYPO3 is known for its ability to process images on the server.
- </p>
- <p>
- In the backend interface (TBE) thumbnails are automatically generated
- as well as icons, menu items and pane tabs (by GDLib).
- In the frontend all kinds of graphical elements are processed. Typically images are
- scaled down to fit the pages (by ImageMagick) and menu items, graphical headers and
- such are generated automatically (by GDLib + ImageMagick). In addition TYPO3 is able
- to handle many file formats (thanks to ImageMagick), for example TIF, BMP, PCX, TGA,
- AI and PDF in addition to the standard web formats; JPG, GIF, PNG.
- </p>
- <p>
- In order to do this, TYPO3 uses two sets of tools:
- </p>
- <strong>
- ImageMagick / GraphicsMagick:
- </strong>
- <p>
- For conversion of non-web formats to webformats, combining images with alpha-masks,
- performing image-effects like blurring and sharpening.
- </p>
- <p>
- ImageMagick is a collection of external programs on the server called by the exec()
- function in PHP. TYPO3 uses three of these, namely 'convert' (converting fileformats,
- scaling, effects), 'combine'/'composite' (combining images with masks) and 'identify'
- (returns image information). GraphicsMagick is an alternative to ImageMagick and can
- be enabled by setting [GFX][processor] to 'GraphicsMagick'. This is recommended and enabled
- by default. Because ImageMagick and Graphicsmagick are external programs, a requirement
- must be met: The programs must be installed on the server and working. ImageMagick is
- available for both Windows and Unix. The current version is 6+. ImageMagick homepage is
- at <a href="http://www.imagemagick.org/">http://www.imagemagick.org/</a>
- </p>
- <strong>GDLib:</strong>
- <p>
- For drawing boxes and rendering text on images with truetype fonts. Also used for
- icons, menuitems and generally the TypoScript GIFBUILDER object is based on GDlib,
- but extensively utilizing ImageMagick to process intermediate results.
- </p>
- <p>
- GDLib is accessed through internal functions in PHP, you'll need a version of PHP
- with GDLib compiled in. Also in order to use TrueType fonts with GDLib you'll
- need FreeType compiled in as well.
- </p>
- </div>
- </div>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingAbout">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAbout" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
+ <span class="caret"></span>
+ About image handling
+ </a>
+ </h4>
+ </div>
+ <div id="collapseAbout" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAbout">
+ <div class="panel-body">
+ <p>
+ TYPO3 is known for its ability to process images on the server.
+ </p>
+ <p>
+ In the backend interface (TBE) thumbnails are automatically generated
+ as well as icons, menu items and pane tabs (by GDLib).
+ In the frontend all kinds of graphical elements are processed. Typically images are
+ scaled down to fit the pages (by ImageMagick) and menu items, graphical headers and
+ such are generated automatically (by GDLib + ImageMagick). In addition TYPO3 is able
+ to handle many file formats (thanks to ImageMagick), for example TIF, BMP, PCX, TGA,
+ AI and PDF in addition to the standard web formats; JPG, GIF, PNG.
+ </p>
+ <p>
+ In order to do this, TYPO3 uses two sets of tools:
+ </p>
+ <strong>
+ ImageMagick / GraphicsMagick:
+ </strong>
+ <p>
+ For conversion of non-web formats to webformats, combining images with alpha-masks,
+ performing image-effects like blurring and sharpening.
+ </p>
+ <p>
+ ImageMagick is a collection of external programs on the server called by the exec()
+ function in PHP. TYPO3 uses three of these, namely 'convert' (converting fileformats,
+ scaling, effects), 'combine'/'composite' (combining images with masks) and 'identify'
+ (returns image information). GraphicsMagick is an alternative to ImageMagick and can
+ be enabled by setting [GFX][processor] to 'GraphicsMagick'. This is recommended and enabled
+ by default. Because ImageMagick and Graphicsmagick are external programs, a requirement
+ must be met: The programs must be installed on the server and working. ImageMagick is
+ available for both Windows and Unix. The current version is 6+. ImageMagick homepage is
+ at <a href="http://www.imagemagick.org/">http://www.imagemagick.org/</a>
+ </p>
+ <strong>GDLib:</strong>
+ <p>
+ For drawing boxes and rendering text on images with truetype fonts. Also used for
+ icons, menuitems and generally the TypoScript GIFBUILDER object is based on GDlib,
+ but extensively utilizing ImageMagick to process intermediate results.
+ </p>
+ <p>
+ GDLib is accessed through internal functions in PHP, you'll need a version of PHP
+ with GDLib compiled in. Also in order to use TrueType fonts with GDLib you'll
+ need FreeType compiled in as well.
+ </p>
+ </div>
+ </div>
+ </div>
- <div class="panel panel-default">
- <div class="panel-heading" role="tab" id="headingTestImages">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTestImages" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
- <span class="caret"></span>
- About test images
- </a>
- </h4>
- </div>
- <div id="collapseTestImages" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTestImages">
- <div class="panel-body">
- <p>
- Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or
- <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>],
- <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a>
- </p>
- </div>
- </div>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingTestImages">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTestImages" aria-expanded="true" aria-controls="collapseFive" class="collapsed">
+ <span class="caret"></span>
+ About test images
+ </a>
+ </h4>
+ </div>
+ <div id="collapseTestImages" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTestImages">
+ <div class="panel-body">
+ <p>
+ Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>],
+ <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a>
+ </p>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html b/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
index e59443f2b46a..2384a11fd54b 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
@@ -1,45 +1,45 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Check the basic mail functionality by entering your email address here and clicking the button.
- You should then receive a test email from "{senderEmailAddress}".
+ Check the basic mail functionality by entering your email address here and clicking the button.
+ You should then receive a test email from "{senderEmailAddress}".
</p>
<p>
- If no email is received, your setup might be broken. Check the following:
+ If no email is received, your setup might be broken. Check the following:
</p>
<ul>
- <li>
- If <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport']</code> is set to mail or sendmail, TYPO3 tries to use
- PHPs internal mail() function. There might be no such program installed.
- </li>
- <li>
- If <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport']</code> is set to smtp, check if the data given in
- <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport_smtp_*']</code> is valid. Wrong data here results in faulty
- requests to the mail server. You can find the resulting messages in the mail server log.
- </li>
+ <li>
+ If <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport']</code> is set to mail or sendmail, TYPO3 tries to use
+ PHPs internal mail() function. There might be no such program installed.
+ </li>
+ <li>
+ If <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport']</code> is set to smtp, check if the data given in
+ <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport_smtp_*']</code> is valid. Wrong data here results in faulty
+ requests to the mail server. You can find the resulting messages in the mail server log.
+ </li>
</ul>
<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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/PhpInfo.html b/typo3/sysext/install/Resources/Private/Templates/Environment/PhpInfo.html
index 385504c85813..143503d89dca 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/PhpInfo.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/PhpInfo.html
@@ -1,7 +1,7 @@
<html xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="table-responsive" id="phpinfo">
- <i:phpInfo/>
+ <i:phpInfo/>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/SystemInformation.html b/typo3/sysext/install/Resources/Private/Templates/Environment/SystemInformation.html
index 9b74e6de8590..02a89d4a93d1 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/SystemInformation.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/SystemInformation.html
@@ -1,56 +1,56 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<table class="table table-striped table-bordered">
- <tr>
- <td>Operating system:</td>
- <td><strong>{systemInformationOperatingSystem}</strong></td>
- </tr>
- <tr>
- <td>PHP version:</td>
- <td><strong>
- <i:constant name="PHP_VERSION"/>
- </strong></td>
- </tr>
- <tr>
- <td>PHP CGI detected:</td>
- <td><strong>{f:if(condition:systemInformationCgiDetected, then:'Yes', else:'No')}</strong></td>
- </tr>
- <f:if condition="{systemInformationDatabaseConnections -> f:count()} > 1">
- <tr>
- <td>Number of database connections:</td>
- <td><strong>{systemInformationDatabaseConnections -> f:count()}</strong></td>
- </tr>
- </f:if>
- <f:for each="{systemInformationDatabaseConnections}" as="connection">
- <tr>
- <td>Database connection <strong>'{connection.connectionName}'</strong></td>
- <td>
- <ul>
- <li><strong>Database name:</strong> {connection.databaseName}</li>
- <li><strong>Username:</strong> {connection.username}</li>
- <li><strong>Host:</strong> {connection.host}</li>
- <f:if condition="{connection.port}">
- <f:then>
- <li><strong>Port:</strong> {connection.port}</li>
- </f:then>
- <f:else>
- <li>
- <strong>Socket:</strong>
- {f:if(condition:connection.socket, then: '{connection.socket}', else:'<em>PHP default</em>')}
- </li>
- </f:else>
- </f:if>
- <li><strong>Version:</strong> {connection.version}</li>
- <li><strong>Tables:</strong> {connection.numberOfTables}</li>
- <f:if condition="{connection.numberOfMappedTables}">
- <f:then>
- <li><strong>Mapped tables:</strong> {connection.numberOfMappedTables}</li>
- </f:then>
- </f:if>
- </ul>
- </td>
- </tr>
- </f:for>
+ <tr>
+ <td>Operating system:</td>
+ <td><strong>{systemInformationOperatingSystem}</strong></td>
+ </tr>
+ <tr>
+ <td>PHP version:</td>
+ <td><strong>
+ <i:constant name="PHP_VERSION"/>
+ </strong></td>
+ </tr>
+ <tr>
+ <td>PHP CGI detected:</td>
+ <td><strong>{f:if(condition:systemInformationCgiDetected, then:'Yes', else:'No')}</strong></td>
+ </tr>
+ <f:if condition="{systemInformationDatabaseConnections -> f:count()} > 1">
+ <tr>
+ <td>Number of database connections:</td>
+ <td><strong>{systemInformationDatabaseConnections -> f:count()}</strong></td>
+ </tr>
+ </f:if>
+ <f:for each="{systemInformationDatabaseConnections}" as="connection">
+ <tr>
+ <td>Database connection <strong>'{connection.connectionName}'</strong></td>
+ <td>
+ <ul>
+ <li><strong>Database name:</strong> {connection.databaseName}</li>
+ <li><strong>Username:</strong> {connection.username}</li>
+ <li><strong>Host:</strong> {connection.host}</li>
+ <f:if condition="{connection.port}">
+ <f:then>
+ <li><strong>Port:</strong> {connection.port}</li>
+ </f:then>
+ <f:else>
+ <li>
+ <strong>Socket:</strong>
+ {f:if(condition:connection.socket, then: '{connection.socket}', else:'<em>PHP default</em>')}
+ </li>
+ </f:else>
+ </f:if>
+ <li><strong>Version:</strong> {connection.version}</li>
+ <li><strong>Tables:</strong> {connection.numberOfTables}</li>
+ <f:if condition="{connection.numberOfMappedTables}">
+ <f:then>
+ <li><strong>Mapped tables:</strong> {connection.numberOfMappedTables}</li>
+ </f:then>
+ </f:if>
+ </ul>
+ </td>
+ </tr>
+ </f:for>
</table>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html b/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
index 07a4997bffa6..6ef74ff8d86e 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
<head>
- <title>Installing TYPO3 CMS</title>
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" type="text/css" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
- <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
- <script>
- var __bust = '{bust}';
- </script>
- <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
- <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
- <script type="text/javascript">
- require(['TYPO3/CMS/Install/Installer']);
- </script>
+ <title>Installing TYPO3 CMS</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="stylesheet" type="text/css" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
+ <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
+ <script>
+ var __bust = '{bust}';
+ </script>
+ <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
+ <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
+ <script type="text/javascript">
+ require(['TYPO3/CMS/Install/Installer']);
+ </script>
</head>
<body class="backend t3js-body install-tool-installer typo3-install"></body>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html b/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
index 190e7dc7f6b3..22358b4aeaf9 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
@@ -1,17 +1,17 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="typo3-install-container">
- <div class="typo3-install-content">
- <div class="typo3-install-content-header">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="typo3-install-content-header-logo" />
- <h1>Installing TYPO3 CMS</h1>
- </div>
- <div class="typo3-install-content-progress">
- <div class="progress t3js-installer-progress">
- <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="" aria-valuemin="0" aria-valuemax="100" style="width: {currentStep.percent}%;"></div>
- </div>
- </div>
- <div class="t3js-installer-content">
- </div>
- </div>
+ <div class="typo3-install-content">
+ <div class="typo3-install-content-header">
+ <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="typo3-install-content-header-logo" />
+ <h1>Installing TYPO3 CMS</h1>
+ </div>
+ <div class="typo3-install-content-progress">
+ <div class="progress t3js-installer-progress">
+ <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="" aria-valuemin="0" aria-valuemax="100" style="width: {currentStep.percent}%;"></div>
+ </div>
+ </div>
+ <div class="t3js-installer-content">
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html
index 0328db6f3c29..0c86a4408e6e 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html
@@ -1,286 +1,286 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-installer-database-connect-execute-token="{executeDatabaseConnectToken}">
- <div class="typo3-install-content-body">
- <h2>Select database</h2>
- <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="typo3-install-content-spacer"></div>
- <div class="t3js-installer-databaseConnect-output"></div>
- <div class="typo3-install-content-spacer"></div>
- <div class="row">
- <div class="col-md-12">
- <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 class="typo3-install-content-body">
+ <h2>Select database</h2>
+ <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="typo3-install-content-spacer"></div>
+ <div class="t3js-installer-databaseConnect-output"></div>
+ <div class="typo3-install-content-spacer"></div>
+ <div class="row">
+ <div class="col-md-12">
+ <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>
- <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 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 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 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>
- </f:if>
+ <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 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 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 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>
+ </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"
- />
- </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>
- </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"
- />
- </div>
- </div>
- </div>
- </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"
+ />
+ </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>
+ </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"
+ />
+ </div>
+ </div>
+ </div>
+ </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"
- />
- </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>
- </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>
- </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>
- </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>
- </div>
- </div>
- </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"
+ />
+ </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>
+ </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>
+ </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>
+ </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>
+ </div>
+ </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="{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>
- <button class="btn btn-success pull-right t3js-installer-databaseConnect-execute">
- Continue
- </button>
- </form>
- </div>
- </div>
- </f:then>
+ <button class="btn btn-success pull-right t3js-installer-databaseConnect-execute">
+ Continue
+ </button>
+ </form>
+ </div>
+ </div>
+ </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>
- </div>
+ <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>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html
index c14b263b9211..671dd5598b2b 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html
@@ -1,82 +1,82 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-installer-database-data-execute-token="{executeDatabaseDataToken}">
- <div class="typo3-install-content-body">
- <h3>Create Administrative User / Specify Site Name</h3>
+ <div class="typo3-install-content-body">
+ <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="typo3-install-content-spacer"></div>
- <div class="t3js-installer-databaseData-output"></div>
- <div class="typo3-install-content-spacer"></div>
+ <div class="typo3-install-content-spacer"></div>
+ <div class="t3js-installer-databaseData-output"></div>
+ <div class="typo3-install-content-spacer"></div>
- <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 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 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>
+ <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 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 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 class="form-group">
- <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}"
- />
- </div>
- </div>
- <div class="clearfix">
- <button class="btn btn-success pull-right t3js-installer-databaseData-execute">
- Continue
- </button>
- </div>
- </form>
+ <div class="form-group">
+ <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}"
+ />
+ </div>
+ </div>
+ <div class="clearfix">
+ <button class="btn btn-success pull-right t3js-installer-databaseData-execute">
+ Continue
+ </button>
+ </div>
+ </form>
- </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html
index fa0acf5657a6..7394051a9eb6 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html
@@ -1,84 +1,84 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-installer-database-select-execute-token="{executeDatabaseSelectToken}">
- <div class="typo3-install-content-body">
- <h2>Select a database</h2>
+ <div class="typo3-install-content-body">
+ <h2>Select a database</h2>
- <div class="typo3-install-content-spacer"></div>
- <div class="t3js-installer-databaseSelect-output"></div>
- <div class="typo3-install-content-spacer"></div>
+ <div class="typo3-install-content-spacer"></div>
+ <div class="t3js-installer-databaseSelect-output"></div>
+ <div class="typo3-install-content-spacer"></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>
+ <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-12">
- <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-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>
+ <form method="post" id="stepInstaller-databaseSelect">
+ <div class="row">
+ <div class="col-md-12">
+ <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-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 class="form-group">
- <button class="btn btn-success pull-right t3js-installer-databaseSelect-execute">
- Continue
- </button>
- </div>
- </div>
- </div>
- </form>
- </div>
+ <div class="form-group">
+ <button class="btn btn-success pull-right t3js-installer-databaseSelect-execute">
+ Continue
+ </button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html
index 3bd173a82c78..69af27fff09f 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html
@@ -1,53 +1,53 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-installer-default-configuration-execute-token="{executeDefaultConfigurationToken}">
- <div class="typo3-install-content-body">
- <h2>Installation Complete</h2>
- <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="typo3-install-content-body">
+ <h2>Installation Complete</h2>
+ <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="typo3-install-content-spacer"></div>
- <div class="t3js-installer-defaultConfiguration-output"></div>
- <div class="typo3-install-content-spacer"></div>
+ <div class="typo3-install-content-spacer"></div>
+ <div class="t3js-installer-defaultConfiguration-output"></div>
+ <div class="typo3-install-content-spacer"></div>
- <f:if condition="!{composerMode}">
- <div class="alert alert-notice">
- <h3>Want a pre-configured site?</h3>
- <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">
+ <h3>Want a pre-configured site?</h3>
+ <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}">
- <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="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>
- <div class="clearfix">
- <button class="btn btn-success pull-right t3js-installer-defaultConfiguration-execute">
- Open the TYPO3 Backend
- </button>
- </div>
- </form>
- </div>
+ <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="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>
+ <div class="clearfix">
+ <button class="btn btn-success pull-right t3js-installer-defaultConfiguration-execute">
+ Open the TYPO3 Backend
+ </button>
+ </div>
+ </form>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowEnvironmentAndFolders.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowEnvironmentAndFolders.html
index 519e7a674692..30bb471c085e 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowEnvironmentAndFolders.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowEnvironmentAndFolders.html
@@ -1,37 +1,37 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="typo3-install-content-body">
- <h2>Environment Overview</h2>
- <p>First the Install Wizard needs to inspect your web server and identify any issues that may prevent TYPO3 from running correctly.</p>
+ <h2>Environment Overview</h2>
+ <p>First the Install Wizard needs to inspect your web server and identify any issues that may prevent TYPO3 from running correctly.</p>
- <div class="t3js-installer-environment-details" style="display: none;">
- <h3>Problems Detected</h3>
- </div>
+ <div class="t3js-installer-environment-details" style="display: none;">
+ <h3>Problems Detected</h3>
+ </div>
- <form class="t3js-installer-environmentFolders-bad" style="display: none;">
- <div class="typo3-install-content-spacer-small">
- <button class="btn btn-default t3js-installer-environmentFolders-retry">
- Scan environment again
- </button>
- </div>
- </form>
+ <form class="t3js-installer-environmentFolders-bad" style="display: none;">
+ <div class="typo3-install-content-spacer-small">
+ <button class="btn btn-default t3js-installer-environmentFolders-retry">
+ Scan environment again
+ </button>
+ </div>
+ </form>
- <form class="t3js-installer-environmentFolders-bad" style="display: none;">
- <div class="typo3-install-content-spacer-small">
- <button class="btn btn-danger t3js-installer-environmentFolders-execute">
- Continue with errors
- <span class="t3-install-form-button-icon-negative"> </span>
- </button>
- </div>
- </form>
+ <form class="t3js-installer-environmentFolders-bad" style="display: none;">
+ <div class="typo3-install-content-spacer-small">
+ <button class="btn btn-danger t3js-installer-environmentFolders-execute">
+ Continue with errors
+ <span class="t3-install-form-button-icon-negative"> </span>
+ </button>
+ </div>
+ </form>
- <form class="t3js-installer-environmentFolders-good" style="display: none;">
- <div class="typo3-install-content-spacer-small">
- <button class="btn btn-success t3js-installer-environmentFolders-execute">
- No problems detected, continue with installation
- </button>
- </div>
- </form>
+ <form class="t3js-installer-environmentFolders-good" style="display: none;">
+ <div class="typo3-install-content-spacer-small">
+ <button class="btn btn-success t3js-installer-environmentFolders-execute">
+ No problems detected, continue with installation
+ </button>
+ </div>
+ </form>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowInstallerNotAvailable.html b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowInstallerNotAvailable.html
index 31a6fdf35ccb..4d35d7b60b07 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/ShowInstallerNotAvailable.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/ShowInstallerNotAvailable.html
@@ -1,15 +1,15 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="typo3-install-content-body">
- <h2>Thank you for choosing TYPO3</h2>
- <p>The Installation Wizard will guide you through the necessary steps required to install TYPO3 on your web server.</p>
- <p>To begin the installation, create an empty file called
- <strong>FIRST_INSTALL</strong> in the document root of your web server.</p>
- <hr>
- <p class="text-muted">
- <strong>Note:</strong>
- The filename is case sensitive and it will be deleted once the installation process is complete.
- </p>
+ <h2>Thank you for choosing TYPO3</h2>
+ <p>The Installation Wizard will guide you through the necessary steps required to install TYPO3 on your web server.</p>
+ <p>To begin the installation, create an empty file called
+ <strong>FIRST_INSTALL</strong> in the document root of your web server.</p>
+ <hr>
+ <p class="text-muted">
+ <strong>Note:</strong>
+ The filename is case sensitive and it will be deleted once the installation process is complete.
+ </p>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html b/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
index 7bc55fc52d16..9de8e15f1656 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
@@ -1,27 +1,27 @@
<!DOCTYPE html>
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
<head>
- <title>Install tool on site {siteName}</title>
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" type="text/css" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
- <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
- <script>
- var TYPO3 = TYPO3 || {};
- var __bust = '{bust}';
- </script>
- <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
- <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
- <script type="text/javascript">
- require(['TYPO3/CMS/Install/Install']);
- </script>
+ <title>Install tool on site {siteName}</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="stylesheet" type="text/css" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
+ <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
+ <script>
+ var TYPO3 = TYPO3 || {};
+ var __bust = '{bust}';
+ </script>
+ <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
+ <script type="text/javascript" src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
+ <script type="text/javascript">
+ require(['TYPO3/CMS/Install/Install']);
+ </script>
</head>
<body class="backend install-tool-init t3js-body" data-controller="{controller}" data-context="{context}">
<div>
- <div id="t3js-ui-block" class="ui-block">
- <core:icon identifier="spinner-circle" size="large" />
- <h2 id="t3js-ui-block-detail">Initializing</h2>
- </div>
+ <div id="t3js-ui-block" class="ui-block">
+ <core:icon identifier="spinner-circle" size="large" />
+ <h2 id="t3js-ui-block-detail">Initializing</h2>
+ </div>
</div>
</body>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html b/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
index 7d136074bcd4..69fe9755a629 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
@@ -1,127 +1,127 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{context} == 'backend'">
- <f:then>
- <div class="module" data-module-id="" data-module-name="">
- <div class="module-docheader t3js-module-docheader" style="height: auto;">
- <div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation row" style="height: auto;">
- <div class="module-docheader-bar-column-left col-xs-12 col-sm-4 col-md-3">
- <div class="form-inline row"></div>
- </div>
- <div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons" style="height: auto;">
- <div class="module-docheader-bar-column-left">
- <div class="btn-toolbar" role="toolbar" aria-label=""></div>
- </div>
- <div class="module-docheader-bar-column-right"></div>
- </div>
- </div>
- </div>
- <div class="module-body t3js-module-body" style="padding-top: 89px;">
- <div id="t3js-ui-block" class="ui-block">
- <core:icon identifier="spinner-circle" size="large" />
- <h2 id="t3js-ui-block-detail">Loading cards</h2>
- </div>
- </div>
- </div>
- </f:then>
+ <f:then>
+ <div class="module" data-module-id="" data-module-name="">
+ <div class="module-docheader t3js-module-docheader" style="height: auto;">
+ <div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation row" style="height: auto;">
+ <div class="module-docheader-bar-column-left col-xs-12 col-sm-4 col-md-3">
+ <div class="form-inline row"></div>
+ </div>
+ <div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons" style="height: auto;">
+ <div class="module-docheader-bar-column-left">
+ <div class="btn-toolbar" role="toolbar" aria-label=""></div>
+ </div>
+ <div class="module-docheader-bar-column-right"></div>
+ </div>
+ </div>
+ </div>
+ <div class="module-body t3js-module-body" style="padding-top: 89px;">
+ <div id="t3js-ui-block" class="ui-block">
+ <core:icon identifier="spinner-circle" size="large" />
+ <h2 id="t3js-ui-block-detail">Loading cards</h2>
+ </div>
+ </div>
+ </div>
+ </f:then>
- <f:else>
- <div class="scaffold t3js-scaffold scaffold-modulemenu-expanded">
- <div class="t3js-scaffold-header">
- <div class="scaffold-topbar t3js-scaffold-topbar">
- <div class="topbar">
- <div class="topbar-header t3js-topbar-header" style="padding-left: 0">
- <div class="topbar-header-site">
- <a href="" target="_top" title="TYPO3.CMS">
- <span class="topbar-header-site-logo">
- <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
- </span>
- <span class="topbar-header-site-title">
- <span class="topbar-header-site-name">Admin tool on site: {siteName}</span>
- <span class="topbar-header-site-version">TYPO3 CMS <i:constant name="TYPO3_version" /></span>
- </span>
- </a>
- <button type="button" class="btn btn-default btn-danger pull-right t3js-login-lockInstallTool" style="margin-top: 7px; margin-right: 15px;">
- <span class="t3js-icon icon icon-size-small icon-state-default icon-actions-logout" data-identifier="actions-logout">
- <span class="icon-markup">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
- </span>
- </span>
- Logout
- </button>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <f:else>
+ <div class="scaffold t3js-scaffold scaffold-modulemenu-expanded">
+ <div class="t3js-scaffold-header">
+ <div class="scaffold-topbar t3js-scaffold-topbar">
+ <div class="topbar">
+ <div class="topbar-header t3js-topbar-header" style="padding-left: 0">
+ <div class="topbar-header-site">
+ <a href="" target="_top" title="TYPO3.CMS">
+ <span class="topbar-header-site-logo">
+ <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
+ </span>
+ <span class="topbar-header-site-title">
+ <span class="topbar-header-site-name">Admin tool on site: {siteName}</span>
+ <span class="topbar-header-site-version">TYPO3 CMS <i:constant name="TYPO3_version" /></span>
+ </span>
+ </a>
+ <button type="button" class="btn btn-default btn-danger pull-right t3js-login-lockInstallTool" style="margin-top: 7px; margin-right: 15px;">
+ <span class="t3js-icon icon icon-size-small icon-state-default icon-actions-logout" data-identifier="actions-logout">
+ <span class="icon-markup">
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
+ </span>
+ </span>
+ Logout
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
- <div class="scaffold-modulemenu t3js-scaffold-modulemenu">
- <div class="modulemenu t3js-modulemenu">
- <ul class="nav nav-modules" data-role="modulemenu" id="menu">
- <li class="modulemenu-group expanded" id="web" data-modulename="web" data-navigationcomponentid="" data-navigationframescript="" data-navigationframescriptparameters="">
- <div class="modulemenu-group-header">
- <span class="modulemenu-icon modulemenu-group-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default icon-module-tools" data-identifier="module-tools">
- <span class="icon-markup">
- <core:icon identifier="module-tools" size="default"/>
- </span>
- </span>
- </span>
- <span class="modulemenu-group-title">
- Admin Tools
- </span>
- </div>
- <ul class="modulemenu-group-container">
- <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'maintenance', label: 'Maintenance'}" />
- <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'settings', label: 'Settings'}" />
- <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'upgrade', label: 'Upgrade'}" />
- <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'environment', label: 'Environment'}" />
- </ul>
- </li>
- <li class="modulemenu-group expanded" id="context" data-modulename="context" data-navigationcomponentid="" data-navigationframescript="" data-navigationframescriptparameters="">
- <ul class="modulemenu-group-container">
- <li class="modulemenu-item t3js-mainmodule ">
- <a class="modulemenu-item-link" href="index.php">
- <span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default">
- <span class="icon-markup">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
- </span>
- </span>
- </span>
- <span class="modulemenu-item-title">Backend admin</span>
- </a>
- </li>
- <li class="modulemenu-item t3js-mainmodule ">
- <a class="modulemenu-item-link" href="../index.php">
- <span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default">
- <span class="icon-markup">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
- </span>
- </span>
- </span>
- <span class="modulemenu-item-title">Frontend website</span>
- </a>
- </li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
+ <div class="scaffold-modulemenu t3js-scaffold-modulemenu">
+ <div class="modulemenu t3js-modulemenu">
+ <ul class="nav nav-modules" data-role="modulemenu" id="menu">
+ <li class="modulemenu-group expanded" id="web" data-modulename="web" data-navigationcomponentid="" data-navigationframescript="" data-navigationframescriptparameters="">
+ <div class="modulemenu-group-header">
+ <span class="modulemenu-icon modulemenu-group-icon">
+ <span class="t3js-icon icon icon-size-default icon-state-default icon-module-tools" data-identifier="module-tools">
+ <span class="icon-markup">
+ <core:icon identifier="module-tools" size="default"/>
+ </span>
+ </span>
+ </span>
+ <span class="modulemenu-group-title">
+ Admin Tools
+ </span>
+ </div>
+ <ul class="modulemenu-group-container">
+ <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'maintenance', label: 'Maintenance'}" />
+ <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'settings', label: 'Settings'}" />
+ <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'upgrade', label: 'Upgrade'}" />
+ <f:render partial="Layout/MenuModuleLink" arguments="{controller: 'environment', label: 'Environment'}" />
+ </ul>
+ </li>
+ <li class="modulemenu-group expanded" id="context" data-modulename="context" data-navigationcomponentid="" data-navigationframescript="" data-navigationframescriptparameters="">
+ <ul class="modulemenu-group-container">
+ <li class="modulemenu-item t3js-mainmodule ">
+ <a class="modulemenu-item-link" href="index.php">
+ <span class="modulemenu-icon modulemenu-item-icon">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
+ <span class="icon-markup">
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
+ </span>
+ </span>
+ </span>
+ <span class="modulemenu-item-title">Backend admin</span>
+ </a>
+ </li>
+ <li class="modulemenu-item t3js-mainmodule ">
+ <a class="modulemenu-item-link" href="../index.php">
+ <span class="modulemenu-icon modulemenu-item-icon">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
+ <span class="icon-markup">
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
+ </span>
+ </span>
+ </span>
+ <span class="modulemenu-item-title">Frontend website</span>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
- <div class="scaffold-content t3js-scaffold-content" style="padding-top:25px; overflow: auto;">
- <div class="container-fluid">
- <div class="t3js-module-body">
- <div id="t3js-ui-block" class="ui-block">
- <core:icon identifier="spinner-circle" size="large" />
- <h2 id="t3js-ui-block-detail">Loading cards</h2>
- </div>
- </div>
- </div>
- </div>
- </div>
- </f:else>
+ <div class="scaffold-content t3js-scaffold-content" style="padding-top:25px; overflow: auto;">
+ <div class="container-fluid">
+ <div class="t3js-module-body">
+ <div id="t3js-ui-block" class="ui-block">
+ <core:icon identifier="spinner-circle" size="large" />
+ <h2 id="t3js-ui-block-detail">Loading cards</h2>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html b/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
index 28f6e1184d02..79b0d96a92a6 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
@@ -1,32 +1,32 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="container">
- <div class="row">
- <div class="col-md-6 col-md-offset-3">
- <div class="page-header">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="logo" />
- </div>
+ <div class="row">
+ <div class="col-md-6 col-md-offset-3">
+ <div class="page-header">
+ <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="logo" />
+ </div>
- <div class="panel panel-warning">
- <div class="panel-heading">
- <h2 class="panel-title">The Install Tool is locked</h2>
- </div>
- <div class="panel-body">
- <p>
- To enable the Install Tool, the file <code>ENABLE_INSTALL_TOOL</code>
- must be created in the directory <code>typo3conf/</code>.
- The file must be writable by the web server user.
- The filename is case-sensitive but the file itself can be empty.
- </p>
- <p>
- <strong>Security note:</strong>
- When you are finished with the Install Tool, you should rename or delete this file.
- It will automatically be deleted if you log out of the Install Tool or if the file is older than one hour.
- </p>
- </div>
- </div>
- </div>
- </div>
+ <div class="panel panel-warning">
+ <div class="panel-heading">
+ <h2 class="panel-title">The Install Tool is locked</h2>
+ </div>
+ <div class="panel-body">
+ <p>
+ To enable the Install Tool, the file <code>ENABLE_INSTALL_TOOL</code>
+ must be created in the directory <code>typo3conf/</code>.
+ The file must be writable by the web server user.
+ The filename is case-sensitive but the file itself can be empty.
+ </p>
+ <p>
+ <strong>Security note:</strong>
+ When you are finished with the Install Tool, you should rename or delete this file.
+ It will automatically be deleted if you log out of the Install Tool or if the file is older than one hour.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html b/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
index 12f3ce64cd70..cb9db93b98d7 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
@@ -1,51 +1,51 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="container">
- <div class="page-header">
- <h1 class="logo-pageheader">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="logo" /> Site: {siteName} <small>Login to TYPO3 Install Tool</small>
- </h1>
- </div>
- <div class="row">
- <div class="col-md-6 col-md-offset-3">
- <div id="t3-install-box-body">
- <form method="post" class="form-inline" id="t3-install-form-login" data-login-token="{loginToken}">
- <div class="form-group">
- <label for="t3-install-form-password">Password</label>
- <input id="t3-install-form-password" type="password" name="install[password]" class="t3-install-form-input-text form-control" autofocus="autofocus" />
- </div>
- <button type="button" class="btn btn-default btn-success t3js-login-login">
- Login
- </button>
- <button type="button" class="btn btn-default btn-danger pull-right t3js-login-lockInstallTool">
- <i class="fa fa-lock"></i> Lock Install Tool again
- </button>
- </form>
- </div>
- <div id="t3-install-box-border-bottom"> </div>
+ <div class="page-header">
+ <h1 class="logo-pageheader">
+ <img src="{f:uri.resource(path: 'Images/typo3_orange.svg')}" width="130" class="logo" /> Site: {siteName} <small>Login to TYPO3 Install Tool</small>
+ </h1>
+ </div>
+ <div class="row">
+ <div class="col-md-6 col-md-offset-3">
+ <div id="t3-install-box-body">
+ <form method="post" class="form-inline" id="t3-install-form-login" data-login-token="{loginToken}">
+ <div class="form-group">
+ <label for="t3-install-form-password">Password</label>
+ <input id="t3-install-form-password" type="password" name="install[password]" class="t3-install-form-input-text form-control" autofocus="autofocus" />
+ </div>
+ <button type="button" class="btn btn-default btn-success t3js-login-login">
+ Login
+ </button>
+ <button type="button" class="btn btn-default btn-danger pull-right t3js-login-lockInstallTool">
+ <i class="fa fa-lock"></i> Lock Install Tool again
+ </button>
+ </form>
+ </div>
+ <div id="t3-install-box-border-bottom"> </div>
- <div class="t3js-login-output"></div>
+ <div class="t3js-login-output"></div>
- <div class="panel panel-info">
- <div class="panel-heading"><h3 class="panel-title">Information</h3></div>
- <div class="panel-body">
- By default the Install Tool password is the one specified during the installation.
- </div>
- </div>
- <div class="panel panel-warning">
- <div class="panel-heading"><h3 class="panel-title">Important</h3></div>
- <div class="panel-body">
- If you don't know the current password, you can set a new one by setting the value of
- <code>$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']</code> in <code>typo3conf/LocalConfiguration.php</code> to
- the hash value of the password you desire, which will be shown if you enter the desired password
- in this form and submit it.
- <br /><br />
- This password gives an attacker full control over your instance if cracked. It should be strong
- (include lower and upper case characters, special characters and numbers) and at least eight characters long.
- </div>
- </div>
- </div>
- </div>
+ <div class="panel panel-info">
+ <div class="panel-heading"><h3 class="panel-title">Information</h3></div>
+ <div class="panel-body">
+ By default the Install Tool password is the one specified during the installation.
+ </div>
+ </div>
+ <div class="panel panel-warning">
+ <div class="panel-heading"><h3 class="panel-title">Important</h3></div>
+ <div class="panel-body">
+ If you don't know the current password, you can set a new one by setting the value of
+ <code>$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']</code> in <code>typo3conf/LocalConfiguration.php</code> to
+ the hash value of the password you desire, which will be shown if you enter the desired password
+ in this form and submit it.
+ <br /><br />
+ This password gives an attacker full control over your instance if cracked. It should be strong
+ (include lower and upper case characters, special characters and numbers) and at least eight characters long.
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
index 0caed74bcb54..29d2004e27af 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
@@ -3,88 +3,88 @@
<h1>Maintenance</h1>
<div class="card-container">
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Flush TYPO3 and PHP Cache', subtitle: 'Caching', icon: 'Icons/modules/install-clear-cache.svg'}" />
- <div class="card-content">
- <p class="card-text">This action directly clears all registered caches including opcode cache.
- This utility is also present in TYPO3’s backend: Top Bar > Clear Cache > Flush all caches.
- A fatal error will be thrown if a broken extension is detected. If this occurs, use the extension tester utility (Upgrade > Check For Broken Extensions).
- </p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/Cache">Flush cache</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Analyze Database Structure', subtitle: 'Database', icon: 'Icons/modules/install-database-analyze.svg'}" />
- <div class="card-content">
- <p class="card-text">Compare and update the database table and field definitions of your installation against the specification defined for every activated extension.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/DatabaseAnalyzer">Analyze database</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Remove Temporary Assets', subtitle: 'Caching', icon: 'Icons/modules/install-clear-files.svg'}" />
- <div class="card-content">
- <p class="card-text">Clears temporary files including concatenated JS/CSS files and processed images.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ClearTypo3tempFiles">Scan temporary files</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Rebuild PHP Autoload Information', subtitle: 'Caching', icon: 'Icons/modules/install-clear-autoload.svg'}" />
- <div class="card-content">
- <p class="card-text">Resets autoload information for all active third party extensions.</p>
- </div>
- <f:if condition="{composerMode}">
- <f:then>
- <div class="card-footer text-muted">Reset autoloading via Composer</div>
- </f:then>
- <f:else>
- <div class="card-footer">
- <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/DumpAutoload">Dump autoload</a>
- </div>
- </f:else>
- </f:if>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Clear Persistent Database Tables', subtitle: 'Database', icon: 'Icons/modules/install-clear-database.svg'}" />
- <div class="card-content">
- <p class="card-text">Truncates persistent database tables, which are not related to caching.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ClearTables">Scan tables</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Create Administrative User', subtitle: 'Backend Users', icon: 'Icons/modules/install-create-admin.svg'}" />
- <div class="card-content">
- <p class="card-text">Create new administrative users and grant them system maintainer privileges (optional).</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/CreateAdmin">Create Administrator</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Reset Backend User Preferences', subtitle: 'Backend Users', icon: 'Icons/modules/install-reset-user.svg'}" />
- <div class="card-content">
- <p class="card-text">Clears preferences and settings for all backend users. The <code>uc</code> field is then set to an empty string.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/ResetBackendUserUc">Reset backend user preferences</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Manage Language Packs', subtitle: 'Language', icon: 'Icons/modules/install-manage-language.svg'}" />
- <div class="card-content">
- <p class="card-text">Download and update language packs for installed extensions.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/LanguagePacks">Manage languages</a>
- </div>
- </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Flush TYPO3 and PHP Cache', subtitle: 'Caching', icon: 'Icons/modules/install-clear-cache.svg'}" />
+ <div class="card-content">
+ <p class="card-text">This action directly clears all registered caches including opcode cache.
+ This utility is also present in TYPO3’s backend: Top Bar > Clear Cache > Flush all caches.
+ A fatal error will be thrown if a broken extension is detected. If this occurs, use the extension tester utility (Upgrade > Check For Broken Extensions).
+ </p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/Cache">Flush cache</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Analyze Database Structure', subtitle: 'Database', icon: 'Icons/modules/install-database-analyze.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Compare and update the database table and field definitions of your installation against the specification defined for every activated extension.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/DatabaseAnalyzer">Analyze database</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Remove Temporary Assets', subtitle: 'Caching', icon: 'Icons/modules/install-clear-files.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Clears temporary files including concatenated JS/CSS files and processed images.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ClearTypo3tempFiles">Scan temporary files</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Rebuild PHP Autoload Information', subtitle: 'Caching', icon: 'Icons/modules/install-clear-autoload.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Resets autoload information for all active third party extensions.</p>
+ </div>
+ <f:if condition="{composerMode}">
+ <f:then>
+ <div class="card-footer text-muted">Reset autoloading via Composer</div>
+ </f:then>
+ <f:else>
+ <div class="card-footer">
+ <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/DumpAutoload">Dump autoload</a>
+ </div>
+ </f:else>
+ </f:if>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Clear Persistent Database Tables', subtitle: 'Database', icon: 'Icons/modules/install-clear-database.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Truncates persistent database tables, which are not related to caching.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ClearTables">Scan tables</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Create Administrative User', subtitle: 'Backend Users', icon: 'Icons/modules/install-create-admin.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Create new administrative users and grant them system maintainer privileges (optional).</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/CreateAdmin">Create Administrator</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Reset Backend User Preferences', subtitle: 'Backend Users', icon: 'Icons/modules/install-reset-user.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Clears preferences and settings for all backend users. The <code>uc</code> field is then set to an empty string.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-primary " data-inline="1" data-require="TYPO3/CMS/Install/Module/ResetBackendUserUc">Reset backend user preferences</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Manage Language Packs', subtitle: 'Language', icon: 'Icons/modules/install-manage-language.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Download and update language packs for installed extensions.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/LanguagePacks">Manage languages</a>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTables.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTables.html
index 935d2c94760d..123bc286e846 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTables.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTables.html
@@ -1,44 +1,44 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Some database tables in TYPO3 CMS hold semi-temporary data that is not deleted when clicking "Clear All Cache" in
- the backend.
- Those can be cleared here,
- effectively removing all rows from it. This can be useful in rare cases.
+ Some database tables in TYPO3 CMS hold semi-temporary data that is not deleted when clicking "Clear All Cache" in
+ the backend.
+ Those can be cleared here,
+ effectively removing all rows from it. This can be useful in rare cases.
</p>
<p>
- Use with care! Clearing tables here can have a negative impact on your site functionality.
- You could log out all users, delete all their basket data, and lose logging information!
+ Use with care! Clearing tables here can have a negative impact on your site functionality.
+ You could log out all users, delete all their basket data, and lose logging information!
</p>
<div class="t3js-module-content" data-clear-tables-clear-token="{clearTablesClearToken}">
- <div class="t3js-clearTables-output"></div>
+ <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 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 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>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTypo3tempFiles.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTypo3tempFiles.html
index 2ca913a6bfed..03890862c712 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTypo3tempFiles.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/ClearTypo3tempFiles.html
@@ -1,47 +1,47 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- TYPO3 stores processed files and cached images in a dedicated directory.
- This directory is likely to grow quickly.
+ 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.
+ 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.
+ 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>
+ <div class="t3js-clearTypo3temp-output"></div>
- <hr>
+ <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 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
- <span class="t3js-clearTypo3temp-stat-directory"></span>
- </button>
- <hr class="t3js-clearTypo3temp-stat-lastRuler">
- </div>
- </div>
- <button
- class="btn btn-default t3js-clearTypo3temp-stats"
- type="button"
- >
- Scan again
- </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
+ <span class="t3js-clearTypo3temp-stat-directory"></span>
+ </button>
+ <hr class="t3js-clearTypo3temp-stat-lastRuler">
+ </div>
+ </div>
+ <button
+ class="btn btn-default t3js-clearTypo3temp-stats"
+ type="button"
+ >
+ Scan again
+ </button>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/CreateAdmin.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/CreateAdmin.html
index 7870d36f9ade..f47a384b4d43 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/CreateAdmin.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/CreateAdmin.html
@@ -1,68 +1,68 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- After you've created the user, log in and add the rest of the user information, like email and real name.
+ After you've created the user, log in and add the rest of the user information, like email and real name.
</p>
<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>
+ <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 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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/DatabaseAnalyzer.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/DatabaseAnalyzer.html
index 8d39495dcaca..f04de2cebcc0 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/DatabaseAnalyzer.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/DatabaseAnalyzer.html
@@ -1,63 +1,63 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<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 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 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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/LanguagePacks.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/LanguagePacks.html
index 96cf7c6ea162..c0bf8c78981e 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/LanguagePacks.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/LanguagePacks.html
@@ -1,25 +1,25 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<div style="display:none;">
- <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 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>
<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}"
+ 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>
+ <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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
index 5510eda6d0d9..95aff5af16fc 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
@@ -3,60 +3,60 @@
<h1>Settings</h1>
<div class="card-container">
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Extension Configuration', subtitle: 'Global Configuration', icon: 'Icons/modules/install-extension-settings.svg'}" />
- <div class="card-content">
- <p class="card-text">Configure settings for all enabled extensions.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ExtensionConfiguration">Configure extensions</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Change Install Tool Password', subtitle: 'Access', icon: 'Icons/modules/install-password.svg'}" />
- <div class="card-content">
- <p class="card-text">Set a new password for the Install Tool when accessed in Standalone mode.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/ChangeInstallToolPassword">Change Install Tool Password</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Manage System Maintainers', subtitle: 'Access', icon: 'Icons/modules/install-manage-maintainer.svg'}" />
- <div class="card-content">
- <p class="card-text">Specify which backend administrators have access to the Admin Tools module and Install Tool when accessed in Standalone Mode.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="medium" data-require="TYPO3/CMS/Install/Module/SystemMaintainer">Manage System Maintainers</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Configuration Presets', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-presets.svg'}" />
- <div class="card-content">
- <p class="card-text">Configure image processing, debug/live mode and mail settings.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/Presets">Choose Preset</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Feature Toggles', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-features.svg'}" />
- <div class="card-content">
- <p class="card-text">Enable and disable core features.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="medium" data-require="TYPO3/CMS/Install/Module/Features">Configure Features</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Configure Installation-Wide Options', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-settings.svg'}" />
- <div class="card-content">
- <p class="card-text">Modify settings written to LocalConfiguration.php.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/LocalConfiguration">Configure options</a>
- </div>
- </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Extension Configuration', subtitle: 'Global Configuration', icon: 'Icons/modules/install-extension-settings.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Configure settings for all enabled extensions.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ExtensionConfiguration">Configure extensions</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Change Install Tool Password', subtitle: 'Access', icon: 'Icons/modules/install-password.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Set a new password for the Install Tool when accessed in Standalone mode.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/ChangeInstallToolPassword">Change Install Tool Password</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Manage System Maintainers', subtitle: 'Access', icon: 'Icons/modules/install-manage-maintainer.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Specify which backend administrators have access to the Admin Tools module and Install Tool when accessed in Standalone Mode.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="medium" data-require="TYPO3/CMS/Install/Module/SystemMaintainer">Manage System Maintainers</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Configuration Presets', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-presets.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Configure image processing, debug/live mode and mail settings.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/Presets">Choose Preset</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Feature Toggles', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-features.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Enable and disable core features.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="medium" data-require="TYPO3/CMS/Install/Module/Features">Configure Features</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Configure Installation-Wide Options', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-settings.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Modify settings written to LocalConfiguration.php.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/LocalConfiguration">Configure options</a>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/ChangeInstallToolPassword.html b/typo3/sysext/install/Resources/Private/Templates/Settings/ChangeInstallToolPassword.html
index 7707107ee7e6..4a5c6af75ebf 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/ChangeInstallToolPassword.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/ChangeInstallToolPassword.html
@@ -1,41 +1,41 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<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 class="t3js-module-content" data-install-tool-token="{changeInstallToolPasswordToken}">
- <form action="" id="t3js-changeInstallToolPassword-form" method="post">
- <div class="form-group">
- <label for="t3-install-tool-password" class="control-label">Enter new password:</label>
- <input
- id="t3-install-tool-password"
- class="t3-install-form-input-text t3-install-form-password-strength t3js-changeInstallToolPassword-password form-control"
- type="password"
- autocomplete="off"
- required
- />
- </div>
- <div class="form-group">
- <label for="t3-install-tool-password-repeat" class="control-label">Repeat password:</label>
- <input
- id="t3-install-tool-password-repeat"
- class="t3-install-form-input-text t3js-changeInstallToolPassword-password-check form-control"
- type="password"
- autocomplete="off"
- required
- />
- </div>
+ <form action="" id="t3js-changeInstallToolPassword-form" method="post">
+ <div class="form-group">
+ <label for="t3-install-tool-password" class="control-label">Enter new password:</label>
+ <input
+ id="t3-install-tool-password"
+ class="t3-install-form-input-text t3-install-form-password-strength t3js-changeInstallToolPassword-password form-control"
+ type="password"
+ autocomplete="off"
+ required
+ />
+ </div>
+ <div class="form-group">
+ <label for="t3-install-tool-password-repeat" class="control-label">Repeat password:</label>
+ <input
+ id="t3-install-tool-password-repeat"
+ class="t3-install-form-input-text t3js-changeInstallToolPassword-password-check form-control"
+ type="password"
+ autocomplete="off"
+ required
+ />
+ </div>
- <div class="t3js-changeInstallToolPassword-output"></div>
- <button
- class="btn btn-default t3js-changeInstallToolPassword-change"
- type="submit"
- >
- Set new password
- </button>
- </form>
+ <div class="t3js-changeInstallToolPassword-output"></div>
+ <button
+ class="btn btn-default t3js-changeInstallToolPassword-change"
+ type="submit"
+ >
+ Set new password
+ </button>
+ </form>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/ExtensionConfigurationGetContent.html b/typo3/sysext/install/Resources/Private/Templates/Settings/ExtensionConfigurationGetContent.html
index e2ee1bd9cad4..2605679cd35b 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/ExtensionConfigurationGetContent.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/ExtensionConfigurationGetContent.html
@@ -1,20 +1,20 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-extension-configuration-write-token="{extensionConfigurationWriteToken}">
- <div class="t3js-extensionConfiguration-output"></div>
+ <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>
- </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>
+ </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>
+ <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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/FeaturesGetContent.html b/typo3/sysext/install/Resources/Private/Templates/Settings/FeaturesGetContent.html
index 8c3d5279d041..a9830317332c 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/FeaturesGetContent.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/FeaturesGetContent.html
@@ -1,40 +1,40 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Enable and disable certain core features. Feature toggles in the core are used to globally
- use new features of TYPO3 that may be activated on new installations but upgrading installations
- can still use the old behaviour.
+ Enable and disable certain core features. Feature toggles in the core are used to globally
+ use new features of TYPO3 that may be activated on new installations but upgrading installations
+ can still use the old behaviour.
</p>
<div class="t3js-features-content" data-features-save-token="{featuresSaveToken}">
- <strong>Available features:</strong>
- <form method="post" class="form-horizontal">
- <f:for each="{features}" as="feature">
- <div class="checkbox checkbox-type-labeled-toggle">
- <input type="checkbox" class="checkbox-input"
- value="1"
- name="install[values][{feature.name}]"
- id="t3-install-tool-features-{feature.name}"
- {f:if(condition: '{feature.value} == 1', then: 'checked="checked"')}
- >
- <label class="checkbox-label" for="t3-install-tool-features-{feature.name}">
- <span class="checkbox-label-switch">
- <span class="checkbox-label-switch-checked">On</span>
- <span class="checkbox-label-switch-unchecked">Off</span>
- </span>
- <span class="checkbox-label-text">
- {feature.name} (default {f:if(condition: '{feature.default} == 1', then: 'on', else: 'off')}): {feature.description}
- </span>
- </label>
- </div>
- </f:for>
+ <strong>Available features:</strong>
+ <form method="post" class="form-horizontal">
+ <f:for each="{features}" as="feature">
+ <div class="checkbox checkbox-type-labeled-toggle">
+ <input type="checkbox" class="checkbox-input"
+ value="1"
+ name="install[values][{feature.name}]"
+ id="t3-install-tool-features-{feature.name}"
+ {f:if(condition: '{feature.value} == 1', then: 'checked="checked"')}
+ >
+ <label class="checkbox-label" for="t3-install-tool-features-{feature.name}">
+ <span class="checkbox-label-switch">
+ <span class="checkbox-label-switch-checked">On</span>
+ <span class="checkbox-label-switch-unchecked">Off</span>
+ </span>
+ <span class="checkbox-label-text">
+ {feature.name} (default {f:if(condition: '{feature.default} == 1', then: 'on', else: 'off')}): {feature.description}
+ </span>
+ </label>
+ </div>
+ </f:for>
- <button
- class="btn btn-default t3js-features-save"
- type="button"
- >
- Save
- </button>
- </form>
+ <button
+ class="btn btn-default t3js-features-save"
+ type="button"
+ >
+ Save
+ </button>
+ </form>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/LocalConfigurationGetContent.html b/typo3/sysext/install/Resources/Private/Templates/Settings/LocalConfigurationGetContent.html
index b8ff5f780357..64747f3c36cb 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/LocalConfigurationGetContent.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/LocalConfigurationGetContent.html
@@ -1,31 +1,31 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<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 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 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 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>
- <span class="btn btn-default t3js-localConfiguration-write">Write configuration</span>
- <span class="btn btn-default t3js-localConfiguration-toggleAll">Toggle All</span>
- </div>
+ <div>
+ <span class="btn btn-default t3js-localConfiguration-write">Write configuration</span>
+ <span class="btn btn-default t3js-localConfiguration-toggleAll">Toggle All</span>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/PresetsGetContent.html b/typo3/sysext/install/Resources/Private/Templates/Settings/PresetsGetContent.html
index d65a7f7927e1..66ea76124825 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/PresetsGetContent.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/PresetsGetContent.html
@@ -1,31 +1,31 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- The Configuration Module recommends configuration settings based on information found in your environments setup.
+ The Configuration Module recommends configuration settings based on information found in your environments setup.
</p>
<p>
- TYPO3 can also be run in a specific application context, by setting an environment variable in the web server configuration. The application context can then be accessed e.g. in the AdditionalConfiguration.php file or TypoScript configuration to customize settings accordingly.
+ TYPO3 can also be run in a specific application context, by setting an environment variable in the web server configuration. The application context can then be accessed e.g. in the AdditionalConfiguration.php file or TypoScript configuration to customize settings accordingly.
</p>
<p>
- 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.
+ 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 class="t3js-presets-content" data-presets-activate-token="{presetsActivateToken}" data-presets-content-token="{presetsGetContentToken}">
- <form method="post" class="form-horizontal">
- <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
- <f:for each="{presetFeatures}" as="feature">
- <f:render partial="Settings/Presets/{feature.name}" arguments="{_all}"/>
- </f:for>
- </div>
- </form>
+ <form method="post" class="form-horizontal">
+ <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+ <f:for each="{presetFeatures}" as="feature">
+ <f:render partial="Settings/Presets/{feature.name}" arguments="{_all}"/>
+ </f:for>
+ </div>
+ </form>
</div>
<div class="t3js-presets-output"></div>
<button
- class="btn btn-default t3js-presets-activate"
- type="button"
+ class="btn btn-default t3js-presets-activate"
+ type="button"
>
- Activate
+ Activate
</button>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/SystemMaintainer.html b/typo3/sysext/install/Resources/Private/Templates/Settings/SystemMaintainer.html
index c54dc09d908a..f9e084146c18 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/SystemMaintainer.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/SystemMaintainer.html
@@ -1,42 +1,42 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<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 class="typo3-message alert alert-info">
- <div class="message-body">
- This TYPO3 instance is set to "Development" context, all backend admin users
- can see the system maintenance related main module entries.
- </div>
- </div>
+ <div class="typo3-message alert alert-info">
+ <div class="message-body">
+ This TYPO3 instance is set to "Development" context, all backend admin users
+ can see the system maintenance related main module entries.
+ </div>
+ </div>
</f:if>
<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 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 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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
index 6d5369a7c969..2ab5373e1678 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
@@ -3,70 +3,70 @@
<h1>Upgrade</h1>
<div class="card-container">
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Update TYPO3 Core', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-update.svg'}" />
- <div class="card-content">
- <p class="card-text">Update your TYPO3 installation (support for symbolic links required).</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/CoreUpdate">Update Core</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Upgrade Wizard', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-wizards.svg'}" />
- <div class="card-content">
- <p class="card-text">Finalises the upgrade process when moving to a major release.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/UpgradeWizards">Run Upgrade Wizard</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'View Upgrade Documentation', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-documentation.svg'}" />
- <div class="card-content">
- <p class="card-text">View and search for important changes that have been made for every major and minor release of TYPO3.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/UpgradeDocs">View Upgrade Documentation</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check TCA in ext_tables.php', subtitle: 'TCA', icon: 'Icons/modules/install-check-extables.svg'}" />
- <div class="card-content">
- <p class="card-text">Identify any extensions that are modifying the Table Control Array (TCA) in ext_tables.php. Changes made to the TCA can result in performance drawbacks.
- </p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/TcaExtTablesCheck">Check TCA</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check for Broken Extensions', subtitle: 'Extensions', icon: 'Icons/modules/install-check-brokenextension.svg'}" />
- <div class="card-content">
- <p class="card-text">Checks the compatibility of all active extensions against the current (installed) version of TYPO3.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/ExtensionCompatTester">Check Extension Compatibility</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check TCA Migrations', subtitle: 'TCA', icon: 'Icons/modules/install-check-tca.svg'}" />
- <div class="card-content">
- <p class="card-text">Identifies any third-party extensions that contain an outdated TCA configuration which should be adapted for the current (installed) version of TYPO3.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/TcaMigrationsCheck">Check TCA Migrations</a>
- </div>
- </div>
- <div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Scan Extension Files', subtitle: 'Extensions', icon: 'Icons/modules/install-scan-extensions.svg'}" />
- <div class="card-content">
- <p class="card-text">Scan extensions for usage of deprecated or outdated TYPO3 API calls.</p>
- </div>
- <div class="card-footer">
- <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ExtensionScanner">Scan Extension Files</a>
- </div>
- </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Update TYPO3 Core', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-update.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Update your TYPO3 installation (support for symbolic links required).</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/CoreUpdate">Update Core</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Upgrade Wizard', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-wizards.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Finalises the upgrade process when moving to a major release.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/UpgradeWizards">Run Upgrade Wizard</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'View Upgrade Documentation', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-documentation.svg'}" />
+ <div class="card-content">
+ <p class="card-text">View and search for important changes that have been made for every major and minor release of TYPO3.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/UpgradeDocs">View Upgrade Documentation</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Check TCA in ext_tables.php', subtitle: 'TCA', icon: 'Icons/modules/install-check-extables.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Identify any extensions that are modifying the Table Control Array (TCA) in ext_tables.php. Changes made to the TCA can result in performance drawbacks.
+ </p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/TcaExtTablesCheck">Check TCA</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Check for Broken Extensions', subtitle: 'Extensions', icon: 'Icons/modules/install-check-brokenextension.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Checks the compatibility of all active extensions against the current (installed) version of TYPO3.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-modal-size="small" data-require="TYPO3/CMS/Install/Module/ExtensionCompatTester">Check Extension Compatibility</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Check TCA Migrations', subtitle: 'TCA', icon: 'Icons/modules/install-check-tca.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Identifies any third-party extensions that contain an outdated TCA configuration which should be adapted for the current (installed) version of TYPO3.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/TcaMigrationsCheck">Check TCA Migrations</a>
+ </div>
+ </div>
+ <div class="card card-size-fixed-small">
+ <f:render partial="Card/Header" arguments="{ title: 'Scan Extension Files', subtitle: 'Extensions', icon: 'Icons/modules/install-scan-extensions.svg'}" />
+ <div class="card-content">
+ <p class="card-text">Scan extensions for usage of deprecated or outdated TYPO3 API calls.</p>
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-default" data-require="TYPO3/CMS/Install/Module/ExtensionScanner">Scan Extension Files</a>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/CoreUpdate.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/CoreUpdate.html
index cb5ad098ca87..44fbb3f85016 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/CoreUpdate.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/CoreUpdate.html
@@ -2,36 +2,36 @@
<p>Automatically updates the TYPO3 CMS core to its latest minor release if these criteria are met:</p>
<ul>
- <li>It only works under Unix and MacOS (support of symbolic links is required).</li>
- <li><code>typo3_src</code> must be a symbolic link to the extracted TYPO3 source directory.</li>
- <li>The symbolic link needs to be writable (and deletable) by the web server user.</li>
- <li>The document root directory needs to be writable.</li>
- <li>One path above document root (<code>../</code>) needs to be writable (new directories will be created).</li>
- <li>The <code>tar</code> command must be available for extracting the TYPO3 source package.</li>
+ <li>It only works under Unix and MacOS (support of symbolic links is required).</li>
+ <li><code>typo3_src</code> must be a symbolic link to the extracted TYPO3 source directory.</li>
+ <li>The symbolic link needs to be writable (and deletable) by the web server user.</li>
+ <li>The document root directory needs to be writable.</li>
+ <li>One path above document root (<code>../</code>) needs to be writable (new directories will be created).</li>
+ <li>The <code>tar</code> command must be available for extracting the TYPO3 source package.</li>
</ul>
<div class="t3js-coreUpdate-output">
- <f:if condition="!{coreUpdateComposerMode} && {coreUpdateEnabled} && {coreUpdateIsReleasedVersion} && {coreUpdateIsSymLinkedCore}">
- <f:then>
- <div class="t3js-coreUpdate-buttonTemplate">
- <button class="btn btn-warning t3js-coreUpdate-init" type="submit" name="coreUpdateCheckForUpdate"
- data-action="checkForUpdate"
- >
- Check for core updates
- </button>
- </div>
- </f:then>
- <f:else>
- <f:be.infobox title="This feature is disabled in this installation">
- <p>
- <f:if condition="{coreUpdateComposerMode}">Composer Mode is active. Please update using composer commands.<br></f:if>
- <f:if condition="!{coreUpdateEnabled}">The environment variable was set <code>TYPO3_DISABLE_CORE_UPDATER=1</code>.<br></f:if>
- <f:if condition="!{coreUpdateIsReleasedVersion}">This system uses an unreleased TYPO3 core version.<br></f:if>
- <f:if condition="!{coreUpdateIsSymLinkedCore}">This action can only be used with a linked <code>typo3_src</code>.</f:if>
- </p>
- </f:be.infobox>
- </f:else>
- </f:if>
+ <f:if condition="!{coreUpdateComposerMode} && {coreUpdateEnabled} && {coreUpdateIsReleasedVersion} && {coreUpdateIsSymLinkedCore}">
+ <f:then>
+ <div class="t3js-coreUpdate-buttonTemplate">
+ <button class="btn btn-warning t3js-coreUpdate-init" type="submit" name="coreUpdateCheckForUpdate"
+ data-action="checkForUpdate"
+ >
+ Check for core updates
+ </button>
+ </div>
+ </f:then>
+ <f:else>
+ <f:be.infobox title="This feature is disabled in this installation">
+ <p>
+ <f:if condition="{coreUpdateComposerMode}">Composer Mode is active. Please update using composer commands.<br></f:if>
+ <f:if condition="!{coreUpdateEnabled}">The environment variable was set <code>TYPO3_DISABLE_CORE_UPDATER=1</code>.<br></f:if>
+ <f:if condition="!{coreUpdateIsReleasedVersion}">This system uses an unreleased TYPO3 core version.<br></f:if>
+ <f:if condition="!{coreUpdateIsSymLinkedCore}">This action can only be used with a linked <code>typo3_src</code>.</f:if>
+ </p>
+ </f:be.infobox>
+ </f:else>
+ </f:if>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionCompatTester.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionCompatTester.html
index 965c6ce9ae34..f6b395083693 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionCompatTester.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionCompatTester.html
@@ -1,25 +1,25 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Checks whether the local extensions' ext_tables and ext_localconf files can be included without errors,
- meaning they can be loaded without breaking the system.
+ Checks whether the local extensions' ext_tables and ext_localconf files can be included without errors,
+ meaning they can be loaded without breaking the system.
</p>
<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}"
+ 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 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>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionScanner.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionScanner.html
index 7be37b58367f..15bb3b415165 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionScanner.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/ExtensionScanner.html
@@ -1,107 +1,107 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- This module scans extensions for usage of deprecated and removed TYPO3 API calls.
- The module can be a great help for extension developers and site maintainers when
- upgrading to new core versions. However, the detection approach - based on static
- code analysis - is limited by concept: false positives/negatives are impossible to avoid.
- Further details can be found at
- <a style="text-decoration: underline;" target="_blank" rel="noopener" href="https://docs.typo3.org/typo3cms/CoreApiReference/ApiOverview/ExtensionScanner/Index.html">
- the official docs.
- </a>
+ This module scans extensions for usage of deprecated and removed TYPO3 API calls.
+ The module can be a great help for extension developers and site maintainers when
+ upgrading to new core versions. However, the detection approach - based on static
+ code analysis - is limited by concept: false positives/negatives are impossible to avoid.
+ Further details can be found at
+ <a style="text-decoration: underline;" target="_blank" rel="noopener" href="https://docs.typo3.org/typo3cms/CoreApiReference/ApiOverview/ExtensionScanner/Index.html">
+ the official docs.
+ </a>
</p>
<div style="display: none">
- <div id="t3js-extensionScanner-file-hit-template">
- <div class="panel panel-flat t3js-extensionScanner-hit-panel risk-medium">
- <div class="panel-heading">
- <h3 class="panel-title">
- <a href="#collapse" class="collapsed t3js-extensionScanner-hit-file-panel-head" data-toggle="collapse">
- <span class="caret"></span>
- <span class="pull-right badges"></span>
- <span class="t3js-extensionScanner-hit-filename file">aFile</span>
- <span class="t3js-extensionScanner-hit-message message">aMessage</span>
- </a>
- </h3>
- </div>
- <div id="collapse" class="panel-collapse collapse t3js-extensionScanner-hit-file-panel-body">
- <div class="panel-body">
- <pre><strong class="t3js-extensionScanner-hit-file-line"></strong><span class="t3js-extensionScanner-hit-file-lineContent"></span></pre>
- <div class="panel-group-flat t3js-extensionScanner-hit-file-rest-container"></div>
- </div>
- </div>
- </div>
- </div>
- <div id="t3js-extensionScanner-file-hit-rest-template">
- <div class="panel panel-flat t3js-extensionScanner-hit-rest-panel risk-medium">
- <div class="panel-heading">
- <h3 class="panel-title">
- <a href="#collapse-rest"
- class="collapsed t3js-extensionScanner-hit-rest-panel-head"
- data-toggle="collapse"
- >
- <span class="badge pull-right">aBadge</span>
- <span class="caret"></span>
- <strong class="t3js-extensionScanner-hit-rest-headline">restFileHeadline</strong>
- </a>
- </h3>
- </div>
- <div id="collapse-rest" class="panel-collapse collapse t3js-extensionScanner-hit-rest-panel-body">
- <pre class="t3js-extensionScanner-hit-rest-body">restFileContent</pre>
- </div>
- </div>
- </div>
+ <div id="t3js-extensionScanner-file-hit-template">
+ <div class="panel panel-flat t3js-extensionScanner-hit-panel risk-medium">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <a href="#collapse" class="collapsed t3js-extensionScanner-hit-file-panel-head" data-toggle="collapse">
+ <span class="caret"></span>
+ <span class="pull-right badges"></span>
+ <span class="t3js-extensionScanner-hit-filename file">aFile</span>
+ <span class="t3js-extensionScanner-hit-message message">aMessage</span>
+ </a>
+ </h3>
+ </div>
+ <div id="collapse" class="panel-collapse collapse t3js-extensionScanner-hit-file-panel-body">
+ <div class="panel-body">
+ <pre><strong class="t3js-extensionScanner-hit-file-line"></strong><span class="t3js-extensionScanner-hit-file-lineContent"></span></pre>
+ <div class="panel-group-flat t3js-extensionScanner-hit-file-rest-container"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="t3js-extensionScanner-file-hit-rest-template">
+ <div class="panel panel-flat t3js-extensionScanner-hit-rest-panel risk-medium">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <a href="#collapse-rest"
+ class="collapsed t3js-extensionScanner-hit-rest-panel-head"
+ data-toggle="collapse"
+ >
+ <span class="badge pull-right">aBadge</span>
+ <span class="caret"></span>
+ <strong class="t3js-extensionScanner-hit-rest-headline">restFileHeadline</strong>
+ </a>
+ </h3>
+ </div>
+ <div id="collapse-rest" class="panel-collapse collapse t3js-extensionScanner-hit-rest-panel-body">
+ <pre class="t3js-extensionScanner-hit-rest-body">restFileContent</pre>
+ </div>
+ </div>
+ </div>
</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}"
+ 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 class="progress t3js-extensionScanner-progress-all-extension">
- <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;">
- <span class="text-nowrap"></span>
- </div>
- </div>
+ <div class="progress t3js-extensionScanner-progress-all-extension">
+ <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;">
+ <span class="text-nowrap"></span>
+ </div>
+ </div>
- <button class="btn btn-default t3js-extensionScanner-scan-all" type="submit">
- Scan all
- </button>
+ <button class="btn btn-default t3js-extensionScanner-scan-all" type="submit">
+ Scan all
+ </button>
- <h2>Extensions</h2>
+ <h2>Extensions</h2>
- <div class="panel-group panel-group-flat panel-group-scanner-extensions">
- <f:for each="{extensionScannerExtensionList}" as="extensionInTypo3conf" iteration="iterator">
- <div
- class="panel panel-default panel-flat t3js-extensionScanner-extension t3js-extensionScanner-extension-{extensionInTypo3conf.filename}"
- data-extension="{extensionInTypo3conf.filename}">
- <div class="panel-progress">
- <div class="panel-progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"><span class="sr-only"></span></div>
- </div>
- <div class="panel-heading">
- <h2 class="panel-title">
- <a href="#extension-{iterator.index}" class="collapsed" data-toggle="collapse">
- <span class="caret"></span>
- Extension: <strong>{extensionInTypo3conf.filename}</strong>
- <span class="pull-right t3js-extensionScanner-number-of-files"></span>
- </a>
- </h2>
- </div>
- <div class="panel-collapse collapse" id="extension-{iterator.index}">
- <div class="panel-body hide t3js-extensionScanner-extension-body"></div>
- <div class="panel-footer">
- <div>Effective lines of code: <span class="t3js-extensionScanner-extension-body-loc">0</span></div>
- <div>Files ignored by scanner: <span class="t3js-extensionScanner-extension-body-ignored-files">0</span></div>
- <div>Code lines ignored by scanner: <span class="t3js-extensionScanner-extension-body-ignored-lines">0</span></div>
- <button class="btn btn-default t3js-extensionScanner-scan-single" type="submit">
- Scanning…
- </button>
- </div>
- </div>
- </div>
- </f:for>
- </div>
+ <div class="panel-group panel-group-flat panel-group-scanner-extensions">
+ <f:for each="{extensionScannerExtensionList}" as="extensionInTypo3conf" iteration="iterator">
+ <div
+ class="panel panel-default panel-flat t3js-extensionScanner-extension t3js-extensionScanner-extension-{extensionInTypo3conf.filename}"
+ data-extension="{extensionInTypo3conf.filename}">
+ <div class="panel-progress">
+ <div class="panel-progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"><span class="sr-only"></span></div>
+ </div>
+ <div class="panel-heading">
+ <h2 class="panel-title">
+ <a href="#extension-{iterator.index}" class="collapsed" data-toggle="collapse">
+ <span class="caret"></span>
+ Extension: <strong>{extensionInTypo3conf.filename}</strong>
+ <span class="pull-right t3js-extensionScanner-number-of-files"></span>
+ </a>
+ </h2>
+ </div>
+ <div class="panel-collapse collapse" id="extension-{iterator.index}">
+ <div class="panel-body hide t3js-extensionScanner-extension-body"></div>
+ <div class="panel-footer">
+ <div>Effective lines of code: <span class="t3js-extensionScanner-extension-body-loc">0</span></div>
+ <div>Files ignored by scanner: <span class="t3js-extensionScanner-extension-body-ignored-files">0</span></div>
+ <div>Code lines ignored by scanner: <span class="t3js-extensionScanner-extension-body-ignored-lines">0</span></div>
+ <button class="btn btn-default t3js-extensionScanner-scan-single" type="submit">
+ Scanning…
+ </button>
+ </div>
+ </div>
+ </div>
+ </f:for>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaExtTablesCheck.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaExtTablesCheck.html
index 9f264f2d9fa4..bd9ab158cba8 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaExtTablesCheck.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaExtTablesCheck.html
@@ -1,11 +1,11 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Check if an extension still changes $GLOBALS['TCA'] in ext_tables.php.
+ Check if an extension still changes $GLOBALS['TCA'] in ext_tables.php.
</p>
<div class="t3js-tcaExtTablesCheck-output"></div>
<button class="btn btn-default t3js-tcaExtTablesCheck-check" type="button">
- Check loaded extensions
+ Check loaded extensions
</button>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaMigrationsCheck.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaMigrationsCheck.html
index 20bd6eec8e9a..bd3632610fee 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaMigrationsCheck.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/TcaMigrationsCheck.html
@@ -1,15 +1,15 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- Checks whether the current TCA needs migrations and displays the new migration paths which need to be adjusted
- manually.
+ Checks whether the current TCA needs migrations and displays the new migration paths which need to be adjusted
+ manually.
</p>
<div class="t3js-tcaMigrationsCheck-output"></div>
<button
- class="btn btn-default t3js-tcaMigrationsCheck-check"
- type="button"
+ class="btn btn-default t3js-tcaMigrationsCheck-check"
+ type="button"
>
- Check TCA Migrations
+ Check TCA Migrations
</button>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetChangelogForVersion.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetChangelogForVersion.html
index bc07c0c0b328..4940a70e774e 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetChangelogForVersion.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetChangelogForVersion.html
@@ -1,15 +1,15 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
- <f:for each="{upgradeDocsFiles}" key="fileId" as="fileArray">
- <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'regular'}"/>
- </f:for>
+ <f:for each="{upgradeDocsFiles}" key="fileId" as="fileArray">
+ <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'regular'}"/>
+ </f:for>
- <f:for each="{upgradeDocsReadFiles}" key="fileId" as="fileArray">
- <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'read', read: 'true'}"/>
- </f:for>
+ <f:for each="{upgradeDocsReadFiles}" key="fileId" as="fileArray">
+ <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'read', read: 'true'}"/>
+ </f:for>
- <f:for each="{upgradeDocsNotAffectedFiles}" key="fileId" as="fileArray">
- <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'notAffected', read: 'true'}"/>
- </f:for>
+ <f:for each="{upgradeDocsNotAffectedFiles}" key="fileId" as="fileArray">
+ <f:render partial="Upgrade/UpgradeDocs/PanelItem" arguments="{id: 'file-{fileId}', fileArray: fileArray, state: 'notAffected', read: 'true'}"/>
+ </f:for>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetContent.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetContent.html
index 4ba900b4da9e..c9239da94f03 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetContent.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeDocsGetContent.html
@@ -1,92 +1,92 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="t3js-module-content" data-upgrade-docs-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"
- disabled
- >
- </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=""
- disabled
- >
- </select>
- </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">Search:</span>
+ <input
+ type="text"
+ class="form-control t3js-upgradeDocs-fulltext-search"
+ placeholder="search setting"
+ disabled
+ >
+ </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=""
+ disabled
+ >
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
- <div class="panel-group panel-group-rst" role="tablist" aria-multiselectable="true">
- <f:for each="{upgradeDocsVersions}" as="version" iteration="iterator">
- <div class="panel panel-default panel-version t3js-version-changes" data-version="{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>
- <span class="pull-right t3js-panel-loading"><core:icon identifier="spinner-circle" size="small" /></span>
- </a>
- </h2>
- </div>
- <div class="panel-collapse collapse"
- id="version-{iterator.index}" role="tabpanel" data-group-version="{version}">
- <div class="panel-body t3js-changelog-list" role="tablist" aria-multiselectable="false"></div>
- </div>
- </div>
- </f:for>
+ <div class="panel-group panel-group-rst" role="tablist" aria-multiselectable="true">
+ <f:for each="{upgradeDocsVersions}" as="version" iteration="iterator">
+ <div class="panel panel-default panel-version t3js-version-changes" data-version="{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>
+ <span class="pull-right t3js-panel-loading"><core:icon identifier="spinner-circle" size="small" /></span>
+ </a>
+ </h2>
+ </div>
+ <div class="panel-collapse collapse"
+ id="version-{iterator.index}" role="tabpanel" data-group-version="{version}">
+ <div class="panel-body t3js-changelog-list" role="tablist" aria-multiselectable="false"></div>
+ </div>
+ </div>
+ </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" data-group-version="read">
- <div class="panel-body panel-body-read t3js-changelog-list" role="tablist" aria-multiselectable="false"></div>
- </div>
- </div>
+ <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" data-group-version="read">
+ <div class="panel-body panel-body-read t3js-changelog-list" role="tablist" aria-multiselectable="false"></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" data-group-version="notAffected">
- <div class="panel-body panel-body-not-affected t3js-changelog-list" role="tablist" aria-multiselectable="false"></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" data-group-version="notAffected">
+ <div class="panel-body panel-body-not-affected t3js-changelog-list" role="tablist" aria-multiselectable="false"></div>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
index c3ad6d91a8a1..af8ec6a2695a 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
@@ -1,118 +1,118 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<p>
- If you upgrade your TYPO3 installation from one major version to another (e.g. 8 LTS to 9 LTS),
- then the Upgrade Wizards guide you through the necessary steps to upgrade your database
- records or explicitly install extensions that ship with the latest TYPO3 version.
+ If you upgrade your TYPO3 installation from one major version to another (e.g. 8 LTS to 9 LTS),
+ then the Upgrade Wizards guide you through the necessary steps to upgrade your database
+ records or explicitly install extensions that ship with the latest TYPO3 version.
</p>
<div style="display: none">
- <div class="t3js-upgradeWizards-blocking-charset-template">
- <p>
- The default database charset of the main MySQL database is not utf-8.
- <br />
- You have to run this update wizard before you can run any other update
- wizard to make sure new tables and fields are created with the correct
- charset.
- <br />
- WARNING: This will NOT convert any existing data.
- </p>
- <button class="btn btn-default t3js-upgradeWizards-blocking-charset-fix" type="button">
- Set default charset to utf8
- </button>
- </div>
+ <div class="t3js-upgradeWizards-blocking-charset-template">
+ <p>
+ The default database charset of the main MySQL database is not utf-8.
+ <br />
+ You have to run this update wizard before you can run any other update
+ wizard to make sure new tables and fields are created with the correct
+ charset.
+ <br />
+ WARNING: This will NOT convert any existing data.
+ </p>
+ <button class="btn btn-default t3js-upgradeWizards-blocking-charset-fix" type="button">
+ Set default charset to utf8
+ </button>
+ </div>
- <div class="t3js-upgradeWizards-blocking-adds-template">
- <p>
- There are tables or fields in the database which need to be created.
- <br />
- You have to run this update wizard before you can run any other update
- wizard to make sure all needed tables and fields are present.
- </p>
- <div>
- <div class="t3js-upgradeWizards-blocking-adds-rows"></div>
- </div>
- <button class="btn btn-default t3js-upgradeWizards-blocking-adds-execute" type="button">
- Create missing tables and fields
- </button>
- </div>
+ <div class="t3js-upgradeWizards-blocking-adds-template">
+ <p>
+ There are tables or fields in the database which need to be created.
+ <br />
+ You have to run this update wizard before you can run any other update
+ wizard to make sure all needed tables and fields are present.
+ </p>
+ <div>
+ <div class="t3js-upgradeWizards-blocking-adds-rows"></div>
+ </div>
+ <button class="btn btn-default t3js-upgradeWizards-blocking-adds-execute" type="button">
+ Create missing tables and fields
+ </button>
+ </div>
- <div class="t3js-upgradeWizards-list-template">
- <h4>Upgrade status</h4>
- <p>Progress of upgrade wizards:</p>
- <div class="progress">
- <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar"
- aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
- style="width: 0%;">
- <span>0%</span>
- </div>
- </div>
- <div class="t3js-upgradeWizards-list-rows"></div>
- </div>
- <div class="t3js-upgradeWizards-list-row-template">
- <h4 class="t3js-upgradeWizards-list-row-title"></h4>
- <div class="row-explanation t3js-upgradeWizards-list-row-explanation"></div>
- <button class="btn btn-default t3js-upgradeWizards-list-row-execute" type="button">
- Execute
- </button>
- <hr />
- </div>
+ <div class="t3js-upgradeWizards-list-template">
+ <h4>Upgrade status</h4>
+ <p>Progress of upgrade wizards:</p>
+ <div class="progress">
+ <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar"
+ aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
+ style="width: 0%;">
+ <span>0%</span>
+ </div>
+ </div>
+ <div class="t3js-upgradeWizards-list-rows"></div>
+ </div>
+ <div class="t3js-upgradeWizards-list-row-template">
+ <h4 class="t3js-upgradeWizards-list-row-title"></h4>
+ <div class="row-explanation t3js-upgradeWizards-list-row-explanation"></div>
+ <button class="btn btn-default t3js-upgradeWizards-list-row-execute" type="button">
+ Execute
+ </button>
+ <hr />
+ </div>
- <div class="t3js-upgradeWizards-input">
- <form>
- <h4 class="t3js-upgradeWizards-input-title">{updateData.title}</h4>
- <div class="t3js-upgradeWizards-input-html"></div>
- <button class="btn btn-warning t3js-upgradeWizards-input-perform" type="button">
- Perform updates!
- </button>
- </form>
- </div>
+ <div class="t3js-upgradeWizards-input">
+ <form>
+ <h4 class="t3js-upgradeWizards-input-title">{updateData.title}</h4>
+ <div class="t3js-upgradeWizards-input-html"></div>
+ <button class="btn btn-warning t3js-upgradeWizards-input-perform" type="button">
+ Perform updates!
+ </button>
+ </form>
+ </div>
- <div class="t3js-upgradeWizards-done-body-template">
- <table class="table table-condensed table-striped">
- <tbody class="t3js-upgradeWizards-done-rows"></tbody>
- </table>
- </div>
- <div class="t3js-upgradeWizards-done-row-template">
- <table>
- <tr>
- <td>
- <button
- type="button"
- class="btn btn-default t3js-upgradeWizards-done-markUndone"
- >
- Mark undone
- </button>
- </td>
- <td class="t3js-upgradeWizards-done-title">
- </td>
- </tr>
- </table>
- </div>
+ <div class="t3js-upgradeWizards-done-body-template">
+ <table class="table table-condensed table-striped">
+ <tbody class="t3js-upgradeWizards-done-rows"></tbody>
+ </table>
+ </div>
+ <div class="t3js-upgradeWizards-done-row-template">
+ <table>
+ <tr>
+ <td>
+ <button
+ type="button"
+ class="btn btn-default t3js-upgradeWizards-done-markUndone"
+ >
+ Mark undone
+ </button>
+ </td>
+ <td class="t3js-upgradeWizards-done-title">
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<hr>
<div class="t3js-upgrade-status-section">
- <div class="upgradeWizards-wizards-output t3js-upgradeWizards-wizards-output"></div>
+ <div class="upgradeWizards-wizards-output t3js-upgradeWizards-wizards-output"></div>
- <hr>
+ <hr>
- <h4>Wizards marked as done</h4>
- <p>
- Some wizards fully automatically check whether they should be executed, while others just
- set a flag in the system registry if they have been executed once. This "I have been executed"
- flag can be reset by selecting specific wizards from the list below, so the according wizards
- show up as possible upgrade wizards again.
- </p>
- <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-done-output"></div>
- </div>
+ <h4>Wizards marked as done</h4>
+ <p>
+ Some wizards fully automatically check whether they should be executed, while others just
+ set a flag in the system registry if they have been executed once. This "I have been executed"
+ flag can be reset by selecting specific wizards from the list below, so the according wizards
+ show up as possible upgrade wizards again.
+ </p>
+ <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-done-output"></div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/linkvalidator/Resources/Private/Templates/mailtemplate.html b/typo3/sysext/linkvalidator/Resources/Private/Templates/mailtemplate.html
index da3e7a9a30b2..5d237d4c26db 100644
--- a/typo3/sysext/linkvalidator/Resources/Private/Templates/mailtemplate.html
+++ b/typo3/sysext/linkvalidator/Resources/Private/Templates/mailtemplate.html
@@ -6,18 +6,18 @@
Total broken links: ###TOTALBROKENLINK### (last report: ###TOTALBROKENLINK_OLD###)<br />
- <br />
+<br />
- <!-- ###PAGE_SECTION### -->
- Page: ###TITLE###<br />
- All links types: ###BROKENLINKCOUNT### (last report: ###BROKENLINKCOUNT_OLD###)<br />
- Internal links: ###DB### (last report: ###DB_OLD###)<br />
- File links: ###FILE### (last report: ###FILE_OLD###)<br />
- External links: ###EXTERNAL### (last report: ###EXTERNAL_OLD###)<br />
+<!-- ###PAGE_SECTION### -->
+ Page: ###TITLE###<br />
+ All links types: ###BROKENLINKCOUNT### (last report: ###BROKENLINKCOUNT_OLD###)<br />
+ Internal links: ###DB### (last report: ###DB_OLD###)<br />
+ File links: ###FILE### (last report: ###FILE_OLD###)<br />
+ External links: ###EXTERNAL### (last report: ###EXTERNAL_OLD###)<br />
- <!-- ###PAGE_SECTION### -->
+<!-- ###PAGE_SECTION### -->
</body>
</html>
-<!-- ###REPORT_TEMPLATE### -->
\ No newline at end of file
+<!-- ###REPORT_TEMPLATE### -->
diff --git a/typo3/sysext/linkvalidator/Resources/Private/Templates/mod_template.html b/typo3/sysext/linkvalidator/Resources/Private/Templates/mod_template.html
index 460230b46234..688072324829 100644
--- a/typo3/sysext/linkvalidator/Resources/Private/Templates/mod_template.html
+++ b/typo3/sysext/linkvalidator/Resources/Private/Templates/mod_template.html
@@ -1,8 +1,8 @@
<!-- ###FULLDOC### begin -->
<div class="linkvalidator-check-options">
- ###ID###
- <h4>###CHECKOPTIONS_TITLE###</h4>
- <div>###CHECKOPTIONS###</div>
+ ###ID###
+ <h4>###CHECKOPTIONS_TITLE###</h4>
+ <div>###CHECKOPTIONS###</div>
</div>
<div class="linkvalidator-function-menu"><h4>###FUNC_TITLE###</h4><div>###FUNC_MENU###</div></div>
<div class="linkvalidator-button">###REFRESH######UPDATE###</div>
@@ -12,50 +12,50 @@
<!-- ###CHECKOPTIONS_SECTION### begin -->
<table class="table table-striped table-hover" id="linkvalidator-statistics-table">
- <thead>
- <tr>
- <th>###TOTAL_COUNT_LABEL###</th>
- <th class="number"><span class="badge">###TOTAL_COUNT###</span></th>
- </tr>
- </thead>
- <tbody>
- <!-- ###HOOK_SECTION### begin -->
- <tr>
- <td>###OPTION###</td>
- <td class="number"><span class="badge">###COUNT###</span></td>
- </tr>
- <!-- ###HOOK_SECTION### end -->
- </tbody>
+ <thead>
+ <tr>
+ <th>###TOTAL_COUNT_LABEL###</th>
+ <th class="number"><span class="badge">###TOTAL_COUNT###</span></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- ###HOOK_SECTION### begin -->
+ <tr>
+ <td>###OPTION###</td>
+ <td class="number"><span class="badge">###COUNT###</span></td>
+ </tr>
+ <!-- ###HOOK_SECTION### end -->
+ </tbody>
</table>
<!-- ###CHECKOPTIONS_SECTION### end -->
<!-- ###BROKENLINKS_CONTENT### begin -->
###LIST_HEADER###
<table class="table table-striped table-hover" id="linkvalidator-broken-links-table">
- <thead>
- <tr>
- <th>###TABLEHEAD_ELEMENT###</th>
- <th>###TABLEHEAD_PATH###</th>
- <th>###TABLEHEAD_HEADLINK###</th>
- <th>###TABLEHEAD_LINKTARGET###</th>
- <th>###TABLEHEAD_LINKMESSAGE###</th>
- <th>###TABLEHEAD_LASTCHECK###</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <!-- ###BROKENLINKS_ITEM### begin -->
- <tr>
- <td>###ACTIONLINKOPEN######ELEMENT######ACTIONLINKCLOSE###</td>
- <td>###PATH###</td>
- <td>###HEADLINK###</td>
- <td><a href="###LINKTARGET###" target="_blank">###LINKTARGET###</a></td>
- <td>###LINKMESSAGE###</td>
- <td>###LASTCHECK###</td>
- <td>###ACTIONLINKOPEN######ACTIONLINKICON######ACTIONLINKCLOSE###</td>
- </tr>
- <!-- ###BROKENLINKS_ITEM### end -->
- </tbody>
+ <thead>
+ <tr>
+ <th>###TABLEHEAD_ELEMENT###</th>
+ <th>###TABLEHEAD_PATH###</th>
+ <th>###TABLEHEAD_HEADLINK###</th>
+ <th>###TABLEHEAD_LINKTARGET###</th>
+ <th>###TABLEHEAD_LINKMESSAGE###</th>
+ <th>###TABLEHEAD_LASTCHECK###</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- ###BROKENLINKS_ITEM### begin -->
+ <tr>
+ <td>###ACTIONLINKOPEN######ELEMENT######ACTIONLINKCLOSE###</td>
+ <td>###PATH###</td>
+ <td>###HEADLINK###</td>
+ <td><a href="###LINKTARGET###" target="_blank">###LINKTARGET###</a></td>
+ <td>###LINKMESSAGE###</td>
+ <td>###LASTCHECK###</td>
+ <td>###ACTIONLINKOPEN######ACTIONLINKICON######ACTIONLINKCLOSE###</td>
+ </tr>
+ <!-- ###BROKENLINKS_ITEM### end -->
+ </tbody>
</table>
<!-- ###BROKENLINKS_CONTENT### end -->
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
index e34068bc7fb8..9fe4389f5e62 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
@@ -1,37 +1,37 @@
<form action="" id="ConfigurationView" method="post">
- <h1><f:translate key="configuration" /></h1>
+ <h1><f:translate key="configuration" /></h1>
- <h2><f:translate key="{treeName}" /></h2>
+ <h2><f:translate key="{treeName}" /></h2>
- <div id="lowlevel-config">
- <div class="form-group">
- <label for="lowlevel-searchString">
- <f:translate key="enterSearchPhrase" />
- </label>
- <input class="form-control" type="search" id="lowlevel-searchString" name="searchString" value="{searchString}" />
- </div>
- <div class="form-group">
- <div class="checkbox">
- <label for="lowlevel-regexSearch">
- <input type="hidden" name="regexSearch" value="0" />
- <input
- type="checkbox"
- class="checkbox"
- name="regexSearch"
- id="lowlevel-regexSearch"
- value="1"
- {f:if(condition:'{regexSearch}', then: ' checked')}
- >
- <f:translate key="useRegExp" />
- </label>
- </div>
- </div>
- <div class="form-group">
- <input class="btn btn-default" type="submit" name="search" id="search" value="{f:translate(key: 'search')}"/>
- </div>
- </div>
+ <div id="lowlevel-config">
+ <div class="form-group">
+ <label for="lowlevel-searchString">
+ <f:translate key="enterSearchPhrase" />
+ </label>
+ <input class="form-control" type="search" id="lowlevel-searchString" name="searchString" value="{searchString}" />
+ </div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label for="lowlevel-regexSearch">
+ <input type="hidden" name="regexSearch" value="0" />
+ <input
+ type="checkbox"
+ class="checkbox"
+ name="regexSearch"
+ id="lowlevel-regexSearch"
+ value="1"
+ {f:if(condition:'{regexSearch}', then: ' checked')}
+ >
+ <f:translate key="useRegExp" />
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <input class="btn btn-default" type="submit" name="search" id="search" value="{f:translate(key: 'search')}"/>
+ </div>
+ </div>
- <div class="nowrap">
- <f:format.raw>{tree}</f:format.raw>
- </div>
-</form>
\ No newline at end of file
+ <div class="nowrap">
+ <f:format.raw>{tree}</f:format.raw>
+ </div>
+</form>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/CustomSearch.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/CustomSearch.html
index 5bde7301dc53..23cf7128cdc1 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/CustomSearch.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/CustomSearch.html
@@ -2,16 +2,14 @@
<f:format.raw>{submenu}</f:format.raw>
<f:if condition="{searchMode} == 'query'">
- <f:then>
- <f:format.raw>{queryMaker}</f:format.raw>
- </f:then>
- <f:else>
- <h2>{f:translate(key:'searchOptions')}</h2>
- <f:format.raw>{searchOptions}</f:format.raw>
-
- <h2>{f:translate(key:'result')}</h2>
- <f:format.raw>{results}</f:format.raw>
- </f:else>
+ <f:then>
+ <f:format.raw>{queryMaker}</f:format.raw>
+ </f:then>
+ <f:else>
+ <h2>{f:translate(key:'searchOptions')}</h2>
+ <f:format.raw>{searchOptions}</f:format.raw>
+
+ <h2>{f:translate(key:'result')}</h2>
+ <f:format.raw>{results}</f:format.raw>
+ </f:else>
</f:if>
-
-
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/IntegrityOverview.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/IntegrityOverview.html
index beaa7b8cd036..259696044ab8 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/IntegrityOverview.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/IntegrityOverview.html
@@ -1,10 +1,10 @@
<h1>{f:translate(key:'title')}</h1>
<dl class="t3-overview-list">
- <f:for each="{availableFunctions}" as="url" key="name">
- <dt>
- <a href="{url}">
- <img src="sysext/lowlevel/Resources/Public/Icons/module-dbint.svg" width="16" height="16" title="{f:translate(key: name)}" alt="{f:translate(key: name)}" /> {f:translate(key: name)}
- </a></dt>
- <dd>{f:translate(key:'{name}_description')}</dd>
- </f:for>
+ <f:for each="{availableFunctions}" as="url" key="name">
+ <dt>
+ <a href="{url}">
+ <img src="sysext/lowlevel/Resources/Public/Icons/module-dbint.svg" width="16" height="16" title="{f:translate(key: name)}" alt="{f:translate(key: name)}" /> {f:translate(key: name)}
+ </a></dt>
+ <dd>{f:translate(key:'{name}_description')}</dd>
+ </f:for>
</dl>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/RecordStatistics.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/RecordStatistics.html
index 1238d7725114..cf6a08cc969f 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/RecordStatistics.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/RecordStatistics.html
@@ -2,78 +2,78 @@
<h2>{f:translate(key:'pages')}</h2>
<table class="table table-striped table-hover">
- <colgroup>
- <col width="24">
- <col>
- <col width="150">
- </colgroup>
- <thead>
- <tr>
- <th colspan="2"></th>
- <th>{f:translate(key:'count')}</th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{pages}" as="item" key="name">
- <tr>
- <td><f:format.raw>{item.icon}</f:format.raw></td>
- <td>{f:translate(key:'{name}')}</td>
- <td>{item.count}</td>
- </tr>
- </f:for>
- </tbody>
+ <colgroup>
+ <col width="24">
+ <col>
+ <col width="150">
+ </colgroup>
+ <thead>
+ <tr>
+ <th colspan="2"></th>
+ <th>{f:translate(key:'count')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{pages}" as="item" key="name">
+ <tr>
+ <td><f:format.raw>{item.icon}</f:format.raw></td>
+ <td>{f:translate(key:'{name}')}</td>
+ <td>{item.count}</td>
+ </tr>
+ </f:for>
+ </tbody>
</table>
<h2>{f:translate(key:'doktype')}</h2>
<table class="table table-striped table-hover">
- <colgroup>
- <col width="24">
- <col>
- <col width="150">
- </colgroup>
- <thead>
- <tr>
- <th></th>
- <th>{f:translate(key:'doktype_value')}</th>
- <th>{f:translate(key:'count')}</th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{doktypes}" as="item">
- <tr>
- <td><f:format.raw>{item.icon}</f:format.raw></td>
- <td>{item.title}</td>
- <td>{item.count}</td>
- </tr>
- </f:for>
- </tbody>
+ <colgroup>
+ <col width="24">
+ <col>
+ <col width="150">
+ </colgroup>
+ <thead>
+ <tr>
+ <th></th>
+ <th>{f:translate(key:'doktype_value')}</th>
+ <th>{f:translate(key:'count')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{doktypes}" as="item">
+ <tr>
+ <td><f:format.raw>{item.icon}</f:format.raw></td>
+ <td>{item.title}</td>
+ <td>{item.count}</td>
+ </tr>
+ </f:for>
+ </tbody>
</table>
<h2>{f:translate(key:'tables')}</h2>
<table class="table table-striped table-hover">
- <colgroup>
- <col width="24">
- <col>
- <col width="150">
- </colgroup>
- <thead>
- <tr>
- <th></th>
- <th>{f:translate(key:'label')}</th>
- <th>{f:translate(key:'tablename')}</th>
- <th>{f:translate(key:'total_lost')}</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{tables}" key="name" as="item">
- <tr>
- <td><f:format.raw>{item.icon}</f:format.raw></td>
- <td>{item.title}</td>
- <td>{name}</td>
- <td>{item.count}</td>
- <td><f:format.raw>{item.lostRecords}</f:format.raw></td>
- </tr>
- </f:for>
- </tbody>
+ <colgroup>
+ <col width="24">
+ <col>
+ <col width="150">
+ </colgroup>
+ <thead>
+ <tr>
+ <th></th>
+ <th>{f:translate(key:'label')}</th>
+ <th>{f:translate(key:'tablename')}</th>
+ <th>{f:translate(key:'total_lost')}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{tables}" key="name" as="item">
+ <tr>
+ <td><f:format.raw>{item.icon}</f:format.raw></td>
+ <td>{item.title}</td>
+ <td>{name}</td>
+ <td>{item.count}</td>
+ <td><f:format.raw>{item.lostRecords}</f:format.raw></td>
+ </tr>
+ </f:for>
+ </tbody>
</table>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/ReferenceIndex.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/ReferenceIndex.html
index 30cf83971943..7d4f557461a8 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/ReferenceIndex.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/ReferenceIndex.html
@@ -4,8 +4,8 @@
<f:format.raw>{content}</f:format.raw>
<div>
- <input class="btn btn-default" type="submit" name="_check" value="{f:translate(key:'referenceIndex_buttonCheck')}" />
- <input class="btn btn-default" type="submit" name="_update" value="{f:translate(key:'referenceIndex_buttonUpdate')}" />
+ <input class="btn btn-default" type="submit" name="_check" value="{f:translate(key:'referenceIndex_buttonCheck')}" />
+ <input class="btn btn-default" type="submit" name="_update" value="{f:translate(key:'referenceIndex_buttonUpdate')}" />
</div><br /><br />
<h2>{f:translate(key:'checkScript_headline')}</h2>
@@ -13,15 +13,15 @@
<h3>{f:translate(key:'checkScript_check_description')}</h3>
<p>
- <code>php {binaryPath} referenceindex:update -c</code>
+ <code>php {binaryPath} referenceindex:update -c</code>
</p>
<h3>{f:translate(key:'checkScript_update_description')}</h3>
<p>
- <code>php {binaryPath} referenceindex:update</code>
+ <code>php {binaryPath} referenceindex:update</code>
</p>
<p>
- {f:translate(key:'checkScript_moreDetails')}<br>
- <a href="{ReadmeLink}" target="_new">{ReadmeLocation}</a>
+ {f:translate(key:'checkScript_moreDetails')}<br>
+ <a href="{ReadmeLink}" target="_new">{ReadmeLocation}</a>
</p>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
index 435009b5877f..619da61ae868 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
@@ -2,41 +2,41 @@
<h2>{f:translate(key:'files_no_ref')}</h2>
<f:if condition="{files.noReferences}">
- <f:then>
- <f:for each="{files.noReferences}" as="item">
- <span class="text-nowrap">{item.0}/<strong>{item.1}</strong></span>
- <br>
- </f:for>
- </f:then>
- <f:else>
- <p>{f:translate(key:'no_files_found')}</p>
- </f:else>
+ <f:then>
+ <f:for each="{files.noReferences}" as="item">
+ <span class="text-nowrap">{item.0}/<strong>{item.1}</strong></span>
+ <br>
+ </f:for>
+ </f:then>
+ <f:else>
+ <p>{f:translate(key:'no_files_found')}</p>
+ </f:else>
</f:if>
<h2>{f:translate(key:'files_many_ref')}</h2>
<f:if condition="{files.moreReferences}">
- <f:then>
- <f:for each="{files.moreReferences}" as="item">
- <span class="text-nowrap">{item.0}/<strong>{item.1}</strong>: {item.2} {f:translate(key:'references')}</span>
- <br>{item.3}<br><br>
- </f:for>
- </f:then>
- <f:else>
- <p>{f:translate(key:'no_files_found')}</p>
- </f:else>
+ <f:then>
+ <f:for each="{files.moreReferences}" as="item">
+ <span class="text-nowrap">{item.0}/<strong>{item.1}</strong>: {item.2} {f:translate(key:'references')}</span>
+ <br>{item.3}<br><br>
+ </f:for>
+ </f:then>
+ <f:else>
+ <p>{f:translate(key:'no_files_found')}</p>
+ </f:else>
</f:if>
<h2>{f:translate(key:'files_no_file')}</h2>
<f:if condition="{files.noFile}">
- <f:then>
- <f:for each="{files.noFile}" as="item">
- <span class="text-nowrap">{item.0}/<strong>{item.1}</strong> {f:translate(key:'isMissing')}</span>
- <br>{f:translate(key:'referencedFrom')} {item.2}<br><br>
- </f:for>
- </f:then>
- <f:else>
- <p>{f:translate(key:'no_files_found')}</p>
- </f:else>
+ <f:then>
+ <f:for each="{files.noFile}" as="item">
+ <span class="text-nowrap">{item.0}/<strong>{item.1}</strong> {f:translate(key:'isMissing')}</span>
+ <br>{f:translate(key:'referencedFrom')} {item.2}<br><br>
+ </f:for>
+ </f:then>
+ <f:else>
+ <p>{f:translate(key:'no_files_found')}</p>
+ </f:else>
</f:if>
diff --git a/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/DropDown.html b/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/DropDown.html
index 627e648aed55..d0d4aac8dd7e 100644
--- a/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/DropDown.html
+++ b/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/DropDown.html
@@ -2,63 +2,63 @@
<f:be.pageRenderer includeRequireJsModules="{0:'TYPO3/CMS/Opendocs/Toolbar/OpendocsMenu'}"/>
<h3 class="dropdown-headline">
- {f:translate(key: 'toolbaritem', extensionName: 'opendocs')}
+ {f:translate(key: 'toolbaritem', extensionName: 'opendocs')}
</h3>
<hr>
<f:if condition="{noDocs}">
- <f:then>
- <p>
- <f:translate key="no_docs" extensionName="opendocs"/>
- </p>
- </f:then>
- <f:else>
- <f:if condition="{openDocuments}">
- <h3 class="dropdown-headline">
- <f:translate key="open_docs" extensionName="opendocs"/>
- </h3>
- <div class="dropdown-table">
- <f:for each="{openDocuments}" as="openDocument">
- <div class="dropdown-table-row t3js-topbar-opendocs-item">
- <div class="dropdown-table-column dropdown-table-icon">
- <core:iconForRecord table="{openDocument.table}" row="{openDocument.record}"/>
- </div>
- <div class="dropdown-table-column dropdown-table-title">
- <a class="dropdown-table-title-ellipsis t3js-open-doc" data-pid="{openDocument.pid}" href="{openDocument.uri}">
- {openDocument.label}
- </a>
- </div>
- <div class="dropdown-table-column dropdown-table-actions">
- <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-close t3js-topbar-opendocs-close"
- data-opendocsidentifier="{openDocument.md5sum}"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.closeDoc')}">
- <core:icon identifier="actions-close" alternativeMarkupIdentifier="inline"/>
- </a>
- </div>
- </div>
- </f:for>
- </div>
- <hr>
- </f:if>
- <f:if condition="{recentDocuments}">
- <h3 class="dropdown-headline">
- <f:translate key="recent_docs" extensionName="opendocs"/>
- </h3>
- <div class="dropdown-table">
- <f:for each="{recentDocuments}" as="recentDocument">
- <div class="dropdown-table-row t3js-topbar-recentdoc">
- <div class="dropdown-table-column dropdown-table-icon">
- <core:iconForRecord table="{recentDocument.table}" row="{recentDocument.record}"/>
- </div>
- <div class="dropdown-table-column dropdown-table-title">
- <a class="dropdown-table-title-ellipsis t3js-open-doc" data-pid="{recentDocument.pid}" href="{recentDocument.uri}" >
- {recentDocument.label}
- </a>
- </div>
- </div>
- </f:for>
- </div>
- </f:if>
- </f:else>
+ <f:then>
+ <p>
+ <f:translate key="no_docs" extensionName="opendocs"/>
+ </p>
+ </f:then>
+ <f:else>
+ <f:if condition="{openDocuments}">
+ <h3 class="dropdown-headline">
+ <f:translate key="open_docs" extensionName="opendocs"/>
+ </h3>
+ <div class="dropdown-table">
+ <f:for each="{openDocuments}" as="openDocument">
+ <div class="dropdown-table-row t3js-topbar-opendocs-item">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <core:iconForRecord table="{openDocument.table}" row="{openDocument.record}"/>
+ </div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <a class="dropdown-table-title-ellipsis t3js-open-doc" data-pid="{openDocument.pid}" href="{openDocument.uri}">
+ {openDocument.label}
+ </a>
+ </div>
+ <div class="dropdown-table-column dropdown-table-actions">
+ <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-close t3js-topbar-opendocs-close"
+ data-opendocsidentifier="{openDocument.md5sum}"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.closeDoc')}">
+ <core:icon identifier="actions-close" alternativeMarkupIdentifier="inline"/>
+ </a>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ <hr>
+ </f:if>
+ <f:if condition="{recentDocuments}">
+ <h3 class="dropdown-headline">
+ <f:translate key="recent_docs" extensionName="opendocs"/>
+ </h3>
+ <div class="dropdown-table">
+ <f:for each="{recentDocuments}" as="recentDocument">
+ <div class="dropdown-table-row t3js-topbar-recentdoc">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <core:iconForRecord table="{recentDocument.table}" row="{recentDocument.record}"/>
+ </div>
+ <div class="dropdown-table-column dropdown-table-title">
+ <a class="dropdown-table-title-ellipsis t3js-open-doc" data-pid="{recentDocument.pid}" href="{recentDocument.uri}" >
+ {recentDocument.label}
+ </a>
+ </div>
+ </div>
+ </f:for>
+ </div>
+ </f:if>
+ </f:else>
</f:if>
</html>
diff --git a/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/ToolbarItem.html b/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
index 068baffc42db..19eb2f2bbf57 100644
--- a/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
+++ b/typo3/sysext/opendocs/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
@@ -1,6 +1,6 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<span class="toolbar-item-icon" title="{f:translate(key: 'toolbaritem', extensionName: 'opendocs')}">
- <core:icon identifier="apps-toolbar-menu-opendocs" alternativeMarkupIdentifier="inline"/>
+ <core:icon identifier="apps-toolbar-menu-opendocs" alternativeMarkupIdentifier="inline"/>
</span>
<span class="toolbar-item-title">{f:translate(key: 'toolbaritem', extensionName: 'opendocs')}</span>
<span class="toolbar-item-badge badge" id="tx-opendocs-counter"></span>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
index 60dbbace01d5..b016d88a7e1a 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
@@ -1,35 +1,35 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-sidebar">
- <div class="element-browser-body">
- {tree -> f:format.raw()}
- </div>
- </div>
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <f:if condition="{selectedFolder}">
- <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:files" /></h3>
- <span title="{selectedFolder.identifier}">
- {selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
- </span>
- <f:if condition="{itemsInSelectedFolder}">
- <ul class="list-tree">
- <f:for each="{itemsInSelectedFolder}" as="file">
- <li{f:if(condition: '{file.uid} == {currentIdentifier}', then: ' class="active"')}>
- <span class="list-tree-group">
- <a href="{file.url}" class="t3js-fileLink list-tree-group" title="{file.name}">
- <span class="list-tree-icon">
- <span title="{file.name} ({file.size})">{file.icon -> f:format.raw()}</span>
- </span>
- <span class="list-tree-title">{file.title}</span>
- </a>
- </span>
- </li>
- </f:for>
- </ul>
- </f:if>
- </f:if>
- {uploadFileForm -> f:format.raw()}
- {createFolderForm -> f:format.raw()}
- </div>
- </div>
+ <div class="element-browser-main-sidebar">
+ <div class="element-browser-body">
+ {tree -> f:format.raw()}
+ </div>
+ </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <f:if condition="{selectedFolder}">
+ <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:files" /></h3>
+ <span title="{selectedFolder.identifier}">
+ {selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
+ </span>
+ <f:if condition="{itemsInSelectedFolder}">
+ <ul class="list-tree">
+ <f:for each="{itemsInSelectedFolder}" as="file">
+ <li{f:if(condition: '{file.uid} == {currentIdentifier}', then: ' class="active"')}>
+ <span class="list-tree-group">
+ <a href="{file.url}" class="t3js-fileLink list-tree-group" title="{file.name}">
+ <span class="list-tree-icon">
+ <span title="{file.name} ({file.size})">{file.icon -> f:format.raw()}</span>
+ </span>
+ <span class="list-tree-title">{file.title}</span>
+ </a>
+ </span>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
+ </f:if>
+ {uploadFileForm -> f:format.raw()}
+ {createFolderForm -> f:format.raw()}
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
index 2c0cbef2ea04..53b6f61a9164 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
@@ -1,34 +1,34 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-sidebar">
- <div class="element-browser-body">
- {tree -> f:format.raw()}
- </div>
- </div>
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <f:if condition="{selectedFolder}">
- <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:folders" /></h3>
- <span class="{f:if(condition: '{selectedFolder.combinedIdentifier} == {currentIdentifier}', then: 'bg-success')}" title="{selectedFolder.identifier}">
- {selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
- </span>
- <f:if condition="{itemsInSelectedFolder}">
- <ul class="list-tree">
- <f:for each="{itemsInSelectedFolder}" as="folder">
- <li{f:if(condition: '{folder.identifier} == {currentIdentifier}', then: ' class="active"')}>
- <span class="list-tree-group">
- <a href="{folder.url}" class="t3js-fileLink list-tree-group" title="{folder.name}">
- <span class="list-tree-icon">
- <span title="{folder.name}">{folder.icon -> f:format.raw()}</span>
- </span>
- <span class="list-tree-title">{folder.title}</span>
- </a>
- </span>
- </li>
- </f:for>
- </ul>
- </f:if>
- </f:if>
- {createFolderForm -> f:format.raw()}
- </div>
- </div>
+ <div class="element-browser-main-sidebar">
+ <div class="element-browser-body">
+ {tree -> f:format.raw()}
+ </div>
+ </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <f:if condition="{selectedFolder}">
+ <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:folders" /></h3>
+ <span class="{f:if(condition: '{selectedFolder.combinedIdentifier} == {currentIdentifier}', then: 'bg-success')}" title="{selectedFolder.identifier}">
+ {selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
+ </span>
+ <f:if condition="{itemsInSelectedFolder}">
+ <ul class="list-tree">
+ <f:for each="{itemsInSelectedFolder}" as="folder">
+ <li{f:if(condition: '{folder.identifier} == {currentIdentifier}', then: ' class="active"')}>
+ <span class="list-tree-group">
+ <a href="{folder.url}" class="t3js-fileLink list-tree-group" title="{folder.name}">
+ <span class="list-tree-icon">
+ <span title="{folder.name}">{folder.icon -> f:format.raw()}</span>
+ </span>
+ <span class="list-tree-title">{folder.title}</span>
+ </a>
+ </span>
+ </li>
+ </f:for>
+ </ul>
+ </f:if>
+ </f:if>
+ {createFolderForm -> f:format.raw()}
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
index 02bc5e162f1a..37390f161638 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
@@ -1,19 +1,19 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <form action="" id="lmailform" class="form-horizontal">
- <div class="form-group form-group-sm">
- <label class="col-xs-4 control-label"><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:emailAddress" /></label>
- <div class="col-xs-8">
- <div class="input-group">
- <input type="text" name="lemail" size="20" class="form-control" value="{email}" />
- <div class="input-group-btn">
- <input class="btn btn-sm btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
- </div>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <form action="" id="lmailform" class="form-horizontal">
+ <div class="form-group form-group-sm">
+ <label class="col-xs-4 control-label"><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:emailAddress" /></label>
+ <div class="col-xs-8">
+ <div class="input-group">
+ <input type="text" name="lemail" size="20" class="form-control" value="{email}" />
+ <div class="input-group-btn">
+ <input class="btn btn-sm btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
index dbb7278da896..c2ab487e1fd5 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
@@ -1,43 +1,43 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-sidebar">
- <div class="element-browser-body">
- <f:if condition="{temporaryTreeMountCancelLink}">
- <p>
- <a href="{temporaryTreeMountCancelLink}" class="btn btn-primary">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.temporaryDBmount" />
- </a>
- </p>
- </f:if>
- {tree -> f:format.raw()}
- </div>
- </div>
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <f:if condition="{expandActivePage}">
- <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:contentElements" /></h3>
- <ul class="list-tree list-tree-root list-tree-root-clean">
- <li class="list-tree-control-open">
- <span class="list-tree-group">
- <span class="list-tree-icon">{activePageIcon -> f:format.raw()}</span>
- <span class="list-tree-title">{activePageTitle -> f:format.raw()}</span>
- </span>
- <ul>
- <f:for each="{contentElements}" as="content">
- <li{f:if(condition: content.isSelected, then: ' class="active"')}>
- <span class="list-tree-group">
- <span class="list-tree-icon">{content.icon -> f:format.raw()}</span>
- <span class="list-tree-title">
- <a href="{content.url}" class="t3js-pageLink">
- {content.title -> f:format.raw()}
- </a>
- </span>
- </span>
- </li>
- </f:for>
- </ul>
- </li>
- </ul>
- </f:if>
- </div>
- </div>
+ <div class="element-browser-main-sidebar">
+ <div class="element-browser-body">
+ <f:if condition="{temporaryTreeMountCancelLink}">
+ <p>
+ <a href="{temporaryTreeMountCancelLink}" class="btn btn-primary">
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.temporaryDBmount" />
+ </a>
+ </p>
+ </f:if>
+ {tree -> f:format.raw()}
+ </div>
+ </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <f:if condition="{expandActivePage}">
+ <h3><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:contentElements" /></h3>
+ <ul class="list-tree list-tree-root list-tree-root-clean">
+ <li class="list-tree-control-open">
+ <span class="list-tree-group">
+ <span class="list-tree-icon">{activePageIcon -> f:format.raw()}</span>
+ <span class="list-tree-title">{activePageTitle -> f:format.raw()}</span>
+ </span>
+ <ul>
+ <f:for each="{contentElements}" as="content">
+ <li{f:if(condition: content.isSelected, then: ' class="active"')}>
+ <span class="list-tree-group">
+ <span class="list-tree-icon">{content.icon -> f:format.raw()}</span>
+ <span class="list-tree-title">
+ <a href="{content.url}" class="t3js-pageLink">
+ {content.title -> f:format.raw()}
+ </a>
+ </span>
+ </span>
+ </li>
+ </f:for>
+ </ul>
+ </li>
+ </ul>
+ </f:if>
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Record.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Record.html
index c29a92d83f29..e533c402e64d 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Record.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Record.html
@@ -1,14 +1,14 @@
<div class="element-browser-panel element-browser-main">
- <f:if condition="{tree}">
- <div class="element-browser-main-sidebar">
- <div class="element-browser-body">
- {tree -> f:format.raw()}
- </div>
- </div>
- </f:if>
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- {recordList -> f:format.raw()}
- </div>
- </div>
+ <f:if condition="{tree}">
+ <div class="element-browser-main-sidebar">
+ <div class="element-browser-body">
+ {tree -> f:format.raw()}
+ </div>
+ </div>
+ </f:if>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ {recordList -> f:format.raw()}
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Telephone.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Telephone.html
index fe38bb20ccbb..64cb5db33795 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Telephone.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Telephone.html
@@ -1,19 +1,19 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <form action="" id="ltelephoneform" class="form-horizontal">
- <div class="form-group form-group-sm">
- <label class="col-xs-4 control-label"><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:telephoneNumber" /></label>
- <div class="col-xs-8">
- <div class="input-group">
- <input type="tel" name="ltelephone" size="20" class="form-control" value="{telephone}" />
- <div class="input-group-btn">
- <input class="btn btn-sm btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
- </div>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <form action="" id="ltelephoneform" class="form-horizontal">
+ <div class="form-group form-group-sm">
+ <label class="col-xs-4 control-label"><f:translate key="LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:telephoneNumber" /></label>
+ <div class="col-xs-8">
+ <div class="input-group">
+ <input type="tel" name="ltelephone" size="20" class="form-control" value="{telephone}" />
+ <div class="input-group-btn">
+ <input class="btn btn-sm btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
index c888da293e3a..6330e8679c63 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
@@ -1,25 +1,25 @@
<div class="element-browser-panel element-browser-main">
- <div class="element-browser-main-content">
- <div class="element-browser-body">
- <form action="" id="lurlform" class="form-horizontal">
- <div class="form-group form-group-sm" id="typo3-linkURL">
- <label class="col-xs-4 control-label">URL</label>
- <div class="col-xs-8">
- <div class="input-group">
- <input type="text"
- name="lurl"
- size="30"
- class="form-control"
- value="{url}"
- placeholder="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:urlPlaceholder')}" />
- <div class="input-group-btn">
- <input class="btn btn-sm btn-default" type="submit"
- value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
- </div>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
+ <div class="element-browser-main-content">
+ <div class="element-browser-body">
+ <form action="" id="lurlform" class="form-horizontal">
+ <div class="form-group form-group-sm" id="typo3-linkURL">
+ <label class="col-xs-4 control-label">URL</label>
+ <div class="col-xs-8">
+ <div class="input-group">
+ <input type="text"
+ name="lurl"
+ size="30"
+ class="form-control"
+ value="{url}"
+ placeholder="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:urlPlaceholder')}" />
+ <div class="input-group-btn">
+ <input class="btn btn-sm btn-default" type="submit"
+ value="{f:translate(key: 'LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/recycler/Resources/Private/Partials/RecordsTable/DeletedRecord.html b/typo3/sysext/recycler/Resources/Private/Partials/RecordsTable/DeletedRecord.html
index 7dc56e05b147..6919bdc66e3b 100644
--- a/typo3/sysext/recycler/Resources/Private/Partials/RecordsTable/DeletedRecord.html
+++ b/typo3/sysext/recycler/Resources/Private/Partials/RecordsTable/DeletedRecord.html
@@ -1,56 +1,56 @@
<html xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers" data-namespace-typo3-fluid="true">
<tr data-uid="{record.uid}" data-table="{record.table}" data-recordtitle="{record.title}" data-parent-deleted="{record.isParentDeleted}">
- <td class="nowrap">
- <label class="btn btn-default btn-checkbox">
- <input type="checkbox">
- <span class="t3-icon fa"></span>
- </label>
- </td>
- <td class="nowrap">{record.tableTitle}</td>
- <td class="nowrap"><f:format.raw>{record.icon}</f:format.raw> {record.title}</td>
- <td class="nowrap">{record.tstamp}</td>
- <td class="nowrap">{record.uid}</td>
- <td class="nowrap">{record.pageTitle} ({record.pid})</td>
- <td class="nowrap text-right">
- <div class="btn-group">
- <a class="btn btn-default" data-action="undo" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.undo')}">
- <core:icon identifier="actions-edit-undo" />
- </a>
- <f:if condition="{allowDelete}">
- <a class="btn btn-default" data-action="delete" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.delete')}">
- <core:icon identifier="actions-edit-delete" />
- </a>
- </f:if>
- </div>
- <div class="btn-group">
- <a class="btn btn-default" data-action="expand" data-toggle="collapse" data-target="#{record.table}_{record.uid}" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.expand')}">
- <core:icon identifier="actions-document-info" />
- </a>
- </div>
- </td>
+ <td class="nowrap">
+ <label class="btn btn-default btn-checkbox">
+ <input type="checkbox">
+ <span class="t3-icon fa"></span>
+ </label>
+ </td>
+ <td class="nowrap">{record.tableTitle}</td>
+ <td class="nowrap"><f:format.raw>{record.icon}</f:format.raw> {record.title}</td>
+ <td class="nowrap">{record.tstamp}</td>
+ <td class="nowrap">{record.uid}</td>
+ <td class="nowrap">{record.pageTitle} ({record.pid})</td>
+ <td class="nowrap text-right">
+ <div class="btn-group">
+ <a class="btn btn-default" data-action="undo" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.undo')}">
+ <core:icon identifier="actions-edit-undo" />
+ </a>
+ <f:if condition="{allowDelete}">
+ <a class="btn btn-default" data-action="delete" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.delete')}">
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </f:if>
+ </div>
+ <div class="btn-group">
+ <a class="btn btn-default" data-action="expand" data-toggle="collapse" data-target="#{record.table}_{record.uid}" title="{f:translate(key: 'LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:button.expand')}">
+ <core:icon identifier="actions-document-info" />
+ </a>
+ </div>
+ </td>
</tr>
<tr class="collapse" id="{record.table}_{record.uid}">
- <td colspan="7">
- <table class="table">
- <thead>
- <tr>
- <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.recordtype" /></th>
- <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.crdate" /></th>
- <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.owner" /></th>
- <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.deletedBy" /></th>
- <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.path" /></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>{record.table}</td>
- <td>{record.crdate}</td>
- <td><be:avatar backendUser="{record.owner_uid}" showIcon="true" />{record.owner} ({record.owner_uid})</td>
- <td><f:if condition="{record.delete_user}"><be:avatar backendUser="{record.delete_user_uid}" showIcon="true" />{record.delete_user} ({record.delete_user_uid})</f:if></td>
- <td><f:format.html>{record.path}</f:format.html></td>
- </tr>
- </tbody>
- </table>
- </td>
+ <td colspan="7">
+ <table class="table">
+ <thead>
+ <tr>
+ <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.recordtype" /></th>
+ <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.crdate" /></th>
+ <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.owner" /></th>
+ <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.deletedBy" /></th>
+ <th><f:translate key="LLL:EXT:recycler/Resources/Private/Language/locallang.xlf:table.header.path" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{record.table}</td>
+ <td>{record.crdate}</td>
+ <td><be:avatar backendUser="{record.owner_uid}" showIcon="true" />{record.owner} ({record.owner_uid})</td>
+ <td><f:if condition="{record.delete_user}"><be:avatar backendUser="{record.delete_user_uid}" showIcon="true" />{record.delete_user} ({record.delete_user_uid})</f:if></td>
+ <td><f:format.html>{record.path}</f:format.html></td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
</tr>
</html>
diff --git a/typo3/sysext/recycler/Resources/Private/Templates/Ajax/RecordsTable.html b/typo3/sysext/recycler/Resources/Private/Templates/Ajax/RecordsTable.html
index 01ace236a609..28b8e1ea0206 100644
--- a/typo3/sysext/recycler/Resources/Private/Templates/Ajax/RecordsTable.html
+++ b/typo3/sysext/recycler/Resources/Private/Templates/Ajax/RecordsTable.html
@@ -1,9 +1,9 @@
<f:for each="{records}" as="record">
- <f:render
- partial="RecordsTable/DeletedRecord"
- arguments="{
- record: '{record}',
- allowDelete: '{allowDelete}'
- }"
- />
+ <f:render
+ partial="RecordsTable/DeletedRecord"
+ arguments="{
+ record: '{record}',
+ allowDelete: '{allowDelete}'
+ }"
+ />
</f:for>
diff --git a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
index 1f586721fa4e..1b047b81a23b 100644
--- a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
+++ b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
@@ -1,66 +1,66 @@
<f:layout name="Default" />
<f:section name="content">
- <div id="recycler-index" class="tx_recycler_recycler">
- <form id="recycler-form" class="form-inline form-inline-spaced">
- <div class="form-group">
- <div class="input-group">
- <input type="text" name="search-text" class="form-control">
- <span class="input-group-btn">
- <button type="submit" class="btn btn-default disabled"><core:icon identifier="actions-search" /></button>
- </span>
- </div>
- </div>
- <div class="form-group">
- <select name="depth" class="form-control">
- <option value="0"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
- <option value="1"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
- <option value="2"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
- <option value="3"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
- <option value="4"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
- <option value="999"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
- </select>
- </div>
- <div class="form-group">
- <select name="pages" class="form-control"></select>
- </div>
- </form>
- <div class="table-fit">
- <table class="table table-hover" id="itemsInRecycler">
- <thead>
- <tr>
- <th>
- <button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></button>
- </th>
- <th><f:translate key="table.header.recordtype" /></th>
- <th><f:translate key="table.header.record" /></th>
- <th><f:translate key="table.header.tstamp" /></th>
- <th><f:translate key="table.header.uid" /></th>
- <th><f:translate key="table.header.pid" /></th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- <div>
- <button class="btn btn-default disabled" data-action="massundo" disabled>
- <core:icon identifier="actions-edit-undo" />
- <span class="text">
- <f:translate key="button.undo" />
- </span>
- </button>
- <f:if condition="{allowDelete}">
- <button class="btn btn-default disabled" data-action="massdelete" disabled>
- <core:icon identifier="actions-edit-delete" />
- <span class="text">
- <f:translate key="button.delete" />
- </span>
- </button>
- </f:if>
- </div>
- <nav>
- </nav>
- </div>
+ <div id="recycler-index" class="tx_recycler_recycler">
+ <form id="recycler-form" class="form-inline form-inline-spaced">
+ <div class="form-group">
+ <div class="input-group">
+ <input type="text" name="search-text" class="form-control">
+ <span class="input-group-btn">
+ <button type="submit" class="btn btn-default disabled"><core:icon identifier="actions-search" /></button>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <select name="depth" class="form-control">
+ <option value="0"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
+ <option value="1"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
+ <option value="2"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
+ <option value="3"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
+ <option value="4"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
+ <option value="999"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
+ </select>
+ </div>
+ <div class="form-group">
+ <select name="pages" class="form-control"></select>
+ </div>
+ </form>
+ <div class="table-fit">
+ <table class="table table-hover" id="itemsInRecycler">
+ <thead>
+ <tr>
+ <th>
+ <button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></button>
+ </th>
+ <th><f:translate key="table.header.recordtype" /></th>
+ <th><f:translate key="table.header.record" /></th>
+ <th><f:translate key="table.header.tstamp" /></th>
+ <th><f:translate key="table.header.uid" /></th>
+ <th><f:translate key="table.header.pid" /></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ <div>
+ <button class="btn btn-default disabled" data-action="massundo" disabled>
+ <core:icon identifier="actions-edit-undo" />
+ <span class="text">
+ <f:translate key="button.undo" />
+ </span>
+ </button>
+ <f:if condition="{allowDelete}">
+ <button class="btn btn-default disabled" data-action="massdelete" disabled>
+ <core:icon identifier="actions-edit-delete" />
+ <span class="text">
+ <f:translate key="button.delete" />
+ </span>
+ </button>
+ </f:if>
+ </div>
+ <nav>
+ </nav>
+ </div>
</f:section>
diff --git a/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html b/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
index 0db2569a0c13..b1df98e2ef73 100644
--- a/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
+++ b/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
@@ -1,107 +1,107 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true">
+ data-namespace-typo3-fluid="true">
<script type="text/javascript">
- function goToPage(formObject) {
- var formField = formObject.elements['paginator-target-page'];
- var url = formField.dataset.url;
- var numberOfPages = parseInt(formField.dataset.numberOfPages);
- var page = parseInt(formField.value);
- if (page > numberOfPages) {
- page = numberOfPages;
- } else if (page < 1) {
- page = 1;
- }
- url = url.replace('987654322', page);
- self.location.href = url;
- return false;
- }
+ function goToPage(formObject) {
+ var formField = formObject.elements['paginator-target-page'];
+ var url = formField.dataset.url;
+ var numberOfPages = parseInt(formField.dataset.numberOfPages);
+ var page = parseInt(formField.value);
+ if (page > numberOfPages) {
+ page = numberOfPages;
+ } else if (page < 1) {
+ page = 1;
+ }
+ url = url.replace('987654322', page);
+ self.location.href = url;
+ return false;
+ }
</script>
<nav class="pagination-wrap">
- <ul class="pagination pagination-block">
- <f:if condition="{pagination.hasLessPages}">
- <f:then>
- <li>
- <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: 1})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.first')}">
- <core:icon identifier="actions-view-paging-first" />
- </a>
- </li>
- <li>
- <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.previousPage})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.previous')}">
- <core:icon identifier="actions-view-paging-previous" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li>
- <span>
- Redirects
- {pagination.startRecord} - {pagination.endRecord}
- </span>
- </li>
- <li>
- <span>
- <f:translate extensionName="fluid" key="widget.pagination.page" />
- <f:variable name="gotToPageUrl">
- <f:be.uri route="site_redirects" parameters="{action: 'overview', demand: demand.parameters, page: 987654322}" />
- </f:variable>
- <form onsubmit="return goToPage(this);" style="display:inline;">
- <f:form.textfield
- additionalAttributes="{min: 1, max: pagination.numberOfPages}"
- data="{number-of-pages: pagination.numberOfPages, url: gotToPageUrl}"
- name="paginator-target-page"
- class="form-control input-sm paginator-input"
- value="{pagination.current}"
- type="number" />
- </form>
- / {pagination.numberOfPages}
- </span>
- </li>
- <f:if condition="{pagination.hasMorePages}">
- <f:then>
- <li>
- <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.nextPage})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.next')}">
- <core:icon identifier="actions-view-paging-next" />
- </a>
- </li>
- <li>
- <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.numberOfPages})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.last')}">
- <core:icon identifier="actions-view-paging-last" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="disabled">
- <span>
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li>
- <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: demand.page})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.refresh')}">
- <core:icon identifier="actions-refresh" />
- </a>
- </li>
- </ul>
+ <ul class="pagination pagination-block">
+ <f:if condition="{pagination.hasLessPages}">
+ <f:then>
+ <li>
+ <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: 1})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.first')}">
+ <core:icon identifier="actions-view-paging-first" />
+ </a>
+ </li>
+ <li>
+ <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.previousPage})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.previous')}">
+ <core:icon identifier="actions-view-paging-previous" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li>
+ <span>
+ Redirects
+ {pagination.startRecord} - {pagination.endRecord}
+ </span>
+ </li>
+ <li>
+ <span>
+ <f:translate extensionName="fluid" key="widget.pagination.page" />
+ <f:variable name="gotToPageUrl">
+ <f:be.uri route="site_redirects" parameters="{action: 'overview', demand: demand.parameters, page: 987654322}" />
+ </f:variable>
+ <form onsubmit="return goToPage(this);" style="display:inline;">
+ <f:form.textfield
+ additionalAttributes="{min: 1, max: pagination.numberOfPages}"
+ data="{number-of-pages: pagination.numberOfPages, url: gotToPageUrl}"
+ name="paginator-target-page"
+ class="form-control input-sm paginator-input"
+ value="{pagination.current}"
+ type="number" />
+ </form>
+ / {pagination.numberOfPages}
+ </span>
+ </li>
+ <f:if condition="{pagination.hasMorePages}">
+ <f:then>
+ <li>
+ <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.nextPage})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.next')}">
+ <core:icon identifier="actions-view-paging-next" />
+ </a>
+ </li>
+ <li>
+ <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: pagination.numberOfPages})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.last')}">
+ <core:icon identifier="actions-view-paging-last" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="disabled">
+ <span>
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li>
+ <a href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview', demand: demand.parameters, page: demand.page})}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.refresh')}">
+ <core:icon identifier="actions-refresh" />
+ </a>
+ </li>
+ </ul>
</nav>
</html>
diff --git a/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html b/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
index a06889697de1..6223fd808faf 100644
--- a/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
+++ b/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
@@ -1,190 +1,190 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:rd="http://typo3.org/ns/TYPO3/CMS/Redirects/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- data-namespace-typo3-fluid="true">
+ xmlns:rd="http://typo3.org/ns/TYPO3/CMS/Redirects/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ data-namespace-typo3-fluid="true">
<f:layout name="RedirectAdministration" />
<f:section name="headline">
- <h1><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:heading_text"/></h1>
+ <h1><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:heading_text"/></h1>
</f:section>
<f:section name="content">
- <f:if condition="{redirects -> f:count()}">
- <f:then>
- <f:render section="filter" arguments="{_all}" />
- <f:render section="table" arguments="{_all}" />
- </f:then>
- <f:else>
- <f:if condition="{demand.constraints}">
- <f:then>
- <f:render section="filter" arguments="{_all}" />
- <f:be.infobox state="-2" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found_with_filter.title')}">
- <p><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found_with_filter.message"/></p>
- <a class="btn btn-default" href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview'})}">
- <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_no_filter"/>
- </a>
- <be:link.newRecord class="btn btn-primary" table="sys_redirect">
- <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_create"/>
- </be:link.newRecord>
- </f:be.infobox>
- </f:then>
- <f:else>
- <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found.title')}">
- <p><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found.message"/></p>
- <be:link.newRecord class="btn btn-primary" table="sys_redirect">
- <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_create"/>
- </be:link.newRecord>
- </f:be.infobox>
- </f:else>
- </f:if>
- </f:else>
- </f:if>
+ <f:if condition="{redirects -> f:count()}">
+ <f:then>
+ <f:render section="filter" arguments="{_all}" />
+ <f:render section="table" arguments="{_all}" />
+ </f:then>
+ <f:else>
+ <f:if condition="{demand.constraints}">
+ <f:then>
+ <f:render section="filter" arguments="{_all}" />
+ <f:be.infobox state="-2" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found_with_filter.title')}">
+ <p><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found_with_filter.message"/></p>
+ <a class="btn btn-default" href="{f:be.uri(route:'site_redirects', parameters: {action: 'overview'})}">
+ <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_no_filter"/>
+ </a>
+ <be:link.newRecord class="btn btn-primary" table="sys_redirect">
+ <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_create"/>
+ </be:link.newRecord>
+ </f:be.infobox>
+ </f:then>
+ <f:else>
+ <f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found.title')}">
+ <p><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_not_found.message"/></p>
+ <be:link.newRecord class="btn btn-primary" table="sys_redirect">
+ <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:redirect_create"/>
+ </be:link.newRecord>
+ </f:be.infobox>
+ </f:else>
+ </f:if>
+ </f:else>
+ </f:if>
</f:section>
<f:section name="table">
- <f:render partial="Pagination" arguments="{_all}" />
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_host"/></th>
- <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_path"/></th>
- <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination"/></th>
- <f:if condition="{showHitCounter}">
- <th># <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hits"/></th>
- <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_last"/></th>
- </f:if>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{redirects}" key="domainName" as="redirect">
- <f:variable name="pageId" value="{rd:targetPageId(target:redirect.target)}" />
- <f:variable name="targetUri" value="{f:uri.typolink(parameter:redirect.target)}" />
- <tr>
- <td>{redirect.source_host}</td>
- <td>
- <f:alias map="{
- disable: '{f:translate(key: \'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:record_disabled\')}',
- onlystart: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')}',
- onlyend: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}',
- startend: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')} - {f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}'
- }">
- <f:if condition="{redirect.disabled}"><f:then><span title="{disable}"></f:then>
- <f:else if="{redirect.starttime} && !{redirect.endtime}"><span title="{onlystart}"></f:else>
- <f:else if="!{redirect.starttime} && {redirect.endtime}"><span title="{onlyend}"></f:else>
- <f:else if="{redirect.starttime} && {redirect.endtime}"><span title="{startend}"></f:else>
- <f:else><span></f:else>
- </f:if>
- <core:iconForRecord table="sys_redirect" row="{redirect}" /></span>
- </f:alias>
- <be:link.editRecord table="sys_redirect" uid="{redirect.uid}" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:edit')}: {redirect.source_path}">
- {redirect.source_path -> f:format.crop(maxCharacters:100)}
- </be:link.editRecord>
- </td>
- <td><f:link.typolink parameter="{redirect.target}" target="_blank" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:visit_destination')} {targetUri}">{targetUri}</f:link.typolink>
- (<f:if condition="{pageId}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:pageID"/>: {pageId},
- </f:if><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination_status_code"/>: {redirect.target_statuscode})</td>
- <f:if condition="{showHitCounter}">
- <td>
- <f:if condition="!{redirect.disable_hitcount}">
- <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit{f:if(condition:'{redirect.hitcount} > 1',then:'s')}_text" arguments="{0:redirect.hitcount}"/>
- <f:if condition="{redirect.hitcount} != 0">
- <a class="t3js-modal-trigger"
- href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][hitcount]=0', currentUrlParameterName:'redirect')}"
- title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset')}"
- data-title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset.confirm.title')}"
- data-content="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset.confirm.content')}"
- data-button-close-text="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_record.no')}">
- <core:icon identifier="actions-edit-restore" /></a>
- </f:if>
- </f:if>
- <td>
- <f:if condition="{redirect.lasthiton}">
- <f:then><f:format.date format="d.m.Y H:i:s">@{redirect.lasthiton}</f:format.date></f:then>
- <f:else><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_last_never"/></f:else>
- </f:if>
- </td>
- </f:if>
- <td>
- <div class="btn-group">
- <f:if condition="{redirect.is_regexp}">
- <f:then>
- <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
- </f:then>
- <f:else>
- <f:link.external class="btn btn-default" uri="{f:if(condition: '{redirect.source_host} == \'*\'', then: defaultUrl, else: redirect.source_host)}{redirect.source_path}" target="_blank">
- <core:icon identifier="actions-view-page" />
- </f:link.external>
- </f:else>
- </f:if>
- <be:link.editRecord class="btn btn-default" table="sys_redirect" uid="{redirect.uid}" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:edit')}">
- <core:icon identifier="actions-open" />
- </be:link.editRecord>
- <f:if condition="{redirect.disabled} == 1">
- <f:then>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][disabled]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:unHide')}"><core:icon identifier="actions-edit-unhide" /></a>
- </f:then>
- <f:else>
- <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][disabled]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:hide')}"><core:icon identifier="actions-edit-hide" /></a>
- </f:else>
- </f:if>
- <a class="btn btn-default t3js-modal-trigger"
- href="{be:moduleLink(route:'tce_db', query:'cmd[sys_redirect][{redirect.uid}][delete]=1', currentUrlParameterName:'redirect')}"
- title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
- data-severity="warning"
- data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
- data-content="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:deleteWarning')}"
- data-button-close-text="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_record.no')}">
- <core:icon identifier="actions-delete" />
- </a>
- </div>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
- </div>
- <f:render partial="Pagination" arguments="{_all}" />
+ <f:render partial="Pagination" arguments="{_all}" />
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_host"/></th>
+ <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_path"/></th>
+ <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination"/></th>
+ <f:if condition="{showHitCounter}">
+ <th># <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hits"/></th>
+ <th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_last"/></th>
+ </f:if>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{redirects}" key="domainName" as="redirect">
+ <f:variable name="pageId" value="{rd:targetPageId(target:redirect.target)}" />
+ <f:variable name="targetUri" value="{f:uri.typolink(parameter:redirect.target)}" />
+ <tr>
+ <td>{redirect.source_host}</td>
+ <td>
+ <f:alias map="{
+ disable: '{f:translate(key: \'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:record_disabled\')}',
+ onlystart: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')}',
+ onlyend: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}',
+ startend: '{f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')} - {f:translate(key: \'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}'
+ }">
+ <f:if condition="{redirect.disabled}"><f:then><span title="{disable}"></f:then>
+ <f:else if="{redirect.starttime} && !{redirect.endtime}"><span title="{onlystart}"></f:else>
+ <f:else if="!{redirect.starttime} && {redirect.endtime}"><span title="{onlyend}"></f:else>
+ <f:else if="{redirect.starttime} && {redirect.endtime}"><span title="{startend}"></f:else>
+ <f:else><span></f:else>
+ </f:if>
+ <core:iconForRecord table="sys_redirect" row="{redirect}" /></span>
+ </f:alias>
+ <be:link.editRecord table="sys_redirect" uid="{redirect.uid}" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:edit')}: {redirect.source_path}">
+ {redirect.source_path -> f:format.crop(maxCharacters:100)}
+ </be:link.editRecord>
+ </td>
+ <td><f:link.typolink parameter="{redirect.target}" target="_blank" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:visit_destination')} {targetUri}">{targetUri}</f:link.typolink>
+ (<f:if condition="{pageId}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:pageID"/>: {pageId},
+ </f:if><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination_status_code"/>: {redirect.target_statuscode})</td>
+ <f:if condition="{showHitCounter}">
+ <td>
+ <f:if condition="!{redirect.disable_hitcount}">
+ <f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit{f:if(condition:'{redirect.hitcount} > 1',then:'s')}_text" arguments="{0:redirect.hitcount}"/>
+ <f:if condition="{redirect.hitcount} != 0">
+ <a class="t3js-modal-trigger"
+ href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][hitcount]=0', currentUrlParameterName:'redirect')}"
+ title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset')}"
+ data-title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset.confirm.title')}"
+ data-content="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_reset.confirm.content')}"
+ data-button-close-text="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_record.no')}">
+ <core:icon identifier="actions-edit-restore" /></a>
+ </f:if>
+ </f:if>
+ <td>
+ <f:if condition="{redirect.lasthiton}">
+ <f:then><f:format.date format="d.m.Y H:i:s">@{redirect.lasthiton}</f:format.date></f:then>
+ <f:else><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:hit_last_never"/></f:else>
+ </f:if>
+ </td>
+ </f:if>
+ <td>
+ <div class="btn-group">
+ <f:if condition="{redirect.is_regexp}">
+ <f:then>
+ <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
+ </f:then>
+ <f:else>
+ <f:link.external class="btn btn-default" uri="{f:if(condition: '{redirect.source_host} == \'*\'', then: defaultUrl, else: redirect.source_host)}{redirect.source_path}" target="_blank">
+ <core:icon identifier="actions-view-page" />
+ </f:link.external>
+ </f:else>
+ </f:if>
+ <be:link.editRecord class="btn btn-default" table="sys_redirect" uid="{redirect.uid}" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:edit')}">
+ <core:icon identifier="actions-open" />
+ </be:link.editRecord>
+ <f:if condition="{redirect.disabled} == 1">
+ <f:then>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][disabled]=0', currentUrlParameterName:'redirect')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:unHide')}"><core:icon identifier="actions-edit-unhide" /></a>
+ </f:then>
+ <f:else>
+ <a class="btn btn-default" href="{be:moduleLink(route:'tce_db', query:'data[sys_redirect][{redirect.uid}][disabled]=1', currentUrlParameterName:'redirect')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:hide')}"><core:icon identifier="actions-edit-hide" /></a>
+ </f:else>
+ </f:if>
+ <a class="btn btn-default t3js-modal-trigger"
+ href="{be:moduleLink(route:'tce_db', query:'cmd[sys_redirect][{redirect.uid}][delete]=1', currentUrlParameterName:'redirect')}"
+ title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
+ data-severity="warning"
+ data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
+ data-content="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:deleteWarning')}"
+ data-button-close-text="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_record.no')}">
+ <core:icon identifier="actions-delete" />
+ </a>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </div>
+ <f:render partial="Pagination" arguments="{_all}" />
</f:section>
<f:section name="filter">
- <form action="{f:be.uri(route:'site_redirects', parameters: {action: 'overview'})}"
- method="post"
- enctype="multipart/form-data"
- name="demand"
- class="form-inline form-inline-spaced">
+ <form action="{f:be.uri(route:'site_redirects', parameters: {action: 'overview'})}"
+ method="post"
+ enctype="multipart/form-data"
+ name="demand"
+ class="form-inline form-inline-spaced">
- <div class="form-group">
- <label for="demand-source-host"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_host"/></label>
- <select id="demand-source-host" class="form-control input-sm" name="demand[source_host]" onchange="submit()">
- <option value=""><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.source_host.showAll"/></option>
- <f:for each="{hosts}" as="host">
- <f:form.select.option value="{host.name}" selected="{host.name} === {demand.sourceHost}">{host.name}</f:form.select.option>
- </f:for>
- </select>
- </div>
- <div class="form-group">
- <label for="demand-source-path"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_path"/></label>
- <input type="text" id="demand-source-path" class="form-control input-sm" name="demand[source_path]" value="{demand.sourcePath}"/>
- </div>
- <div class="form-group">
- <label for="demand-target"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.destination"/></label>
- <input type="text" id="demand-target" class="form-control input-sm" name="demand[target]" value="{demand.target}"/>
- </div>
- <div class="form-group">
- <label for="demand-target-status-code"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.targetStatusCode"/></label>
- <select id="demand-target-status-code" class="form-control input-sm" name="demand[target_statuscode]" onchange="submit()">
- <option value=""><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.source_host.showAll"/></option>
- <f:for each="{statusCodes}" as="statusCode">
- <f:form.select.option value="{statusCode.code}" selected="{statusCode.code} === {demand.statusCode}">{statusCode.code}</f:form.select.option>
- </f:for>
- </select>
- </div>
- <div class="form-group">
- <input type="submit" value="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.sendButton')}" class="btn btn-default btn-sm" />
- </div>
- </form>
+ <div class="form-group">
+ <label for="demand-source-host"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_host"/></label>
+ <select id="demand-source-host" class="form-control input-sm" name="demand[source_host]" onchange="submit()">
+ <option value=""><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.source_host.showAll"/></option>
+ <f:for each="{hosts}" as="host">
+ <f:form.select.option value="{host.name}" selected="{host.name} === {demand.sourceHost}">{host.name}</f:form.select.option>
+ </f:for>
+ </select>
+ </div>
+ <div class="form-group">
+ <label for="demand-source-path"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_path"/></label>
+ <input type="text" id="demand-source-path" class="form-control input-sm" name="demand[source_path]" value="{demand.sourcePath}"/>
+ </div>
+ <div class="form-group">
+ <label for="demand-target"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.destination"/></label>
+ <input type="text" id="demand-target" class="form-control input-sm" name="demand[target]" value="{demand.target}"/>
+ </div>
+ <div class="form-group">
+ <label for="demand-target-status-code"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.targetStatusCode"/></label>
+ <select id="demand-target-status-code" class="form-control input-sm" name="demand[target_statuscode]" onchange="submit()">
+ <option value=""><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.source_host.showAll"/></option>
+ <f:for each="{statusCodes}" as="statusCode">
+ <f:form.select.option value="{statusCode.code}" selected="{statusCode.code} === {demand.statusCode}">{statusCode.code}</f:form.select.option>
+ </f:for>
+ </select>
+ </div>
+ <div class="form-group">
+ <input type="submit" value="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.sendButton')}" class="btn btn-default btn-sm" />
+ </div>
+ </form>
</f:section>
</html>
diff --git a/typo3/sysext/reports/Resources/Private/Layouts/Default.html b/typo3/sysext/reports/Resources/Private/Layouts/Default.html
index 8d5af188dfbe..9303b726ce41 100644
--- a/typo3/sysext/reports/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/reports/Resources/Private/Layouts/Default.html
@@ -1 +1 @@
-<f:render section="content" />
\ No newline at end of file
+<f:render section="content" />
diff --git a/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html b/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
index 222adcc5fb04..17c9f5238046 100644
--- a/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
+++ b/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
@@ -1,14 +1,14 @@
<f:layout name="Default" />
<f:section name="content">
- <h1><f:translate key="title" /></h1>
+ <h1><f:translate key="title" /></h1>
- <f:if condition="{error}">
- <f:then>
- {error}
- </f:then>
- <f:else>
- <f:format.html parseFuncTSPath="">{content -> f:format.raw()}</f:format.html>
- </f:else>
- </f:if>
+ <f:if condition="{error}">
+ <f:then>
+ {error}
+ </f:then>
+ <f:else>
+ <f:format.html parseFuncTSPath="">{content -> f:format.raw()}</f:format.html>
+ </f:else>
+ </f:if>
</f:section>
diff --git a/typo3/sysext/reports/Resources/Private/Templates/Report/Index.html b/typo3/sysext/reports/Resources/Private/Templates/Report/Index.html
index fcd0b19c1cd4..f944575ca426 100644
--- a/typo3/sysext/reports/Resources/Private/Templates/Report/Index.html
+++ b/typo3/sysext/reports/Resources/Private/Templates/Report/Index.html
@@ -1,26 +1,26 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:r="http://typo3.org/ns/TYPO3/CMS/Reports/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- data-namespace-typo3-fluid="true">
+ xmlns:r="http://typo3.org/ns/TYPO3/CMS/Reports/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ data-namespace-typo3-fluid="true">
<f:layout name="Default" />
<f:section name="content">
- <h1><f:translate key="title" /></h1>
+ <h1><f:translate key="title" /></h1>
- <h2 class="uppercase"><f:translate key="reports_overview" /></h2>
+ <h2 class="uppercase"><f:translate key="reports_overview" /></h2>
- <dl class="t3-overview-list">
- <f:for each="{reports}" as="reportOverview" key="extensionKey">
- <f:for each="{reportOverview}" key="reportName" as="report">
- <dt>
- <a href="{be:moduleLink(route:'system_reports',arguments:{action:'detail', extension:extensionKey, report:reportName})}">
- <r:icon icon="{report.icon}" title="{f:translate(key:report.title)}" />
- <f:translate key="{report.title}" />
- </a>
- </dt>
- <dd><f:translate key="{report.description}" /></dd>
- </f:for>
- </f:for>
- </dl>
+ <dl class="t3-overview-list">
+ <f:for each="{reports}" as="reportOverview" key="extensionKey">
+ <f:for each="{reportOverview}" key="reportName" as="report">
+ <dt>
+ <a href="{be:moduleLink(route:'system_reports',arguments:{action:'detail', extension:extensionKey, report:reportName})}">
+ <r:icon icon="{report.icon}" title="{f:translate(key:report.title)}" />
+ <f:translate key="{report.title}" />
+ </a>
+ </dt>
+ <dd><f:translate key="{report.description}" /></dd>
+ </f:for>
+ </f:for>
+ </dl>
</f:section>
diff --git a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/ServerTime.html b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/ServerTime.html
index 6638bae21297..f8ffac77a8cc 100644
--- a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/ServerTime.html
+++ b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/ServerTime.html
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:be.infobox state="-1" title="{f:translate(key:'label.serverTime')}">
- <p><f:translate key="msg.serverTimeHelp" /></p>
- <p><f:translate key="msg.serverTime" arguments="{0: now}" /></p>
+ <p><f:translate key="msg.serverTimeHelp" /></p>
+ <p><f:translate key="msg.serverTime" arguments="{0: now}" /></p>
</f:be.infobox>
</html>
diff --git a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
index f69917fe43d1..f429da0408d8 100644
--- a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
+++ b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
@@ -1,179 +1,179 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
- <f:if condition="{missingClasses}">
- <f:be.infobox title="{f:translate(key:'msg.invalidTaskClass.infobox.title', arguments: {0: '{missingClasses ->f:count()}'})}" state="2">
- <f:format.raw><f:translate key="msg.invalidTaskClass.infobox.message" /></f:format.raw>
- </f:be.infobox>
- </f:if>
- <f:for each="{tasks}" as="taskGroup" iteration="groupIterator">
- <f:if condition="{taskGroup.tasks -> f:count()}">
- <div class="tx_scheduler_mod1_table">
- <div class="panel panel-space panel-default recordlist">
- <f:if condition="{taskGroup.groupName} == ''">
- <f:then>
- <f:if condition="{tasks -> f:count()}>1">
- <div class="panel-heading taskGroup" data-task-group-id="{groupIterator.index}">
- <span title="{f:translate(key: 'label.group')}">{f:translate(id: 'label.noGroup')}</span> (<span class="t3js-table-total-items" title="{f:translate(id: 'label.noGroup.taskCount')}">{taskGroup.tasks -> f:count()}</span>)
- <a href="#" class="pull-right t3js-toggle-recordlist" data-table="task-group-{groupIterator.index}" data-toggle="collapse" data-target="#recordlist-task-group-{groupIterator.index}">
- <span class="caret"></span>
- </a>
- </div>
- </f:if>
- </f:then>
- <f:else>
- <div class="panel-heading taskGroup" data-task-group-id="{groupIterator.index}">
- <span title="{f:translate(key: 'label.group')}">{taskGroup.groupName}</span> (<span class="t3js-table-total-items" title="{f:translate(id: 'label.group.taskCount')}">{taskGroup.tasks -> f:count()}</span>)
- <a href="#" class="pull-right t3js-toggle-recordlist" data-table="task-group-{groupIterator.index}" data-toggle="collapse" data-target="#recordlist-task-group-{groupIterator.index}">
- <span class="caret"></span>
- </a>
- </div>
- </f:else>
- </f:if>
- <div class="collapse in" data-state="expanded" id="recordlist-task-group-{groupIterator.index}">
- <div class="table-fit">
- <table class="table table-striped table-hover taskGroup-table">
- <thead>
- <tr class="taskGroup_{groupIterator.index}">
- <th><span class="t-span"><a class="btn btn-default checkall" href="#" id="checkall" title="{f:translate(key:'label.checkAll')}"><core:icon identifier="actions-document-select"/></a></span></th>
- <th><span class="t-span"><f:translate key="label.id"/></span></th>
- <th><span class="t-span"><f:translate key="task"/></span></th>
- <th><span class="t-span"><f:translate key="label.type"/></span></th>
- <th><span class="t-span"><f:translate key="label.frequency"/></span></th>
- <th><span class="t-span"><f:translate key="label.parallel"/></span></th>
- <th><span class="t-span"><f:translate key="label.lastExecution"/></span></th>
- <th><span class="t-span"><f:translate key="label.nextExecution"/></span></th>
- <th><span class="t-span"></span></th>
- </tr>
- </thead>
- <f:for each="{taskGroup.tasks}" as="taskRecord" iteration="taskIterator">
- <f:if condition="{taskRecord.validClass}">
- <tr class="{taskRecord.showAsDisabled} taskGroup_{groupIterator.index}">
- <td><span class="t-span"><label class="btn btn-default btn-checkbox"><input type="checkbox" name="tx_scheduler[execute][]" value="{taskRecord.uid}" id="task_{taskRecord.uid}"><span class="t3-icon fa"></span></label></span></td>
- <td class="right"><span class="t-span">{taskRecord.uid}</span></td>
- <td class="nowrap-disabled">
- <span class="t-span">
- <f:for each="{taskRecord.labels}" as="label">
- <f:if condition="{taskRecord.validClass}">
- <span class="label label-{label.class} pull-right" title="{label.desciption}">{label.text}</span>
- </f:if>
- </f:for>
- <span class="name">
- <a href="{moduleUri}&CMD=edit&tx_scheduler[uid]={taskRecord.uid}">
- {taskRecord.classTitle} ({taskRecord.classExtension})
- <f:if condition="{taskRecord.progress}">
- <div class="progress">
- <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{taskRecord.progress}" aria-valuemin="0" aria-valuemax="100" style="width: {taskRecord.progress}%;">{taskRecord.progress}%</div>
- </div>
- </f:if>
- <f:if condition="{taskRecord.additionalInformation}">
- <div class="additional-information"><f:format.nl2br>{taskRecord.additionalInformation}</f:format.nl2br></div>
- </f:if>
- </a>
- </span>
- <f:if condition="{taskRecord.description} != ''">
- <span class="description"><f:format.nl2br>{taskRecord.description}</f:format.nl2br></span>
- </f:if>
- </span>
- </td>
- <td><span class="t-span">{taskRecord.execType}</span></td>
- <td><span class="t-span">{taskRecord.frequency}</span></td>
- <td><span class="t-span">{taskRecord.multiple}</span></td>
- <td><span class="t-span">{taskRecord.lastExecution}</span></td>
- <td><span class="t-span {taskRecord.labels.nextexecution.class}">{taskRecord.nextDate}</span></td>
- <td class="nowrap">
- <span class="t-span">
- <f:if condition="{taskRecord.isRunning}">
- <f:then>
- <div class="btn-group" role="group">
- <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=stop&tx_scheduler[uid]={taskRecord.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.stop')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop')}">
- <core:icon identifier="actions-close"/>
- </a>
- </div>
- </f:then>
- <f:else>
- <div class="btn-group" role="group">
- <a data-toggle="tooltip" data-container="body" class="btn btn-default" href="{moduleUri}&CMD=edit&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
- <core:icon identifier="actions-open"/>
- </a>
- <a data-toggle="tooltip" data-container="body" class="btn btn-default" href="{moduleUri}&CMD=toggleHidden&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:{taskRecord.translationKey}')}">
- <f:if condition="{taskRecord.translationKey} == 'enable'">
- <f:then>
- <core:icon identifier="actions-edit-unhide"/>
- </f:then>
- <f:else>
- <core:icon identifier="actions-edit-hide"/>
- </f:else>
- </f:if>
- </a>
- <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=delete&tx_scheduler[uid]={taskRecord.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.delete')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}">
- <core:icon identifier="actions-edit-delete"/>
- </a>
- </div>
- <div class="btn-group" role="group">
- <a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&CMD=setNextExecutionTime&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'action.run_task_cron')}">
- <core:icon identifier="extensions-scheduler-run-task-cron"/>
- </a>
- <a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&tx_scheduler[execute][]={taskRecord.uid}" title="{f:translate(key:'action.run_task')}">
- <core:icon identifier="extensions-scheduler-run-task"/>
- </a>
- </div>
- </f:else>
- </f:if>
- </span>
- </td>
- </tr>
- </f:if>
- </f:for>
- </table>
- </div>
- </div>
- </div>
- </div>
- </f:if>
+ <f:if condition="{missingClasses}">
+ <f:be.infobox title="{f:translate(key:'msg.invalidTaskClass.infobox.title', arguments: {0: '{missingClasses ->f:count()}'})}" state="2">
+ <f:format.raw><f:translate key="msg.invalidTaskClass.infobox.message" /></f:format.raw>
+ </f:be.infobox>
+ </f:if>
+ <f:for each="{tasks}" as="taskGroup" iteration="groupIterator">
+ <f:if condition="{taskGroup.tasks -> f:count()}">
+ <div class="tx_scheduler_mod1_table">
+ <div class="panel panel-space panel-default recordlist">
+ <f:if condition="{taskGroup.groupName} == ''">
+ <f:then>
+ <f:if condition="{tasks -> f:count()}>1">
+ <div class="panel-heading taskGroup" data-task-group-id="{groupIterator.index}">
+ <span title="{f:translate(key: 'label.group')}">{f:translate(id: 'label.noGroup')}</span> (<span class="t3js-table-total-items" title="{f:translate(id: 'label.noGroup.taskCount')}">{taskGroup.tasks -> f:count()}</span>)
+ <a href="#" class="pull-right t3js-toggle-recordlist" data-table="task-group-{groupIterator.index}" data-toggle="collapse" data-target="#recordlist-task-group-{groupIterator.index}">
+ <span class="caret"></span>
+ </a>
+ </div>
+ </f:if>
+ </f:then>
+ <f:else>
+ <div class="panel-heading taskGroup" data-task-group-id="{groupIterator.index}">
+ <span title="{f:translate(key: 'label.group')}">{taskGroup.groupName}</span> (<span class="t3js-table-total-items" title="{f:translate(id: 'label.group.taskCount')}">{taskGroup.tasks -> f:count()}</span>)
+ <a href="#" class="pull-right t3js-toggle-recordlist" data-table="task-group-{groupIterator.index}" data-toggle="collapse" data-target="#recordlist-task-group-{groupIterator.index}">
+ <span class="caret"></span>
+ </a>
+ </div>
+ </f:else>
+ </f:if>
+ <div class="collapse in" data-state="expanded" id="recordlist-task-group-{groupIterator.index}">
+ <div class="table-fit">
+ <table class="table table-striped table-hover taskGroup-table">
+ <thead>
+ <tr class="taskGroup_{groupIterator.index}">
+ <th><span class="t-span"><a class="btn btn-default checkall" href="#" id="checkall" title="{f:translate(key:'label.checkAll')}"><core:icon identifier="actions-document-select"/></a></span></th>
+ <th><span class="t-span"><f:translate key="label.id"/></span></th>
+ <th><span class="t-span"><f:translate key="task"/></span></th>
+ <th><span class="t-span"><f:translate key="label.type"/></span></th>
+ <th><span class="t-span"><f:translate key="label.frequency"/></span></th>
+ <th><span class="t-span"><f:translate key="label.parallel"/></span></th>
+ <th><span class="t-span"><f:translate key="label.lastExecution"/></span></th>
+ <th><span class="t-span"><f:translate key="label.nextExecution"/></span></th>
+ <th><span class="t-span"></span></th>
+ </tr>
+ </thead>
+ <f:for each="{taskGroup.tasks}" as="taskRecord" iteration="taskIterator">
+ <f:if condition="{taskRecord.validClass}">
+ <tr class="{taskRecord.showAsDisabled} taskGroup_{groupIterator.index}">
+ <td><span class="t-span"><label class="btn btn-default btn-checkbox"><input type="checkbox" name="tx_scheduler[execute][]" value="{taskRecord.uid}" id="task_{taskRecord.uid}"><span class="t3-icon fa"></span></label></span></td>
+ <td class="right"><span class="t-span">{taskRecord.uid}</span></td>
+ <td class="nowrap-disabled">
+ <span class="t-span">
+ <f:for each="{taskRecord.labels}" as="label">
+ <f:if condition="{taskRecord.validClass}">
+ <span class="label label-{label.class} pull-right" title="{label.desciption}">{label.text}</span>
+ </f:if>
+ </f:for>
+ <span class="name">
+ <a href="{moduleUri}&CMD=edit&tx_scheduler[uid]={taskRecord.uid}">
+ {taskRecord.classTitle} ({taskRecord.classExtension})
+ <f:if condition="{taskRecord.progress}">
+ <div class="progress">
+ <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{taskRecord.progress}" aria-valuemin="0" aria-valuemax="100" style="width: {taskRecord.progress}%;">{taskRecord.progress}%</div>
+ </div>
+ </f:if>
+ <f:if condition="{taskRecord.additionalInformation}">
+ <div class="additional-information"><f:format.nl2br>{taskRecord.additionalInformation}</f:format.nl2br></div>
+ </f:if>
+ </a>
+ </span>
+ <f:if condition="{taskRecord.description} != ''">
+ <span class="description"><f:format.nl2br>{taskRecord.description}</f:format.nl2br></span>
+ </f:if>
+ </span>
+ </td>
+ <td><span class="t-span">{taskRecord.execType}</span></td>
+ <td><span class="t-span">{taskRecord.frequency}</span></td>
+ <td><span class="t-span">{taskRecord.multiple}</span></td>
+ <td><span class="t-span">{taskRecord.lastExecution}</span></td>
+ <td><span class="t-span {taskRecord.labels.nextexecution.class}">{taskRecord.nextDate}</span></td>
+ <td class="nowrap">
+ <span class="t-span">
+ <f:if condition="{taskRecord.isRunning}">
+ <f:then>
+ <div class="btn-group" role="group">
+ <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=stop&tx_scheduler[uid]={taskRecord.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.stop')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:stop')}">
+ <core:icon identifier="actions-close"/>
+ </a>
+ </div>
+ </f:then>
+ <f:else>
+ <div class="btn-group" role="group">
+ <a data-toggle="tooltip" data-container="body" class="btn btn-default" href="{moduleUri}&CMD=edit&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
+ <core:icon identifier="actions-open"/>
+ </a>
+ <a data-toggle="tooltip" data-container="body" class="btn btn-default" href="{moduleUri}&CMD=toggleHidden&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:{taskRecord.translationKey}')}">
+ <f:if condition="{taskRecord.translationKey} == 'enable'">
+ <f:then>
+ <core:icon identifier="actions-edit-unhide"/>
+ </f:then>
+ <f:else>
+ <core:icon identifier="actions-edit-hide"/>
+ </f:else>
+ </f:if>
+ </a>
+ <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=delete&tx_scheduler[uid]={taskRecord.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.delete')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}">
+ <core:icon identifier="actions-edit-delete"/>
+ </a>
+ </div>
+ <div class="btn-group" role="group">
+ <a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&CMD=setNextExecutionTime&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'action.run_task_cron')}">
+ <core:icon identifier="extensions-scheduler-run-task-cron"/>
+ </a>
+ <a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&tx_scheduler[execute][]={taskRecord.uid}" title="{f:translate(key:'action.run_task')}">
+ <core:icon identifier="extensions-scheduler-run-task"/>
+ </a>
+ </div>
+ </f:else>
+ </f:if>
+ </span>
+ </td>
+ </tr>
+ </f:if>
+ </f:for>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </f:if>
</f:for>
<f:if condition="{missingClasses}">
- <div class="tx_scheduler_mod1_table">
- <div class="panel panel-space panel-default recordlist">
- <div class="panel-heading taskGroup" data-task-group-id="missing">
- <f:translate key="label.noClass"/>
- (<span class="t3js-table-total-items" title="{f:translate(key: 'label.noClass.taskCount')}">{missingClasses -> f:count()}</span>)
- <a href="#" class="pull-right t3js-toggle-recordlist"
- data-table="task-group-missing" data-toggle="collapse" data-target="#recordlist-task-group-missing">
- <span class="caret"></span>
- </a>
- </div>
- <div class="collapse in" data-state="expanded" id="recordlist-task-group-missing">
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <tr class="taskGroup" data-task-group-id="0">
- <td class="nowrap-disabled"><span>{f:translate(key:'msg.invalidTaskClass') -> f:format.raw()}</span></td>
- </tr>
- </table>
- <table class="table table-striped table-hover taskGroup-table">
- <thead>
- <tr>
- <th><span class="t-span"><f:translate key="label.id"/></span></th>
- <th><span class="t-span"><f:translate key="task"/></span></th>
- <th><span class="t-span"></span></th>
- </tr>
- </thead>
- <f:for each="{missingClasses}" as="missingClass">
- <tr>
- <td class="right">{missingClass.uid}</td>
- <td><span class="label label-danger">{missingClass.class}</span></td>
- <td class="nowrap">
- <div class="btn-group" role="group">
- <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=delete&tx_scheduler[uid]={missingClass.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.delete')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}">
- <core:icon identifier="actions-edit-delete"/>
- </a>
- </div>
- </td>
- </tr>
- </f:for>
- </table>
- </div>
- </div>
- </div>
- </div>
+ <div class="tx_scheduler_mod1_table">
+ <div class="panel panel-space panel-default recordlist">
+ <div class="panel-heading taskGroup" data-task-group-id="missing">
+ <f:translate key="label.noClass"/>
+ (<span class="t3js-table-total-items" title="{f:translate(key: 'label.noClass.taskCount')}">{missingClasses -> f:count()}</span>)
+ <a href="#" class="pull-right t3js-toggle-recordlist"
+ data-table="task-group-missing" data-toggle="collapse" data-target="#recordlist-task-group-missing">
+ <span class="caret"></span>
+ </a>
+ </div>
+ <div class="collapse in" data-state="expanded" id="recordlist-task-group-missing">
+ <div class="table-fit">
+ <table class="table table-striped table-hover">
+ <tr class="taskGroup" data-task-group-id="0">
+ <td class="nowrap-disabled"><span>{f:translate(key:'msg.invalidTaskClass') -> f:format.raw()}</span></td>
+ </tr>
+ </table>
+ <table class="table table-striped table-hover taskGroup-table">
+ <thead>
+ <tr>
+ <th><span class="t-span"><f:translate key="label.id"/></span></th>
+ <th><span class="t-span"><f:translate key="task"/></span></th>
+ <th><span class="t-span"></span></th>
+ </tr>
+ </thead>
+ <f:for each="{missingClasses}" as="missingClass">
+ <tr>
+ <td class="right">{missingClass.uid}</td>
+ <td><span class="label label-danger">{missingClass.class}</span></td>
+ <td class="nowrap">
+ <div class="btn-group" role="group">
+ <a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=delete&tx_scheduler[uid]={missingClass.uid}" data-severity="warning" data-title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-button-close-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}" data-content="{f:translate(key:'msg.delete')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}">
+ <core:icon identifier="actions-edit-delete"/>
+ </a>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</f:if>
</html>
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/CheckScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/CheckScreen.html
index 47b9d744b640..929ba502189d 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/CheckScreen.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/CheckScreen.html
@@ -1,12 +1,12 @@
<p class="lead">
- <f:translate key="msg.schedulerSetupCheck" />
+ <f:translate key="msg.schedulerSetupCheck" />
</p>
<f:be.infobox title="{f:translate(key: 'hdg.lastRun')}" message="{lastRunMessage}" state="{lastRunSeverity}" />
<f:be.infobox title="{f:translate(key: 'hdg.cliScript')}" state="{isExecutableSeverity}">
- <p>{f:translate(key: 'msg.cliScript', arguments: '{0: script}') -> f:format.raw()}</p>
- {isExecutableMessage}
+ <p>{f:translate(key: 'msg.cliScript', arguments: '{0: script}') -> f:format.raw()}</p>
+ {isExecutableMessage}
</f:be.infobox>
<f:render partial="ServerTime" arguments="{now: now}" />
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
index 4bb8cea77d40..49353ef1721c 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
@@ -97,25 +97,25 @@
<div class="form-group">
<f:be.labels.csh table="{csh}" field="task_frequency" label="{lang}label.frequency.long"/>
<div class="form-control-wrap">
- <div class="form-wizards-wrap">
- <div class="form-wizards-element">
- <input type="text" name="tx_scheduler[frequency]" class="form-control" id="task_frequency" value="{frequency}">
- </div>
- <f:if condition="{frequencyOptions}">
- <div class="form-wizards-items-aside">
- <div class="btn-group">
- <select
- class="form-control tceforms-select tceforms-wizardselect"
- onchange="document.getElementById('task_frequency').value=this.options[this.selectedIndex].value;this.blur();this.selectedIndex=0;">
- <option></option>
- <f:for each="{frequencyOptions}" as="label" key="command">
- <option value="{command}">{f:translate(key:label,default:label)} ({command})</option>
- </f:for>
- </select>
+ <div class="form-wizards-wrap">
+ <div class="form-wizards-element">
+ <input type="text" name="tx_scheduler[frequency]" class="form-control" id="task_frequency" value="{frequency}">
</div>
- </div>
- </f:if>
- </div>
+ <f:if condition="{frequencyOptions}">
+ <div class="form-wizards-items-aside">
+ <div class="btn-group">
+ <select
+ class="form-control tceforms-select tceforms-wizardselect"
+ onchange="document.getElementById('task_frequency').value=this.options[this.selectedIndex].value;this.blur();this.selectedIndex=0;">
+ <option></option>
+ <f:for each="{frequencyOptions}" as="label" key="command">
+ <option value="{command}">{f:translate(key:label,default:label)} ({command})</option>
+ </f:for>
+ </select>
+ </div>
+ </div>
+ </f:if>
+ </div>
</div>
</div>
</div>
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
index b9500fb559d4..7b3abe3e25dd 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
@@ -1,45 +1,45 @@
<html xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers" data-namespace-typo3-fluid="true">
<p class="lead">
- <f:translate key="msg.infoScreenIntro" />
+ <f:translate key="msg.infoScreenIntro" />
</p>
<div class="table-responsive">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th>
- <f:translate key="label.name" />
- </th>
- <th>
- <f:translate key="label.extension" />
- </th>
- <th colspan="2">
- <f:translate key="label.description" />
- </th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{registeredClasses}" key="class" as="classInfo">
- <tr>
- <td>
- <a href="{be:moduleLink(route: 'system_txschedulerM1', query: 'SET[function]=scheduler&CMD=add&tx_scheduler[class]={class}')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:new')}">
- {classInfo.title}
- </a>
- </td>
- <td>{classInfo.extension}</td>
- <td>{classInfo.description}</td>
- <td>
- <div class="btn-group" role="group">
- <span class="btn btn-default">
- <a href="{be:moduleLink(route: 'system_txschedulerM1', query: 'SET[function]=scheduler&CMD=add&tx_scheduler[class]={class}')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:new')}">
- <core:icon identifier="actions-add" />
- </a>
- </span>
- </div>
- </td>
- </tr>
- </f:for>
- </tbody>
- </table>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th>
+ <f:translate key="label.name" />
+ </th>
+ <th>
+ <f:translate key="label.extension" />
+ </th>
+ <th colspan="2">
+ <f:translate key="label.description" />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{registeredClasses}" key="class" as="classInfo">
+ <tr>
+ <td>
+ <a href="{be:moduleLink(route: 'system_txschedulerM1', query: 'SET[function]=scheduler&CMD=add&tx_scheduler[class]={class}')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:new')}">
+ {classInfo.title}
+ </a>
+ </td>
+ <td>{classInfo.extension}</td>
+ <td>{classInfo.description}</td>
+ <td>
+ <div class="btn-group" role="group">
+ <span class="btn btn-default">
+ <a href="{be:moduleLink(route: 'system_txschedulerM1', query: 'SET[function]=scheduler&CMD=add&tx_scheduler[class]={class}')}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:new')}">
+ <core:icon identifier="actions-add" />
+ </a>
+ </span>
+ </div>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
</div>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreenNoClasses.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreenNoClasses.html
index 00d61868eff1..0d0bb144820b 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreenNoClasses.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreenNoClasses.html
@@ -1 +1 @@
-<f:translate key="msg.noTasksDefined" />
\ No newline at end of file
+<f:translate key="msg.noTasksDefined" />
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/ListTasks.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/ListTasks.html
index d6f4a3c82d00..c35c666c9220 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/ListTasks.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/ListTasks.html
@@ -1,12 +1,12 @@
<f:render partial="TaskList" arguments="{tasks: tasks, moduleUri: moduleUri, missingClasses: missingClasses}" />
<button class="btn btn-default" name="go_cron" id="scheduler_executeselected">
- <core:icon identifier="extensions-scheduler-run-task-cron" />
- <f:translate key="label.cronjobSelected" />
+ <core:icon identifier="extensions-scheduler-run-task-cron" />
+ <f:translate key="label.cronjobSelected" />
</button>
<button class="btn btn-default" name="go" id="scheduler_executeselected">
- <core:icon identifier="extensions-scheduler-run-task" />
- <f:translate key="label.executeSelected" />
+ <core:icon identifier="extensions-scheduler-run-task" />
+ <f:translate key="label.executeSelected" />
</button>
<f:render partial="ServerTime" arguments="{now: now}" />
diff --git a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
index 1fc9f67e19d3..10e823c03d63 100644
--- a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
+++ b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
@@ -1,55 +1,55 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:notes="http://typo3.org/ns/TYPO3/CMS/SysNote/ViewHelpers"
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+ xmlns:notes="http://typo3.org/ns/TYPO3/CMS/SysNote/ViewHelpers"
>
<f:layout name="Default" />
<f:section name="main">
<f:if condition="{notes}">
- <h2><f:translate key="internal_note" /></h2>
+ <h2><f:translate key="internal_note" /></h2>
- <div class="typo3-dblist-sysnotes">
- <f:for each="{notes}" as="note">
- <div class="panel panel-default panel-sysnote panel-sysnote-category-{note.category}">
- <div class="panel-heading clearfix">
- <span class="typeicon t3js-contextmenutrigger" data-table="sys_note" data-uid="{note.uid}">
- <core:icon identifier="sysnote-type-{note.category}" />
- </span>
- <span class="author">
- <f:translate key="author" />
- <f:if condition="{note.realName}">
- <f:then>{note.realName}</f:then>
- <f:else>{note.username}</f:else>
- </f:if>
- </span>
- <span>•</span>
- <span class="date">
- <f:translate key="date" />
- <f:format.date>@{note.tstamp}</f:format.date>
- </span>
- <f:if condition="{note.personal}">
- ·
- <span class="personal">
- <f:translate key="personal" /> <f:translate key="yes" /></span>
- </f:if>
+ <div class="typo3-dblist-sysnotes">
+ <f:for each="{notes}" as="note">
+ <div class="panel panel-default panel-sysnote panel-sysnote-category-{note.category}">
+ <div class="panel-heading clearfix">
+ <span class="typeicon t3js-contextmenutrigger" data-table="sys_note" data-uid="{note.uid}">
+ <core:icon identifier="sysnote-type-{note.category}" />
+ </span>
+ <span class="author">
+ <f:translate key="author" />
+ <f:if condition="{note.realName}">
+ <f:then>{note.realName}</f:then>
+ <f:else>{note.username}</f:else>
+ </f:if>
+ </span>
+ <span>•</span>
+ <span class="date">
+ <f:translate key="date" />
+ <f:format.date>@{note.tstamp}</f:format.date>
+ </span>
+ <f:if condition="{note.personal}">
+ ·
+ <span class="personal">
+ <f:translate key="personal" /> <f:translate key="yes" /></span>
+ </f:if>
- <div class="btn-group pull-right">
- <be:link.editRecord uid="{note.uid}" table="sys_note" class="btn btn-default btn-sm">
- <core:icon identifier="actions-open" />
- </be:link.editRecord>
- <a href="{be:moduleLink(route:'tce_db', query:'cmd[sys_note][{note.uid}][delete]=1', currentUrlParameterName:'redirect')}" class="btn btn-default btn-sm t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}">
- <core:icon identifier="actions-edit-delete" />
- </a>
- </div>
- </div>
- <div class="panel-body">
- <h4><span><f:if condition="{note.category}"><f:translate key="category.{note.category}" />: </f:if></span>{note.subject}</h4>
- <f:format.nl2br>{note.message}</f:format.nl2br>
- </div>
- </div>
- </f:for>
- </div>
+ <div class="btn-group pull-right">
+ <be:link.editRecord uid="{note.uid}" table="sys_note" class="btn btn-default btn-sm">
+ <core:icon identifier="actions-open" />
+ </be:link.editRecord>
+ <a href="{be:moduleLink(route:'tce_db', query:'cmd[sys_note][{note.uid}][delete]=1', currentUrlParameterName:'redirect')}" class="btn btn-default btn-sm t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}">
+ <core:icon identifier="actions-edit-delete" />
+ </a>
+ </div>
+ </div>
+ <div class="panel-body">
+ <h4><span><f:if condition="{note.category}"><f:translate key="category.{note.category}" />: </f:if></span>{note.subject}</h4>
+ <f:format.nl2br>{note.message}</f:format.nl2br>
+ </div>
+ </div>
+ </f:for>
+ </div>
</f:if>
</f:section>
</html>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoBox.html b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoBox.html
index 870c90946284..40a93fcaebc2 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoBox.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoBox.html
@@ -1,3 +1,3 @@
<f:be.infobox title="{title}" state="{state}">
- <f:format.raw>{message}</f:format.raw>
+ <f:format.raw>{message}</f:format.raw>
</f:be.infobox>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/Main.html b/typo3/sysext/tstemplate/Resources/Private/Templates/Main.html
index 2bbb2c485243..fc447077a84d 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/Main.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/Main.html
@@ -2,4 +2,4 @@
<h1><f:translate key="moduleTitle" /></h1>
<f:render partial="{partialName}" arguments="{content: content}" optional="1" />
<f:format.raw>{typoscriptTemplateModuleContent}</f:format.raw>
-</form>
\ No newline at end of file
+</form>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
index 8176dadad135..a15f7d4162b9 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
@@ -27,4 +27,4 @@
<a class="btn btn-default" href="{content.previousPage.aHref}"><f:translate key="goToClosestAction" /></a>
</div>
</f:if>
-</form>
\ No newline at end of file
+</form>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html b/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
index f709741bf85a..096f5e99d44e 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
@@ -25,13 +25,13 @@
<f:variable name="maxCharacters" value="30" />
<tr class="{f:if(condition: page.hidden, then: 'inactive')}">
<td class="nowrap">
- <span style="width: 1px; height: 1px; display:inline-block; margin-left: {level * 20}px"></span>
+ <span style="width: 1px; height: 1px; display: inline-block; margin-left: {level * 20}px"></span>
<f:if condition="{page}">
<f:then>
<f:if condition="{page._templates}">
<f:then>
<a href="{f:be.uri(route:'web_ts', parameters:{id: page.uid})}"
- title="ID: {page.uid}">
+ title="ID: {page.uid}">
<core:IconForRecord table="pages" row="{page}" />
{page.title -> f:format.crop(maxCharacters: maxCharacters)}
</a>
@@ -55,7 +55,7 @@
<f:variable name="web_ts_parameters"
value="{id: template.pid, 'SET[templatesOnPage]': template.uid}" />
<a href="{f:be.uri(route:'web_ts', parameters:web_ts_parameters)}"
- title="ID: {template.uid} {template.sitetitle}">
+ title="ID: {template.uid} {template.sitetitle}">
<core:IconForRecord table="sys_template" row="{template}" />
{template.title -> f:format.crop(maxCharacters: maxCharacters)}
</a>
@@ -93,4 +93,4 @@
</f:if>
</f:if>
</f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateAnalyzerModuleFunction.html b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateAnalyzerModuleFunction.html
index f31ec9359657..8d18843a8833 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateAnalyzerModuleFunction.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateAnalyzerModuleFunction.html
@@ -17,13 +17,13 @@
<div class="table-fit"><table class="table table-striped table-hover" id="ts-analyzer">
<thead>
<tr>
- <th><f:translate key="{LLPrefix}title"/></th>
- <th><f:translate key="{LLPrefix}rootlevel"/></th>
- <th><f:translate key="{LLPrefix}clearSetup"/></th>
- <th><f:translate key="{LLPrefix}clearConstants"/></th>
- <th><f:translate key="{LLPrefix}pid"/></th>
- <th><f:translate key="{LLPrefix}rootline"/></th>
- <th><f:translate key="{LLPrefix}nextLevel"/></th>
+ <th><f:translate key="{LLPrefix}title"/></th>
+ <th><f:translate key="{LLPrefix}rootlevel"/></th>
+ <th><f:translate key="{LLPrefix}clearSetup"/></th>
+ <th><f:translate key="{LLPrefix}clearConstants"/></th>
+ <th><f:translate key="{LLPrefix}pid"/></th>
+ <th><f:translate key="{LLPrefix}rootline"/></th>
+ <th><f:translate key="{LLPrefix}nextLevel"/></th>
</tr>
</thead>
<f:format.raw>{hierarchy}</f:format.raw>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
index 05dc6ef57266..dc2e85178fe4 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
@@ -1,220 +1,220 @@
<f:if condition="{existTemplate}">
- <h3>
- <f:translate key="{LLPrefix}currentTemplate"/>
- </h3>
- <div>
- <core:iconForRecord table="sys_template" row="{templateRecord}"/>
- <strong>
- <f:format.raw>{linkWrapTemplateTitle}</f:format.raw>
- </strong>
- <f:if condition="{templateRecord.sitetitle} != ''">
- ({templateRecord.sitetitle})
- </f:if>
- </div>
+ <h3>
+ <f:translate key="{LLPrefix}currentTemplate"/>
+ </h3>
+ <div>
+ <core:iconForRecord table="sys_template" row="{templateRecord}"/>
+ <strong>
+ <f:format.raw>{linkWrapTemplateTitle}</f:format.raw>
+ </strong>
+ <f:if condition="{templateRecord.sitetitle} != ''">
+ ({templateRecord.sitetitle})
+ </f:if>
+ </div>
</f:if>
<f:if condition="{manyTemplatesMenu}">
- <f:format.raw>
- {manyTemplatesMenu}
- </f:format.raw>
+ <f:format.raw>
+ {manyTemplatesMenu}
+ </f:format.raw>
</f:if>
<f:if condition="{typoScriptPath}">
- <f:then>
- <f:if condition="{existTemplate}">
- <f:then>
- <div style="padding-top: 10px;">
- <div class="form-group">
- <h3>
- <f:translate key="{LLPrefix}editProperty"/>
- </h3>
- <label>{typoScriptPath} =</label>
- <f:form.textfield class="form-control" name="data[{typoScriptPath}][value]" value="{theSetupValue}"/>
- </div>
- <f:form.submit value="{f:translate(key:'{LLPrefix}updateButton')}" class="btn btn-default"
- name="update_value"/>
- </div>
- <div style="padding-top: 20px">
- <div class="form-group">
- <h3>
- <f:translate key="{LLPrefix}addProperty"/>
- </h3>
- </div>
- <div class="form-inline form-inline-spaced">
- <div class="form-group">
- <label class="sr-only">{typoScriptPath}.</label>
- <div class="input-group">
- <div class="input-group-addon">{typoScriptPath}.</div>
- <f:form.textfield class="form-control" name="data[{typoScriptPath}][name]"/>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label>=</label>
- <f:form.textfield class="form-control" name="data[{typoScriptPath}][propertyValue]"/>
- </div>
- <div class="form-group">
- <f:form.submit class="btn btn-default" name="add_property"
- value="{f:translate(key:'{LLPrefix}addButton')}"/>
- </div>
- </div>
- <div style="padding-top: 20px;">
- <div class="form-group">
- <h3>
- <f:translate key="{LLPrefix}clearObject"/>
- </h3>
- </div>
- <div class="form-inline form-inline-spaced">
- <div class="form-group">
- <div class="checkbox">
- <label>
- {typoScriptPath}
- <f:format.case mode="upper">
- <f:translate key="{LLPrefix}clear"/>
- </f:format.case>
- <f:form.checkbox name="data[{typoScriptPath}][clearValue]" value="1"/>
- </label>
- </div>
- </div>
- <div class="form-group">
- <f:form.submit class="btn btn-default" name="clear_object"
- value="{f:translate(key:'{LLPrefix}clearButton')}"/>
- </div>
- </div>
- </div>
- <f:if condition="{isNotInTopLevelKeyList}">
- <f:then>
- <f:if condition="{hasProperties}">
- <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
- <f:translate key="{LLPrefix}addKey" arguments="{0:'{typoScriptPath}'}"/>
- </f:link.external>
- </f:if>
- </f:then>
- <f:else>
- <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
- <f:translate key="{LLPrefix}removeKey" arguments="{0:'{typoScriptPath}'}"/>
- </f:link.external>
- </f:else>
- </f:if>
- </f:then>
- <f:else>
- {typoScriptPath} = <strong>{theSetupValue}</strong>
- </f:else>
- </f:if>
- <div>
- <hr style="margin-top: 5px; margin-bottom: 5px;"/>
- <f:link.external uri="{moduleUrl}" defaultScheme="" class="btn btn-default">
- <strong><i class="fa fa-chevron-left"></i>
- <f:translate key="{LLPrefix}back"/>
- </strong>
- </f:link.external>
- </div>
- </f:then>
- <f:else>
- <f:be.pageRenderer includeRequireJsModules="{0: 'TYPO3/CMS/Tstemplate/TypoScriptObjectBrowser'}"/>
- <div class="tsob-menu">
- <div class="form-inline">
- <f:if condition="{hasTsBrowserTypes}">
- <div class="form-group">
- <label class="control-label">
- <f:translate key="{LLPrefix}browse"/>
- </label>
- <f:format.raw>{browserTypeDropdownMenu}</f:format.raw>
- </div>
- </f:if>
- <f:if condition="{hasTopLevelInObjectList}">
- <div class="form-group">
- <label class="control-label" for="ts_browser_toplevel_{tsBrowserType}">
- <f:translate key="{LLPrefix}objectList"/>
- </label>
- <f:format.raw>{objectListDropdownMenu}</f:format.raw>
- </div>
- </f:if>
- <div class="form-group">
- <label class="control-label" for="search_field">
- <f:translate key="{LLPrefix}search"/>
- </label>
- <div class="form-group"><input class="form-control" type="search" name="search_field" id="search_field"
- value="{postSearchField}"/></div>
- </div>
- <input class="btn btn-default tsob-search-submit" type="submit" name="search"
- value="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:search')}"/>
- </div>
- <div class="checkbox">
- <label for="checkTs_browser_regexsearch">
- <f:format.raw>{regexSearchCheckbox}</f:format.raw>
- <f:translate key="{LLPrefix}regExp"/>
- </label>
- </div>
- </div>
- <f:if condition="{hasParseErrors}">
- <div style="padding-top: 10px;"></div>
- <f:be.infobox title="{f:translate(key: '{LLPrefix}errorsWarnings')}" state="1">
- <f:for each="{parseErrors}" as="parseError">
- <f:translate key="{LLPrefix}severity.{parseError.1}"/>
- : {parseError.0}
- <f:link.external uri="{showErrorDetailsUri}{parseError.2}" defaultScheme="" class="text-warning">
- <f:translate key="{LLPrefix}errorShowDetails"/>
- </f:link.external>
- <br/>
- </f:for>
- </f:be.infobox>
- </f:if>
- <div class="panel panel-space panel-default">
- <div class="panel-heading">
- <f:if condition="{hasKeySelected}">
- <f:then>
- <strong>{treeLabel}</strong>
- </f:then>
- <f:else>
- <f:format.case mode="upper">
- <f:translate key="{LLPrefix}{rootLLKey}" />
- </f:format.case>
- </f:else>
- </f:if>
- <strong>{selectedKey}</strong>
- <f:if condition="{moduleUrlRemoveFromObjectList}">
- <f:link.external uri="{moduleUrlRemoveFromObjectList}" defaultScheme="" class="btn btn-default">
- <f:translate key="{LLPrefix}removeKey" />
- </f:link.external>
- </f:if>
- </div>
- <div class="panel-body tstemplate-tsobjectbrowser-content"><f:format.raw>{tsTree}</f:format.raw></div>
- </div>
- <div>
- <h2><f:translate key="{LLPrefix}displayOptions" /></h2>
- <div class="typo3-listOptions">
- <div class="checkbox">
- <label for="checkTs_browser_showComments">
- <f:format.raw>{checkBoxShowComments}</f:format.raw>
- <f:translate key="{LLPrefix}displayComments" />
- </label>
- </div>
- <div class="checkbox">
- <label for="checkTs_browser_alphaSort">
- <f:format.raw>{checkBoxAlphaSort}</f:format.raw>
- <f:translate key="{LLPrefix}sortAlphabetically" />
- </label>
- </div>
- </div>
- <f:if condition="{isSetupAndCropLinesDisabled}">
- <div class="form">
- <label><f:translate key="{LLPrefix}displayConstants" /></label>
- <f:format.raw>{dropdownDisplayConstants}</f:format.raw>
- </div>
- </f:if>
- <f:if condition="{hasConditions}">
- <h2><f:translate key="{LLPrefix}conditions" /></h2>
- <div class="typo3-listOptions">
- <f:for each="{tsConditions}" as="condition">
- <div class="checkbox">
- <label for="check{condition.key}">
- <f:form.checkbox class="checkbox" name="conditions[{condition.key}]" id="check{condition.key}" value="{condition.value}" checked="{condition.isSet}" />
- <f:format.raw>{condition.label}</f:format.raw>
- </label>
- </div>
- </f:for>
- </div>
- <f:form.submit class="btn btn-default" value="{f:translate(key: '{LLPrefix}setConditions')}" name="Submit"/>
- </f:if>
- </div>
- </f:else>
+ <f:then>
+ <f:if condition="{existTemplate}">
+ <f:then>
+ <div style="padding-top: 10px;">
+ <div class="form-group">
+ <h3>
+ <f:translate key="{LLPrefix}editProperty"/>
+ </h3>
+ <label>{typoScriptPath} =</label>
+ <f:form.textfield class="form-control" name="data[{typoScriptPath}][value]" value="{theSetupValue}"/>
+ </div>
+ <f:form.submit value="{f:translate(key:'{LLPrefix}updateButton')}" class="btn btn-default"
+ name="update_value"/>
+ </div>
+ <div style="padding-top: 20px">
+ <div class="form-group">
+ <h3>
+ <f:translate key="{LLPrefix}addProperty"/>
+ </h3>
+ </div>
+ <div class="form-inline form-inline-spaced">
+ <div class="form-group">
+ <label class="sr-only">{typoScriptPath}.</label>
+ <div class="input-group">
+ <div class="input-group-addon">{typoScriptPath}.</div>
+ <f:form.textfield class="form-control" name="data[{typoScriptPath}][name]"/>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label>=</label>
+ <f:form.textfield class="form-control" name="data[{typoScriptPath}][propertyValue]"/>
+ </div>
+ <div class="form-group">
+ <f:form.submit class="btn btn-default" name="add_property"
+ value="{f:translate(key:'{LLPrefix}addButton')}"/>
+ </div>
+ </div>
+ <div style="padding-top: 20px;">
+ <div class="form-group">
+ <h3>
+ <f:translate key="{LLPrefix}clearObject"/>
+ </h3>
+ </div>
+ <div class="form-inline form-inline-spaced">
+ <div class="form-group">
+ <div class="checkbox">
+ <label>
+ {typoScriptPath}
+ <f:format.case mode="upper">
+ <f:translate key="{LLPrefix}clear"/>
+ </f:format.case>
+ <f:form.checkbox name="data[{typoScriptPath}][clearValue]" value="1"/>
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <f:form.submit class="btn btn-default" name="clear_object"
+ value="{f:translate(key:'{LLPrefix}clearButton')}"/>
+ </div>
+ </div>
+ </div>
+ <f:if condition="{isNotInTopLevelKeyList}">
+ <f:then>
+ <f:if condition="{hasProperties}">
+ <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
+ <f:translate key="{LLPrefix}addKey" arguments="{0:'{typoScriptPath}'}"/>
+ </f:link.external>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:link.external uri="{moduleUrlObjectListAction}" defaultScheme="" class="btn btn-default">
+ <f:translate key="{LLPrefix}removeKey" arguments="{0:'{typoScriptPath}'}"/>
+ </f:link.external>
+ </f:else>
+ </f:if>
+ </f:then>
+ <f:else>
+ {typoScriptPath} = <strong>{theSetupValue}</strong>
+ </f:else>
+ </f:if>
+ <div>
+ <hr style="margin-top: 5px; margin-bottom: 5px;"/>
+ <f:link.external uri="{moduleUrl}" defaultScheme="" class="btn btn-default">
+ <strong><i class="fa fa-chevron-left"></i>
+ <f:translate key="{LLPrefix}back"/>
+ </strong>
+ </f:link.external>
+ </div>
+ </f:then>
+ <f:else>
+ <f:be.pageRenderer includeRequireJsModules="{0: 'TYPO3/CMS/Tstemplate/TypoScriptObjectBrowser'}"/>
+ <div class="tsob-menu">
+ <div class="form-inline">
+ <f:if condition="{hasTsBrowserTypes}">
+ <div class="form-group">
+ <label class="control-label">
+ <f:translate key="{LLPrefix}browse"/>
+ </label>
+ <f:format.raw>{browserTypeDropdownMenu}</f:format.raw>
+ </div>
+ </f:if>
+ <f:if condition="{hasTopLevelInObjectList}">
+ <div class="form-group">
+ <label class="control-label" for="ts_browser_toplevel_{tsBrowserType}">
+ <f:translate key="{LLPrefix}objectList"/>
+ </label>
+ <f:format.raw>{objectListDropdownMenu}</f:format.raw>
+ </div>
+ </f:if>
+ <div class="form-group">
+ <label class="control-label" for="search_field">
+ <f:translate key="{LLPrefix}search"/>
+ </label>
+ <div class="form-group"><input class="form-control" type="search" name="search_field" id="search_field"
+ value="{postSearchField}"/></div>
+ </div>
+ <input class="btn btn-default tsob-search-submit" type="submit" name="search"
+ value="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:search')}"/>
+ </div>
+ <div class="checkbox">
+ <label for="checkTs_browser_regexsearch">
+ <f:format.raw>{regexSearchCheckbox}</f:format.raw>
+ <f:translate key="{LLPrefix}regExp"/>
+ </label>
+ </div>
+ </div>
+ <f:if condition="{hasParseErrors}">
+ <div style="padding-top: 10px;"></div>
+ <f:be.infobox title="{f:translate(key: '{LLPrefix}errorsWarnings')}" state="1">
+ <f:for each="{parseErrors}" as="parseError">
+ <f:translate key="{LLPrefix}severity.{parseError.1}"/>
+ : {parseError.0}
+ <f:link.external uri="{showErrorDetailsUri}{parseError.2}" defaultScheme="" class="text-warning">
+ <f:translate key="{LLPrefix}errorShowDetails"/>
+ </f:link.external>
+ <br/>
+ </f:for>
+ </f:be.infobox>
+ </f:if>
+ <div class="panel panel-space panel-default">
+ <div class="panel-heading">
+ <f:if condition="{hasKeySelected}">
+ <f:then>
+ <strong>{treeLabel}</strong>
+ </f:then>
+ <f:else>
+ <f:format.case mode="upper">
+ <f:translate key="{LLPrefix}{rootLLKey}" />
+ </f:format.case>
+ </f:else>
+ </f:if>
+ <strong>{selectedKey}</strong>
+ <f:if condition="{moduleUrlRemoveFromObjectList}">
+ <f:link.external uri="{moduleUrlRemoveFromObjectList}" defaultScheme="" class="btn btn-default">
+ <f:translate key="{LLPrefix}removeKey" />
+ </f:link.external>
+ </f:if>
+ </div>
+ <div class="panel-body tstemplate-tsobjectbrowser-content"><f:format.raw>{tsTree}</f:format.raw></div>
+ </div>
+ <div>
+ <h2><f:translate key="{LLPrefix}displayOptions" /></h2>
+ <div class="typo3-listOptions">
+ <div class="checkbox">
+ <label for="checkTs_browser_showComments">
+ <f:format.raw>{checkBoxShowComments}</f:format.raw>
+ <f:translate key="{LLPrefix}displayComments" />
+ </label>
+ </div>
+ <div class="checkbox">
+ <label for="checkTs_browser_alphaSort">
+ <f:format.raw>{checkBoxAlphaSort}</f:format.raw>
+ <f:translate key="{LLPrefix}sortAlphabetically" />
+ </label>
+ </div>
+ </div>
+ <f:if condition="{isSetupAndCropLinesDisabled}">
+ <div class="form">
+ <label><f:translate key="{LLPrefix}displayConstants" /></label>
+ <f:format.raw>{dropdownDisplayConstants}</f:format.raw>
+ </div>
+ </f:if>
+ <f:if condition="{hasConditions}">
+ <h2><f:translate key="{LLPrefix}conditions" /></h2>
+ <div class="typo3-listOptions">
+ <f:for each="{tsConditions}" as="condition">
+ <div class="checkbox">
+ <label for="check{condition.key}">
+ <f:form.checkbox class="checkbox" name="conditions[{condition.key}]" id="check{condition.key}" value="{condition.value}" checked="{condition.isSet}" />
+ <f:format.raw>{condition.label}</f:format.raw>
+ </label>
+ </div>
+ </f:for>
+ </div>
+ <f:form.submit class="btn btn-default" value="{f:translate(key: '{LLPrefix}setConditions')}" name="Submit"/>
+ </f:if>
+ </div>
+ </f:else>
</f:if>
diff --git a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
index da3981a03229..5866edab8a54 100644
--- a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
+++ b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
@@ -1,8 +1,8 @@
<f:be.pageRenderer
- includeCssFiles="{
- 0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}'
- }"
- includeRequireJsModules="{
- 0:'TYPO3/CMS/Viewpage/Main'
- }" />
+ includeCssFiles="{
+ 0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}'
+ }"
+ includeRequireJsModules="{
+ 0:'TYPO3/CMS/Viewpage/Main'
+ }" />
<f:render section="Content" />
diff --git a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html b/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
index 9d1d4b92e824..988cf8c4cfd1 100644
--- a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
+++ b/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
@@ -1,81 +1,81 @@
<f:layout name="DocHeader" />
<f:section name="Content">
- <f:flashMessages />
- <f:if condition="{url}">
- <div class="viewpage-item">
- <div class="viewpage-topbar t3js-viewpage-topbar">
- <div class="viewpage-topbar-orientation t3js-viewpage-topbar-orientation">
- <a href="#" class="t3js-change-orientation">
- {icons.orientation -> f:format.raw()}
- </a>
- </div>
- <div class="viewpage-topbar-preset">
- <span class="dropdown">
- <button class="dropdown-toggle" type="button" id="viewpage-topbar-preset-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <span class="t3js-viewpage-current-label">
- {current.label}
- </span>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="viewpage-topbar-preset-button">
- <li role="separator" class="divider"></li>
- <li>
- <a href="#" class="t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'maximized')}" data-width data-height>
- <span class="viewpage-preset-item">
- <span class="viewpage-preset-item-icon">{icons.fullscreen -> f:format.raw()}</span>
- <span class="viewpage-preset-item-label">
- {f:translate(key: 'maximized')}
- </span>
- <span class="viewpage-preset-item-size">
- 100%/100%
- </span>
- </span>
- </a>
- </li>
- <li>
- <a href="#" class="t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'custom')}" data-width="{custom.width}" data-height="{custom.height}">
- <span class="viewpage-preset-item">
- <span class="viewpage-preset-item-icon">{icons.expand -> f:format.raw()}</span>
- <span class="viewpage-preset-item-label t3js-preset-custom-label">
- {f:translate(key: 'custom')}
- </span>
- <span class="viewpage-preset-item-size">
- <span class="t3js-preset-custom-width">{custom.width}</span>px/<span class="t3js-preset-custom-height">{custom.height}</span>px
- </span>
- </span>
- </a>
- </li>
+ <f:flashMessages />
+ <f:if condition="{url}">
+ <div class="viewpage-item">
+ <div class="viewpage-topbar t3js-viewpage-topbar">
+ <div class="viewpage-topbar-orientation t3js-viewpage-topbar-orientation">
+ <a href="#" class="t3js-change-orientation">
+ {icons.orientation -> f:format.raw()}
+ </a>
+ </div>
+ <div class="viewpage-topbar-preset">
+ <span class="dropdown">
+ <button class="dropdown-toggle" type="button" id="viewpage-topbar-preset-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ <span class="t3js-viewpage-current-label">
+ {current.label}
+ </span>
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="viewpage-topbar-preset-button">
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="#" class="t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'maximized')}" data-width data-height>
+ <span class="viewpage-preset-item">
+ <span class="viewpage-preset-item-icon">{icons.fullscreen -> f:format.raw()}</span>
+ <span class="viewpage-preset-item-label">
+ {f:translate(key: 'maximized')}
+ </span>
+ <span class="viewpage-preset-item-size">
+ 100%/100%
+ </span>
+ </span>
+ </a>
+ </li>
+ <li>
+ <a href="#" class="t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'custom')}" data-width="{custom.width}" data-height="{custom.height}">
+ <span class="viewpage-preset-item">
+ <span class="viewpage-preset-item-icon">{icons.expand -> f:format.raw()}</span>
+ <span class="viewpage-preset-item-label t3js-preset-custom-label">
+ {f:translate(key: 'custom')}
+ </span>
+ <span class="viewpage-preset-item-size">
+ <span class="t3js-preset-custom-width">{custom.width}</span>px/<span class="t3js-preset-custom-height">{custom.height}</span>px
+ </span>
+ </span>
+ </a>
+ </li>
- <f:for each="{presetGroups}" as="presetGroup" iteration="presetGroupIteration">
- <f:if condition="{presetGroup}">
- <li role="separator" class="divider"></li>
- <f:for each="{presetGroup}" as="preset">
- <li>
- <a href="#" class="t3js-change-preset" data-key="{preset.key}" data-label="{preset.label}" data-width="{preset.width}" data-height="{preset.height}">
- <span class="viewpage-preset-item">
- <span class="viewpage-preset-item-icon">{icons.{preset.type} -> f:format.raw()}</span>
- <span class="viewpage-preset-item-label">{preset.label}</span>
- <span class="viewpage-preset-item-size">
- {f:if(condition: preset.width, then: '{preset.width}px', else: '100%')}/{f:if(condition: preset.height, then: '{preset.height}px', else: '100%')}
- </span>
- </span>
- </a>
- </li>
- </f:for>
- </f:if>
- </f:for>
- </ul>
- </span>
- </div>
- <div class="viewpage-topbar-size">
- <input class="t3js-viewpage-input-width" type="number" name="width" min="300" max="9999" value="{current.width}">
- x
- <input class="t3js-viewpage-input-height" type="number" name="height" min="300" max="9999" value="{current.height}">
- </div>
- </div>
- <div class="viewpage-resizeable t3js-viewpage-resizeable" style="width:{current.width}px;height:{current.height}px;">
- <iframe src="{url}" width="100%" height="100%" id="tx_viewpage_iframe" frameborder="0" border="0"></iframe>
- </div>
- </div>
- </f:if>
+ <f:for each="{presetGroups}" as="presetGroup" iteration="presetGroupIteration">
+ <f:if condition="{presetGroup}">
+ <li role="separator" class="divider"></li>
+ <f:for each="{presetGroup}" as="preset">
+ <li>
+ <a href="#" class="t3js-change-preset" data-key="{preset.key}" data-label="{preset.label}" data-width="{preset.width}" data-height="{preset.height}">
+ <span class="viewpage-preset-item">
+ <span class="viewpage-preset-item-icon">{icons.{preset.type} -> f:format.raw()}</span>
+ <span class="viewpage-preset-item-label">{preset.label}</span>
+ <span class="viewpage-preset-item-size">
+ {f:if(condition: preset.width, then: '{preset.width}px', else: '100%')}/{f:if(condition: preset.height, then: '{preset.height}px', else: '100%')}
+ </span>
+ </span>
+ </a>
+ </li>
+ </f:for>
+ </f:if>
+ </f:for>
+ </ul>
+ </span>
+ </div>
+ <div class="viewpage-topbar-size">
+ <input class="t3js-viewpage-input-width" type="number" name="width" min="300" max="9999" value="{current.width}">
+ x
+ <input class="t3js-viewpage-input-height" type="number" name="height" min="300" max="9999" value="{current.height}">
+ </div>
+ </div>
+ <div class="viewpage-resizeable t3js-viewpage-resizeable" style="width:{current.width}px;height:{current.height}px;">
+ <iframe src="{url}" width="100%" height="100%" id="tx_viewpage_iframe" frameborder="0" border="0"></iframe>
+ </div>
+ </div>
+ </f:if>
</f:section>
diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
index 1cf117ca0350..d244106e5656 100644
--- a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
+++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
@@ -2,4 +2,4 @@
<f:render section="main" />
-<f:if condition="{showLegend}"><f:render partial="legend" /></f:if>
\ No newline at end of file
+<f:if condition="{showLegend}"><f:render partial="legend" /></f:if>
diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
index 71351b39fcaf..42dfeba9f5fb 100644
--- a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
+++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
@@ -1,17 +1,17 @@
<style type="text/css">
- .module-body {
- padding: 0;
- }
+ .module-body {
+ padding: 0;
+ }
- div.typo3-noDoc {
- margin: 0;
- }
+ div.typo3-noDoc {
+ margin: 0;
+ }
</style>
<div class="typo3-noDoc">
- <!-- Content of module, for instance listing, info or editing -->
- <div id="typo3-docbody">
- <div id="typo3-inner-docbody">
- <f:render section="main"/>
- </div>
- </div>
+ <!-- Content of module, for instance listing, info or editing -->
+ <div id="typo3-docbody">
+ <div id="typo3-inner-docbody">
+ <f:render section="main"/>
+ </div>
+ </div>
</div>
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/Legend.html b/typo3/sysext/workspaces/Resources/Private/Partials/Legend.html
index 45ef08ac136e..e7b94faece23 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/Legend.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/Legend.html
@@ -1,10 +1,10 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<dl class="legend">
- <dt><f:translate key="legend.label" /></dt>
- <dd><span class="item-state-modified"><f:translate key="legend.edited" /></span> • </dd>
- <dd><span class="item-state-moved"><f:translate key="legend.moved" /></span> • </dd>
- <dd><span class="item-state-new"><f:translate key="legend.new" /></span> • </dd>
- <dd><span class="item-state-hidden"><f:translate key="legend.hidden" /></span> • </dd>
- <dd><span class="item-state-deleted"><f:translate key="legend.deleted" /></span></dd>
+ <dt><f:translate key="legend.label" /></dt>
+ <dd><span class="item-state-modified"><f:translate key="legend.edited" /></span> • </dd>
+ <dd><span class="item-state-moved"><f:translate key="legend.moved" /></span> • </dd>
+ <dd><span class="item-state-new"><f:translate key="legend.new" /></span> • </dd>
+ <dd><span class="item-state-hidden"><f:translate key="legend.hidden" /></span> • </dd>
+ <dd><span class="item-state-deleted"><f:translate key="legend.deleted" /></span></dd>
</dl>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/Navigation.html b/typo3/sysext/workspaces/Resources/Private/Partials/Navigation.html
index cbc66a954812..b19e0d30872a 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/Navigation.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/Navigation.html
@@ -1,36 +1,36 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<ul class="x-tab-strip x-tab-strip-top">
- <f:for each="{workspaceList}" as="workspace" key="uid">
- <f:if condition="{uid}=={activeWorkspaceUid}">
- <f:then>
- <li class="x-tab-strip-active x-tab-strip-closable">
- <span class="x-tab-right">
- <em class="x-tab-left"><span class="x-tab-strip-inner"><span class="x-tab-strip-text">{workspace}</span></span></em>
- </span>
- </li>
- </f:then>
- <f:else>
- <li class="x-tab-strip-closable">
- <f:link.action controller="Review" action="index" additionalParams="{workspace:uid}" class="x-tab-right">
- <em class="x-tab-left"><span class="x-tab-strip-inner"><span class="x-tab-strip-text">{workspace}</span></span></em>
- </f:link.action>
- </li>
- </f:else>
- </f:if>
- </f:for>
- <f:if condition="{showAllWorkspaceTab}">
- <li class="last {f:if(condition: '-98=={activeWorkspaceUid}', then: 'x-tab-strip-active')}">
- <f:link.action controller="Review" action="fullIndex" class="x-tab-right">
- <em class="x-tab-left">
- <span class="x-tab-strip-inner">
- <span class="x-tab-strip-text">
- All
- </span>
- </span>
- </em>
- </f:link.action>
- </li>
- </f:if>
- <div class="x-clear"></div>
- </ul>
-</html>
\ No newline at end of file
+ <f:for each="{workspaceList}" as="workspace" key="uid">
+ <f:if condition="{uid}=={activeWorkspaceUid}">
+ <f:then>
+ <li class="x-tab-strip-active x-tab-strip-closable">
+ <span class="x-tab-right">
+ <em class="x-tab-left"><span class="x-tab-strip-inner"><span class="x-tab-strip-text">{workspace}</span></span></em>
+ </span>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="x-tab-strip-closable">
+ <f:link.action controller="Review" action="index" additionalParams="{workspace:uid}" class="x-tab-right">
+ <em class="x-tab-left"><span class="x-tab-strip-inner"><span class="x-tab-strip-text">{workspace}</span></span></em>
+ </f:link.action>
+ </li>
+ </f:else>
+ </f:if>
+ </f:for>
+ <f:if condition="{showAllWorkspaceTab}">
+ <li class="last {f:if(condition: '-98=={activeWorkspaceUid}', then: 'x-tab-strip-active')}">
+ <f:link.action controller="Review" action="fullIndex" class="x-tab-right">
+ <em class="x-tab-left">
+ <span class="x-tab-strip-inner">
+ <span class="x-tab-strip-text">
+ All
+ </span>
+ </span>
+ </em>
+ </f:link.action>
+ </li>
+ </f:if>
+ <div class="x-clear"></div>
+</ul>
+</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/Preview/StageButtons.html b/typo3/sysext/workspaces/Resources/Private/Partials/Preview/StageButtons.html
index f388e32ed563..26eea00a1780 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/Preview/StageButtons.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/Preview/StageButtons.html
@@ -1,11 +1,11 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{enablePreviousStageButton}">
- <input type="button" class="btn btn-sm btn-default" value="{prevStage}" data-stage-id="{prevStageId}" data-action="send-to-stage" data-direction="prev">
+ <input type="button" class="btn btn-sm btn-default" value="{prevStage}" data-stage-id="{prevStageId}" data-action="send-to-stage" data-direction="prev">
</f:if>
<f:if condition="{enableNextStageButton}">
- <input type="button" class="btn btn-sm btn-success" value="{nextStage}" data-stage-id="{nextStageId}" data-action="send-to-stage" data-direction="next">
+ <input type="button" class="btn btn-sm btn-success" value="{nextStage}" data-stage-id="{nextStageId}" data-action="send-to-stage" data-direction="next">
</f:if>
<f:if condition="{enableDiscardStageButton}">
- <input type="button" class="btn btn-sm btn-danger" value="{f:translate(key: 'label_doaction_discard', extensionName: 'workspaces')}" data-action="discard">
+ <input type="button" class="btn btn-sm btn-danger" value="{f:translate(key: 'label_doaction_discard', extensionName: 'workspaces')}" data-action="discard">
</f:if>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
index d002d096298f..861b895e6a99 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
@@ -1,95 +1,95 @@
<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
+ xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+ data-namespace-typo3-fluid="true"
>
<div role="tabpanel">
- <!-- Nav tabs -->
- <ul class="nav nav-tabs" role="tablist">
- <f:for each="{workspaceList}" as="workspace">
- <li role="presentation" {f:if(condition: '{activeWorkspaceUid} == {workspace.workspaceId}', then: 'class="active"')}><a href="{workspace.triggerUrl}" aria-controls="{workspace.itemId}" role="tab">{workspace.title}</a></li>
- </f:for>
- </ul>
+ <!-- Nav tabs -->
+ <ul class="nav nav-tabs" role="tablist">
+ <f:for each="{workspaceList}" as="workspace">
+ <li role="presentation" {f:if(condition: '{activeWorkspaceUid} == {workspace.workspaceId}', then: 'class="active"')}><a href="{workspace.triggerUrl}" aria-controls="{workspace.itemId}" role="tab">{workspace.title}</a></li>
+ </f:for>
+ </ul>
- <!-- Tab panes -->
- <div class="tab-content">
- <div role="tabpanel" class="tab-pane active">
- <div class="form-section" id="workspace-panel">
- <form id="workspace-settings-form" class="form-inline form-inline-spaced">
- <div class="form-group">
- <select name="depth" class="form-control" disabled>
- <option value="0"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
- <option value="1"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
- <option value="2"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
- <option value="3"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
- <option value="4"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
- <option value="999"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
- </select>
- </div>
- <div class="form-group">
- <div class="input-group">
- <span class="input-group-addon input-group-icon"></span>
- <select name="languages" class="form-control" disabled></select>
- </div>
- </div>
- <div class="form-group">
- <div class="input-group">
- <input class="form-control t3js-clearable" type="text" name="search-text">
- <span class="input-group-btn">
- <button type="submit" class="btn btn-default disabled"><core:icon identifier="actions-search" /></button>
- </span>
- </div>
- </div>
- </form>
- <div class="hidden" id="workspace-action-icons">
- <f:comment>We pre-render the required icons that are used in the Workspaces module until we're able to use StandaloneView of Fluid</f:comment>
- <core:icon identifier="empty-empty" size="small" />
- <core:icon identifier="actions-version-workspace-preview" size="small" />
- <core:icon identifier="actions-version-document-remove" size="small" />
- <core:icon identifier="actions-version-page-open" size="small" />
- <core:icon identifier="actions-version-swap-version" size="small" />
- <core:icon identifier="actions-open" size="small" />
- <core:icon identifier="actions-document-info" size="small" />
- <core:icon identifier="apps-pagetree-expand" size="small" />
- <core:icon identifier="apps-pagetree-collapse" size="small" />
- </div>
- <div class="table-fit">
- <table class="table table-striped">
- <thead>
- <tr>
- <th><button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></span></button></th>
- <th><f:translate key="column.wsTitle" /></th>
- <th><f:translate key="column.liveTitle" /></th>
- <th><f:translate key="column.stage" /></th>
- <th><f:translate key="column.integrity" /></th>
- <th><core:icon identifier="flags-multiple" size="small" /></th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- <form id="workspace-actions-form" class="form-inline form-inline-spaced">
- <div class="form-group">
- <select name="stage-action" class="form-control" disabled>
- <option value=""><f:translate key="chooseAction" /></option>
- </select>
- </div>
- <div class="form-group">
- <select name="selection-action" class="form-control" disabled>
- <option value=""><f:translate key="chooseSelectionAction" /></option>
- </select>
- </div>
- <div class="form-group">
- <select name="mass-action" class="form-control" disabled>
- <option value=""><f:translate key="chooseMassAction" /></option>
- </select>
- </div>
- </form>
- <nav id="workspace-pagination"></nav>
- </div>
- </div>
- </div>
+ <!-- Tab panes -->
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active">
+ <div class="form-section" id="workspace-panel">
+ <form id="workspace-settings-form" class="form-inline form-inline-spaced">
+ <div class="form-group">
+ <select name="depth" class="form-control" disabled>
+ <option value="0"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
+ <option value="1"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
+ <option value="2"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
+ <option value="3"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
+ <option value="4"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
+ <option value="999"><f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
+ </select>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <span class="input-group-addon input-group-icon"></span>
+ <select name="languages" class="form-control" disabled></select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <input class="form-control t3js-clearable" type="text" name="search-text">
+ <span class="input-group-btn">
+ <button type="submit" class="btn btn-default disabled"><core:icon identifier="actions-search" /></button>
+ </span>
+ </div>
+ </div>
+ </form>
+ <div class="hidden" id="workspace-action-icons">
+ <f:comment>We pre-render the required icons that are used in the Workspaces module until we're able to use StandaloneView of Fluid</f:comment>
+ <core:icon identifier="empty-empty" size="small" />
+ <core:icon identifier="actions-version-workspace-preview" size="small" />
+ <core:icon identifier="actions-version-document-remove" size="small" />
+ <core:icon identifier="actions-version-page-open" size="small" />
+ <core:icon identifier="actions-version-swap-version" size="small" />
+ <core:icon identifier="actions-open" size="small" />
+ <core:icon identifier="actions-document-info" size="small" />
+ <core:icon identifier="apps-pagetree-expand" size="small" />
+ <core:icon identifier="apps-pagetree-collapse" size="small" />
+ </div>
+ <div class="table-fit">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th><button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></span></button></th>
+ <th><f:translate key="column.wsTitle" /></th>
+ <th><f:translate key="column.liveTitle" /></th>
+ <th><f:translate key="column.stage" /></th>
+ <th><f:translate key="column.integrity" /></th>
+ <th><core:icon identifier="flags-multiple" size="small" /></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ <form id="workspace-actions-form" class="form-inline form-inline-spaced">
+ <div class="form-group">
+ <select name="stage-action" class="form-control" disabled>
+ <option value=""><f:translate key="chooseAction" /></option>
+ </select>
+ </div>
+ <div class="form-group">
+ <select name="selection-action" class="form-control" disabled>
+ <option value=""><f:translate key="chooseSelectionAction" /></option>
+ </select>
+ </div>
+ <div class="form-group">
+ <select name="mass-action" class="form-control" disabled>
+ <option value=""><f:translate key="chooseMassAction" /></option>
+ </select>
+ </div>
+ </form>
+ <nav id="workspace-pagination"></nav>
+ </div>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Ajax/StageButtons.html b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Ajax/StageButtons.html
index fac1cc3fceb6..3d5071e73582 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Ajax/StageButtons.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Ajax/StageButtons.html
@@ -1,3 +1,3 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="Preview/StageButtons" arguments="{_all}" />
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
index 61fd4b3237e4..b0c481a61eb9 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
@@ -1,73 +1,73 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div id="typo3-topbar">
- <div class="typo3-topbar-container" role="navigation" id="typo3-top-container">
- <div class="typo3-topbar-site">
- <a class="typo3-topbar-site-logo" href="{logoLink}" target="_blank">
- <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg', extensionName: 'backend')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
- </a>
- <span class="typo3-topbar-site-name">{activeWorkspace}</span>
- </div>
- <div class="typo3-topbar-tabs t3js-workspace-tabs">
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="active"><a href="#visual" aria-controls="visual" role="tab" data-toggle="tab" data-actions="true"><f:translate key="preview.visualPreview" extensionName="workspaces" /></a></li>
- <li role="presentation"><a href="#list" aria-controls="list" role="tab" data-toggle="tab" data-actions="false"><f:translate key="preview.listView" extensionName="workspaces" /></a></li>
- </ul>
- </div>
- <div class="typo3-topbar-workspace-actions t3js-workspace-actions">
- <f:if condition="{liveUrl}">
- <div class="workspace-action">
- <div class="slider-wrapper">
- <span>Published Version</span><div
- id="workspace-stage-slider"
- data-slider-min="0"
- data-slider-max="100"
- data-slider-value="100"
- data-slider-tooltip="hide"
- style="width: 150px;"
- ></div>
- <span>Staged Version</span>
- </div>
- </div>
- </f:if>
- <div class="workspace-action t3js-stage-buttons">
- <f:render partial="Preview/StageButtons" arguments="{_all}"/>
- </div>
- <div class="workspace-action t3js-preview-mode">
- <f:if condition="{liveUrl}">
- <f:then>
- <div class="btn-group">
- <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <span class="t3js-active-preview-mode active-preview-mode" data-active-preview-mode="{firstPreviewMode}"><f:translate key="preview.mode{firstPreviewMode -> f:format.case(mode: 'capital')}" extensionName="workspaces" /></span> <span class="caret"></span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right">
- <f:for each="{splitPreviewModes}" as="mode">
- <li><a href="#" data-preview-mode="{mode}"><span><f:translate key="preview.mode{mode -> f:format.case(mode: 'capital')}" extensionName="workspaces" /></span></a></li>
- </f:for>
- </ul>
- </div>
- </f:then>
- <f:else>
- <span><f:translate key="info.newpage.detail" extensionName="workspaces" /></span>
- </f:else>
- </f:if>
- </div>
- </div>
- </div>
+ <div class="typo3-topbar-container" role="navigation" id="typo3-top-container">
+ <div class="typo3-topbar-site">
+ <a class="typo3-topbar-site-logo" href="{logoLink}" target="_blank">
+ <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg', extensionName: 'backend')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
+ </a>
+ <span class="typo3-topbar-site-name">{activeWorkspace}</span>
+ </div>
+ <div class="typo3-topbar-tabs t3js-workspace-tabs">
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="active"><a href="#visual" aria-controls="visual" role="tab" data-toggle="tab" data-actions="true"><f:translate key="preview.visualPreview" extensionName="workspaces" /></a></li>
+ <li role="presentation"><a href="#list" aria-controls="list" role="tab" data-toggle="tab" data-actions="false"><f:translate key="preview.listView" extensionName="workspaces" /></a></li>
+ </ul>
+ </div>
+ <div class="typo3-topbar-workspace-actions t3js-workspace-actions">
+ <f:if condition="{liveUrl}">
+ <div class="workspace-action">
+ <div class="slider-wrapper">
+ <span>Published Version</span><div
+ id="workspace-stage-slider"
+ data-slider-min="0"
+ data-slider-max="100"
+ data-slider-value="100"
+ data-slider-tooltip="hide"
+ style="width: 150px;"
+ ></div>
+ <span>Staged Version</span>
+ </div>
+ </div>
+ </f:if>
+ <div class="workspace-action t3js-stage-buttons">
+ <f:render partial="Preview/StageButtons" arguments="{_all}"/>
+ </div>
+ <div class="workspace-action t3js-preview-mode">
+ <f:if condition="{liveUrl}">
+ <f:then>
+ <div class="btn-group">
+ <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="t3js-active-preview-mode active-preview-mode" data-active-preview-mode="{firstPreviewMode}"><f:translate key="preview.mode{firstPreviewMode -> f:format.case(mode: 'capital')}" extensionName="workspaces" /></span> <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu dropdown-menu-right">
+ <f:for each="{splitPreviewModes}" as="mode">
+ <li><a href="#" data-preview-mode="{mode}"><span><f:translate key="preview.mode{mode -> f:format.case(mode: 'capital')}" extensionName="workspaces" /></span></a></li>
+ </f:for>
+ </ul>
+ </div>
+ </f:then>
+ <f:else>
+ <span><f:translate key="info.newpage.detail" extensionName="workspaces" /></span>
+ </f:else>
+ </f:if>
+ </div>
+ </div>
+ </div>
</div>
<div role="tabpanel" class="workspace-panel">
- <div class="tab-content">
- <div role="tabpanel" class="tab-pane active workspaces preview-mode-slider" id="visual">
- <div class="t3js-workspace-preview">
- <f:if condition="{liveUrl}">
- <iframe src="{liveUrl}" style="height: 0px;" id="live-view"></iframe>
- </f:if>
- <iframe src="{wsUrl}" id="workspace-view"></iframe>
- </div>
- </div>
- <div role="tabpanel" class="tab-pane workspaces" id="list">
- <iframe src="{wsSettingsUrl}" id="workspace-list"></iframe>
- </div>
- </div>
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active workspaces preview-mode-slider" id="visual">
+ <div class="t3js-workspace-preview">
+ <f:if condition="{liveUrl}">
+ <iframe src="{liveUrl}" style="height: 0px;" id="live-view"></iframe>
+ </f:if>
+ <iframe src="{wsUrl}" id="workspace-view"></iframe>
+ </div>
+ </div>
+ <div role="tabpanel" class="tab-pane workspaces" id="list">
+ <iframe src="{wsSettingsUrl}" id="workspace-list"></iframe>
+ </div>
+ </div>
</div>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Review/FullIndex.html b/typo3/sysext/workspaces/Resources/Private/Templates/Review/FullIndex.html
index 8350fe2f258c..dfdb0ef56892 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Review/FullIndex.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Review/FullIndex.html
@@ -3,7 +3,7 @@
<f:section name="main">
- <f:render partial="WorkingTable" arguments="{_all}" />
+ <f:render partial="WorkingTable" arguments="{_all}" />
</f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Review/Index.html b/typo3/sysext/workspaces/Resources/Private/Templates/Review/Index.html
index 07863b1fc2bb..3fe4dc9c64e4 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Review/Index.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Review/Index.html
@@ -3,21 +3,21 @@
<f:section name="main">
- <f:if condition="{performWorkspaceSwitch}">
- <script type="text/javascript">
- top.TYPO3.ModuleMenu.App.refreshMenu();
- top.TYPO3.WorkspacesMenu.performWorkspaceSwitch({activeWorkspaceUid}, "{activeWorkspaceTitle}");
- </script>
- </f:if>
+ <f:if condition="{performWorkspaceSwitch}">
+ <script type="text/javascript">
+ top.TYPO3.ModuleMenu.App.refreshMenu();
+ top.TYPO3.WorkspacesMenu.performWorkspaceSwitch({activeWorkspaceUid}, "{activeWorkspaceTitle}");
+ </script>
+ </f:if>
- <f:if condition="{showGrid}">
- <f:then>
- <f:render partial="WorkingTable" arguments="{_all}" />
- </f:then>
- <f:else>
- <f:be.infobox message="{f:translate(key: 'editorInLive')}" state="-1" />
- </f:else>
- </f:if>
+ <f:if condition="{showGrid}">
+ <f:then>
+ <f:render partial="WorkingTable" arguments="{_all}" />
+ </f:then>
+ <f:else>
+ <f:be.infobox message="{f:translate(key: 'editorInLive')}" state="-1" />
+ </f:else>
+ </f:if>
</f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html b/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html
index 8a521e25ad9a..5f3c5035975b 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html
@@ -3,7 +3,7 @@
<f:section name="main">
- <f:render partial="WorkingTable" arguments="{_all}" />
+ <f:render partial="WorkingTable" arguments="{_all}" />
</f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/DropDown.html b/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/DropDown.html
index ab7af90149c8..32f8fae63303 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/DropDown.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/DropDown.html
@@ -1,71 +1,71 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<h3 class="dropdown-headline">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace" />
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace" />
</h3>
<hr>
<div class="dropdown-table">
- <f:if condition="{topItem}">
- <f:then>
- <f:render section="workspaceItem" arguments="{item: topItem}" />
- <f:if condition="{showLinkToModule}">
- <div class="dropdown-table-row">
- <div class="dropdown-table-column dropdown-table-icon">
- <f:render section="uncheckedIcon" />
- </div>
- <div class="dropdown-table-column">
- <a href="#" target="list_frame" data-module="web_WorkspacesWorkspaces" class="t3js-workspaces-modulelink">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_workspace" />
- </a>
- </div>
- </div>
- </f:if>
- </f:then>
- <f:else>
- <f:comment>no items on top (= no workspace to work in)</f:comment>
- <div class="dropdown-table-row">
- <div class="dropdown-table-column dropdown-table-icon">
- <f:render section="uncheckedIcon" />
- </div>
- <div class="dropdown-table-column">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_noWSfound" />
- </div>
- </div>
- </f:else>
- </f:if>
+ <f:if condition="{topItem}">
+ <f:then>
+ <f:render section="workspaceItem" arguments="{item: topItem}" />
+ <f:if condition="{showLinkToModule}">
+ <div class="dropdown-table-row">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <f:render section="uncheckedIcon" />
+ </div>
+ <div class="dropdown-table-column">
+ <a href="#" target="list_frame" data-module="web_WorkspacesWorkspaces" class="t3js-workspaces-modulelink">
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_workspace" />
+ </a>
+ </div>
+ </div>
+ </f:if>
+ </f:then>
+ <f:else>
+ <f:comment>no items on top (= no workspace to work in)</f:comment>
+ <div class="dropdown-table-row">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <f:render section="uncheckedIcon" />
+ </div>
+ <div class="dropdown-table-column">
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_noWSfound" />
+ </div>
+ </div>
+ </f:else>
+ </f:if>
</div>
<f:if condition="{additionalItems}">
- <hr>
+ <hr>
- <div class="dropdown-table">
- <f:for each="{additionalItems}" as="item">
- <f:render section="workspaceItem" arguments="{item: item}" />
- </f:for>
- </div>
+ <div class="dropdown-table">
+ <f:for each="{additionalItems}" as="item">
+ <f:render section="workspaceItem" arguments="{item: item}" />
+ </f:for>
+ </div>
</f:if>
<f:section name="workspaceItem">
- <div class="dropdown-table-row t3js-workspace-item{f:if(condition: item.isActive, then: ' selected')}">
- <div class="dropdown-table-column dropdown-table-icon">
- <f:if condition="{item.isActive}">
- <f:then><core:icon identifier="status-status-checked" size="small" /></f:then>
- <f:else><f:render section="uncheckedIcon" /></f:else>
- </f:if>
- </div>
- <div class="dropdown-table-column">
- <a href="{item.link}" data-workspaceid="{item.workspaceId}" class="t3js-workspaces-switchlink">
- {item.label -> f:format.htmlspecialchars()}
- </a>
- </div>
- </div>
+ <div class="dropdown-table-row t3js-workspace-item{f:if(condition: item.isActive, then: ' selected')}">
+ <div class="dropdown-table-column dropdown-table-icon">
+ <f:if condition="{item.isActive}">
+ <f:then><core:icon identifier="status-status-checked" size="small" /></f:then>
+ <f:else><f:render section="uncheckedIcon" /></f:else>
+ </f:if>
+ </div>
+ <div class="dropdown-table-column">
+ <a href="{item.link}" data-workspaceid="{item.workspaceId}" class="t3js-workspaces-switchlink">
+ {item.label -> f:format.htmlspecialchars()}
+ </a>
+ </div>
+ </div>
</f:section>
<f:section name="uncheckedIcon">
- <span title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_inactive')}">
- <core:icon identifier="empty-empty" size="small" />
- </span>
+ <span title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_inactive')}">
+ <core:icon identifier="empty-empty" size="small" />
+ </span>
</f:section>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/ToolbarItem.html b/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
index dafa41e5b9ae..3742ed55cfab 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/ToolbarItems/ToolbarItem.html
@@ -1,6 +1,6 @@
<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="ToolbarItem" arguments="{
- title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace',
- icon: '{core:icon(identifier: \'apps-toolbar-menu-workspace\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
+ title: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace',
+ icon: '{core:icon(identifier: \'apps-toolbar-menu-workspace\', size: \'small\', alternativeMarkupIdentifier: \'inline\')}'
}" />
</html>
--
GitLab