Merge remote-tracking branch 'origin/7.2'

# Conflicts: # Resources/Private/Translations/de/Main.xlf # Resources/Private/Translations/ja/Main.xlf # Resources/Private/Translations/sr/Main.xlf # Resources/Private/Translations/sv/Main.xlf # Resources/Private/Translations/tl/Main.xlf # Resources/Private/Translations/tr/Main.xlf # Resources/Private/Translations/uk/Main.xlf # Resources/Private/Translations/vi/Main.xlf # Resources/Private/Translations/zh_TW/Main.xlf
neos · Nov 22, 2021 · 82716d3 · 82716d3
2 parents aab4bee + 124d967
commit 82716d3
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 29 deletions.
diff --git a/Resources/Private/Translations/de/Main.xlf b/Resources/Private/Translations/de/Main.xlf
@@ -454,14 +454,14 @@
                 <source>documents selected</source>
         <target>ausgewählte Dokumente</target>
       </trans-unit>
-      <trans-unit id="inspectorMutlipleContentNodesSelectedTooltip" xml:space="preserve">
-                <source>Select a single document in order to be able to edit its properties</source>
-        <target>Wählen Sie ein einzelnes Dokument aus, um dessen Eigenschaften zu bearbeiten</target>
-      </trans-unit>
       <trans-unit id="deleteXNodes" xml:space="preserve">
                 <source>Delete {amount} nodes</source>
         <target>{amount} Knoten löschen</target>
       </trans-unit>
+      <trans-unit id="inspectorMutlipleContentNodesSelectedTooltip" xml:space="preserve">
+                <source>Select a single document in order to be able to edit its properties</source>
+        <target>Wählen Sie ein einzelnes Dokument aus, um dessen Eigenschaften zu bearbeiten</target>
+      </trans-unit>
       <trans-unit id="contentElementsSelected" xml:space="preserve">
                 <source>content elements selected</source>
         <target>ausgewählte Inhaltselemente</target>
@@ -470,18 +470,6 @@
                 <source>Select a single content element in order to be able to edit its properties</source>
         <target>Wählen Sie ein einzelnes Inhaltselement aus, um dessen Eigenschaften zu bearbeiten</target>
       </trans-unit>
-      <trans-unit id="rangeEditorMinimum" xml:space="preserve">
-        <source>Minimum</source>
-        <taget>Minimum</taget>
-      </trans-unit>
-        <trans-unit id="rangeEditorMaximum" xml:space="preserve">
-        <source>Maximum</source>
-        <target>Maximum</target>
-      </trans-unit>
-        <trans-unit id="rangeEditorCurrentValue" xml:space="preserve">
-        <source>Current value</source>
-        <target>Aktueller Wert</target>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/Private/Translations/ja/Main.xlf b/Resources/Private/Translations/ja/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="ja" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="ja" state="translated">順序付きリスト</target>

diff --git a/Resources/Private/Translations/sr/Main.xlf b/Resources/Private/Translations/sr/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="sr" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="sr" state="needs-translation">Ordered list</target>

diff --git a/Resources/Private/Translations/sv/Main.xlf b/Resources/Private/Translations/sv/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="sv-SE" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="sv-SE" state="translated">Sorterad lista</target>

diff --git a/Resources/Private/Translations/tl/Main.xlf b/Resources/Private/Translations/tl/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="tl" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="tl" state="needs-translation">Ordered list</target>

diff --git a/Resources/Private/Translations/tr/Main.xlf b/Resources/Private/Translations/tr/Main.xlf
@@ -113,6 +113,9 @@
                 <source>Format as email?</source>
         <target xml:lang="tr" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="tr" state="translated">Maddeli Liste</target>

diff --git a/Resources/Private/Translations/uk/Main.xlf b/Resources/Private/Translations/uk/Main.xlf
@@ -113,6 +113,15 @@
                 <source>Format as email?</source>
         <target xml:lang="uk" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="uk" state="needs-translation">Ordered list</target>

diff --git a/Resources/Private/Translations/vi/Main.xlf b/Resources/Private/Translations/vi/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="vi" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="vi" state="needs-translation">Ordered list</target>

diff --git a/Resources/Private/Translations/zh_TW/Main.xlf b/Resources/Private/Translations/zh_TW/Main.xlf
@@ -110,6 +110,9 @@
                 <source>Format as email?</source>
         <target xml:lang="zh-TW" state="needs-translation">Format as email?</target>
       </trans-unit>
+      <trans-unit id="" xml:space="preserve">
+                <source/>
+      </trans-unit>
       <trans-unit id="ckeditor__toolbar__ordered-list" xml:space="preserve">
                 <source>Ordered list</source>
         <target xml:lang="zh-TW" state="translated">項目清單</target>

diff --git a/packages/neos-ui-editors/src/EditorEnvelope/index.js b/packages/neos-ui-editors/src/EditorEnvelope/index.js
@@ -19,7 +19,7 @@ import {Icon} from '@neos-project/react-ui-components';
 }))
 export default class EditorEnvelope extends PureComponent {
     state = {
-        showHelpmessage: false
+        showHelpMessage: false
     };
 
     static defaultProps = {
@@ -113,9 +113,10 @@ export default class EditorEnvelope extends PureComponent {
         );
     }
 
-    toggleHelmpessage = () => {
+    toggleHelpMessage = event => {
+        event.preventDefault();
         this.setState({
-            showHelpmessage: !this.state.showHelpmessage
+            showHelpMessage: !this.state.showHelpMessage
         });
     };
 
@@ -127,7 +128,7 @@ export default class EditorEnvelope extends PureComponent {
         return thumbnail;
     }
 
-    renderHelpmessage() {
+    renderHelpMessage() {
         const {i18nRegistry, helpMessage, helpThumbnail, label} = this.props;
 
         const translatedHelpMessage = i18nRegistry.translate(helpMessage);
@@ -144,7 +145,7 @@ export default class EditorEnvelope extends PureComponent {
     renderHelpIcon = () => {
         if (this.props.helpMessage || this.props.helpThumbnail) {
             return (
-                <span role="button" onClick={this.toggleHelmpessage} className={style.envelope__tooltipButton}>
+                <span role="button" onClick={this.toggleHelpMessage} className={style.envelope__tooltipButton}>
                     <Icon icon="question-circle" />
                 </span>
             );
@@ -169,7 +170,7 @@ export default class EditorEnvelope extends PureComponent {
                     {this.renderLabel()}
                 </span>
                 {this.renderEditorComponent()}
-                {this.state.showHelpmessage ? this.renderHelpmessage() : ''}
+                {this.state.showHelpMessage ? this.renderHelpMessage() : ''}
                 {this.isInvalid() && <Tooltip renderInline asError><ul>{validationErrors.map((error, index) => <li key={index}>{error}</li>)}</ul></Tooltip>}
             </Fragment>
         );

diff --git a/packages/neos-ui-editors/src/EditorEnvelope/style.css b/packages/neos-ui-editors/src/EditorEnvelope/style.css
@@ -13,6 +13,16 @@
     z-index: var(--zIndex-NodeToolBar);
     max-width: 100%;
 }
+
+.envelope__helpmessage a {
+    color: var(--colors-PrimaryBlue);
+}
+
+.envelope__helpmessage a:hover,
+.envelope__helpmessage a:focus {
+    color: var(--colors-PrimaryBlueHover);
+}
+
 .envelope--invalid {
     box-shadow: 0 0 0 2px var(--colors-Error);
     border-radius: 2px;

diff --git a/packages/neos-ui-editors/src/Editors/Boolean/index.js b/packages/neos-ui-editors/src/Editors/Boolean/index.js
@@ -47,9 +47,11 @@ const BooleanEditor = props => {
         <div className={wrapperClassName}>
             <Label className={finalClassName}>
                 <CheckBox isChecked={toBoolean(value)} disabled={finalOptions.disabled} onChange={commit}/>
-                <I18n id={label}/>
+                <span>
+                    <I18n id={label}/>
+                    {props.renderHelpIcon ? props.renderHelpIcon() : ''}
+                </span>
             </Label>
-            {props.renderHelpIcon ? props.renderHelpIcon() : ''}
         </div>
     );
 };

diff --git a/packages/neos-ui-editors/src/Editors/Boolean/style.css b/packages/neos-ui-editors/src/Editors/Boolean/style.css
@@ -13,5 +13,5 @@
 
 .boolean__label {
     max-width: none;
-    display: inline;
+    display: flex;
 }
diff --git a/packages/neos-ui/src/Containers/Modals/SelectNodeType/style.css b/packages/neos-ui/src/Containers/Modals/SelectNodeType/style.css
@@ -86,6 +86,15 @@
     position: relative;
 }
 
+.helpMessage a {
+    color: var(--colors-PrimaryBlue);
+}
+
+.helpMessage a:hover,
+.helpMessage a:focus {
+    color: var(--colors-PrimaryBlueHover);
+}
+
 .helpMessage__label {
     display: block;
     margin-bottom: var(--spacing-Half);

diff --git a/packages/react-ui-components/src/CheckBox/style.css b/packages/react-ui-components/src/CheckBox/style.css
@@ -1,7 +1,9 @@
 .checkbox {
     composes: reset from './../reset.css';
     position: relative;
-    display: inline-block;
+    display: block;
+    width: 20px;
+    height: 20px;
     margin-right: 8px;
     vertical-align: middle;
 }

diff --git a/packages/react-ui-components/src/Label/style.css b/packages/react-ui-components/src/Label/style.css
@@ -10,9 +10,6 @@
 
     &,
     span {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
         max-width: 100%;
     }
 }