From 788fc17e782b456ea345a84d107bcd2110ca57a6 Mon Sep 17 00:00:00 2001
From: Jasmina Liessmann <code@frauliessmann.de>
Date: Fri, 24 Feb 2017 22:02:53 +0100
Subject: [PATCH] [TASK] Update layout of field 'style' in link wizard (RTE,
CKeditor)
Use Bootstrap grid for form field 'style' in link wizard.
Resolves: #80011
Releases: master
Change-Id: Icb62d5f4e8cc3990b774ddf0ba56ab9fb301d17c
Reviewed-on: https://review.typo3.org/51843
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anders Kostending <aha@systime.dk>
Tested-by: Anders Kostending <aha@systime.dk>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Controller/BrowseLinksController.php | 28 ++++++++++---------
.../Controller/BrowseLinksController.php | 28 ++++++++++---------
2 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
index 8b411c1615f4..9eac2a014b20 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
@@ -422,11 +422,11 @@ class BrowseLinksController extends AbstractLinkBrowserController
<form action="" name="ltargetform" id="ltargetform" class="t3js-dummyform form-horizontal">
<div class="form-group form-group-sm" ' . ($targetSelectorConfig['disabled'] ? ' style="display: none;"' : '') . '>
<label class="col-xs-4 control-label">' . htmlspecialchars($lang->getLL('target')) . '</label>
- <div class="col-xs-3">
+ <div class="col-xs-4">
<input type="text" name="ltarget" class="t3js-linkTarget form-control"
value="' . htmlspecialchars($target) . '" />
</div>
- <div class="col-xs-3">
+ <div class="col-xs-4">
' . $targetSelector . '
</div>
</div>
@@ -493,17 +493,19 @@ class BrowseLinksController extends AbstractLinkBrowserController
$selectClass = '';
if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId]) {
$selectClass = '
- <form action="" name="lclassform" id="lclassform" class="t3js-dummyform">
- <table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
- <tr>
- <td style="width: 96px;">' . htmlspecialchars($this->getLanguageService()->getLL('class')) . '</td>
- <td><select name="lclass" class="t3js-class-selector form-control">
- ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
- </select></td>
- </tr>
- </table>
- </form>
- ';
+ <form action="" name="lclassform" id="lclassform" class="t3js-dummyform form-horizontal">
+ <div class="form-group form-group-sm">
+ <label class="col-xs-4 control-label">
+ ' . htmlspecialchars($this->getLanguageService()->getLL('class')) . '
+ </label>
+ <div class="col-xs-8">
+ <select name="lclass" class="t3js-class-selector form-control">
+ ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
+ </select>
+ </div>
+ </div>
+ </form>
+ ';
}
return $selectClass;
}
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index e425f8120803..86bcc417a3ee 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -478,11 +478,11 @@ class BrowseLinksController extends AbstractLinkBrowserController
<form action="" name="ltargetform" id="ltargetform" class="t3js-dummyform form-horizontal">
<div class="form-group form-group-sm" ' . ($targetSelectorConfig['disabled'] ? ' style="display: none;"' : '') . '>
<label class="col-xs-4 control-label">' . htmlspecialchars($lang->getLL('target')) . '</label>
- <div class="col-xs-3">
+ <div class="col-xs-4">
<input type="text" name="ltarget" class="t3js-linkTarget form-control"
value="' . htmlspecialchars($target) . '" />
</div>
- <div class="col-xs-3">
+ <div class="col-xs-4">
' . $targetSelector . '
</div>
</div>
@@ -549,17 +549,19 @@ class BrowseLinksController extends AbstractLinkBrowserController
$selectClass = '';
if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId]) {
$selectClass = '
- <form action="" name="lclassform" id="lclassform" class="t3js-dummyform">
- <table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
- <tr>
- <td style="width: 96px;">' . htmlspecialchars($this->getLanguageService()->getLL('anchor_class')) . '</td>
- <td><select name="lclass" class="t3js-class-selector form-control">
- ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
- </select></td>
- </tr>
- </table>
- </form>
- ';
+ <form action="" name="lclassform" id="lclassform" class="t3js-dummyform form-horizontal">
+ <div class="form-group form-group-sm">
+ <label class="col-xs-4 control-label">
+ ' . htmlspecialchars($this->getLanguageService()->getLL('anchor_class')) . '
+ </label>
+ <div class="col-xs-8">
+ <select name="lclass" class="t3js-class-selector form-control">
+ ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
+ </select>
+ </div>
+ </div>
+ </form>
+ ';
}
return $selectClass;
}
--
GitLab