itizawa 6 лет назад
Родитель
Сommit
95c8b942b8

+ 6 - 0
src/client/js/components/Admin/Notification/ManageGlobalNotification.jsx

@@ -200,6 +200,7 @@ class ManageGlobalNotification extends React.Component {
             <div className="form-group">
             <div className="form-group">
               <h3>{t('notification_setting.trigger_events')}</h3>
               <h3>{t('notification_setting.trigger_events')}</h3>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="success"
                 event="pageCreate"
                 event="pageCreate"
                 checked={this.state.triggerEvents.has('pageCreate')}
                 checked={this.state.triggerEvents.has('pageCreate')}
                 onChange={() => this.onChangeTriggerEvents('pageCreate')}
                 onChange={() => this.onChangeTriggerEvents('pageCreate')}
@@ -209,6 +210,7 @@ class ManageGlobalNotification extends React.Component {
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="warning"
                 event="pageEdit"
                 event="pageEdit"
                 checked={this.state.triggerEvents.has('pageEdit')}
                 checked={this.state.triggerEvents.has('pageEdit')}
                 onChange={() => this.onChangeTriggerEvents('pageEdit')}
                 onChange={() => this.onChangeTriggerEvents('pageEdit')}
@@ -218,6 +220,7 @@ class ManageGlobalNotification extends React.Component {
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="warning"
                 event="pageMove"
                 event="pageMove"
                 checked={this.state.triggerEvents.has('pageMove')}
                 checked={this.state.triggerEvents.has('pageMove')}
                 onChange={() => this.onChangeTriggerEvents('pageMove')}
                 onChange={() => this.onChangeTriggerEvents('pageMove')}
@@ -227,6 +230,7 @@ class ManageGlobalNotification extends React.Component {
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="danger"
                 event="pageDelete"
                 event="pageDelete"
                 checked={this.state.triggerEvents.has('pageDelete')}
                 checked={this.state.triggerEvents.has('pageDelete')}
                 onChange={() => this.onChangeTriggerEvents('pageDelete')}
                 onChange={() => this.onChangeTriggerEvents('pageDelete')}
@@ -236,6 +240,7 @@ class ManageGlobalNotification extends React.Component {
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="info"
                 event="pageLike"
                 event="pageLike"
                 checked={this.state.triggerEvents.has('pageLike')}
                 checked={this.state.triggerEvents.has('pageLike')}
                 onChange={() => this.onChangeTriggerEvents('pageLike')}
                 onChange={() => this.onChangeTriggerEvents('pageLike')}
@@ -245,6 +250,7 @@ class ManageGlobalNotification extends React.Component {
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>
               <TriggerEventCheckBox
               <TriggerEventCheckBox
+                checkbox="secondary"
                 event="comment"
                 event="comment"
                 checked={this.state.triggerEvents.has('comment')}
                 checked={this.state.triggerEvents.has('comment')}
                 onChange={() => this.onChangeTriggerEvents('comment')}
                 onChange={() => this.onChangeTriggerEvents('comment')}

+ 4 - 2
src/client/js/components/Admin/Notification/TriggerEventCheckBox.jsx

@@ -6,14 +6,15 @@ const TriggerEventCheckBox = (props) => {
   const { t } = props;
   const { t } = props;
 
 
   return (
   return (
-    <div className="checkbox">
+    <div className={`custom-control custom-checkbox custom-checkbox-${props.checkbox}`}>
       <input
       <input
+        className="custom-control-input"
         type="checkbox"
         type="checkbox"
         id={`trigger-event-${props.event}`}
         id={`trigger-event-${props.event}`}
         checked={props.checked}
         checked={props.checked}
         onChange={props.onChange}
         onChange={props.onChange}
       />
       />
-      <label htmlFor={`trigger-event-${props.event}`}>
+      <label className="custom-control-label" htmlFor={`trigger-event-${props.event}`}>
         {props.children}{' '}
         {props.children}{' '}
         {t(`notification_setting.event_${props.event}`)}
         {t(`notification_setting.event_${props.event}`)}
       </label>
       </label>
@@ -25,6 +26,7 @@ const TriggerEventCheckBox = (props) => {
 TriggerEventCheckBox.propTypes = {
 TriggerEventCheckBox.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   t: PropTypes.func.isRequired, // i18next
 
 
+  checkbox: PropTypes.string.isRequired,
   checked: PropTypes.bool.isRequired,
   checked: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
   event: PropTypes.string.isRequired,
   event: PropTypes.string.isRequired,

+ 3 - 3
src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -78,9 +78,9 @@ class UserInviteModal extends React.Component {
 
 
     return (
     return (
       <>
       <>
-        <div className="checkbox checkbox-success text-left" onChange={this.handleCheckBox} style={{ flex: 0.95 }}>
-          <input type="checkbox" id="sendEmail" className="form-check-input" name="sendEmail" defaultChecked={this.state.sendEmail} />
-          <label htmlFor="sendEmail">
+        <div className="ccustom-control custom-switch custom-checkbox-info text-left" onChange={this.handleCheckBox} style={{ flex: 0.95 }}>
+          <input type="checkbox" id="sendEmail" className="custom-control-input" name="sendEmail" defaultChecked={this.state.sendEmail} />
+          <label className="custom-control-label" htmlFor="sendEmail">
             {t('admin:user_management.invite_modal.invite_thru_email')}
             {t('admin:user_management.invite_modal.invite_thru_email')}
           </label>
           </label>
         </div>
         </div>

+ 1 - 1
src/client/js/components/PageHistory/PageRevisionList.jsx

@@ -95,7 +95,7 @@ export default class PageRevisionList extends React.Component {
 
 
     return (
     return (
       <React.Fragment>
       <React.Fragment>
-        <div className="custom-control custom-switch float-right">
+        <div className="custom-control custom-checkbox custom-checkbox-info float-right">
           <input
           <input
             type="checkbox"
             type="checkbox"
             id="cbCompactize"
             id="cbCompactize"