Merge 946424e into fbba5f2

superdesk · Jan 15, 2019 · de88602 · de88602
2 parents fbba5f2 + 946424e
commit de88602
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/client/components/Events/RecurringRulesInput/index.jsx b/client/components/Events/RecurringRulesInput/index.jsx
@@ -61,12 +61,12 @@ export class RecurringRulesInput extends React.Component {
         const interval = get(schedule, 'recurring_rule.interval');
 
         return (
-            <div>
+            <div className="recurring-rules">
                 <Row noPadding>
                     <div className="flex-grid">
                         {!onlyUpdateRepetitions && <Label row text={gettext('Every')} noMinWidth padding/>}
                         {!onlyUpdateRepetitions && <LineInput {...this.props} isSelect={true} readOnly={readOnly}
-                            noMargin={frequency === 'WEEKLY'}
+                            noMargin={true}
                             className="form__row form__row--max-width-35">
                             <Select
                                 field="dates.recurring_rule.interval"
@@ -95,7 +95,7 @@ export class RecurringRulesInput extends React.Component {
                             padding
                             marginLeft={!onlyUpdateRepetitions} />
                         <LineInput {...this.props} isSelect={true} readOnly={readOnly}
-                            noMargin={frequency === 'WEEKLY'}
+                            noMargin={true}
                             className="form__row form__row--max-width-80">
                             <Select
                                 field="dates.recurring_rule.endRepeatMode"
@@ -123,7 +123,7 @@ export class RecurringRulesInput extends React.Component {
                         {endRepeatMode === 'count' &&
                             <div className="form__row form__row--flex">
                                 <LineInput {...this.props} readOnly={readOnly}
-                                    noMargin={frequency === 'WEEKLY'}
+                                    noMargin={true}
                                     invalid={!!get(errors, 'count')}
                                     message={get(errors, 'count', '')} >
                                     <Input

diff --git a/client/components/Events/style.scss b/client/components/Events/style.scss
@@ -26,4 +26,13 @@
 
 .sd-line-input__input--related-item-link {
     margin-right: 0.6rem;
+}
+
+.recurring-rules {
+    .sd-line-input {
+        &--no-margin {
+            margin-top: 0;
+            margin-bottom: 0;
+        }
+    }
 }
diff --git a/client/components/ItemActionConfirmation/forms/updateTimeForm.jsx b/client/components/ItemActionConfirmation/forms/updateTimeForm.jsx
@@ -158,6 +158,7 @@ export class UpdateTimeComponent extends React.Component {
                 <FormRow
                     flex={true}
                     noPadding={true}
+                    halfWidth={true}
                     invalid={!!get(this.state, 'errors._startTime')}
                 >
                     <Label text={gettext('From')} row={true}/>
@@ -174,7 +175,7 @@ export class UpdateTimeComponent extends React.Component {
                     />
                 </FormRow>
 
-                <FormRow flex={true}>
+                <FormRow flex={true} halfWidth={true}>
                     <Label
                         text={gettext('To')}
                         row={true}

diff --git a/client/components/UI/constants.js b/client/components/UI/constants.js
@@ -25,5 +25,8 @@ export const ICON_COLORS = {
     DEFAULT: false,
 };
 
-export const TOOLTIPS = {postedState: gettext('Posted')};
+export const TOOLTIPS = {
+    postedState: gettext('Posted'),
+    notForPublication: gettext('Not For Publication'),
+};