From 13913a61118dea5aa802d6c5dc605110431178e2 Mon Sep 17 00:00:00 2001 From: Joao Siebel Date: Tue, 10 Aug 2021 09:50:13 -0300 Subject: [PATCH] Remove LEGACY option for valid layouts. close #12858 --- .../main/scala/org/bigbluebutton/core/models/Layouts.scala | 1 - .../ui/components/settings/submenus/application/component.jsx | 4 ---- bigbluebutton-html5/public/locales/en.json | 1 - bigbluebutton-web/grails-app/conf/bigbluebutton.properties | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Layouts.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Layouts.scala index bc5504ce4e..7bc68ae398 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Layouts.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Layouts.scala @@ -34,7 +34,6 @@ class Layouts { object LayoutsType { val layoutsType = Map( - "legacy" -> "LEGACY", "custom" -> "CUSTOM_LAYOUT", "smart" -> "SMART_LAYOUT", "presentationFocus" -> "PRESENTATION_FOCUS", diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx index c158a08829..460b450ec5 100644 --- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx @@ -76,10 +76,6 @@ const intlMessages = defineMessages({ id: 'app.submenu.application.pushLayoutOptionLabel', description: 'enable/disable push layout to all users', }, - legacyLayout: { - id: 'app.layout.style.legacy', - description: 'label for legacy layout style', - }, customLayout: { id: 'app.layout.style.custom', description: 'label for custom layout style', diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json index 51461605b6..f37fdf35fa 100755 --- a/bigbluebutton-html5/public/locales/en.json +++ b/bigbluebutton-html5/public/locales/en.json @@ -845,7 +845,6 @@ "app.debugWindow.form.enableAutoarrangeLayoutDescription": "(it will be disabled if you drag or resize the webcams area)", "app.debugWindow.form.chatLoggerLabel": "Test Chat Logger Levels", "app.debugWindow.form.button.apply": "Apply", - "app.layout.style.legacy": "Legacy", "app.layout.style.custom": "Custom", "app.layout.style.smart": "Smart layout", "app.layout.style.presentationFocus": "Focus on presentation", diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index 3ad6017ea4..5747414203 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -180,7 +180,7 @@ authenticatedGuest=true #--------------------------------------------------- # Default Meeting Layout -# Valid values are LEGACY, CUSTOM_LAYOUT, SMART_LAYOUT, PRESENTATION_FOCUS, VIDEO_FOCUS +# Valid values are CUSTOM_LAYOUT, SMART_LAYOUT, PRESENTATION_FOCUS, VIDEO_FOCUS defaultMeetingLayout=SMART_LAYOUT #