diff --git a/app/models/contact/Contact.php b/app/models/contact/Contact.php index bd49a4d61..dd3a75d73 100644 --- a/app/models/contact/Contact.php +++ b/app/models/contact/Contact.php @@ -207,9 +207,9 @@ class Contact extends ModlModel { $out = base_convert($jid, 32, 8); if($out == false) - $out[4] = 1; + $out[3] = 1; - return BASE_URI.'/themes/movim/img/default'.$out[4].'.svg'; + return BASE_URI.'/themes/movim/img/default'.$out[3].'.svg'; } } else { $out = base_convert(md5(openssl_random_pseudo_bytes(5)), 16, 8); diff --git a/app/widgets/Visio/visio.css b/app/widgets/Visio/visio.css index af07c9245..7543c839a 100644 --- a/app/widgets/Visio/visio.css +++ b/app/widgets/Visio/visio.css @@ -48,7 +48,7 @@ body { top: 50%; max-width: 200px; margin-left: -100px; - margin-top: -150px; + margin-top: -160px; } #visio #avatar img { @@ -69,6 +69,13 @@ body { font-size: 1.6em; } +#visio #avatar #status { + color: white; + text-align: center; + margin-top: 1em; + line-height: 1.5em; +} + #visio #remote-video, #visio #local-video { position: absolute; @@ -84,7 +91,6 @@ body { position: absolute; top: 0; left: 0; - display: none; } #visio #log div { diff --git a/app/widgets/Visio/visio.js b/app/widgets/Visio/visio.js index 60557fdd2..4de68e9a2 100644 --- a/app/widgets/Visio/visio.js +++ b/app/widgets/Visio/visio.js @@ -139,7 +139,7 @@ var Visio = { movim_add_onload(function() { document.getElementById("call").onclick = function() { init(true); }; - document.getElementById("hang-up").onclick = function() { terminate(); }; + document.getElementById("hang-up").onclick = function() { sendTerminate('success'); terminate(); }; document.getElementById("toggle-screen").onclick = function() { Visio.fullScreen(); }; document.getElementById("toggle-camera").onclick = function() { Visio.toggleVideoMute(); }; document.getElementById("toggle-microphone").onclick = function() { Visio.toggleAudioMute(); }; diff --git a/app/widgets/Visio/visio.tpl b/app/widgets/Visio/visio.tpl index 625b63a26..ac2bc0ce2 100644 --- a/app/widgets/Visio/visio.tpl +++ b/app/widgets/Visio/visio.tpl @@ -12,6 +12,7 @@
{$name} +
diff --git a/app/widgets/Visio/webrtc.js b/app/widgets/Visio/webrtc.js index ed22a8b57..fcd26f75c 100644 --- a/app/widgets/Visio/webrtc.js +++ b/app/widgets/Visio/webrtc.js @@ -97,6 +97,10 @@ function onIceCandidate(event) { */ } +function sendTerminate(reason) { + Visio.call(['VisioExt_ajaxSendSessionTerminate', VISIO_JID, VISIO_RESSOURCE, reason]); +} + function sendMessage(msg, accept) { offer = {}; offer.sdp = msg.sdp; @@ -148,6 +152,7 @@ function onSetSessionDescriptionSuccess() { function onSetSessionDescriptionError(error) { Visio.log('Failed to set local session description: ' + error.toString()); + sendTerminate('failed-application'); } function onSetRemoteSessionDescriptionSuccess() { @@ -155,9 +160,8 @@ function onSetRemoteSessionDescriptionSuccess() { } function onSetRemoteSessionDescriptionError(error) { - //console.log('gnap'); - console.log(error); Visio.log('Failed to set remote session description: ' + error.message); + sendTerminate('failed-application'); } function onOffer(offer) { @@ -165,8 +169,6 @@ function onOffer(offer) { Visio.log('Offer received.'); Visio.log('OFFER ' + offer); - - console.log(offer); if(!pc) init(false); @@ -176,14 +178,9 @@ function onOffer(offer) { var message = {}; message.sdp = offer; message.type = 'offer'; - console.log(message); + var desc = new RTCSessionDescription(message); - console.log(desc); - /* - var desc = new RTCSessionDescription(); - desc.sdp = offer; - desc.type = 'offer'; - */ + pc.setRemoteDescription(desc, onSetRemoteSessionDescriptionSuccess, onSetRemoteSessionDescriptionError); } @@ -196,13 +193,7 @@ function onAccept(offer) { Visio.log('ACCEPT ' + offer); if(offer != null) { - //Visio.log('GN0P'); - /*var message = {}; - message.sdp = offer; - message.type = 'anwser'; - console.log(message);*/ - var desc = new RTCSessionDescription(/*message*/); - //console.log(desc); + var desc = new RTCSessionDescription(); desc.sdp = offer; desc.type = 'answer'; @@ -220,7 +211,6 @@ function onCandidate(message) { var candidate = new RTCIceCandidate({sdpMLineIndex: label[message[1]], candidate: message[0]}); - //console.log(candidate); pc.addIceCandidate(candidate, onRemoteIceCandidateAdded, onRemoteIceCandidateError); } @@ -272,14 +262,13 @@ function init(isCaller) { pc.createOffer(onOfferCreated, onError); else pc.createAnswer(onAnswerCreated, onError); - - //pc.createOffer(onOfferCreated, onError); }, // Error Callback function(err) { // Log the error to the console. Visio.log('The following error occurred when trying to use getUserMedia: ' + err); + sendTerminate('decline'); } @@ -287,20 +276,19 @@ function init(isCaller) { } else { alert('Sorry, your browser does not support getUserMedia'); } - - console.log(pc); } function terminate() { // We close the RTCPeerConnection - pc.close(); + console.log(pc); + if(pc != null && pc.signalingState != 'closed') + pc.close(); // We close the local webcam and microphone - localStream.stop(); + if(localStream != null) + localStream.stop(); remoteStream = null; - Visio.call(['VisioExt_ajaxSendSessionTerminate', VISIO_JID, VISIO_RESSOURCE]); - // Get a reference to the video elements on the page. var vid = document.getElementById('local-video'); var rvid = document.getElementById('remote-video'); diff --git a/app/widgets/VisioExt/VisioExt.php b/app/widgets/VisioExt/VisioExt.php index 19659ac36..d3924b4c6 100644 --- a/app/widgets/VisioExt/VisioExt.php +++ b/app/widgets/VisioExt/VisioExt.php @@ -58,6 +58,47 @@ class VisioExt extends WidgetBase } function onSessionTerminate($jingle) { + $message = ''; + + switch($jingle->reason->children()->getName()) { + case 'success': + $message = t('Hung up'); + break; + + case 'busy': + $message = t('Your contact is busy'); + break; + + case 'decline': + $message = t('Declined'); + break; + + case 'unsupported-transports': + + break; + + case 'failed-transport': + + break; + + case 'unsupported-applications': + + break; + + case 'failed-application': + $message = t('Remote application incompatible'); + break; + + case 'incompatible-parameters': + + break; + + default: + $message = t('Unknown error'); + break; + } + + RPC::call('Popup.call', 'movim_fill', 'status', $message); RPC::call('Popup.call', 'terminate'); } @@ -99,14 +140,18 @@ class VisioExt extends WidgetBase ->request(); } - function ajaxSendSessionTerminate($jid, $ressource) { + function ajaxSendSessionTerminate($jid, $ressource, $reason = null) { $s = Session::start('movim'); $jingleSid = $s->get("jingleSid"); $r = new moxl\JingleSessionTerminate(); - $r->setTo($jid.'/'.$ressource) - ->setJingleSid($jingleSid) - ->request(); + $r->setTo($jid.'/'.$ressource); + $r->setJingleSid($jingleSid); + + if(isset($reason)) + $r->setReason($reason); + + $r->request(); } function ajaxSendCandidate($candidate) { diff --git a/app/widgets/WidgetCommon/WidgetCommon.php b/app/widgets/WidgetCommon/WidgetCommon.php index d12f95976..2eed78c1c 100644 --- a/app/widgets/WidgetCommon/WidgetCommon.php +++ b/app/widgets/WidgetCommon/WidgetCommon.php @@ -50,9 +50,12 @@ class WidgetCommon extends WidgetBase { $flagcolor='orange'; $access .= 'protect orange'; } - + $avatar = $post->getContact()->getPhoto('m'); - } else + // A little hack which display a colored avatar for the Groups + } elseif(!filter_var($post->jid, FILTER_VALIDATE_EMAIL) && $post->node != '') { + $avatar = $post->getContact()->getPhoto('m', $post->node); + } else $avatar = $post->getContact()->getPhoto('m'); if(!filter_var($post->jid, FILTER_VALIDATE_EMAIL) && $post->node != '') @@ -99,7 +102,7 @@ class WidgetCommon extends WidgetBase { if(isset($enc) && $enc != '') { $enc = ' -
'. +
'. $enc. '
@@ -218,26 +221,36 @@ class WidgetCommon extends WidgetBase { case 'enclosure' : if(in_array($l['type'], array('image/jpeg', 'image/png', 'image/jpg'))) { $enc .= ' - - + '; - } elseif(in_array($l['type'], array('audio/mpeg', 'audio/ogg'))) { + /*} elseif(in_array($l['type'], array('audio/mpeg', 'audio/ogg'))) { $enc .= ' '; - } else { + }*/} else { $enc .= ' - - '.$l['href'].' + '.$l['href'].' '; } break; case 'alternate' : $url = parse_url($l['href']); $enc .= ' - - '.$url['scheme'].'://'.$url['host'].$url['path'].' + '.$url['scheme'].'://'.$url['host'].$url['path'].' '; break; } diff --git a/themes/movim/css/posts.css b/themes/movim/css/posts.css index f8606c471..6b9efdd6c 100644 --- a/themes/movim/css/posts.css +++ b/themes/movim/css/posts.css @@ -215,7 +215,8 @@ article p.summary { font-style:italic; } -article .enclosure { +/* Enclosures */ +article .enclosures { line-height: 1em; box-sizing: border-box; -webkit-box-sizing: border-box; @@ -224,6 +225,47 @@ article .enclosure { padding: 1em 0; } +article .enclosures .enclosure, +article .enclosures .alternate { + line-height: 2em; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +article .enclosures .alternate img, +article .enclosures .enclosure:before { + width: 16px; + height: 16px; + display: inline-block; + background-size: 16px 16px; + margin-bottom: -0.2em; + margin-right: 0.5em; +} + +article .enclosures .enclosure:before { + content: ''; + background-image: url(../img/icons/gray/file.svg); +} + +article .enclosures .enclosure[type='application/x-bittorrent']:before { + background-image: url(../img/icons/gray/file-xml.svg); +} + +article .enclosures .enclosure[type='image/jpeg']:before, +article .enclosures .enclosure[type='image/png']:before, +article .enclosures .enclosure[type='image/jpg']:before { + content: none; +} + +article .enclosures .enclosure[type='image/jpeg'] img, +article .enclosures .enclosure[type='image/png'] img +article .enclosures .enclosure[type='image/jpg'] img{ + max-height: 15em; +} + +/* Others usefull elements */ article span.tag { font-weight: normal; @@ -240,64 +282,39 @@ article span.recycle, article span.group { display: inline-block; padding-left: 2em; + font-weight: normal; - margin-top: 0.5em; float: right; margin-left: 1em; padding-right: 0.5em; line-height: 2em; max-width: 300px; + + background-size: 16px 16px; + background-repeat: no-repeat; + background-position: 0 0.5em; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } article span.place { - background: url(../img/icons/place.png) 0 0.5em no-repeat; + background-image: url(../img/icons/gray/earth.svg); } article span.recycle { - background: url(../img/icons/recycle.png) 0 0.5em no-repeat; + background-image: url(../img/icons/gray/loop.svg); } article span.group { - background: url(../img/icons/users.png) 0 0.5em no-repeat; + background-image: url(../img/icons/gray/users.svg); } article .content i, article .content em { font-style: italic; } article .content b, article .content strong { font-weight: bold; } article .content u, article .content a { text-decoration: underline; } -article .enclosure a { - display: inline-block; - height: auto; - width: 100%; - line-height: 1.5em; - - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -article a.imglink img { - max-height: 400px; - width: 100%; -} - -article .enclosure a.imglink img { - max-height: 200px; - max-width: 100%; - width: auto; - margin-bottom: -0.2em; -} - -article .enclosure a.imglink img.icon { - max-height: 24px; - margin-right: 0.5em; - min-width: 16px; - min-height: 16px; -} - article .content img, article .content video { max-width: 100%; diff --git a/themes/movim/img/icons/gray/earth.svg b/themes/movim/img/icons/gray/earth.svg new file mode 100644 index 000000000..f74aa12bf --- /dev/null +++ b/themes/movim/img/icons/gray/earth.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-css.svg b/themes/movim/img/icons/gray/file-css.svg new file mode 100644 index 000000000..bb7ef5828 --- /dev/null +++ b/themes/movim/img/icons/gray/file-css.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-excel.svg b/themes/movim/img/icons/gray/file-excel.svg new file mode 100644 index 000000000..af60bcb53 --- /dev/null +++ b/themes/movim/img/icons/gray/file-excel.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-openoffice.svg b/themes/movim/img/icons/gray/file-openoffice.svg new file mode 100644 index 000000000..6d6fa0fed --- /dev/null +++ b/themes/movim/img/icons/gray/file-openoffice.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-pdf.svg b/themes/movim/img/icons/gray/file-pdf.svg new file mode 100644 index 000000000..3fac70633 --- /dev/null +++ b/themes/movim/img/icons/gray/file-pdf.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-powerpoint.svg b/themes/movim/img/icons/gray/file-powerpoint.svg new file mode 100644 index 000000000..b331cf9f1 --- /dev/null +++ b/themes/movim/img/icons/gray/file-powerpoint.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-word.svg b/themes/movim/img/icons/gray/file-word.svg new file mode 100644 index 000000000..df74cf199 --- /dev/null +++ b/themes/movim/img/icons/gray/file-word.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-xml.svg b/themes/movim/img/icons/gray/file-xml.svg new file mode 100644 index 000000000..bf7a5038b --- /dev/null +++ b/themes/movim/img/icons/gray/file-xml.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file-zip.svg b/themes/movim/img/icons/gray/file-zip.svg new file mode 100644 index 000000000..0a58ff335 --- /dev/null +++ b/themes/movim/img/icons/gray/file-zip.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/file.svg b/themes/movim/img/icons/gray/file.svg new file mode 100644 index 000000000..b73372e75 --- /dev/null +++ b/themes/movim/img/icons/gray/file.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/film.svg b/themes/movim/img/icons/gray/film.svg new file mode 100644 index 000000000..875948667 --- /dev/null +++ b/themes/movim/img/icons/gray/film.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/image.svg b/themes/movim/img/icons/gray/image.svg new file mode 100644 index 000000000..f7124e3f0 --- /dev/null +++ b/themes/movim/img/icons/gray/image.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/link.svg b/themes/movim/img/icons/gray/link.svg new file mode 100644 index 000000000..02c343424 --- /dev/null +++ b/themes/movim/img/icons/gray/link.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/loop.svg b/themes/movim/img/icons/gray/loop.svg new file mode 100644 index 000000000..f76d50013 --- /dev/null +++ b/themes/movim/img/icons/gray/loop.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/music.svg b/themes/movim/img/icons/gray/music.svg new file mode 100644 index 000000000..2ed50826d --- /dev/null +++ b/themes/movim/img/icons/gray/music.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/gray/users.svg b/themes/movim/img/icons/gray/users.svg new file mode 100644 index 000000000..6b4918395 --- /dev/null +++ b/themes/movim/img/icons/gray/users.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/themes/movim/img/icons/place.png b/themes/movim/img/icons/place.png deleted file mode 100644 index 2cc33a998..000000000 Binary files a/themes/movim/img/icons/place.png and /dev/null differ diff --git a/themes/movim/img/icons/recycle.png b/themes/movim/img/icons/recycle.png deleted file mode 100644 index 474bcaa6e..000000000 Binary files a/themes/movim/img/icons/recycle.png and /dev/null differ diff --git a/themes/movim/img/icons/users.png b/themes/movim/img/icons/users.png deleted file mode 100644 index c118a9e93..000000000 Binary files a/themes/movim/img/icons/users.png and /dev/null differ