Merge branch 'master' into ahtisham/INF-867

2023-01-17 20:47:25 +05:00
parent a1a9e3b21e e1d8af4498
commit 0b3fc507bf
4 changed files with 40 additions and 32 deletions
--- a/src/components/PostPreviewPane.jsx
+++ b/src/components/PostPreviewPane.jsx
@@ -37,9 +37,10 @@ function PostPreviewPane({
        && (
          <Button
            variant="link"
-            size="md"
+            size="sm"
            onClick={() => setShowPreviewPane(true)}
-            className={`text-primary-500 px-0 ${editExisting && 'mb-4.5'}`}
+            className={`text-primary-500 p-0 ${editExisting && 'mb-4.5'}`}
+            style={{ lineHeight: '26px' }}
          >
            {intl.formatMessage(messages.showPreviewButton)}
          </Button>
--- a/src/discussions/common/AlertBanner.jsx
+++ b/src/discussions/common/AlertBanner.jsx
@@ -10,7 +10,9 @@ import { Report } from '@edx/paragon/icons';

 import { commentShape } from '../comments/comment/proptypes';
 import messages from '../comments/messages';
-import { selectModerationSettings, selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../data/selectors';
+import {
+  selectModerationSettings, selectUserHasModerationPrivileges, selectUserIsGroupTa, selectUserIsStaff,
+} from '../data/selectors';
 import { postShape } from '../posts/post/proptypes';
 import AuthorLabel from './AuthorLabel';

@@ -20,10 +22,13 @@ function AlertBanner({
 }) {
  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
  const userIsGroupTa = useSelector(selectUserIsGroupTa);
+  const userIsGlobalStaff = useSelector(selectUserIsStaff);
  const { reasonCodesEnabled } = useSelector(selectModerationSettings);
  const userIsContentAuthor = getAuthenticatedUser().username === content.author;
-  const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsContentAuthor || userIsGroupTa);
  const canSeeReportedBanner = content?.abuseFlagged;
+  const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsGroupTa
+    || userIsGlobalStaff || userIsContentAuthor
+  );

  return (
    <>
--- a/src/discussions/posts/post-editor/PostEditor.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.jsx
@@ -59,7 +59,7 @@ function DiscussionPostType({
 }) {
  // Need to use regular label since Form.Label doesn't support overriding htmlFor
  return (
-    <label htmlFor={`post-type-${value}`} className="d-flex p-0 my-2 mr-3">
+    <label htmlFor={`post-type-${value}`} className="d-flex p-0 my-0 mr-3">
      <Form.Radio value={value} id={`post-type-${value}`} className="sr-only">{type}</Form.Radio>
      <Card
        className={classNames('border-2 shadow-none', {
@@ -270,11 +270,11 @@ function PostEditor({
        resetForm,
      }) => (
        <Form className="m-4 card p-4 post-form" onSubmit={handleSubmit}>
-          <h3 className="mb-3">
+          <h4 className="mb-4" style={{ lineHeight: '16px' }}>
            {editExisting
              ? intl.formatMessage(messages.editPostHeading)
              : intl.formatMessage(messages.addPostHeading)}
-          </h3>
+          </h4>
          <Form.RadioSet
            name="postType"
            className="d-flex flex-row flex-wrap"
@@ -288,14 +288,12 @@ function PostEditor({
              selected={values.postType === 'discussion'}
              type={intl.formatMessage(messages.discussionType)}
              icon={<Post />}
-              description={intl.formatMessage(messages.discussionDescription)}
            />
            <DiscussionPostType
              value="question"
              selected={values.postType === 'question'}
              type={intl.formatMessage(messages.questionType)}
              icon={<Help />}
-              description={intl.formatMessage(messages.questionDescription)}
            />
          </Form.RadioSet>
          <div className="d-flex flex-row my-4.5 justify-content-between">
@@ -380,8 +378,8 @@ function PostEditor({
              </Form.Group>
            )}
          </div>
-          <div className="border-bottom border-light-400" />
-          <div className="d-flex flex-row my-4.5 justify-content-between">
+
+          <div className="d-flex flex-row mb-4.5 justify-content-between">
            <Form.Group
              className="w-100 m-0"
              isInvalid={isFormikFieldInvalid('title', {
@@ -403,7 +401,7 @@ function PostEditor({
            </Form.Group>
            {canDisplayEditReason && (
              <Form.Group
-                className="w-100 ml-3 mb-0"
+                className="w-100 ml-4 mb-0"
                isInvalid={isFormikFieldInvalid('editReasonCode', {
                  errors,
                  touched,
@@ -428,7 +426,7 @@ function PostEditor({
              </Form.Group>
            )}
          </div>
-          <div className="mb-2">
+          <div className="mb-3">
            <TinyMCEEditor
              onInit={
                /* istanbul ignore next: TinyMCE is mocked so this cannot be easily tested */
@@ -446,7 +444,7 @@ function PostEditor({

          <PostPreviewPane htmlNode={values.comment} isPost editExisting={editExisting} />

-          <div className="d-flex flex-row mt-n4.5 w-75 text-primary">
+          <div className="d-flex flex-row mt-n4 w-75 text-primary">
            {!editExisting && (
              <>
                <Form.Group>
@@ -457,7 +455,9 @@ function PostEditor({
                    onBlur={handleBlur}
                    className="mr-4.5"
                  >
-                    {intl.formatMessage(messages.followPost)}
+                    <span className="font-size-14">
+                      {intl.formatMessage(messages.followPost)}
+                    </span>
                  </Form.Checkbox>
                </Form.Group>
                {allowAnonymousToPeers && (
@@ -468,7 +468,9 @@ function PostEditor({
                    onChange={handleChange}
                    onBlur={handleBlur}
                  >
-                    {intl.formatMessage(messages.anonymousToPeersPost)}
+                    <span className="font-size-14">
+                      {intl.formatMessage(messages.anonymousToPeersPost)}
+                    </span>
                  </Form.Checkbox>
                </Form.Group>
                )}
@@ -476,7 +478,7 @@ function PostEditor({
            )}
          </div>

-          <div className="d-flex justify-content-end mt-2.5">
+          <div className="d-flex justify-content-end">
            <Button
              variant="outline-primary"
              onClick={() => hideEditor(resetForm)}
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -41,18 +41,18 @@
  "discussion.comment.repliesHeading": "{count} réponses pour la réponse ajoutée",
  "discussion.comment.time": "il y a {time}",
  "discussion.thread.notFound": "Sujet introuvable",
-  "discussions.topics.backAlt": "Back to topics list",
+  "discussions.topics.backAlt": "Retour à la liste des sujets",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
  "discussions.topics.reported": "{reported} signalé",
  "discussions.topics.previouslyReported": "{previouslyReported} signalé précédemment",
  "discussions.topics.find.label": "Rechercher des sujets",
-  "discussions.topics.unnamed.section.label": "Unnamed Section",
-  "discussions.topics.unnamed.subsection.label": "Unnamed Subsection",
-  "discussions.subtopics.unnamed.topic.label": "Unnamed Topic",
-  "discussions.topics.title": "No topic exists",
-  "discussions.topics.createTopic": "Please contact you admin to create a topic",
-  "discussions.topics.nothing": "Nothing here yet",
+  "discussions.topics.unnamed.section.label": "Section sans nom",
+  "discussions.topics.unnamed.subsection.label": "Sous-section sans nom",
+  "discussions.subtopics.unnamed.topic.label": "Sujet sans nom",
+  "discussions.topics.title": "Aucun sujet n&#39;existe",
+  "discussions.topics.createTopic": "Veuillez contacter votre administrateur pour créer un sujet",
+  "discussions.topics.nothing": "Rien ici encore",
  "discussions.topics.archived.label": "Archivé",
  "discussions.learner.reported": "{reported} signalé",
  "discussions.learner.previouslyReported": "{previouslyReported} signalé précédemment",
@@ -99,7 +99,7 @@
  "discussion.banner.welcomeMessage": "🎉 Bienvenue dans la nouvelle expérience améliorée de discussions !",
  "discussion.banner.learnMore": "En savoir plus",
  "discussion.banner.shareFeedback": "Partager vos commentaires",
-  "discussion.blackoutBanner.information": "Posting in discussions is temporarily disabled by the course team",
+  "discussion.blackoutBanner.information": "La publication dans les discussions est temporairement désactivée par l&#39;équipe du cours",
  "discussions.editor.image.warning.message": "Les images dont la largeur ou la hauteur est supérieure à 999 pixels ne seront pas visibles lorsque la publication, la réponse ou le commentaire est affiché à l'aide de discussions de cours en ligne",
  "discussions.editor.image.warning.title": "Avertissement!",
  "discussions.editor.image.warning.dismiss": "Ok",
@@ -168,16 +168,16 @@
  "discussions.post.contentReported": "Signalé",
  "discussions.post.following": "Suivi",
  "discussions.post.follow": "Suivre",
-  "discussions.post.followed": "Followed",
-  "discussions.post.notFollowed": "Not Followed",
+  "discussions.post.followed": "Suivi",
+  "discussions.post.notFollowed": "Non suivi",
  "discussions.post.answered": "Répondu",
  "discussions.post.unFollow": "Ne plus suivre",
  "discussions.post.like": "Aime",
  "discussions.post.removeLike": "Contrairement à",
-  "discussions.post.liked": "liked",
-  "discussions.post.likes": "likes",
+  "discussions.post.liked": "aimé",
+  "discussions.post.likes": "aime",
  "discussions.post.viewActivity": "Afficher l'activité",
-  "discussions.post.activity": "Activity",
+  "discussions.post.activity": "Activité",
  "discussions.post.closed": "Message fermé pour réponses et commentaires",
  "discussions.post.relatedTo": "Relative à",
  "discussions.editor.delete.post.title": "Supprimer le message",
@@ -194,8 +194,8 @@
  "discussions.post.editedBy": "Édité par",
  "discussions.post.editReason": "Raison",
  "discussions.post.postWithoutPreview": "Aucun aperçu disponible",
-  "discussions.post.follow.description": "you are following this post",
-  "discussions.post.unfollow.description": "you are not following this post",
+  "discussions.post.follow.description": "vous suivez ce post",
+  "discussions.post.unfollow.description": "vous ne suivez pas ce post",
  "discussions.topics.sort.message": "Trié par {sortBy}",
  "discussions.topics.sort.lastActivity": "Activité récente",
  "discussions.topics.sort.commentCount": "La plupart des activités",