Fixing group labels and icons of links which should have been already changed in previous PRs.

Martin Krulis · Martin Krulis · commit dbc27da64e1e · 2019-12-28T18:38:41.000+01:00
diff --git a/src/containers/SisIntegrationContainer/SisIntegrationContainer.js b/src/containers/SisIntegrationContainer/SisIntegrationContainer.js
@@ -19,7 +19,7 @@ import LeaveJoinGroupButtonContainer from '../LeaveJoinGroupButtonContainer';
 import { getGroupCanonicalLocalizedName } from '../../helpers/localizedData';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 
-import { GroupIcon } from '../../components/icons';
+import { AssignmentsIcon } from '../../components/icons';
 import { safeGet } from '../../helpers/common';
 import withLinks from '../../helpers/withLinks';
 
@@ -148,10 +148,10 @@ class SisIntegrationContainer extends Component {
                                                     : GROUP_DETAIL_URI_FACTORY(group.id)
                                                 }>
                                                 <Button bsStyle="primary" bsSize="xs" className="btn-flat">
-                                                  <GroupIcon gapRight />
+                                                  <AssignmentsIcon gapRight />
                                                   <FormattedMessage
                                                     id="app.group.assignments"
-                                                    defaultMessage="Group Detail"
+                                                    defaultMessage="Assignments"
                                                   />
                                                 </Button>
                                               </LinkContainer>
diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -798,6 +798,7 @@
   "app.group.adminsView.addSupervisor": "Přidat vedoucího",
   "app.group.archivedExplain": "Tato skupina je archivována, takže nemůže být měněna.",
   "app.group.assignments": "Úlohy",
+  "app.group.assignmentsLong": "Úlohy skupiny",
   "app.group.createExercise": "Vytvořit úlohu ve skupině",
   "app.group.info": "Info skupiny",
   "app.group.isPublicWarning": "Skupina je veřejná, což znamená, že ji vidí všichni a kdokoli se do ní může přihlásit.",
@@ -807,7 +808,6 @@
   "app.group.setRoot": "Vybrat",
   "app.group.spervisorsView.addStudent": "Přidat studenta",
   "app.group.spervisorsView.groupExercises": "Skupinové úlohy",
-  "app.group.title": "Detaily skupiny",
   "app.group.unbind": "Odvázat",
   "app.group.unbind.confirmQuestion": "Opravdu si přejete zrušit tuto vazbu na skupinu? Skupina zůstane na svém místě, ale bez odpovídající vazby na SIS ji nemusí nalézt studenti.",
   "app.group.unsetRoot": "Zrušit výběr",
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -797,7 +797,8 @@
   "app.generateTokenForm.year": "1 Year",
   "app.group.adminsView.addSupervisor": "Add Supervisor",
   "app.group.archivedExplain": "This group is archived, so it cannot be modified.",
-  "app.group.assignments": "Group Detail",
+  "app.group.assignments": "Assignments",
+  "app.group.assignmentsLong": "Group Assignments",
   "app.group.createExercise": "Create Exercise in Group",
   "app.group.info": "Group Info",
   "app.group.isPublicWarning": "The group is public, which means that everyone can see this group and join it.",
@@ -807,7 +808,6 @@
   "app.group.setRoot": "Select",
   "app.group.spervisorsView.addStudent": "Add Student",
   "app.group.spervisorsView.groupExercises": "Group Exercises",
-  "app.group.title": "Group detail",
   "app.group.unbind": "Unbind",
   "app.group.unbind.confirmQuestion": "Do you really wish to unbind the group? The group will linger on, but it will be detached from the SIS so the students will not see it.",
   "app.group.unsetRoot": "Unset",
diff --git a/src/locales/whitelist_en.json b/src/locales/whitelist_en.json
@@ -798,6 +798,7 @@
   "app.group.adminsView.addSupervisor",
   "app.group.archivedExplain",
   "app.group.assignments",
+  "app.group.assignmentsLong",
   "app.group.createExercise",
   "app.group.info",
   "app.group.isPublicWarning",
@@ -807,7 +808,6 @@
   "app.group.setRoot",
   "app.group.spervisorsView.addStudent",
   "app.group.spervisorsView.groupExercises",
-  "app.group.title",
   "app.group.unbind",
   "app.group.unbind.confirmQuestion",
   "app.group.unsetRoot",
diff --git a/src/pages/Assignment/Assignment.js b/src/pages/Assignment/Assignment.js
@@ -104,9 +104,9 @@ class Assignment extends Component {
         breadcrumbs={[
           {
             resource: assignment,
-            iconName: 'users',
+            iconName: 'tasks',
             breadcrumb: assignment => ({
-              text: <FormattedMessage id="app.group.title" defaultMessage="Group detail" />,
+              text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,
               link: ({ GROUP_DETAIL_URI_FACTORY }) => GROUP_DETAIL_URI_FACTORY(assignment.groupId),
             }),
           },
diff --git a/src/pages/AssignmentStats/AssignmentStats.js b/src/pages/AssignmentStats/AssignmentStats.js
@@ -281,9 +281,9 @@ class AssignmentStats extends Component {
         breadcrumbs={[
           {
             resource: assignment,
-            iconName: 'users',
+            iconName: 'tasks',
             breadcrumb: assignment => ({
-              text: <FormattedMessage id="app.group.title" defaultMessage="Group detail" />,
+              text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,
               link: ({ GROUP_DETAIL_URI_FACTORY }) => GROUP_DETAIL_URI_FACTORY(assignment.groupId),
             }),
           },
diff --git a/src/pages/Dashboard/Dashboard.js b/src/pages/Dashboard/Dashboard.js
@@ -212,7 +212,7 @@ class Dashboard extends Component {
                                               <AssignmentsIcon gapRight />
                                               <FormattedMessage
                                                 id="app.group.assignments"
-                                                defaultMessage="Group Detail"
+                                                defaultMessage="Assignments"
                                               />
                                             </Button>
                                           </LinkContainer>
@@ -275,7 +275,7 @@ class Dashboard extends Component {
                                               <GroupIcon gapRight />
                                               <FormattedMessage
                                                 id="app.group.assignments"
-                                                defaultMessage="Group Detail"
+                                                defaultMessage="Assignments"
                                               />
                                             </Button>
                                           </LinkContainer>
diff --git a/src/pages/EditGroup/EditGroup.js b/src/pages/EditGroup/EditGroup.js
@@ -93,7 +93,7 @@ class EditGroup extends Component {
             link: GROUP_INFO_URI_FACTORY(groupId),
           },
           {
-            text: <FormattedMessage id="app.group.title" />,
+            text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,
             iconName: 'tasks',
             link: GROUP_DETAIL_URI_FACTORY(groupId),
           },
diff --git a/src/pages/ShadowAssignment/ShadowAssignment.js b/src/pages/ShadowAssignment/ShadowAssignment.js
@@ -55,9 +55,9 @@ class ShadowAssignment extends Component {
         breadcrumbs={[
           {
             resource: shadowAssignment,
-            iconName: 'users',
+            iconName: 'tasks',
             breadcrumb: shadowAssignment => ({
-              text: <FormattedMessage id="app.group.title" defaultMessage="Group detail" />,
+              text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,
               link: ({ GROUP_DETAIL_URI_FACTORY }) => GROUP_DETAIL_URI_FACTORY(shadowAssignment.groupId),
             }),
           },
diff --git a/src/pages/Solution/Solution.js b/src/pages/Solution/Solution.js
@@ -76,9 +76,9 @@ class Solution extends Component {
         breadcrumbs={[
           {
             resource: assignment,
-            iconName: 'users',
+            iconName: 'tasks',
             breadcrumb: assignment => ({
-              text: <FormattedMessage id="app.group.title" defaultMessage="Group detail" />,
+              text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,
               link: ({ GROUP_DETAIL_URI_FACTORY }) => GROUP_DETAIL_URI_FACTORY(assignment.groupId),
             }),
           },

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class EditGroup extends Component {`
`93`	`93`	`link: GROUP_INFO_URI_FACTORY(groupId),`
`94`	`94`	`},`
`95`	`95`	`{`
`96`		`- text: <FormattedMessage id="app.group.title" />,`
	`96`	`+ text: <FormattedMessage id="app.group.assignmentsLong" defaultMessage="Group Assignments" />,`
`97`	`97`	`iconName: 'tasks',`
`98`	`98`	`link: GROUP_DETAIL_URI_FACTORY(groupId),`
`99`	`99`	`},`