diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
index a268854d9bcb4d04af298136053aa1ec0a330396..fc6ff0c623d6dfcf5446448eac12a117d3dd4476 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Form;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
/**
@@ -78,23 +80,41 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
* @return string
*/
protected function renderColorPicker(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
+ $elementId = 'em-' . $configuration->getName();
+ $elementName = $this->getName($configuration);
+
+ // configure the field
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'text');
- $this->tag->addAttribute('name', $this->getName($configuration));
- $this->tag->addAttribute('id', 'em-' . $configuration->getName());
- $doc = $this->getDocInstance();
- $pageRenderer = $doc->getPageRenderer();
- $pageRenderer->addCssFile('sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.css');
- $pageRenderer->addJsFile('sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.js');
- $pageRenderer->addJsInlineCode('colorpicker', '
- jQuery(document).ready(function() {
- jQuery(".colorPicker").farbtastic("#em-' . $configuration->getName() . '");
- });
- ');
+ $this->tag->addAttribute('id', $elementId);
+ $this->tag->addAttribute('name', $elementName);
+ $this->tag->addAttribute('class', 'form-control');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
- return $this->tag->render() . '<div class="colorPicker"></div>';
+
+ // configure colorpicker wizard
+ $params = array(
+ 'formName' => 'configurationform',
+ 'itemName' => $elementName,
+ );
+ $onClick =
+ 'this.blur();' .
+ 'vHWin=window.open(' .
+ GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_colorpicker') . GeneralUtility::implodeArrayForUrl('', array('P' => $params))) . ' + \'&P[currentValue]=\' + encodeURIComponent(document.getElementById(' . GeneralUtility::quoteJSvalue($elementId) . ').value),' .
+ '\'popUpem-' . GeneralUtility::shortmd5($elementName) . '\',' .
+ '\'height=400,width=400,status=0,menubar=0,scrollbars=1\'' .
+ ');' .
+ 'vHWin.focus();' .
+ 'return false;';
+
+ // wrap the field
+ $output = '<div class="form-wizards-wrap form-wizards-aside">'
+ . '<div class="form-wizards-element">' . $this->tag->render() . '</div>'
+ . '<div class="form-wizards-items"><a href="#" onClick="' . htmlspecialchars($onClick) . '" class="btn btn-default"><span class="t3-icon fa fa-eyedropper"></span></a></div>'
+ . '</div>';
+
+ return $output;
}
/**
@@ -106,9 +126,9 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
protected function renderOffsetField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'text');
- $this->tag->addAttribute('name', $this->getName($configuration));
$this->tag->addAttribute('id', 'em-' . $configuration->getName());
- $this->tag->addAttribute('class', 'offset');
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control t3js-emconf-offset');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
@@ -124,9 +144,9 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
protected function renderWrapField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'text');
- $this->tag->addAttribute('name', $this->getName($configuration));
$this->tag->addAttribute('id', 'em-' . $configuration->getName());
- $this->tag->addAttribute('class', 'wrap');
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control t3js-emconf-wrap');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
@@ -140,9 +160,10 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
* @return string
*/
protected function renderOptionSelect(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
- $this->tag->addAttribute('name', $this->getName($configuration));
- $this->tag->addAttribute('id', 'em-' . $configuration->getName());
$this->tag->setTagName('select');
+ $this->tag->addAttribute('id', 'em-' . $configuration->getName());
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control');
$optionValueArray = $configuration->getGeneric();
$output = '';
foreach ($optionValueArray as $label => $value) {
@@ -165,9 +186,10 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
protected function renderPositiveIntegerField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'number');
- $this->tag->addAttribute('min', '0');
- $this->tag->addAttribute('name', $this->getName($configuration));
$this->tag->addAttribute('id', 'em-' . $configuration->getName());
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control');
+ $this->tag->addAttribute('min', '0');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
@@ -183,8 +205,9 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
protected function renderIntegerField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'number');
- $this->tag->addAttribute('name', $this->getName($configuration));
$this->tag->addAttribute('id', 'em-' . $configuration->getName());
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
@@ -200,8 +223,9 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
protected function renderTextField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
$this->tag->setTagName('input');
$this->tag->addAttribute('type', 'text');
- $this->tag->addAttribute('name', $this->getName($configuration));
$this->tag->addAttribute('id', 'em-' . $configuration->getName());
+ $this->tag->addAttribute('name', $this->getName($configuration));
+ $this->tag->addAttribute('class', 'form-control');
if ($configuration->getValue() !== NULL) {
$this->tag->addAttribute('value', $configuration->getValue());
}
@@ -215,7 +239,6 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
* @return string
*/
protected function renderSmallTextField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
- $this->tag->addAttribute('class', 'small');
return $this->renderTextField($configuration);
}
@@ -234,7 +257,7 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
$this->tag->addAttribute('checked', 'checked');
}
$hiddenField = $this->renderHiddenFieldForEmptyValue($configuration);
- return $hiddenField . $this->tag->render();
+ return '<div class="checkbox">' . $hiddenField . '<label>' . $this->tag->render() . '</label></div>';
}
/**
@@ -286,17 +309,4 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
return '';
}
- /**
- * Gets instance of template if exists or create a new one.
- *
- * @return \TYPO3\CMS\Backend\Template\DocumentTemplate $doc
- */
- public function getDocInstance() {
- if (!isset($GLOBALS['SOBE']->doc)) {
- $GLOBALS['SOBE']->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
- $GLOBALS['SOBE']->doc->backPath = $GLOBALS['BACK_PATH'];
- }
- return $GLOBALS['SOBE']->doc;
- }
-
}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
index 52559c5d781363d9e25cb8216d56c3c5bc0f45db..a08080a60fb8550c1e7a62937ccb78f2dad48582 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
@@ -19,7 +19,11 @@
<ul class="nav nav-tabs" role="tablist">
<f:for each="{configuration}" as="category" key="categoryNumber" iteration="iteration">
<f:if condition="{category.name}">
- <li role="presentation" class="{f:if(condition:'{iteration.isFirst}', then:'active')}"><a href="#category-{categoryNumber}" aria-controls="category-{categoryNumber}" role="tab" data-toggle="tab">{category.name}</a></li>
+ <li role="presentation" class="{f:if(condition:'{iteration.isFirst}', then:'active')}">
+ <a class="text-capitalize" href="#category-{categoryNumber}" aria-controls="category-{categoryNumber}" role="tab" data-toggle="tab">
+ {category.name}
+ </a>
+ </li>
</f:if>
</f:for>
</ul>
@@ -31,33 +35,40 @@
<f:if condition="{category.name}">
<div role="tabpanel" class="tab-pane {f:if(condition:'{iteration.isFirst}', then:'active')}" id="category-{categoryNumber}">
<f:for each="{category.subcategories}" as="subcategory">
- <div class="subcategory">
+ <div class="form-section">
<f:if condition="{subcategory.label}">
<f:then>
- <h2>{subcategory.label}</h2>
+ <h2 class="h4 form-section-headline">{subcategory.label}</h2>
</f:then>
<f:else>
<f:if condition="{category.subcategories->f:count()} > 1">
- <h3><f:translate key="extConfTemplate.other" /></h3>
+ <h3 class="h4 form-section-headline"><f:translate key="extConfTemplate.other" /></h3>
</f:if>
</f:else>
</f:if>
<f:for each="{subcategory.items}" as="item">
- <div class="group">
- <h3>{item.labelHeadline} <span class="info">[{category.name}.{item.name}]</span></h3>
- <f:if condition="{item.labelText}">
- <label for="{item.name}">{item.labelText -> f:format.nl2br()}</label><br>
- </f:if>
+ <div class="form-group form-group-dashed">
+ <label for="em-{item.name}">
+ {item.labelHeadline}<br>
+ <span class="text-monospace text-normal">
+ {category.name}.{item.name}
+ <f:if condition="{item.type} != 'user'">
+ <f:alias map="{label: '{f:translate(key: \'extConfTemplate.type.{item.type}\')}'}">
+ <f:if condition="{label}">
+ ({label})
+ </f:if>
+ </f:alias>
+ </f:if>
+ </span>
+ </label>
<f:if condition="{item.highlight}">
- <span style="background:red; padding:1px 2px; color:#fff; font-weight:bold;">{item.highlight}</span>
+ <p class="text-danger">{item.highlight}</p>
</f:if>
- <em:form.typoScriptConstants configuration="{item}" />
- <f:if condition="{item.type} != 'user'">
- <f:alias map="{label: '{f:translate(key: \'extConfTemplate.type.{item.type}\')}'}">
- <f:if condition="{label}">
- <span class="info">({label})</span>
- </f:if>
- </f:alias>
+ <div class="form-control-wrap">
+ <em:form.typoScriptConstants configuration="{item}" />
+ </div>
+ <f:if condition="{item.labelText}">
+ <div class="help-block">{item.labelText -> f:format.nl2br()}</div>
</f:if>
</div>
</f:for>
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/LICENSE.txt b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/LICENSE.txt
deleted file mode 100644
index 5a3cc209adfdbaa0bd5d8eac199972cbec2d4435..0000000000000000000000000000000000000000
--- a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/LICENSE.txt
+++ /dev/null
@@ -1,341 +0,0 @@
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.css b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.css
deleted file mode 100644
index 48161fbf66a982a8409cbe866aff923bf2311489..0000000000000000000000000000000000000000
--- a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Farbtastic Color Picker 1.2
- * © 2008 Steven Wittens
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-.farbtastic {
- position: relative;
-}
-.farbtastic * {
- position: absolute;
- cursor: crosshair;
-}
-.farbtastic, .farbtastic .wheel {
- width: 195px;
- height: 195px;
-}
-.farbtastic .color, .farbtastic .overlay {
- top: 47px;
- left: 47px;
- width: 101px;
- height: 101px;
-}
-.farbtastic .wheel {
- background: url(wheel.png) no-repeat;
- width: 195px;
- height: 195px;
-}
-.farbtastic .overlay {
- background: url(mask.png) no-repeat;
-}
-.farbtastic .marker {
- width: 17px;
- height: 17px;
- margin: -8px 0 0 -8px;
- overflow: hidden;
- background: url(marker.png) no-repeat;
-}
-
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.js b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.js
deleted file mode 100644
index d8b5ad9cdf077a2460c6cfab11cef2eb53f0c229..0000000000000000000000000000000000000000
--- a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/farbtastic.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * Farbtastic Color Picker 1.2
- * © 2008 Steven Wittens
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-jQuery.fn.farbtastic = function (callback) {
- $.farbtastic(this, callback);
- return this;
-};
-
-jQuery.farbtastic = function (container, callback) {
- var container = $(container).get(0);
- return container.farbtastic || (container.farbtastic = new jQuery._farbtastic(container, callback));
-}
-
-jQuery._farbtastic = function (container, callback) {
- // Store farbtastic object
- var fb = this;
-
- // Insert markup
- $(container).html('<div class="farbtastic"><div class="color"></div><div class="wheel"></div><div class="overlay"></div><div class="h-marker marker"></div><div class="sl-marker marker"></div></div>');
- var e = $('.farbtastic', container);
- fb.wheel = $('.wheel', container).get(0);
- // Dimensions
- fb.radius = 84;
- fb.square = 100;
- fb.width = 194;
-
- // Fix background PNGs in IE6
- if (navigator.appVersion.match(/MSIE [0-6]\./)) {
- $('*', e).each(function () {
- if (this.currentStyle.backgroundImage != 'none') {
- var image = this.currentStyle.backgroundImage;
- image = this.currentStyle.backgroundImage.substring(5, image.length - 2);
- $(this).css({
- 'backgroundImage': 'none',
- 'filter': "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image + "')"
- });
- }
- });
- }
-
- /**
- * Link to the given element(s) or callback.
- */
- fb.linkTo = function (callback) {
- // Unbind previous nodes
- if (typeof fb.callback == 'object') {
- $(fb.callback).unbind('keyup', fb.updateValue);
- }
-
- // Reset color
- fb.color = null;
-
- // Bind callback or elements
- if (typeof callback == 'function') {
- fb.callback = callback;
- }
- else if (typeof callback == 'object' || typeof callback == 'string') {
- fb.callback = $(callback);
- fb.callback.bind('keyup', fb.updateValue);
- if (fb.callback.get(0).value) {
- fb.setColor(fb.callback.get(0).value);
- }
- }
- return this;
- }
- fb.updateValue = function (event) {
- if (this.value && this.value != fb.color) {
- fb.setColor(this.value);
- }
- }
-
- /**
- * Change color with HTML syntax #123456
- */
- fb.setColor = function (color) {
- var unpack = fb.unpack(color);
- if (fb.color != color && unpack) {
- fb.color = color;
- fb.rgb = unpack;
- fb.hsl = fb.RGBToHSL(fb.rgb);
- fb.updateDisplay();
- }
- return this;
- }
-
- /**
- * Change color with HSL triplet [0..1, 0..1, 0..1]
- */
- fb.setHSL = function (hsl) {
- fb.hsl = hsl;
- fb.rgb = fb.HSLToRGB(hsl);
- fb.color = fb.pack(fb.rgb);
- fb.updateDisplay();
- return this;
- }
-
- /////////////////////////////////////////////////////
-
- /**
- * Retrieve the coordinates of the given event relative to the center
- * of the widget.
- */
- fb.widgetCoords = function (event) {
- var x, y;
- var el = event.target || event.srcElement;
- var reference = fb.wheel;
-
- if (typeof event.offsetX != 'undefined') {
- // Use offset coordinates and find common offsetParent
- var pos = { x: event.offsetX, y: event.offsetY };
-
- // Send the coordinates upwards through the offsetParent chain.
- var e = el;
- while (e) {
- e.mouseX = pos.x;
- e.mouseY = pos.y;
- pos.x += e.offsetLeft;
- pos.y += e.offsetTop;
- e = e.offsetParent;
- }
-
- // Look for the coordinates starting from the wheel widget.
- var e = reference;
- var offset = { x: 0, y: 0 }
- while (e) {
- if (typeof e.mouseX != 'undefined') {
- x = e.mouseX - offset.x;
- y = e.mouseY - offset.y;
- break;
- }
- offset.x += e.offsetLeft;
- offset.y += e.offsetTop;
- e = e.offsetParent;
- }
-
- // Reset stored coordinates
- e = el;
- while (e) {
- e.mouseX = undefined;
- e.mouseY = undefined;
- e = e.offsetParent;
- }
- }
- else {
- // Use absolute coordinates
- var pos = fb.absolutePosition(reference);
- x = (event.pageX || 0*(event.clientX + $('html').get(0).scrollLeft)) - pos.x;
- y = (event.pageY || 0*(event.clientY + $('html').get(0).scrollTop)) - pos.y;
- }
- // Subtract distance to middle
- return { x: x - fb.width / 2, y: y - fb.width / 2 };
- }
-
- /**
- * Mousedown handler
- */
- fb.mousedown = function (event) {
- // Capture mouse
- if (!document.dragging) {
- $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
- document.dragging = true;
- }
-
- // Check which area is being dragged
- var pos = fb.widgetCoords(event);
- fb.circleDrag = Math.max(Math.abs(pos.x), Math.abs(pos.y)) * 2 > fb.square;
-
- // Process
- fb.mousemove(event);
- return false;
- }
-
- /**
- * Mousemove handler
- */
- fb.mousemove = function (event) {
- // Get coordinates relative to color picker center
- var pos = fb.widgetCoords(event);
-
- // Set new HSL parameters
- if (fb.circleDrag) {
- var hue = Math.atan2(pos.x, -pos.y) / 6.28;
- if (hue < 0) hue += 1;
- fb.setHSL([hue, fb.hsl[1], fb.hsl[2]]);
- }
- else {
- var sat = Math.max(0, Math.min(1, -(pos.x / fb.square) + .5));
- var lum = Math.max(0, Math.min(1, -(pos.y / fb.square) + .5));
- fb.setHSL([fb.hsl[0], sat, lum]);
- }
- return false;
- }
-
- /**
- * Mouseup handler
- */
- fb.mouseup = function () {
- // Uncapture mouse
- $(document).unbind('mousemove', fb.mousemove);
- $(document).unbind('mouseup', fb.mouseup);
- document.dragging = false;
- }
-
- /**
- * Update the markers and styles
- */
- fb.updateDisplay = function () {
- // Markers
- var angle = fb.hsl[0] * 6.28;
- $('.h-marker', e).css({
- left: Math.round(Math.sin(angle) * fb.radius + fb.width / 2) + 'px',
- top: Math.round(-Math.cos(angle) * fb.radius + fb.width / 2) + 'px'
- });
-
- $('.sl-marker', e).css({
- left: Math.round(fb.square * (.5 - fb.hsl[1]) + fb.width / 2) + 'px',
- top: Math.round(fb.square * (.5 - fb.hsl[2]) + fb.width / 2) + 'px'
- });
-
- // Saturation/Luminance gradient
- $('.color', e).css('backgroundColor', fb.pack(fb.HSLToRGB([fb.hsl[0], 1, 0.5])));
-
- // Linked elements or callback
- if (typeof fb.callback == 'object') {
- // Set background/foreground color
- $(fb.callback).css({
- backgroundColor: fb.color,
- color: fb.hsl[2] > 0.5 ? '#000' : '#fff'
- });
-
- // Change linked value
- $(fb.callback).each(function() {
- if (this.value && this.value != fb.color) {
- this.value = fb.color;
- }
- });
- }
- else if (typeof fb.callback == 'function') {
- fb.callback.call(fb, fb.color);
- }
- }
-
- /**
- * Get absolute position of element
- */
- fb.absolutePosition = function (el) {
- var r = { x: el.offsetLeft, y: el.offsetTop };
- // Resolve relative to offsetParent
- if (el.offsetParent) {
- var tmp = fb.absolutePosition(el.offsetParent);
- r.x += tmp.x;
- r.y += tmp.y;
- }
- return r;
- };
-
- /* Various color utility functions */
- fb.pack = function (rgb) {
- var r = Math.round(rgb[0] * 255);
- var g = Math.round(rgb[1] * 255);
- var b = Math.round(rgb[2] * 255);
- return '#' + (r < 16 ? '0' : '') + r.toString(16) +
- (g < 16 ? '0' : '') + g.toString(16) +
- (b < 16 ? '0' : '') + b.toString(16);
- }
-
- fb.unpack = function (color) {
- if (color.length == 7) {
- return [parseInt('0x' + color.substring(1, 3)) / 255,
- parseInt('0x' + color.substring(3, 5)) / 255,
- parseInt('0x' + color.substring(5, 7)) / 255];
- }
- else if (color.length == 4) {
- return [parseInt('0x' + color.substring(1, 2)) / 15,
- parseInt('0x' + color.substring(2, 3)) / 15,
- parseInt('0x' + color.substring(3, 4)) / 15];
- }
- }
-
- fb.HSLToRGB = function (hsl) {
- var m1, m2, r, g, b;
- var h = hsl[0], s = hsl[1], l = hsl[2];
- m2 = (l <= 0.5) ? l * (s + 1) : l + s - l*s;
- m1 = l * 2 - m2;
- return [this.hueToRGB(m1, m2, h+0.33333),
- this.hueToRGB(m1, m2, h),
- this.hueToRGB(m1, m2, h-0.33333)];
- }
-
- fb.hueToRGB = function (m1, m2, h) {
- h = (h < 0) ? h + 1 : ((h > 1) ? h - 1 : h);
- if (h * 6 < 1) return m1 + (m2 - m1) * h * 6;
- if (h * 2 < 1) return m2;
- if (h * 3 < 2) return m1 + (m2 - m1) * (0.66666 - h) * 6;
- return m1;
- }
-
- fb.RGBToHSL = function (rgb) {
- var min, max, delta, h, s, l;
- var r = rgb[0], g = rgb[1], b = rgb[2];
- min = Math.min(r, Math.min(g, b));
- max = Math.max(r, Math.max(g, b));
- delta = max - min;
- l = (min + max) / 2;
- s = 0;
- if (l > 0 && l < 1) {
- s = delta / (l < 0.5 ? (2 * l) : (2 - 2 * l));
- }
- h = 0;
- if (delta > 0) {
- if (max == r && max != g) h += (g - b) / delta;
- if (max == g && max != b) h += (2 + (b - r) / delta);
- if (max == b && max != r) h += (4 + (r - g) / delta);
- h /= 6;
- }
- return [h, s, l];
- }
-
- // Install mousedown handler (the others are set on the document on-demand)
- $('*', e).mousedown(fb.mousedown);
-
- // Init color
- fb.setColor('#000000');
-
- // Set linked elements/callback
- if (callback) {
- fb.linkTo(callback);
- }
-}
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/marker.png b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/marker.png
deleted file mode 100644
index 00d36e794104f2071a388659b4c45f0b31b6113b..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/marker.png and /dev/null differ
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/mask.png b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/mask.png
deleted file mode 100644
index 391544ae4e4e2aad7bbd3c5c52e9e3ef3ca978f8..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/mask.png and /dev/null differ
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/wheel.png b/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/wheel.png
deleted file mode 100644
index 8798367e24d9eaf06d7bd343bec82decfb2a5e44..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/extensionmanager/Resources/Public/Contrib/Farbtastic/wheel.png and /dev/null differ
diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
index cbb740fb628d05a6e0925d346067aa2d08d84336..399b1be7195046070d4826ec83fc4ba10fb5e083 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
+++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
@@ -259,43 +259,71 @@ define(['jquery', 'datatables', 'jquery/jquery.clearable'], function($) {
* configuration properties
*/
ExtensionManager.configurationFieldSupport = function() {
- $('.offset').each(function() {
+ $('.t3js-emconf-offset').each(function() {
var $me = $(this),
- $parent = $me.parent();
- $me.hide();
-
- var val = $me.attr('value');
- var valArr = val.split(',');
-
- $me.wrap('<div class="offsetSelector"></div>');
- $parent.append('x: <input value="' + $.trim(valArr[0]) + '" class="tempOffset1 tempOffset">');
- $parent.append('<span>, </span>');
- $parent.append('y: <input value="' + $.trim(valArr[1]) + '" class="tempOffset2 tempOffset">');
-
- $me.siblings('.tempOffset').keyup(function() {
- $me.siblings('.offset').attr(
+ $parent = $me.parent(),
+ id = $me.attr('id'),
+ val = $me.attr('value'),
+ valArr = val.split(',');
+
+ $me.attr('data-offsetfield-x', '#' + id + '_offset_x')
+ .attr('data-offsetfield-y', '#' + id + '_offset_y')
+ .wrap('<div class="hidden"></div>');
+
+ var elementX = '' +
+ '<div class="form-multigroup-item">' +
+ '<div class="input-group">' +
+ '<div class="input-group-addon">x</div>' +
+ '<input id="' + id + '_offset_x" class="form-control t3js-emconf-offsetfield" data-target="#' + id + '" value="' + $.trim(valArr[0]) + '">' +
+ '</div>' +
+ '</div>';
+ var elementY = '' +
+ '<div class="form-multigroup-item">' +
+ '<div class="input-group">' +
+ '<div class="input-group-addon">y</div>' +
+ '<input id="' + id + '_offset_y" class="form-control t3js-emconf-offsetfield" data-target="#' + id + '" value="' + $.trim(valArr[1]) + '">' +
+ '</div>' +
+ '</div>';
+
+ var offsetGroup = '<div class="form-multigroup-wrap">' + elementX + elementY + '</div>';
+ $parent.append(offsetGroup);
+ $parent.find('.t3js-emconf-offset').keyup(function() {
+ var $target = $($(this).data('target'));
+ $target.attr(
'value',
- $parent.children('.tempOffset1').attr('value') + ',' + $parent.children('.tempOffset2').attr('value'));
+ $($target.data('offsetfield-x')).val() + ',' + $($target.data('offsetfield-y')).val()
+ );
});
});
- $('.wrap').each(function() {
+ $('.t3js-emconf-wrap').each(function() {
var $me = $(this),
- $parent = $me.parent();
- $me.hide();
-
- var val = $me.attr('value');
- var valArr = val.split('|');
-
- $me.wrap('<div class="wrapSelector"></div>');
- $parent.append('<input value="' + $.trim(valArr[0]) + '" class="tempWrap1 tempWrap">');
- $parent.append('<span>|</span>');
- $parent.append('<input value="' + $.trim(valArr[1]) + '" class="tempWrap2 tempWrap">');
-
- $me.siblings('.tempWrap').keyup(function() {
- $me.siblings('.wrap').attr(
+ $parent = $me.parent(),
+ id = $me.attr('id'),
+ val = $me.attr('value'),
+ valArr = val.split('|');
+
+ $me.attr('data-wrapfield-start', '#' + id + '_wrap_start')
+ .attr('data-wrapfield-end', '#' + id + '_wrap_end')
+ .wrap('<div class="hidden"></div>');
+
+ var elementStart = '' +
+ '<div class="form-multigroup-item">' +
+ '<input id="' + id + '_wrap_start" class="form-control t3js-emconf-wrapfield" data-target="#' + id + '" value="' + $.trim(valArr[0]) + '">' +
+ '</div>';
+ var elementEnd = '' +
+ '<div class="form-multigroup-item">' +
+ '<input id="' + id + '_wrap_end" class="form-control t3js-emconf-wrapfield" data-target="#' + id + '" value="' + $.trim(valArr[1]) + '">' +
+ '</div>';
+
+ var wrapGroup = '<div class="form-multigroup-wrap">' + elementStart + elementEnd + '</div>';
+ $parent.append(wrapGroup);
+ $parent.find('.t3js-emconf-wrapfield').keyup(function() {
+ var $target = $($(this).data('target'));
+ $target.attr(
'value',
- $parent.children('.tempWrap1').attr('value') + '|' + $parent.children('.tempWrap2').attr('value'));
+ $($target.data('wrapfield-start')).val() + '|' + $($target.data('wrapfield-end')).val()
+ );
});
});
};
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_form.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_form.less
index d65b0809b28123d2463489c43959351fa07f13e9..42558f9bee541850be199dcb57efee75b0d42bae 100644
--- a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_form.less
+++ b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_form.less
@@ -48,6 +48,9 @@ a.typo3-goBack {
max-height: 18px;
}
}
+.input-group-addon {
+ min-width: 2.5em;
+}
//
// Form control additions
@@ -145,6 +148,16 @@ select {
}
}
+//
+// Form group additions
+//
+.form-group-dashed {
+ & + .form-group-dashed {
+ padding-top: 15px;
+ border-top: 1px dashed #ccc;
+ }
+}
+
//
// Form Sections
//
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_type.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_type.less
index 9496237f0b2df9b2349397d2cd1671da9b47b625..6c2b490d884f796c9bcfc47df7e636fb70da9bbb 100644
--- a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_type.less
+++ b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_type.less
@@ -4,6 +4,9 @@
.text-monospace {
font-family: @font-family-monospace;
}
+.text-normal {
+ font-weight: normal;
+}
//
// Lead text
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_extensionmanager.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_extensionmanager.less
index a2b37a48c54827e3c4ae3100ca2cd290af4cb4fa..879919b51eeb2812ea6bf8c42dd67be45f7b3cd4 100644
--- a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_extensionmanager.less
+++ b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_extensionmanager.less
@@ -199,48 +199,6 @@
.dataTables_paginate {
width: auto;
}
-#typo3-extension-configuration-forms {
- min-width: 400px;
- max-width: 900px;
- .category {
- background-repeat: repeat-x;
- background-color: #fff;
- border: 1px solid #adadad;
- padding: 15px;
- }
- .group {
- margin-bottom: 30px;
- label {
- display: block;
- padding-bottom: 10px;
- }
- input[type=text] {
- width: 300px;
- }
- }
-}
-#typo3-extension-configuration-forms #typo3-docheader-row2 .back {
- float: right;
-}
-#typo3-extension-configuration-forms input.submit {
- margin-top: 10px;
-}
-#typo3-extension-configuration-forms .error,
-#typo3-extension-configuration-forms .invalid {
- border-radius: 0 4px 4px 0;
- .box-shadow(0 0 6px #ddd);
- height: 15px;
- background-color: #ff2262;
- border: 1px solid #e1e16d;
- font-size: 11px;
- color: #000;
- padding: 3px 10px;
- margin-left: -2px;
-}
-#typo3-extension-configuration-forms .info {
- color: #666;
- font-weight: normal;
-}
.typo3-extension-list tr.installed td {
background-color: #c8ffaa;
}
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
index d81b01c2e175ad43ebfc2f8578ee03c34506255e..8bf0191c7b00d460002bbd6f812baca148c33dc5 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
@@ -7345,6 +7345,9 @@ button.close {
.text-monospace {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
+.text-normal {
+ font-weight: normal;
+}
.lead {
font-size: 1.25em;
}
@@ -9803,6 +9806,9 @@ a.typo3-goBack {
width: auto;
max-height: 18px;
}
+.input-group-addon {
+ min-width: 2.5em;
+}
.form-control {
min-width: 120px;
}
@@ -9871,6 +9877,10 @@ select.icon-select option {
.form-inline-spaced .form-group label {
margin-right: 0.5em;
}
+.form-group-dashed + .form-group-dashed {
+ padding-top: 15px;
+ border-top: 1px dashed #ccc;
+}
.form-section {
border: 1px solid #cccccc;
background-color: #fafafa;
@@ -11027,49 +11037,6 @@ fieldset[disabled] .live-search-list .x-btn button.active {
.dataTables_paginate {
width: auto;
}
-#typo3-extension-configuration-forms {
- min-width: 400px;
- max-width: 900px;
-}
-#typo3-extension-configuration-forms .category {
- background-repeat: repeat-x;
- background-color: #fff;
- border: 1px solid #adadad;
- padding: 15px;
-}
-#typo3-extension-configuration-forms .group {
- margin-bottom: 30px;
-}
-#typo3-extension-configuration-forms .group label {
- display: block;
- padding-bottom: 10px;
-}
-#typo3-extension-configuration-forms .group input[type=text] {
- width: 300px;
-}
-#typo3-extension-configuration-forms #typo3-docheader-row2 .back {
- float: right;
-}
-#typo3-extension-configuration-forms input.submit {
- margin-top: 10px;
-}
-#typo3-extension-configuration-forms .error,
-#typo3-extension-configuration-forms .invalid {
- border-radius: 0 4px 4px 0;
- -webkit-box-shadow: 0 0 6px #dddddd;
- box-shadow: 0 0 6px #dddddd;
- height: 15px;
- background-color: #ff2262;
- border: 1px solid #e1e16d;
- font-size: 11px;
- color: #000;
- padding: 3px 10px;
- margin-left: -2px;
-}
-#typo3-extension-configuration-forms .info {
- color: #666;
- font-weight: normal;
-}
.typo3-extension-list tr.installed td {
background-color: #c8ffaa;
}