Merge branch 'main' into N21-939-assign-groups-to-course

hpi-schul-cloud · Oct 13, 2023 · a95d9e6 · a95d9e6
2 parents 560478c + 0866f9b
commit a95d9e6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/locales/de.json b/locales/de.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Gruppen",
 				"tasks": "Aufgaben",
-				"tools": "Tools (neu)",
-				"oldTools": "Tools",
+				"tools": "Tools",
 				"oldTopics": "Themen",
 				"topics": "Lerninhalte"
 			},

diff --git a/locales/en.json b/locales/en.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Groups",
 				"tasks": "Tasks",
-				"tools": "Tools (new)",
-				"oldTools": "Tools",
+				"tools": "Tools",
 				"oldTopics": "Topics",
 				"topics": "Learning content"
 			},

diff --git a/locales/es.json b/locales/es.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Grupos",
 				"tasks": "Tareas",
-				"tools": "Herramientas (nuevo)",
-				"oldTools": "Herramientas",
+				"tools": "Herramientas",
 				"oldTopics": "Temas",
 				"topics": "Contenidos de aprendizaje"
 			},

diff --git a/locales/uk.json b/locales/uk.json
@@ -315,8 +315,7 @@
 			"tab_label": {
 				"groups": "Групи",
 				"tasks": "Завдання",
-				"tools": "Інструменти (новий)",
-				"oldTools": "Інструменти",
+				"tools": "Інструменти",
 				"oldTopics": "Теми",
 				"topics": "Зміст навчання"
 			},

diff --git a/views/courses/course.hbs b/views/courses/course.hbs
@@ -75,7 +75,7 @@
       {{#if (getConfig "FEATURE_LTI_TOOLS_TAB_ENABLED")}}
         <button class="tab" data-testid="tools" data-tab="js-tools" type="button">
           <i class="mdi mdi-puzzle-outline" aria-hidden="true"></i>
-          <span class="text">{{$t "courses._course.tab_label.oldTools"}}</span>
+          <span class="text">{{$t "courses._course.tab_label.tools"}}</span>
         </button>
       {{/if}}
       <button class="tab" data-testid="groups" data-tab="js-groups" type="button">

diff --git a/views/courses/edit-course.hbs b/views/courses/edit-course.hbs
@@ -123,8 +123,8 @@
                 {{#ifConfig "FEATURE_CTL_TOOLS_TAB_ENABLED" true}}
 				{{#ifConfig "FEATURE_VIDEOCONFERENCE_ENABLED" true}}
                     <div class="form-group">
-                        <input id="activateConf" type="checkbox" name="videoconference" value="true" data-testid="videoconf_checkbox" {{#inArray "videoconference" @root.course.features}}checked{{/inArray}} {{#inArray "videoconference" @root.schoolData.features}} {{else}} disabled {{/inArray}}>
-                        <label for="activateConf">{{$t "courses._course.edit.label.activateVideoConferences"}}</label>
+                    <input id="activateConf" type="checkbox" name="videoconference" value="true" data-testid="videoconf_checkbox" {{#if @root.course.isArchived}}disabled{{/if}} {{#inArray "videoconference" @root.course.features}}checked{{/inArray}} {{#inArray "videoconference" @root.schoolData.features}} {{else}} disabled {{/inArray}}>
+                    <label for="activateConf">{{$t "courses._course.edit.label.activateVideoConferences"}}</label>
                         {{#inArray "videoconference" @root.schoolData.features}}
                         {{else}}
                             <small class="form-text text-muted">