Adjusting labels and icons for comment threads.

src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js

@@ -205,6 +205,12 @@ class AssignmentsTable extends Component {
                   />
                 </>
               }
+              additionalPublicSwitchNote={
+                <FormattedMessage
+                  id="app.assignments.discussionModal.additionalSwitchNote"
+                  defaultMessage="(supervisors and students of this group)"
+                />
+              }
               inModal
             />
           )}

src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js

@@ -114,7 +114,15 @@ class ReferenceSolutionDetail extends Component {
               download={download}
             />
 
-            <CommentThreadContainer threadId={id} />
+            <CommentThreadContainer
+              threadId={id}
+              additionalPublicSwitchNote={
+                <FormattedMessage
+                  id="app.referenceSolutionDetail.comments.additionalSwitchNote"
+                  defaultMessage="(teachers who can see this reference solution)"
+                />
+              }
+            />
           </Col>
 
           {evaluations && (

src/components/Solutions/SolutionDetail/SolutionDetail.js

@@ -254,7 +254,15 @@ class SolutionDetail extends Component {
               />
             )}
 
-            <CommentThreadContainer threadId={id} />
+            <CommentThreadContainer
+              threadId={id}
+              additionalPublicSwitchNote={
+                <FormattedMessage
+                  id="app.solutionDetail.comments.additionalSwitchNote"
+                  defaultMessage="(author of the solution and supervisors of this group)"
+                />
+              }
+            />
           </Col>
 
           {evaluations && (

src/components/forms/EditAssignmentForm/EditAssignmentForm.js

@@ -577,7 +577,7 @@ class EditAssignmentForm extends Component {
                   <span>
                     <FormattedMessage
                       id="app.editExerciseForm.solutionFilesLimit"
-                      defaultMessage="Soluition files limit:"
+                      defaultMessage="Solution files limit:"
                     />
                     <Explanation id="solutionFilesLimitExplanation">
                       <FormattedMessage
@@ -600,7 +600,7 @@ class EditAssignmentForm extends Component {
                   <span>
                     <FormattedMessage
                       id="app.editExerciseForm.solutionSizeLimit"
-                      defaultMessage="Soluition total size [KiB] limit:"
+                      defaultMessage="Solution total size [KiB] limit:"
                     />
                     <Explanation id="solutionSizeLimitExplanation">
                       <FormattedMessage

src/components/forms/EditExerciseForm/EditExerciseForm.js

@@ -106,7 +106,7 @@ const EditExerciseForm = ({
       nullable
       label={
         <span>
-          <FormattedMessage id="app.editExerciseForm.solutionFilesLimit" defaultMessage="Soluition files limit:" />
+          <FormattedMessage id="app.editExerciseForm.solutionFilesLimit" defaultMessage="Solution files limit:" />
           <Explanation id="solutionFilesLimitExplanation">
             <FormattedMessage
               id="app.exercise.solutionFilesLimitExplanation"
@@ -134,7 +134,7 @@ const EditExerciseForm = ({
         <span>
           <FormattedMessage
             id="app.editExerciseForm.solutionSizeLimit"
-            defaultMessage="Soluition total size [KiB] limit:"
+            defaultMessage="Solution total size [KiB] limit:"
           />
           <Explanation id="solutionSizeLimitExplanation">
             <FormattedMessage

src/components/widgets/Comments/AddComment/AddComment.js

@@ -68,6 +68,7 @@ class AddComment extends Component {
     const { text, isPrivate } = this.state;
     const {
       addComment,
+      additionalPublicSwitchNote = null,
       intl: { formatMessage },
     } = this.props;
 
@@ -106,26 +107,25 @@ class AddComment extends Component {
               disabled={!addComment}
               noShadow
               className="mr-2">
-              {isPrivate ? <Icon icon="lock" /> : <Icon icon="unlock-alt" />}
+              {isPrivate ? <Icon icon="eye-slash" /> : <Icon icon="eye" />}
             </Button>
-            {isPrivate && (
-              <FormattedMessage
-                id="app.comments.warnings.isPrivate"
-                defaultMessage="<strong>Only you will see this comment.</strong>"
-                values={{
-                  strong: text => <strong>{text}</strong>,
-                }}
-              />
-            )}
-            {!isPrivate && (
-              <FormattedMessage
-                id="app.comments.warnings.isPublic"
-                defaultMessage="<strong>Everyone on this page will see this comment.</strong>"
-                values={{
-                  strong: text => <strong>{text}</strong>,
-                }}
-              />
-            )}
+
+            <strong>
+              {isPrivate && (
+                <FormattedMessage
+                  id="app.comments.warnings.isPrivate"
+                  defaultMessage="This will be a private comment visible only to you."
+                />
+              )}
+              {!isPrivate && (
+                <FormattedMessage
+                  id="app.comments.warnings.isPublic"
+                  defaultMessage="This will be a public comment visible to everyone who can see this thread."
+                />
+              )}
+            </strong>
+
+            {!isPrivate && additionalPublicSwitchNote && <> {additionalPublicSwitchNote}</>}
           </Form.Text>
         </FormGroup>
       </Form>
@@ -135,6 +135,7 @@ class AddComment extends Component {
 
 AddComment.propTypes = {
   addComment: PropTypes.func,
+  additionalPublicSwitchNote: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   intl: PropTypes.object.isRequired,
 };
 

src/components/widgets/Comments/Comment/Comment.js

@@ -26,6 +26,7 @@ const Comment = ({
   isToggling = false,
   togglePrivacy,
   deleteComment,
+  additionalPublicSwitchNote = null,
   links: { USER_URI_FACTORY },
 }) => (
   <div
@@ -63,7 +64,6 @@ const Comment = ({
             gapLeft
             className={classnames({ 'float-right': true, [styles.iconButton]: true, [styles.iconButtonDelete]: true })}
             onClick={() => deleteComment(id)}
-            timid
           />
         )}
         {isFromCurrentUser && togglePrivacy && (
@@ -77,19 +77,26 @@ const Comment = ({
                     defaultMessage="Only you can see this comment"
                   />
                 ) : (
-                  <FormattedMessage
-                    id="app.comments.everyoneCanSeeThisComment"
-                    defaultMessage="This comment is visible to everyone."
-                  />
+                  <>
+                    <FormattedMessage
+                      id="app.comments.everyoneCanSeeThisComment"
+                      defaultMessage="This comment is visible to everyone who can see this thread."
+                    />
+                    {additionalPublicSwitchNote && <> {additionalPublicSwitchNote}</>}
+                  </>
                 )}
               </Tooltip>
             }>
             <Icon
-              icon={isToggling ? 'circle-notch' : isPrivate ? 'lock' : 'unlock-alt'}
+              icon={isToggling ? 'circle-notch' : isPrivate ? 'eye-slash' : 'eye'}
               onClick={() => togglePrivacy(id)}
-              className={classnames({ 'float-right': true, [styles.iconButton]: true, [styles.iconButtonLock]: true })}
+              className={classnames({
+                'float-right': true,
+                [styles.iconButton]: true,
+                [styles.iconButtonLock]: !isPrivate,
+                [styles.iconButtonUnlock]: isPrivate,
+              })}
               spin={isToggling}
-              timid
             />
           </OverlayTrigger>
         )}
@@ -122,6 +129,7 @@ Comment.propTypes = {
   isToggling: PropTypes.bool,
   togglePrivacy: PropTypes.func,
   deleteComment: PropTypes.func,
+  additionalPublicSwitchNote: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   links: PropTypes.object,
 };
 

src/components/widgets/Comments/CommentThread/CommentThread.js

@@ -9,6 +9,7 @@ import { RefreshIcon } from '../../../icons';
 
 const CommentThread = ({
   title = <FormattedMessage id="app.comments.title" defaultMessage="Comments and Notes" />,
+  additionalPublicSwitchNote = null,
   comments = [],
   currentUserId,
   addComment,
@@ -21,7 +22,9 @@ const CommentThread = ({
   <CommentBox
     title={title}
     commentsCount={comments.length}
-    footer={addComment && <AddComment addComment={addComment} />}
+    footer={
+      addComment && <AddComment addComment={addComment} additionalPublicSwitchNote={additionalPublicSwitchNote} />
+    }
     inModal={inModal}>
     <div>
       {comments.map((comment, i) =>
@@ -32,6 +35,7 @@ const CommentThread = ({
             repost={repostComment}
             togglePrivacy={togglePrivacy}
             deleteComment={deleteComment}
+            additionalPublicSwitchNote={additionalPublicSwitchNote}
           />
         ) : (
           <SomebodyElsesComment {...comment} key={comment.id} />
@@ -64,6 +68,7 @@ const CommentThread = ({
 
 CommentThread.propTypes = {
   title: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
+  additionalPublicSwitchNote: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   comments: PropTypes.array,
   currentUserId: PropTypes.string.isRequired,
   addComment: PropTypes.func,

src/components/widgets/Comments/comments.less

@@ -10,6 +10,10 @@
   color: #ff6;
 }
 
+.iconButtonUnlock {
+  color: #28a745;
+}
+
 .iconButtonDelete {
   color: #f88;
 }

src/containers/CommentThreadContainer/CommentThreadContainer.js

@@ -38,6 +38,7 @@ class CommentThreadContainer extends Component {
   render() {
     const {
       title = <FormattedMessage id="app.comments.title" defaultMessage="Comments and Notes" />,
+      additionalPublicSwitchNote = null,
       thread,
       user,
       addComment,
@@ -53,6 +54,7 @@ class CommentThreadContainer extends Component {
         {(thread, user) => (
           <CommentThread
             title={title}
+            additionalPublicSwitchNote={additionalPublicSwitchNote}
             comments={thread.comments.sort((a, b) => a.postedAt - b.postedAt)}
             currentUserId={user.id}
             addComment={(text, isPrivate) => addComment(user, text, isPrivate)}
@@ -71,6 +73,7 @@ class CommentThreadContainer extends Component {
 CommentThreadContainer.propTypes = {
   threadId: PropTypes.string.isRequired,
   title: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
+  additionalPublicSwitchNote: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   inModal: PropTypes.bool,
   thread: PropTypes.object,
   user: PropTypes.object,

src/locales/cs.json

@@ -138,6 +138,7 @@
   "app.assignmentStats.onlyBestSolutionsCheckbox": "Pouze nejlepší řešení",
   "app.assignmentStats.title": "Všechna řešení zadané úlohy",
   "app.assignments.deadline": "Termín odevzdání",
+  "app.assignments.discussionModal.additionalSwitchNote": "(vedoucí a studenti této skupiny)",
   "app.assignments.discussionModalTitle": "Veřejná diskuse",
   "app.assignments.group": "Zadáno ve skupině",
   "app.assignments.hidePastAssignments": "Celkem {count} {count, plural, one {zadaná úloha má} =2 {zadané úlohy mají} =3 {zadané úlohy mají} =4 {zadané úlohy mají} other {zadaných úloh má}} termín v minulosti. <a>Skrýt staré úlohy.</a>",
@@ -198,15 +199,15 @@
   "app.changePasswordForm.validation.passwordsDontMatch": "Hesla se neshodují.",
   "app.comments.addComment": "Odeslat",
   "app.comments.commentPlaceholder": "Váš komentář...",
-  "app.comments.everyoneCanSeeThisComment": "Tento komentář je veřejný.",
+  "app.comments.everyoneCanSeeThisComment": "Tento komentář vidí všichni uživatelé, kteří vidí toto vlákno.",
   "app.comments.loadingCommentThread": "Načítají se komentáře...",
   "app.comments.noCommentsYet": "V tomto vláknu zatím nejsou žádné komentáře.",
-  "app.comments.onlyYouCanSeeThisComment": "Pouze vy vidíte tento komentář.",
+  "app.comments.onlyYouCanSeeThisComment": "Tento komentář vidíte pouze vy.",
   "app.comments.publishing": "Publikuji...",
   "app.comments.publishingFailed": "Zveřejnění selhalo",
   "app.comments.title": "Komentáře a poznámky",
-  "app.comments.warnings.isPrivate": "<strong>Tento komentář uvidíte pouze vy - nebude veřejný.</strong>",
-  "app.comments.warnings.isPublic": "<strong>Tento komentář bude veřejný.</strong>",
+  "app.comments.warnings.isPrivate": "Tento komentář bude soukromý, takže jej uvidíte pouze vy.",
+  "app.comments.warnings.isPublic": "Tento komentář bude veřejný, takže jej uvidí každý, kdo může číst toto vlákno.",
   "app.confirm.no": "Ne",
   "app.confirm.yes": "Ano",
   "app.createExerciseForm.selectGroupFirst": "... nejprve vyberte domovskou skupinu ...",
@@ -1311,6 +1312,7 @@
   "app.referenceSolution.exerciseBroken": "Úloha je rozbitá, a proto není v tuto chvíli možné nechat toto vzorové řešení znovu vyhodnotit.",
   "app.referenceSolution.exerciseNoLongerHasEnvironment": "Úloha již nepodporuje běhové prostředí, pod kterým bylo toto řešení odevzdáno. Řešení není možné znovu vyhodnotit.",
   "app.referenceSolution.title": "Podrobnosti referenčního řešení",
+  "app.referenceSolutionDetail.comments.additionalSwitchNote": "(učitelé, kteří smí vidět toto referenční řešení)",
   "app.referenceSolutionDetail.exercise": "Úloha",
   "app.referenceSolutionDetail.title.details": "Detail referenčního řešení",
   "app.referenceSolutionTable.evaluationFailed": "Poslední vyhodnocení selhalo",
@@ -1572,6 +1574,7 @@
   "app.solution.submittedBeforeSecondDeadline": "Řešení bylo odevzdáno po prvním termínu, ale stále ještě před druhým termínem",
   "app.solution.title": "Řešení",
   "app.solutionArchiveInfoBox.description": "Všechny soubory v ZIPu",
+  "app.solutionDetail.comments.additionalSwitchNote": "(autor tohoto řešení a vedoucí této skupiny)",
   "app.solutionFiles.countLimitExceeded": "Celkový počet souborů řešení překročil výchozí limit ({limit}).",
   "app.solutionFiles.downloadButton": "Stáhnout soubor",
   "app.solutionFiles.entryPoint": "Vstupní bod (zaváděcí soubor aplikace)",

src/locales/en.json

@@ -138,6 +138,7 @@
   "app.assignmentStats.onlyBestSolutionsCheckbox": "Best solutions only",
   "app.assignmentStats.title": "All Submissions of The Assignment",
   "app.assignments.deadline": "Deadline",
+  "app.assignments.discussionModal.additionalSwitchNote": "(supervisors and students of this group)",
   "app.assignments.discussionModalTitle": "Public Discussion",
   "app.assignments.group": "Assigned in group",
   "app.assignments.hidePastAssignments": "Total {count} {count, plural, one {assignment} other {assignments}} {count, plural, one {is past its} other {are past their}} deadline. <a>Hide old assignments.</a>",
@@ -198,15 +199,15 @@
   "app.changePasswordForm.validation.passwordsDontMatch": "Passwords do not match.",
   "app.comments.addComment": "Send",
   "app.comments.commentPlaceholder": "Your comment...",
-  "app.comments.everyoneCanSeeThisComment": "This comment is visible to everyone.",
+  "app.comments.everyoneCanSeeThisComment": "This comment is visible to everyone who can see this thread.",
   "app.comments.loadingCommentThread": "Loading comments...",
   "app.comments.noCommentsYet": "There are no comments in this thread yet.",
   "app.comments.onlyYouCanSeeThisComment": "Only you can see this comment",
   "app.comments.publishing": "Publishing...",
   "app.comments.publishingFailed": "Publishing Failed",
   "app.comments.title": "Comments and Notes",
-  "app.comments.warnings.isPrivate": "<strong>Only you will see this comment.</strong>",
-  "app.comments.warnings.isPublic": "<strong>Everyone on this page will see this comment.</strong>",
+  "app.comments.warnings.isPrivate": "This will be a private comment visible only to you.",
+  "app.comments.warnings.isPublic": "This will be a public comment visible to everyone who can see this thread.",
   "app.confirm.no": "No",
   "app.confirm.yes": "Yes",
   "app.createExerciseForm.selectGroupFirst": "... select group of residence first ...",
@@ -383,8 +384,8 @@
   "app.editExerciseForm.isPublic": "Exercise is public",
   "app.editExerciseForm.medium": "Medium",
   "app.editExerciseForm.mergeJudgeLogs": "Merge judge logs in one",
-  "app.editExerciseForm.solutionFilesLimit": "Soluition files limit:",
-  "app.editExerciseForm.solutionSizeLimit": "Soluition total size [KiB] limit:",
+  "app.editExerciseForm.solutionFilesLimit": "Solution files limit:",
+  "app.editExerciseForm.solutionSizeLimit": "Solution total size [KiB] limit:",
   "app.editExerciseForm.title": "Edit exercise {name}",
   "app.editExerciseForm.validation.difficulty": "Please select the difficulty of the exercise.",
   "app.editExerciseForm.validation.emptyName": "Please fill the name of the exercise.",
@@ -1311,6 +1312,7 @@
   "app.referenceSolution.exerciseBroken": "The exercise is broken. This reference solution may not be resubmitted at the moment.",
   "app.referenceSolution.exerciseNoLongerHasEnvironment": "The exercise no longer supports the environment for which this solution was evaluated. Resubmission is not possible.",
   "app.referenceSolution.title": "Reference Solution Detail",
+  "app.referenceSolutionDetail.comments.additionalSwitchNote": "(teachers who can see this reference solution)",
   "app.referenceSolutionDetail.exercise": "Exercise",
   "app.referenceSolutionDetail.title.details": "Reference Solution Detail",
   "app.referenceSolutionTable.evaluationFailed": "Last evaluation failed",
@@ -1572,6 +1574,7 @@
   "app.solution.submittedBeforeSecondDeadline": "The solution was submitted after the first but still before the second deadline",
   "app.solution.title": "The Solution",
   "app.solutionArchiveInfoBox.description": "All files in a ZIP archive",
+  "app.solutionDetail.comments.additionalSwitchNote": "(author of the solution and supervisors of this group)",
   "app.solutionFiles.countLimitExceeded": "The total number of submitted files exceeds the default solution files limit ({limit}).",
   "app.solutionFiles.downloadButton": "Download file",
   "app.solutionFiles.entryPoint": "Execution entry point (bootstrap)",

src/pages/Assignment/Assignment.js

@@ -216,6 +216,12 @@ class Assignment extends Component {
                           defaultMessage="Public Discussion"
                         />
                       }
+                      additionalPublicSwitchNote={
+                        <FormattedMessage
+                          id="app.assignments.discussionModal.additionalSwitchNote"
+                          defaultMessage="(supervisors and students of this group)"
+                        />
+                      }
                     />
                   </Col>
                 </Row>

src/pages/AssignmentStats/AssignmentStats.js

@@ -355,6 +355,12 @@ class AssignmentStats extends Component {
                         : <LocalizedExerciseName entity={{ name: '??', localizedTexts: assignment.localizedTexts }} />
                       </>
                     }
+                    additionalPublicSwitchNote={
+                      <FormattedMessage
+                        id="app.assignments.discussionModal.additionalSwitchNote"
+                        defaultMessage="(supervisors and students of this group)"
+                      />
+                    }
                     inModal
                   />
                 </Modal>