diff --git a/bigbluebutton-html5/app/client/globals.coffee b/bigbluebutton-html5/app/client/globals.coffee
index 766906ff0b0db52fc1a0b9d7d4105a19ecacda4b..02efed291015059037ab00e08638a816798b9d50 100755
--- a/bigbluebutton-html5/app/client/globals.coffee
+++ b/bigbluebutton-html5/app/client/globals.coffee
@@ -104,7 +104,7 @@ Handlebars.registerHelper "getUsersInMeeting", ->
raised.concat lowered
Handlebars.registerHelper "getWhiteboardTitle", ->
- "Presentation: " + (getPresentationFilename() or "Loading...")
+ (getPresentationFilename() or "Loading presentaion...")
Handlebars.registerHelper "isCurrentUser", (userId) ->
userId is null or userId is BBB.getCurrentUser()?.userId
diff --git a/bigbluebutton-html5/app/client/main.html b/bigbluebutton-html5/app/client/main.html
index aa5828201191b56ad85513d7f558cb5f01e0b71c..ad2a2381ba406068446601955e6a8d6642eca8e0 100755
--- a/bigbluebutton-html5/app/client/main.html
+++ b/bigbluebutton-html5/app/client/main.html
@@ -36,9 +36,9 @@
<!-- display/hide whiteboard toggle -->
{{#if getInSession "display_whiteboard"}}
- {{> makeButton btn_class="navbarIconToggleActive whiteboardIcon navbarButton collapseSectionButton" i_class="glyphicon glyphicon-pencil" rel="tooltip" data_placement="bottom" title="Hide Whiteboard"}}
+ {{> makeButton btn_class="navbarIconToggleActive whiteboardIcon navbarButton collapseSectionButton" i_class="ion-easel" rel="tooltip" data_placement="bottom" title="Hide Whiteboard"}}
{{else}}
- {{> makeButton btn_class="whiteboardIcon navbarButton collapseSectionButton" i_class="glyphicon glyphicon-pencil" rel="tooltip" data_placement="bottom" title="Show Whiteboard"}}
+ {{> makeButton btn_class="whiteboardIcon navbarButton collapseSectionButton" i_class="ion-easel" rel="tooltip" data_placement="bottom" title="Show Whiteboard"}}
{{/if}}
<!-- display/hide chat bar toggle -->
@@ -116,7 +116,7 @@
{{else}}
<div>{{> header}}</div>
{{> whiteboard id="whiteboard" title=getWhiteboardTitle name="whiteboard"}}
- {{> chatbar id="chat" title="Chat" name="chatbar"}}
+ {{> chatbar id="chat" name="chatbar"}}
{{> usersList id="users" name="usersList"}}
<audio id="remote-media" autoplay="autoplay"></audio>
{{> footer}}
@@ -146,9 +146,9 @@
<div class="sliding-menu" id="sliding-menu">
<div class="slideSection">
{{#if getInSession "display_whiteboard"}}
- {{> makeButton btn_class="navbarIconToggleActive whiteboardIcon slideButton" i_class="glyphicon glyphicon-pencil" rel="tooltip" data_placement="right" title="Hide Whiteboard"}}
+ {{> makeButton btn_class="navbarIconToggleActive whiteboardIcon slideButton" i_class="ion-easel" rel="tooltip" data_placement="right" title="Hide Whiteboard"}}
{{else}}
- {{> makeButton btn_class="whiteboardIcon slideButton" i_class="glyphicon glyphicon-pencil" rel="tooltip" data_placement="right" title="Show Whiteboard"}}
+ {{> makeButton btn_class="whiteboardIcon slideButton" i_class="ion-easel" rel="tooltip" data_placement="right" title="Show Whiteboard"}}
{{/if}}
{{#if getInSession "display_chatbar"}}
diff --git a/bigbluebutton-html5/app/client/stylesheets/chat.less b/bigbluebutton-html5/app/client/stylesheets/chat.less
index 1ee07825ecd5ca74076ed64d77072ac86eed4315..c74b65460f565a4332322297f6414df8bf0e7e9a 100755
--- a/bigbluebutton-html5/app/client/stylesheets/chat.less
+++ b/bigbluebutton-html5/app/client/stylesheets/chat.less
@@ -1,9 +1,9 @@
@import "variables";
.active {
- border: .2vh solid extract(@azure, 2) !important;
+ border: .2vh solid !important;
@media @mobile-portrait-with-keyboard, @mobile-portrait {
- border-left: .1vh solid extract(@azure, 2) !important;
+ border-left: .1vh solid !important;
}
}
@@ -76,6 +76,18 @@
.chatNameSelectorPrivate {
.chatNameSelector;
width:90%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ @media @landscape {
+ height: 20px;
+ }
+ @media @desktop-portrait {
+ height: 25px;
+ }
+ @media @mobile-portrait, @mobile-portrait-with-keyboard {
+ font-size: 4vw;
+ }
}
.chatNameSelectorPublic {
@@ -285,7 +297,7 @@
&:hover {
background-color: #ddd;
- border: 1px solid extract(@azure, 2);
+ border: 1px solid;
border-bottom: none;
}
}
diff --git a/bigbluebutton-html5/app/client/stylesheets/style.less b/bigbluebutton-html5/app/client/stylesheets/style.less
index 9a86b20aa9b5cf01b6e16796d98ac8dca2997667..e734fa7d5b76905353e61b8906b7f59131b063e1 100755
--- a/bigbluebutton-html5/app/client/stylesheets/style.less
+++ b/bigbluebutton-html5/app/client/stylesheets/style.less
@@ -41,6 +41,10 @@ body {
overflow-x: hidden;
}
+.heading {
+ margin-left:5px
+}
+
.mainContainer {
height: 95%;
}
@@ -50,6 +54,7 @@ body {
color: black;
padding-top: 13px;
text-align: center;
+ background-color: #EEEEEE;
@media @landscape {
position:fixed;
bottom:0;
@@ -83,8 +88,6 @@ body {
}
.btn {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
- border-left: 1px solid extract(@darkGrey, 2);
- border-right: 1px solid extract(@darkGrey, 4);
&.navbarIconToggleActive {
background: extract(@darkGrey, 3);
border-bottom: 4px solid extract(@azure, 1);
@@ -214,7 +217,7 @@ body {
display: block;
float: left;
&:hover {
- background: extract(@darkGrey, 3);
+ background: extract(@darkGrey, 4);
}
}
@media @landscape {
@@ -223,7 +226,7 @@ body {
}
.navbarSettingsButtons .btn:hover {
- background: extract(@darkGrey, 3);
+ background: extract(@darkGrey, 4);
}
.panel-footer {
@@ -446,7 +449,7 @@ body {
}
}
-.glyphicon, .ion-android-hand {
+.glyphicon, .ion-android-hand, .ion-easel {
@media @mobile-portrait-with-keyboard, @mobile-portrait {
font-size: 35px;
}
@@ -534,8 +537,6 @@ body {
}
.btn {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
- border-left: 1px solid extract(@darkGrey, 2);
- border-right: 1px solid extract(@darkGrey, 4);
&.navbarIconToggleActive {
background: extract(@darkGrey, 3);
border-bottom: 4px solid extract(@azure, 1);
diff --git a/bigbluebutton-html5/app/client/stylesheets/users.less b/bigbluebutton-html5/app/client/stylesheets/users.less
index 874b7f5634efc20f4084ea1dd81c326453015c7f..9095fb7eefad5532190063d31c0cf9459288b80d 100755
--- a/bigbluebutton-html5/app/client/stylesheets/users.less
+++ b/bigbluebutton-html5/app/client/stylesheets/users.less
@@ -2,6 +2,9 @@
#content {
margin-top: 10px;
+ &:first-child {
+ margin-top: 0px;
+ }
overflow: hidden;
width: 100%;
@media @mobile-portrait, @mobile-portrait-with-keyboard {
diff --git a/bigbluebutton-html5/app/client/views/chat/chat_bar.html b/bigbluebutton-html5/app/client/views/chat/chat_bar.html
index c99e4d04272a7bd0ff4227c5a59fa1245dba2bc5..bc09fca5564e03ec7de5c7e71ae4e69a4dd99330 100755
--- a/bigbluebutton-html5/app/client/views/chat/chat_bar.html
+++ b/bigbluebutton-html5/app/client/views/chat/chat_bar.html
@@ -1,7 +1,7 @@
<template name="chatbar">
<div id="{{id}}" {{visibility name}} class="component">
<h3 class="title gradientBar">
- <span class="glyphicon glyphicon-comment"></span>
+ <span class="glyphicon glyphicon-comment heading"></span>
{{title}}
{{> extraConversations}}
</h3>
@@ -29,7 +29,7 @@
<template name="chatInput">
<div id="chatInput" class="chat-input-wrapper">
<textarea id="newMessageInput" placeholder="Write a message..." rel="tooltip" data-placement="top" title="Write a new message"></textarea>
- <button type="submit" id="sendMessageButton" class="btn" rel="tooltip" data-placement="top" title="Click to send your message">
+ <button type="submit" id="sendMessageButton" class="btn" rel="tooltip" data-placement="top">
Send
</button>
</div>
diff --git a/bigbluebutton-html5/app/client/views/users/user_list.coffee b/bigbluebutton-html5/app/client/views/users/user_list.coffee
index 96d0fbcb2c217db88bb21c2d005db624d661d49a..c6484a6b63abe76010164e3a43bcaa86b6111c1a 100755
--- a/bigbluebutton-html5/app/client/views/users/user_list.coffee
+++ b/bigbluebutton-html5/app/client/views/users/user_list.coffee
@@ -1,3 +1,6 @@
Template.usersList.helpers
- getMeetingSize: -> # Retreieve the number of users in the chat, or "error" string
- return Meteor.Users.find().count()
+ getInfoNumberOfUsers: ->
+ numberUsers = Meteor.Users.find().count()
+ if numberUsers > 8
+ return "Users: #{numberUsers}"
+ # do not display the label if there are just a few users
diff --git a/bigbluebutton-html5/app/client/views/users/users_list.html b/bigbluebutton-html5/app/client/views/users/users_list.html
index 4c9ec13d958026fe1269a87fe9da648bb1acca1d..b245379dcb5835005c52e4d7a99f976ed5108fc1 100755
--- a/bigbluebutton-html5/app/client/views/users/users_list.html
+++ b/bigbluebutton-html5/app/client/views/users/users_list.html
@@ -1,6 +1,6 @@
<template name="usersList">
<div id="{{id}}" {{visibility name}} class="component">
- <h3 class="title gradientBar"><span class="glyphicon glyphicon-user"></span> Participants: {{getMeetingSize}} User(s)</h3>
+ <h3 class="title gradientBar"><span class="glyphicon glyphicon-user heading"></span> {{getInfoNumberOfUsers}} </h3>
<div id="user-contents">
<div class="userlist ScrollableWindowY">
diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
index 56f6213dd77cfd5cb6c219dfa5d8769c5e98d94e..7288c5f7214b444c4575ba912d11bb240edb57dd 100755
--- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
+++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
@@ -4,7 +4,7 @@
{{#if isMobileChromeOrFirefox}}
{{> makeButton btn_class="fullscreenWhiteboardButton" i_class="glyphicon glyphicon-fullscreen"}}
{{/if}}
- <span class="glyphicon glyphicon-pencil"></span>
+ <span class="ion-easel heading"></span>
{{title}}
</h3>
{{#each getCurrentSlide}}
diff --git a/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.ttf b/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.ttf
old mode 100644
new mode 100755
index f8fcf261a6b2501cb5ede90e5f3d371452c64156..c4e4632486d863337c1c73478ddb3c20726c55a0
Binary files a/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.ttf and b/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.ttf differ
diff --git a/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.woff b/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.woff
old mode 100644
new mode 100755
index 9f808a3cdddbe92050fc02ac0e9251c17d40687d..5f3a14e0a5ca6d20cc4fac708979e807b0d51bc3
Binary files a/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.woff and b/bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.woff differ