diff --git a/app.js b/app.js
index e7b652ce3..35a54ef20 100644
--- a/app.js
+++ b/app.js
@@ -695,6 +695,9 @@ $(document).bind('joined.muc', function (event, jid, info) {
$(document).bind('entered.muc', function (event, jid, info, pres) {
console.log('entered', jid, info);
+ messageHandler.notify(info.displayName || 'Somebody',
+ 'connected',
+ 'connected');
console.log('is focus? ' + (focus ? 'true' : 'false'));
@@ -726,6 +729,11 @@ $(document).bind('entered.muc', function (event, jid, info, pres) {
$(document).bind('left.muc', function (event, jid) {
console.log('left.muc', jid);
+ var displayName = $('#participant_' + Strophe.getResourceFromJid(jid) +
+ '>.displayname').text();
+ messageHandler.notify(displayName || 'Somebody',
+ 'disconnected',
+ 'disconnected');
// Need to call this with a slight delay, otherwise the element couldn't be
// found for some reason.
window.setTimeout(function () {
@@ -1315,6 +1323,31 @@ $(document).ready(function () {
init();
};
}
+
+ toastr.options = {
+ "closeButton": true,
+ "debug": false,
+ "positionClass": "notification-bottom-right",
+ "onclick": null,
+ "showDuration": "300",
+ "hideDuration": "1000",
+ "timeOut": "2000",
+ "extendedTimeOut": "1000",
+ "showEasing": "swing",
+ "hideEasing": "linear",
+ "showMethod": "fadeIn",
+ "hideMethod": "fadeOut",
+ "reposition": function() {
+ if(Chat.isVisible() || ContactList.isVisible()) {
+ $("#toast-container").addClass("toast-bottom-right-center");
+ } else {
+ $("#toast-container").removeClass("toast-bottom-right-center");
+ }
+ },
+ "newestOnTop": false
+ }
+
+
});
$(window).bind('beforeunload', function () {
diff --git a/chat.js b/chat.js
index 3a85cabf1..e90635042 100644
--- a/chat.js
+++ b/chat.js
@@ -214,9 +214,13 @@ var Chat = (function (my) {
);
if (Chat.isVisible()) {
+ $("#toast-container").animate({right: '5px'},
+ {queue: false,
+ duration: 500});
chatspace.hide("slide", { direction: "right",
queue: false,
duration: 500});
+
}
else {
// Undock the toolbar when the chat is shown and if we're in a
@@ -225,6 +229,10 @@ var Chat = (function (my) {
ToolbarToggler.dockToolbar(false);
}
+
+ $("#toast-container").animate({right: (chatSize[0] + 5) + 'px'},
+ {queue: false,
+ duration: 500});
chatspace.show("slide", { direction: "right",
queue: false,
duration: 500,
@@ -237,6 +245,7 @@ var Chat = (function (my) {
}
}
});
+
Chat.resizeChat();
}
diff --git a/contact_list.js b/contact_list.js
index 1ceff0606..aee7af025 100644
--- a/contact_list.js
+++ b/contact_list.js
@@ -158,6 +158,9 @@ var ContactList = (function (my) {
});
if (ContactList.isVisible()) {
+ $("#toast-container").animate({right: '12px'},
+ {queue: false,
+ duration: 500});
$('#contactlist').hide("slide", { direction: "right",
queue: false,
duration: 500});
@@ -167,6 +170,10 @@ var ContactList = (function (my) {
if (VideoLayout.isLargeVideoVisible())
ToolbarToggler.dockToolbar(false);
+
+ $("#toast-container").animate({right: '212px'},
+ {queue: false,
+ duration: 500});
$('#contactlist').show("slide", { direction: "right",
queue: false,
duration: 500});
diff --git a/css/main.css b/css/main.css
index a7f9d7baa..9a0a6e54e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -311,3 +311,56 @@ form {
text-decoration: none;
z-index: 100;
}
+
+#toast-container.notification-bottom-right {
+ bottom: 120px;
+ right: 5px;
+}
+
+#toast-container.notification-bottom-right-center {
+ right: 205px;
+}
+
+#toast-container .toast-info {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.toast-close-button {
+ right: -7px;
+ top: -19px;
+}
+
+#toast-container .toast-info {
+ background-color: black;
+ border: 1px solid #3a3a3a;
+ width: 220px;
+ padding: 10px 10px 10px 50px;
+}
+
+.connected {
+ color: forestgreen;
+ font-size: 12px;
+}
+
+.disconnected {
+ color: darkred;
+ font-size: 12px;
+}
+
+.lastN {
+ color: #a3a3a3;
+ font-size: 12px;
+}
+
+.toast-close-button:hover,
+.toast-close-button:focus {
+ color: #ffffff;
+ opacity: 1;
+ -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+ filter: alpha(opacity=100);
+}
+
+.toast-message .nickname {
+ font-weight: bold;
+}
diff --git a/css/toastr.css b/css/toastr.css
new file mode 100644
index 000000000..d86235a9f
--- /dev/null
+++ b/css/toastr.css
@@ -0,0 +1,180 @@
+/*
+ * Toastr
+ * Copyright 2012-2014 John Papa and Hans Fjällemark.
+ * All Rights Reserved.
+ * Use, reproduction, distribution, and modification of this code is subject to the terms and
+ * conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
+ *
+ * Author: John Papa and Hans Fjällemark
+ * Project: https://github.com/CodeSeven/toastr
+ */
+.toast-title {
+ font-weight: bold;
+}
+.toast-message {
+ -ms-word-wrap: break-word;
+ word-wrap: break-word;
+}
+.toast-message a,
+.toast-message label {
+ color: #ffffff;
+}
+.toast-message a:hover {
+ color: #cccccc;
+ text-decoration: none;
+}
+.toast-close-button {
+ position: relative;
+ right: -0.3em;
+ top: -0.3em;
+ float: right;
+ font-size: 20px;
+ font-weight: bold;
+ color: #ffffff;
+ -webkit-text-shadow: 0 1px 0 #ffffff;
+ text-shadow: 0 1px 0 #ffffff;
+ opacity: 0.8;
+ -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+ filter: alpha(opacity=80);
+}
+.toast-close-button:hover,
+.toast-close-button:focus {
+ color: #000000;
+ text-decoration: none;
+ cursor: pointer;
+ opacity: 0.4;
+ -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
+ filter: alpha(opacity=40);
+}
+/*Additional properties for button version
+ iOS requires the button element instead of an anchor tag.
+ If you want the anchor version, it requires `href="#"`.*/
+button.toast-close-button {
+ padding: 0;
+ cursor: pointer;
+ background: transparent;
+ border: 0;
+ -webkit-appearance: none;
+}
+.toast-top-full-width {
+ top: 0;
+ right: 0;
+ width: 100%;
+}
+.toast-bottom-full-width {
+ bottom: 0;
+ right: 0;
+ width: 100%;
+}
+.toast-top-left {
+ top: 12px;
+ left: 12px;
+}
+.toast-top-right {
+ top: 12px;
+ right: 12px;
+}
+.toast-bottom-right {
+ right: 12px;
+ bottom: 12px;
+}
+.toast-bottom-left {
+ bottom: 12px;
+ left: 12px;
+}
+#toast-container {
+ position: fixed;
+ z-index: 999999;
+ /*overrides*/
+
+}
+#toast-container * {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+#toast-container > div {
+ margin: 0 0 6px;
+ padding: 15px 15px 15px 50px;
+ width: 300px;
+ -moz-border-radius: 3px 3px 3px 3px;
+ -webkit-border-radius: 3px 3px 3px 3px;
+ border-radius: 3px 3px 3px 3px;
+ background-position: 15px center;
+ background-repeat: no-repeat;
+ -moz-box-shadow: 0 0 12px #999999;
+ -webkit-box-shadow: 0 0 12px #999999;
+ box-shadow: 0 0 12px #999999;
+ color: #ffffff;
+ opacity: 0.8;
+ -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+ filter: alpha(opacity=80);
+}
+#toast-container > :hover {
+ -moz-box-shadow: 0 0 12px #000000;
+ -webkit-box-shadow: 0 0 12px #000000;
+ box-shadow: 0 0 12px #000000;
+ opacity: 1;
+ -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+ filter: alpha(opacity=100);
+ cursor: pointer;
+}
+#toast-container > .toast-info {
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
+}
+#toast-container > .toast-error {
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
+}
+#toast-container > .toast-success {
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
+}
+#toast-container > .toast-warning {
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
+}
+#toast-container.toast-top-full-width > div,
+#toast-container.toast-bottom-full-width > div {
+ width: 96%;
+ margin: auto;
+}
+.toast {
+ background-color: #030303;
+}
+.toast-success {
+ background-color: #51a351;
+}
+.toast-error {
+ background-color: #bd362f;
+}
+.toast-info {
+ background-color: #2f96b4;
+}
+.toast-warning {
+ background-color: #f89406;
+}
+/*Responsive Design*/
+@media all and (max-width: 240px) {
+ #toast-container > div {
+ padding: 8px 8px 8px 50px;
+ width: 11em;
+ }
+ #toast-container .toast-close-button {
+ right: -0.2em;
+ top: -0.2em;
+ }
+}
+@media all and (min-width: 241px) and (max-width: 480px) {
+ #toast-container > div {
+ padding: 8px 8px 8px 50px;
+ width: 18em;
+ }
+ #toast-container .toast-close-button {
+ right: -0.2em;
+ top: -0.2em;
+ }
+}
+@media all and (min-width: 481px) and (max-width: 768px) {
+ #toast-container > div {
+ padding: 15px 15px 15px 50px;
+ width: 25em;
+ }
+}
diff --git a/index.html b/index.html
index 389d55810..f2b09144e 100644
--- a/index.html
+++ b/index.html
@@ -28,14 +28,20 @@
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> Adds notifications when a user joins/leaves or is added/removed from lastN.
-
+
@@ -46,7 +52,7 @@
-
+
@@ -58,17 +64,18 @@
-
+
+
-
+
@@ -318,6 +325,7 @@
+ Powered by jitsi.org