瀏覽代碼

fix(toolbar): Button popups

j8
hristoterezov 8 年之前
父節點
當前提交
2b84a149fe
共有 4 個檔案被更改,包括 43 行新增4 行删除
  1. 16
    2
      css/_login_menu.scss
  2. 二進制
      images/leftDropdownPointer.png
  3. 2
    2
      index.html
  4. 25
    0
      modules/UI/toolbars/Toolbar.js

+ 16
- 2
css/_login_menu.scss 查看文件

1
 /*Initialize*/
1
 /*Initialize*/
2
 ul.loginmenu {
2
 ul.loginmenu {
3
-    font-family: inherit;
3
+    font-family: $baseFontFamily;
4
+    line-height: normal;
4
     display:none;
5
     display:none;
5
     position: absolute;
6
     position: absolute;
6
     margin: 0;
7
     margin: 0;
55
     position: absolute;
56
     position: absolute;
56
     top: -30px;
57
     top: -30px;
57
     left: 0px;
58
     left: 0px;
58
-}
59
+}
60
+
61
+.loginmenu.extendedToolbarPopup {
62
+    left: 55px;
63
+    top: 0px;
64
+}
65
+
66
+ul.loginmenu.extendedToolbarPopup:after {
67
+    content: url('../images/leftDropdownPointer.png');
68
+    display: block;
69
+    position: absolute;
70
+    top: 18px;
71
+    left: -7px;
72
+}

二進制
images/leftDropdownPointer.png 查看文件


+ 2
- 2
index.html 查看文件

109
             </a>
109
             </a>
110
             <span id="authentication" class="authentication" style="display: none">
110
             <span id="authentication" class="authentication" style="display: none">
111
                 <a class="button icon-avatar" id="toolbar_button_authentication" data-i18n="[content]toolbar.authenticate"></a>
111
                 <a class="button icon-avatar" id="toolbar_button_authentication" data-i18n="[content]toolbar.authenticate"></a>
112
-                <ul class="loginmenu">
112
+                <ul class="loginmenu extendedToolbarPopup">
113
                     <span class="loginmenuPadding"></span>
113
                     <span class="loginmenuPadding"></span>
114
                     <li id="toolbar_auth_identity"></li>
114
                     <li id="toolbar_auth_identity"></li>
115
                     <li id="toolbar_button_login">
115
                     <li id="toolbar_button_login">
131
             <a class="button icon-security" id="toolbar_button_security" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]toolbar.lock" content="Lock / unlock room"></a>
131
             <a class="button icon-security" id="toolbar_button_security" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]toolbar.lock" content="Lock / unlock room"></a>
132
             <a class="button icon-share-doc" id="toolbar_button_etherpad" data-container="body" data-toggle="popover" data-placement="right" content="Shared document" data-i18n="[content]toolbar.etherpad"></a>
132
             <a class="button icon-share-doc" id="toolbar_button_etherpad" data-container="body" data-toggle="popover" data-placement="right" content="Shared document" data-i18n="[content]toolbar.etherpad"></a>
133
             <a class="button icon-shared-video" id="toolbar_button_sharedvideo" data-container="body" data-toggle="popover" data-placement="right" content="Share a YouTube video" data-i18n="[content]toolbar.sharedvideo" style="display: none">
133
             <a class="button icon-shared-video" id="toolbar_button_sharedvideo" data-container="body" data-toggle="popover" data-placement="right" content="Share a YouTube video" data-i18n="[content]toolbar.sharedvideo" style="display: none">
134
-                <ul id="sharedVideoMutedPopup" class="loginmenu">
134
+                <ul id="sharedVideoMutedPopup" class="loginmenu extendedToolbarPopup">
135
                     <li data-i18n="[html]toolbar.sharedVideoMutedPopup"></li>
135
                     <li data-i18n="[html]toolbar.sharedVideoMutedPopup"></li>
136
                 </ul>
136
                 </ul>
137
             </a>
137
             </a>

+ 25
- 0
modules/UI/toolbars/Toolbar.js 查看文件

184
             APP.conference.toggleAudioMuted();
184
             APP.conference.toggleAudioMuted();
185
         },
185
         },
186
         shortcutDescription: "keyboardShortcuts.mute",
186
         shortcutDescription: "keyboardShortcuts.mute",
187
+        popups: [
188
+            {
189
+                id: "micMutedPopup",
190
+                className: "loginmenu",
191
+                dataAttr: "[html]toolbar.micMutedPopup"
192
+            },
193
+            {
194
+                id: "unableToUnmutePopup",
195
+                className: "loginmenu",
196
+                dataAttr: "[html]toolbar.unableToUnmutePopup"
197
+            }
198
+        ],
187
         content: "Mute / Unmute",
199
         content: "Mute / Unmute",
188
         i18n: "[content]toolbar.mute"
200
         i18n: "[content]toolbar.mute"
189
     },
201
     },
704
         buttonElement.setAttribute("data-container", "body");
716
         buttonElement.setAttribute("data-container", "body");
705
         buttonElement.setAttribute("data-toggle", "popover");
717
         buttonElement.setAttribute("data-toggle", "popover");
706
         buttonElement.setAttribute("data-placement", "bottom");
718
         buttonElement.setAttribute("data-placement", "bottom");
719
+        this._addPopups(buttonElement, button.popups);
707
 
720
 
708
         document.getElementById("mainToolbar")
721
         document.getElementById("mainToolbar")
709
             .appendChild(buttonElement);
722
             .appendChild(buttonElement);
723
+    },
724
+
725
+    _addPopups(buttonElement, popups = []) {
726
+        popups.forEach((popup) => {
727
+            let popupElement = document.createElement("ul");
728
+            popupElement.id = popup.id;
729
+            popupElement.className = popup.className;
730
+            let liElement = document.createElement("li");
731
+            liElement.setAttribute("data-i18n", popup.dataAttr);
732
+            popupElement.appendChild(liElement);
733
+            buttonElement.appendChild(popupElement);
734
+        });
710
     }
735
     }
711
 };
736
 };
712
 
737
 

Loading…
取消
儲存