diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css
index 660bf615bff90c89b372a2ac0e76e37d3f80304c..35d9ac2b6858db0fb8672eeec474f87ce27be806 100644
--- a/bigbluebutton-client/branding/default/style/css/V2Theme.css
+++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css
@@ -284,15 +284,14 @@ mx|ApplicationControlBar {
}
.quickWindowLinkStyle {
- /* FIXME */
paddingLeft : 0;
paddingRight : 0;
textDecoration : underline;
- rollOverColor : #CCCCCC;
- selectionColor : #999999;
- color : #FFFFFF;
- textRollOverColor : #504F3D;
- textSelectedColor : #504F3D;
+ rollOverColor : #1070D7;
+ selectionColor : #0A5EAC;
+ color : #4E5A66;
+ textRollOverColor : #FFFFFF;
+ textSelectedColor : #FFFFFF;
}
.helpLinkButtonStyle {
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 87a288a0cf5da88ed071f2e9ccd9f71f6cfb162b..cc422e1c644fd9a8ab72e91b65cf01d436f4da47 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -518,6 +518,7 @@ bbb.notes.cmpColorPicker.toolTip = Text Color
bbb.notes.saveBtn = Save
bbb.notes.saveBtn.toolTip = Save Note
bbb.sharedNotes.title = Shared notes
+bbb.sharedNotes.quickLink.label = Shared notes Window
bbb.sharedNotes.name = Note name
bbb.sharedNotes.save.toolTip = Save notes to file
bbb.sharedNotes.save.complete = Notes were successfully saved
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
index e1861fcb516ff5c8966468338ccb05ee3497fbf7..c795de2182bea54f65656b5b1a332d7a34a27f63 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
@@ -49,6 +49,8 @@ package org.bigbluebutton.main.events {
public static const FOCUS_CAPTION_WINDOW:String = 'FOCUS_CAPTION_WINDOW';
+ public static const FOCUS_SHARED_NOTES_WINDOW:String = 'FOCUS_SHARED_NOTES_WINDOW';
+
public static const REMOTE_FOCUS_DESKTOP:String = 'REMOTE_FOCUS_DESKTOP';
public static const REMOTE_FOCUS_WEBCAM:String = 'REMOTE_FOCUS_WEBCAM';
// Remote focus microphone not necessary; audio options already hog focus
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index 7bccd322c6303423ec9be381a2625d4a0025cd8c..a64648d69b9147ac0ff5c34d29812713a675e444 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -63,7 +63,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import mx.events.ToolTipEvent;
import mx.managers.PopUpManager;
- import org.as3commons.lang.ArrayUtils;
import org.as3commons.lang.StringUtils;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
@@ -166,6 +165,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
case "caption":
dispatcher.dispatchEvent(new ShortcutEvent(ShortcutEvent.FOCUS_CAPTION_WINDOW));
break;
+ case "sharedNotes":
+ dispatcher.dispatchEvent(new ShortcutEvent(ShortcutEvent.FOCUS_SHARED_NOTES_WINDOW));
+ break;
}
}
@@ -523,7 +525,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
height="30" styleName="quickWindowLinkStyle" />
<mx:LinkButton id="captionLinkBtn" click="onQuickLinkClicked('caption')" label="{ResourceUtil.getInstance().getString('bbb.caption.quickLink.label')}"
accessibilityDescription="{captionLinkBtn.label}" toolTip="{captionLinkBtn.label}"
- height="20" styleName="quickWindowLinkStyle" />
+ height="30" styleName="quickWindowLinkStyle" />
+ <mx:LinkButton id="sharedNotesLinkBtn" click="onQuickLinkClicked('sharedNotes')" label="{ResourceUtil.getInstance().getString('bbb.sharedNotes.quickLink.label')}"
+ accessibilityDescription="{sharedNotesLinkBtn.label}" toolTip="{sharedNotesLinkBtn.label}"
+ height="30" styleName="quickWindowLinkStyle" />
</mx:HBox>
<mx:VRule styleName="toolbarSeparator" height="10" />
<mx:Label id="meetingNameLbl" minWidth="1" styleName="meetingNameLabelStyle" />
@@ -553,7 +558,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Button id="shortcutKeysBtn" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" styleName="shortcutButtonStyle"
click="onShortcutButtonClick()" height="30"
toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}"/>
- <mx:LinkButton id="helpBtn" visible="{showHelpBtn}" includeInLayout="{showHelpBtn}" label="?" click="onHelpButtonClicked()" height="30"
+ <mx:LinkButton id="helpBtn" visible="{showHelpBtn}" includeInLayout="{showHelpBtn}" click="onHelpButtonClicked()" height="30"
styleName="helpLinkButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.access.helpButton')}"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
index 1884cb9e8a997dad08a6f6185163c14e883cfbb4..45c641e4a51d55905893cfdc1c88a60c8b6fe123 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
@@ -32,6 +32,7 @@
<mate:Listener type="{ReceivePatchEvent.RECEIVE_PATCH_EVENT}" method="receivePatch"/>
<mate:Listener type="{CurrentDocumentEvent}" method="gotCurrentDocument"/>
<mate:Listener type="{SharedNotesEvent.SYNC_NOTE_REPLY_EVENT}" method="handleSyncNote"/>
+ <mate:Listener type="{ShortcutEvent.FOCUS_SHARED_NOTES_WINDOW}" method="focusWindow" />
</fx:Declarations>
<fx:Script>
@@ -57,6 +58,7 @@
import org.bigbluebutton.common.Role;
import org.bigbluebutton.core.Options;
import org.bigbluebutton.core.UsersUtil;
+ import org.bigbluebutton.main.events.ShortcutEvent;
import org.bigbluebutton.main.views.MainCanvas;
import org.bigbluebutton.main.views.WellPositionedMenu;
import org.bigbluebutton.modules.sharednotes.SharedNotesOptions;
@@ -433,6 +435,12 @@
public function handleResizableStatus(value:Boolean):void {
this.resizable = value;
}
+
+ private function focusWindow(e:ShortcutEvent):void {
+ if (this.visible) {
+ focusManager.setFocus(titleBarOverlay);
+ }
+ }
]]>
</fx:Script>