Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth

labs/meteor-client/app/client/stylesheets/chat.less

@@ -13,7 +13,6 @@ bottomEntry{
     border: 1px solid #ccc;
     float: left;
     min-height:500px;
-    /*min-width:300px;*/
     overflow: hidden;
     width: 25%;
     margin-right: 0.5%;
@@ -58,6 +57,17 @@ bottomEntry{
 #chat-user-list {
     padding:5px;
 }
+.closeTab {
+	background: transparent;
+	border: 0;
+	color: #000;
+	cursor: pointer;
+	float:left;
+	font-weight: bold;
+	padding: 0;
+	text-shadow: 0 1px 0 #fff;
+	-webkit-appearance: none;
+}
 .gotUnreadMail{
     background: #F9DF6B;
 }
@@ -100,38 +110,41 @@ bottomEntry{
     margin-left: 10px;
     background-color: #D7D7D7
 }
-.tab{}
-
-
-
-
-
 #tabsList {
-    display: table;
-    table-layout: fixed;
-    text-align: center;
-    border-spacing: 6px; /* space between each tab */
-    width: 456px;
-    height: auto;
-    /*background-color:aqua;*/
-    margin: 0;
-    padding: 0;
-}
-#tabsList li {
-    display: table-cell;
-    width: auto;
-    height: auto;
-    vertical-align: bottom;
+	border-spacing: 3px; /* space between each tab */
+	display: table;
+	margin: 0;
+	padding: 0;
+	table-layout: fixed;
+	text-align: center;
+	width: 100%;
 }
 #tabsList a {
-    display: block;
-    min-height: 100%;
-    padding: 4px 10px;
-    /*background-color: lime;*/
-    /*color: blue;*/
-    border-radius: 6px 6px 0 0;
-    overflow: hidden;
-    text-decoration: none;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+	background-color: #C9E6FF;
+	border-radius: 10px 10px 0 0;
+	color: darkblue;
+	display: block;
+	min-height: 100%;
+	overflow: hidden;
+	padding: 4px 10px;
+	text-decoration: none;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+#tabsList:before, #tabsList:after {
+	content: none;
+}
+#tabsList li {
+	display: table-cell;
+	height: auto;
+	list-style-type: none;
+	vertical-align: bottom;
+	width: auto;
+}
+#tabsList > li {
+	float:none;
+}
+#tabsList > li.active > a, #tabsList > li.active > a:hover, #tabsList > li.active > a:focus {
+	border: 2px solid #79C1FF;
+	border-bottom-color: transparent;
 }

labs/meteor-client/app/client/views/chat/chat_bar.coffee

@@ -165,6 +165,7 @@ Template.tabButtons.events
   'click .close': (event) -> # user closes private chat
     setInSession 'inChatWith', 'PUBLIC_CHAT'
     setInSession 'display_chatPane', true
+    console.log "userId: #{@userId}"
     id = chatTabs.findOne({userId: @userId})
     if id?
       chatTabs.remove(id)
@@ -193,36 +194,17 @@ Template.tabButtons.helpers
 		safeClass = @class.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 		safeName = @name.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 
-		# button = '<li '
-		# button += 'class="'
-		# button += 'active ' if getInSession("inChatWith") is @userId
-		# button += 'gotUnreadMail ' if @gotMail
-		# button += "tab #{safeClass}\"><a href=\"#\" data-toggle=\"tab\" id=\"#{safeName}\" >#{safeName}"
-		# button += '&nbsp;<button class="close closeTab" type="button" >×</button>' if @class is 'privateChatTab'
-		# button += '</a></li>'
-		# button
-
 		button = ''
 		button += '<li class=\"'
-		# console.log button
 		button += 'active ' if getInSession("inChatWith") is @userId
-		# console.log button
 		button += 'gotUnreadMail ' if @gotMail
-		# console.log button
 		button += "tab #{safeClass}"
-		# console.log button
 		button += '\">'
-		# console.log button
 		button += "<a href='#' data-toggle='tab' id=\"#{safeName}\">"
-		# console.log button
-		button += "<button class=\"close closeTab\" type=\"button\"><sup><b>X</b></sup></button>&nbsp; " if @class is 'privateChatTab'
-		# console.log button
+		button += "<button class=\"close closeTab\" type=\"button\"><sup><b>X</b></sup></button> " if @class is 'privateChatTab'
 		button += "#{safeName}"
-		# console.log button
 		button += '</a>'
-		# console.log button
 		button += '</li>'
-		# console.log button
 		button
 
 @activateBreakLines = (str) ->

labs/meteor-client/app/client/views/whiteboard/whiteboard.html

@@ -1,6 +1,6 @@
 <template name="whiteboard">
 	<div id="{{id}}" {{visibility name}} class="component gradientBar">
-		<h3 id="whiteboard-navbar" class="title gradientBar">
+		<h3 id="whiteboard-navbar" class="title">
 			<span class="glyphicon glyphicon-pencil"></span>
 			{{title}}
 		</h3>

labs/meteor-client/app/server/collection_methods/chat.coffee

@@ -38,6 +38,9 @@ Meteor.methods
 		else 
 			console.log "requester no exists"
 
+	deletePrivateChatMessages: (userId, contact_id) ->
+		# if authorized pass through
+		deletePrivateChatMessages(userId, contact_id)
 # --------------------------------------------------------------------------------------------
 # Private methods on server
 # --------------------------------------------------------------------------------------------