Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Configuration Options to Enable "Pin Remote Screen Share" and "Invite More Participants" Assistant #351

Merged
merged 3 commits into from Jun 1, 2021
Merged

Add Configuration Options to Enable "Pin Remote Screen Share" and "Invite More Participants" Assistant #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9da163
Update InterfaceConfigServlet.java
gjaekel May 30, 2021
1f18f39
Update ofmeet-uisettings.jsp
gjaekel May 30, 2021
9a3bd81
Update pade_i18n.properties
gjaekel May 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/i18n/pade_i18n.properties
View file
Open in desktop
Expand Up @@ -340,6 +340,8 @@ ofmeet.enable.captions=Enable Instant Messages as sub-titles/captions on screen
ofmeet.start.captions=Start with sub-titles/captions enabled
ofmeet.chat.captions.timeout=Message Captions Timeout (in milliseconds)
ofmeet.random.roomnames.enabled=Generate Random Room Names
ofmeet.pinScreenShare=Auto-Pin others Screen Share
ofmeet.enable.inviteMore=Enable "Invite More Participants" Assistant

ofmeet.welcomepage.content=Show Page Content
ofmeet.welcome.content=Page Content
Expand Down
2 changes: 2 additions & 0 deletions src/java/org/jivesoftware/openfire/plugin/ofmeet/InterfaceConfigServlet.java
View file
Open in desktop
Expand Up @@ -88,6 +88,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) th
config.put( "DISABLE_FOCUS_INDICATOR", JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.disable.focus.indicator", false ) );
config.put( "DISABLE_VIDEO_BACKGROUND", JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.disable.video_background", false ) );
config.put( "ACTIVE_SPEAKER_AVATAR_SIZE", JiveGlobals.getIntProperty( "org.jitsi.videobridge.ofmeet.active.speaker.avatarsize", 100 ) );
config.put( "AUTO_PIN_LATEST_SCREEN_SHARE", JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.pin_screen_share", true ) ? "remote-only" : "false" );

config.put( "OFMEET_MOUSECURSOR_TIMEOUT", JiveGlobals.getIntProperty( "org.jitsi.videobridge.ofmeet.mousecursor.timeout", 10000 ) );
config.put( "OFMEET_ENABLE_MOUSE_SHARING", JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.enable.mouse.sharing", true ) );
Expand Down Expand Up @@ -122,6 +123,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) th
config.put( "filmStripOnly", ofMeetConfig.getFilmstripOnly() );
config.put( "VERTICAL_FILMSTRIP", ofMeetConfig.getVerticalFilmstrip() );
config.put( "FILM_STRIP_MAX_HEIGHT", ofMeetConfig.getFilmstripMaxHeight() );
config.put( "HIDE_INVITE_MORE_HEADER", !JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.enable.inviteMore", true ) );
config.put( "INVITE_OPTIONS", new JSONArray( ofMeetConfig.getInviteOptions() ) );
config.put( "ENFORCE_NOTIFICATION_AUTO_DISMISS_TIMEOUT", "15000" );

Expand Down
16 changes: 16 additions & 0 deletions src/web/ofmeet-uisettings.jsp
View file
Open in desktop
Expand Up @@ -177,6 +177,8 @@
final boolean enableLanguageDetection = ParamUtils.getBooleanParameter( request, "enableLanguageDetection" );

final boolean randomRoomNames = ParamUtils.getBooleanParameter( request, "randomRoomNames" );
final boolean pinScreenShare = ParamUtils.getBooleanParameter( request, "pinScreenShare" );
final boolean enableInviteMore = ParamUtils.getBooleanParameter( request, "enableInviteMore" );

final boolean enableEmoticonConfetti = ParamUtils.getBooleanParameter( request, "enableEmoticonConfetti" );
final boolean closeEmoticonConfettiMenu = ParamUtils.getBooleanParameter( request, "closeEmoticonConfettiMenu" );
Expand Down Expand Up @@ -253,6 +255,8 @@
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.allow.uploads", Boolean.toString( allowUploads ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.enable.breakout", Boolean.toString( enableBreakout ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.random.roomnames", Boolean.toString( randomRoomNames ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.pin_screen_share", Boolean.toString( pinScreenShare ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.enable.inviteMore", Boolean.toString( enableInviteMore ) );

JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.welcomepage.content", Boolean.toString( welcomepageContent ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.welcomepage.toolbarcontent", Boolean.toString( welcomepageToolbarContent ) );
Expand Down Expand Up @@ -454,6 +458,18 @@
<fmt:message key="config.page.configuration.ofmeet.audioLevels.circles"/>
</td>
</tr>
<tr>
<td nowrap colspan="2">
<input type="checkbox" name="pinScreenShare" ${admin:getBooleanProperty( "org.jitsi.videobridge.ofmeet.pin_screen_share", true) ? "checked" : ""}>
<fmt:message key="ofmeet.pinScreenShare" />
</td>
</tr>
<tr>
<td nowrap colspan="2">
<input type="checkbox" name="enableInviteMore" ${admin:getBooleanProperty( "org.jitsi.videobridge.ofmeet.enable.inviteMore", true) ? "checked" : ""}>
<fmt:message key="ofmeet.enable.inviteMore" />
</td>
</tr>
</table>
</admin:contentBox>

Expand Down