BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

participants list and options menu

Browse Source
This commit is contained in:
perroned 2015-02-10 07:17:26 -08:00
parent 56c13bd4c5
commit 570e62143f
8 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
labs/meteor-client/app/client/stylesheets/common/chat.less
View File

@ -17,6 +17,9 @@
overflow: hidden;
-webkit-flex: 1 6 25%;
flex: 1 6 25%;
padding-left: 0px;
padding-right: 0px;
width: 100%;
}
.chat {
@ -36,13 +39,6 @@
}
}
#chatbar-contents {
background-color: extract(@white, 1);
padding-left: 0px;
padding-right: 0px;
width: 100%;
}
#chatbody {
height: 90%;
overflow-y: scroll;
@ -131,7 +127,8 @@
}
.optionsBar {
height: 100%;
height: 85%;
overflow-y: auto;
padding-left: 15px;
padding-top: 15px;
}
@ -144,14 +141,17 @@
}
.private-chat-user-box {
border: left 1px grey;
height: 60%;
border-left: 1px solid grey;
height: 300px;
padding: 5px;
width: 90%;
width: 90%;
}
.private-chat-user-list {
font-size: 12px;
height: 100%;
overflow-y: scroll;
overflow-x: scroll;
:hover {
background: extract(@azure, 2);
font-size: 14px;

5
labs/meteor-client/app/client/stylesheets/common/style.less
View File

@ -165,11 +165,6 @@ body {
color: green;
}
.ScrollableWindow {
height: 100%;
overflow-y: scroll;
}
.tab {
height: 40px;
}

3
labs/meteor-client/app/client/stylesheets/common/users.less
View File

@ -5,7 +5,6 @@
}
#usericons {
margin-left: 10px;
float: right;
span {
margin-left: 3px;
@ -27,7 +26,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 70%;
width: 60%;
}
#users {

1
labs/meteor-client/app/client/stylesheets/landscape/users.less
View File

@ -6,6 +6,7 @@
#users {
-webkit-order: 1;
order: 1;
min-width: 320px;
}
#user-contents {

5
labs/meteor-client/app/client/stylesheets/portrait/chat.less
View File

@ -34,6 +34,11 @@
font-size: 25px;
}
}
.userlist {
font-size: 30px;
padding-left: 10px;
}
}
.closeTab {

65
labs/meteor-client/app/client/views/chat/chat_bar.html
View File

@ -1,30 +1,28 @@
<template name="chatbar">
<div id="{{id}}" {{visibility name}} class="component">
<div id="chatbar-contents">
<h3 class="title gradientBar">
<span class="glyphicon glyphicon-comment"></span>
{{title}}
{{> extraConversations}}
</h3>
{{>tabButtons}} <!-- Display public/options tabs, and private chat tabs -->
{{#if getInSession "display_chatPane"}}
<div id="chatbody">
<ul class="chat" {{messageFontSize}}>
{{#each getCombinedMessagesForChat}}
{{#if message}}
<li>{{> message}}</li>
{{/if}}
{{/each}}
{{#unless userExists}}<li>The user has left</li>{{/unless}}
</ul>
</div>
{{#if userExists}}
<div class="panel-footer">{{> chatInput}}</div>
{{/if}}
{{else}}
{{> optionsBar}}
<h3 class="title gradientBar">
<span class="glyphicon glyphicon-comment"></span>
{{title}}
{{> extraConversations}}
</h3>
{{>tabButtons}} <!-- Display public/options tabs, and private chat tabs -->
{{#if getInSession "display_chatPane"}}
<div id="chatbody">
<ul class="chat" {{messageFontSize}}>
{{#each getCombinedMessagesForChat}}
{{#if message}}
<li>{{> message}}</li>
{{/if}}
{{/each}}
{{#unless userExists}}<li>The user has left</li>{{/unless}}
</ul>
</div>
{{#if userExists}}
<div class="panel-footer">{{> chatInput}}</div>
{{/if}}
</div>
{{else}}
{{> optionsBar}}
{{/if}}
</div>
</template>
@ -81,21 +79,22 @@
{{#if thereArePeopletoChatWith}} <!-- There are people we can chat with, display the user list -->
<p>Select a person to chat with privately</p>
<div class="private-chat-user-box" rel="tooltip" data-placement="top" title="Select a participant to open a private chat">
{{#Layout template="scrollWindow" id="privateChatUserScrollWindow"}}
{{#contentFor region="scrollContents"}}
<div class="private-chat-user-list">
{{#each getUsersInMeeting}}
<div class="private-chat-user-entry">{{#unless isCurrentUser userId}}{{user.name}}{{/unless}}</div>
{{/each}}
<div class="private-chat-user-list">
{{#each getUsersInMeeting}}
<div class="private-chat-user-entry">
{{#unless isCurrentUser userId}}
{{user.name}}
{{/unless}}
</div>
{{/contentFor}}
{{/Layout}}
</div>
{{/each}}
</div>
</div>
{{else}}
<p>There are no participants to chat with right now.</p>
{{/if}}
<br/>
{{> chatOptions}}
<br/><br/><br/>
</div>
</template>

7
labs/meteor-client/app/client/views/sharedTemplates.html
View File

@ -1,10 +1,3 @@
<template name="scrollWindow">
{{> yield}}
<div class="ScrollableWindow" id="{{id}}">
{{> yield region="scrollContents"}}
</div>
</template>
<template name="makeButton">
<button type="submit" id="{{id}}" class="{{btn_class}} btn" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}">
<i class="{{i_class}}"></i>

16
labs/meteor-client/app/client/views/users/users_list.html
View File

@ -3,17 +3,13 @@
<h3 class="title gradientBar"><span class="glyphicon glyphicon-user"></span> Participants: {{getMeetingSize}} User(s)</h3>
<div id="user-contents">
{{#Layout template="scrollWindow" id="publicUserScrollWindow"}}
{{#contentFor region="scrollContents"}}
<div class="userlist">
{{#each getUsersInMeeting}}
<div id="content">
{{>userItem}}
</div>
{{/each}}
<div class="userlist ScrollableWindowY">
{{#each getUsersInMeeting}}
<div id="content">
{{>userItem}}
</div>
{{/contentFor}}
{{/Layout}}
{{/each}}
</div>
</div>
</div>
</template>