build 1.0.0-beta1

In respect of rails assets we should define images in css

.gitignore

@@ -1 +1,2 @@
 node_modules
+*.zip

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lib/strophe.jingle"]
 	path = lib/strophe.jingle
-	url = https://github.com/ESTOS/strophe.jingle.git
+	url = https://github.com/sualko/strophe.jingle.git
 [submodule "lib/otr"]
 	path = lib/otr
-	url = https://github.com/arlolra/otr.git
+	url = https://github.com/sualko/otr.git

CHANGELOG.md

@@ -1,3 +1,87 @@
+v0.8.2 / 2014-08-20
+===
+- fix use of custom username
+- write to console only if debug flag is set
+- allow string|boolean as config param
+- add translations
+
+v0.8.1 / 2014-08-12
+===
+- add user-defined xmpp options
+- fix login form without id submit
+
+v0.8.0 / 2014-07-02
+===
+- add spanish translation
+- add vCard view
+- add more emoticons
+- add grayscale to buddies without subscription
+- add settings for priorities
+- add hint if roster is empty
+- add sound files
+- new chat window design
+- enhanced roster design
+- fix emoticon replacement (XEP-0038)
+- fix some ui issues (explanations,...)
+- fix issue with password only field
+
+v0.7.2 / 2014-05-28
+===
+- fix login issue
+- fix different dialogs
+- fix safari mobile bug
+- fix webworker debugging
+- fix issue with prosody
+- fix submodule state
+- add debug flag
+- add icon for video calls
+- add general stylesheet + vector images
+- add multiple translations
+- add link to online help
+- handle webworker security error
+- remove outline glow
+- reduce tooltip delay
+- remove already confirmed friendship request from notice stack
+- minor style fixes
+- move complete to new notification api
+
+
+v0.7.1 / 2014-03-18
+===
+- fix emoticons
+- fix unique message id
+
+v0.7.0 / 2014-03-07
+===
+- add sound notifications
+- add support for custom default avatars
+- add support for XEP-0184 (Message Delivery Receipts)
+- update & extend hover info
+- handle presence of type unsubscribed
+- remove roster footer if offline
+- enhance otr error handling
+- enhance translations
+- reduce initial timeout
+- fix notices
+- fix friendship response dialog
+- fix shared roster item removel
+- fix debug function
+- fix webrtc bug
+- fix storage check
+- fix firefox fullscreen
+
+v0.6.0 / 2014-02-28
+===
+- add notice stack (for e.g. friendship requests)
+- add option to change presence
+- support all available presence states
+- display own avatar
+- fix issue with prosody
+- fix multi-tab support
+- fix chrome notifications
+- fix otr error handling
+- fix webrtc bug
+
 v0.5.2 / 2014-01-28
 ===
 - update strophe.js to v1.1.3
@@ -12,4 +96,4 @@ v0.5.1 / 2014-01-27
 - handle already attached submit events on login form
 - style changes
 - fix webrtc startup
-- don't block application on dsa key generation
+- don't block application on dsa key generation

Gruntfile.js

@@ -1,9 +1,14 @@
 /* global module:false */
 module.exports = function(grunt) {
-
+   
+   var dep = grunt.file.readJSON('dep.json');
+   var dep_files = dep.map(function(el) {
+      return el.file;
+   });
+   
    // Project configuration.
    grunt.initConfig({
-      app: grunt.file.readJSON('app.json'),
+      app: grunt.file.readJSON('package.json'),
       meta: {
          banner: grunt.file.read('banner.js')
       },
@@ -20,7 +25,7 @@ module.exports = function(grunt) {
          main: {
             files: [ {
                expand: true,
-               src: [ 'lib/strophe.jingle/*.js', 'lib/otr/build/**', 'lib/otr/lib/dsa-webworker.js', 'lib/otr/lib/sm-webworker.js', 'lib/otr/lib/const.js', 'lib/otr/lib/helpers.js', 'lib/otr/lib/dsa.js', 'lib/otr/vendor/*.js', 'lib/*.js', 'jsxc.lib.js', 'jsxc.lib.webrtc.js', 'LICENSE' ],
+               src: [ 'lib/strophe.jingle/*.js', 'lib/otr/build/**', 'lib/otr/lib/dsa-webworker.js', 'lib/otr/lib/sm-webworker.js', 'lib/otr/lib/const.js', 'lib/otr/lib/helpers.js', 'lib/otr/lib/dsa.js', 'lib/otr/vendor/*.js', 'lib/*.js', 'jsxc.lib.js', 'jsxc.lib.webrtc.js', '*.css', 'LICENSE', 'img/**', 'sound/**' ],
                dest: 'build/'
             } ]
          }
@@ -46,6 +51,94 @@ module.exports = function(grunt) {
                to: "<%= app.version %>"
             } ]
          }
+      },
+      concat: {
+         dep: {
+            options: {
+               banner: '/*!' +
+                  ' * <%= app.name %> v<%= app.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+                  ' * \n' +
+                  ' * This file concatenates all dependencies of <%= app.name %>.\n' +
+                  ' * \n' +
+                  ' * For the list of concatenated files and there licenses please see <%= app.homepage %> @github.\n' +
+                  ' */\n\n',
+               process: function(src, filepath) {
+                  if (filepath === 'build/lib/otr/build/dep/crypto.js') { 
+                     src += ';';
+                  }
+                  
+                  var data = dep[dep_files.indexOf(filepath)];
+                  
+                  return '/*!\n * Source: ' + filepath + ', license: ' + data.license + ', url: ' + data.url + ' */\n' + src;
+               }
+            },
+            src: dep_files,
+            dest: 'build/jsxc.dep.js'
+         },
+         jsxc: {
+            options: {
+               banner: '/*! This file is concatenated for the browser. */\n\n'
+            },
+            src: ['build/jsxc.lib.js', 'build/jsxc.lib.webrtc.js'],
+            dest: 'build/jsxc.js'
+         }
+      },
+      uglify: {
+         jsxc: {
+            options: {
+               mangle: false,
+               sourceMap: true,
+               preserveComments: 'some'
+            },
+            files: {
+               'build/jsxc.dep.min.js': ['build/jsxc.dep.js'],
+               'build/jsxc.min.js': ['build/jsxc.js']
+            }
+         }
+      },
+      search: {
+         console: {
+            files: {
+               src: [ '*.js' ]
+            },
+            options: {
+               searchString: /console\.log\((?!'[<>]|msg)/g,
+               logFormat: 'console',
+               failOnMatch: true
+            }
+         },
+         changelog: {
+            files: {
+               src: [ 'CHANGELOG.md' ]
+            },
+            options: {
+               searchString: "<%= app.version %>",
+               logFormat: 'console',
+               onComplete: function(m) {
+                  if (m.numMatches === 0) {
+                     grunt.fail.fatal("No entry in README.md for current version found.");
+                  }
+               }
+            }
+         }
+      },
+      compress: {
+         main: {
+            options: {
+               archive: "jsxc-<%= app.version %>.zip"
+            },
+            files: [ {
+               src: [ '**' ],
+               expand: true,
+               dest: 'jsxc/',
+               cwd: 'build/'
+            } ]
+         }
+      },
+      shell: {
+         hooks: {
+            command: 'cp pre-commit .git/hooks/'
+         }
       }
    });
 
@@ -53,10 +146,23 @@ module.exports = function(grunt) {
    grunt.loadNpmTasks('grunt-contrib-jshint');
    grunt.loadNpmTasks('grunt-contrib-copy');
    grunt.loadNpmTasks('grunt-contrib-clean');
+   grunt.loadNpmTasks('grunt-contrib-concat');
+   grunt.loadNpmTasks('grunt-contrib-uglify');
    grunt.loadNpmTasks('grunt-banner');
    grunt.loadNpmTasks('grunt-text-replace');
+   grunt.loadNpmTasks('grunt-search');
+   grunt.loadNpmTasks('grunt-contrib-compress');
+   grunt.loadNpmTasks('grunt-shell');
 
    // Default task.
-   grunt.registerTask('default', [ 'jshint', 'clean', 'copy', 'usebanner', 'replace' ]);
+   grunt.registerTask('default', [ 'jshint', 'search', 'clean', 'copy', 'usebanner', 'replace', 'concat', 'uglify', 'compress' ]);
 
+   // Create alpha/beta build
+   grunt.registerTask('pre', [ 'jshint', 'search:console', 'clean', 'copy', 'usebanner', 'replace', 'concat', 'uglify', 'compress' ]);
+
+   // before commit
+   grunt.registerTask('commit', [ 'jshint', 'search:console' ]);
+
+   // prepare pre-commit hook
+   grunt.registerTask('hookmeup', [ 'shell:hooks' ]);
 };

README.md

@@ -1,48 +1,12 @@
-# JavaScript Xmpp Client
+# JavaScript XMPP Client
 
-__Beware! This is beta software.__
+Real-time chat app. This app requires an external XMPP server (openfire, ejabberd etc.).
 
-Real-time chat app. This app requires external XMPP server (openfire, ejabberd etc.).
-
-### Features
-- integration into existing ui
-- one-to-one conversation (XMPP)
-- encrypted one-to-one conversation (OTR)
-  - use of whitespace tags to start a OTR session
-- user verification (SMP)
-- encrypted one-to-one video call (WebRTC)
-  - [TURN REST API](http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
-  - fullscreen mode
-  - snapshots
-- auto link-detection
-- emotions
-- roster management 
-- multi-language support (de, en)
-- multi tab support
-
-### Supported protocols
-- XMPP Core (RFC6120)
-- XMPP IM (RFC6121)
-- Bidirectional-streams Over Synchronous HTTP (XEP-0124)
-- XMPP Over BOSH (XEP-0206)
-- Service Discovery (XEP-0030)
-- CAP (XEP-0127)
-- Jingle (XEP-0166)
-- Jingle RTP Sessions (XEP-0167)
-
-### Supported browsers
-- Full support for __Chrome__ and __Firefox__.
-- __IE__ doesn't support multi tabs, WebRTC and Notifications.
-- __Safari__ doesn't support WebRTC and Notifications.
-
-### Planned features
-- multi user chat
-- video conference
-- encrypted file transfer 
+You find a list of features, supported protocols and browsers at the homepage of __[Javascript XMPP Client](http://www.jsxc.org)__.
 
 ## Developer notes
 
-Please execude the following commands to get a copy of the code:
+Please execute the following commands to get a copy of the code:
 
 ```
 git clone https://github.com/sualko/jsxc/

app.json

@@ -1,8 +0,0 @@
-{
-   "name": "jsxc",
-   "version": "0.5.2",
-   "description": "Real-time chat app",
-   "homepage": "http://jsxc.org/",
-   "license": "MIT",
-   "author": "Klaus Herberth <klaus@jsxc.org>"
-}

banner.js

@@ -1,4 +1,4 @@
-/**
+/*!
  * <%= app.name %> v<%= app.version %> - <%= grunt.template.today("yyyy-mm-dd") %>
  * 
  * Copyright (c) <%= grunt.template.today("yyyy") %> <%= app.author %> <br>
@@ -8,4 +8,5 @@
  * 
  * @author <%= app.author %>
  * @version <%= app.version %>
+ * @license MIT
  */

build/img/XMPP_logo.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   xml:space="preserve"
+   height="147.22015"
+   viewBox="0 0 192.89149 147.21771"
+   width="192.89587"
+   version="1.1"
+   y="0px"
+   x="0px"
+   enable-background="new 0 0 176.486 181.437"
+   inkscape:version="0.91pre2 r"
+   sodipodi:docname="XMPP_logo.svg"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10"
+     inkscape:zoom="1.3007054"
+     inkscape:cx="71.332001"
+     inkscape:cy="72.501142"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><linearGradient
+     id="SVGID_1_"
+     y2="0.00048828"
+     gradientUnits="userSpaceOnUse"
+     x2="-1807.2"
+     gradientTransform="translate(1925.9953,9.9988343)"
+     y1="125.86"
+     x1="-1807.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop4" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop6" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop8" /></linearGradient><path
+     d="m 146.28531,24.187835 c 0.077,1.313 -1.786,0.968 -1.786,2.293 0,38.551 -44.720002,96.831035 -89.847002,108.190035 l 0,1.182 C 114.60931,130.34287 181.38231,69.052835 182.89231,10.002834 l -36.6,14.189001 z"
+     id="path10"
+     style="fill:url(#SVGID_1_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 130.22531,27.958835 c 0.077,1.313 0.121,2.633 0.121,3.958 0,38.551 -30.700002,90.497035 -75.827002,101.860035 l 0,1.637 c 59.065002,-3.823 105.810002,-63.023035 105.810002,-109.200035 0,-2.375 -0.125,-4.729 -0.371,-7.056 l -29.73,8.796 z"
+     id="path12"
+     inkscape:connector-curvature="0"
+     style="fill:#e96d1f" /><linearGradient
+     id="SVGID_2_"
+     y2="1.279e-13"
+     gradientUnits="userSpaceOnUse"
+     x2="-1073.2"
+     gradientTransform="matrix(-1,0,0,1,-998.20465,9.9988343)"
+     y1="126.85"
+     x1="-1073.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop15" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop17" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop19" /></linearGradient><path
+     d="m 46.594308,24.187835 c -0.077,1.313 1.787,0.968 1.787,2.293 0,38.551 46.558,97.366035 91.688002,108.730035 l 0,1.639 C 80.116308,131.32987 11.509308,69.049835 9.9993079,9.9998343 L 46.598308,24.188835 Z"
+     id="path21"
+     style="fill:url(#SVGID_2_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 64.726308,28.930835 c -0.076,1.313 -0.12,2.63 -0.12,3.957 0,38.551 30.699,90.497035 75.827002,101.860035 l 0,1.639 C 81.389308,133.59687 34.623308,73.362835 34.623308,27.186835 c 0,-2.375 0.128,-4.729 0.371,-7.056 l 29.73,8.798 z"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#a0ce67" /><path
+     d="m 34.708308,19.581835 7.617,2.722 c -0.041,0.962 -0.066,2.254 -0.066,3.225 0,41.219 37.271,98.204035 87.272002,107.120035 3.245,1.088 7.538,2.077 10.932,2.931 l 0,1.638 C 75.209308,131.65787 29.363308,65.351835 34.703308,19.577835 Z"
+     id="path25"
+     inkscape:connector-curvature="0"
+     style="fill:#439639" /><path
+     d="m 160.33531,18.758835 -7.833,2.625 c 0.041,0.963 0.191,2.203 0.191,3.173 0,41.219 -37.272,98.205035 -87.274002,107.120035 -3.243,1.089 -7.538,2.077 -10.93,2.932 l 0,1.639 C 122.83331,127.58787 165.66931,64.528835 160.32931,18.757835 Z"
+     id="path27"
+     inkscape:connector-curvature="0"
+     style="fill:#d9541e" /></svg>

build/img/camera_icon_grey.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   width="20"
+   height="20">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <g
+     id="layer1"
+     transform="matrix(0.03788594,0,0,0.03788594,-0.41340793,-2.6310716)">
+    <path
+       id="path3906"
+       style="fill:#808080;stroke:none"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 L 358.97338,350.18517 Z M 10.911922,182.40634 l 378.372678,0 0,302.65582 -378.372678,0 z" />
+  </g>
+</svg>

build/img/camera_icon_white.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="535.00458"
+   height="510.4368"
+   id="svg3896"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="camera_icon_white.svg">
+  <defs
+     id="defs3898" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="353.91934"
+     inkscape:cy="233.8456"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3901">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-5.7142771,-72.362177)">
+    <rect
+       style="fill:#ffffff;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3904"
+       width="378.37268"
+       height="302.65582"
+       x="10.911922"
+       y="182.40634" />
+    <path
+       style="fill:#ffffff;stroke:none"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 -179.83884,-133.77734 z"
+       id="path3906"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

build/img/gear_grey.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="272.70593"
+   height="275.19449"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="gear.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="146.88159"
+     inkscape:cy="131.06634"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1111"
+     inkscape:window-height="840"
+     inkscape:window-x="191"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4617">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;stroke:none"
+         id="path4619"
+         sodipodi:cx="141.42857"
+         sodipodi:cy="140.90877"
+         sodipodi:rx="124.28571"
+         sodipodi:ry="124.28571"
+         d="m 265.71429,140.90877 a 124.28571,124.28571 0 1 1 -248.57143,0 124.28571,124.28571 0 1 1 248.57143,0 z"
+         transform="translate(170.48656,275.14888)" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-175.56216,-278.4604)">
+    <path
+       style="fill:#b3b3b3;stroke:none"
+       d="m 322.90077,552.37609 c -0.8025,-1.03265 -4.1298,-6.77812 -7.394,-12.76771 -5.66062,-10.38686 -5.9349,-11.45971 -5.9349,-23.21429 0,-6.77827 -0.16071,-12.33471 -0.35714,-12.34764 -0.19643,-0.0129 -7.10714,-1.25351 -15.35714,-2.75686 -8.25,-1.50332 -15.42054,-2.29632 -15.93453,-1.7622 -0.51399,0.53413 -2.65068,5.852 -4.7482,11.8175 -3.29679,9.3763 -4.91271,11.81339 -11.92261,17.98135 -13.16776,11.58617 -12.78024,11.47418 -21.89865,6.32807 l -7.91867,-4.46902 2.59473,-13.70492 c 2.49374,-13.17148 2.90233,-14.05529 10.49705,-22.70579 4.34627,-4.95047 7.90231,-9.56676 7.90231,-10.2584 0,-1.47559 -18.31337,-23.80793 -20.06165,-24.4643 -0.65433,-0.24566 -6.31795,2.51133 -12.58583,6.12664 l -11.39614,6.57329 -13.13132,-0.41234 -13.13131,-0.41236 -3.2803,-8.73539 -3.28031,-8.7354 10.00696,-8.17517 c 10.84131,-8.85678 12.71635,-9.70148 27.21704,-12.26113 l 9.64286,-1.70214 0,-16.16553 0,-16.16553 -7.5,-1.47726 c -4.125,-0.81249 -9.8425,-1.8811 -12.70556,-2.37469 -3.46464,-0.5973 -8.76203,-3.85429 -15.83987,-9.73882 l -10.63432,-8.8414 3.17885,-8.52806 3.17886,-8.52805 13.60638,-0.40736 13.60637,-0.40735 10.9584,6.47878 c 6.02712,3.56333 11.38742,6.44805 11.91178,6.41048 1.07253,-0.0768 19.25751,-22.17096 20.00721,-24.30806 0.26531,-0.75631 -2.67819,-5.06316 -6.54112,-9.5708 -9.23405,-10.77518 -8.94789,-10.17209 -11.75184,-24.76724 l -2.43237,-12.66102 8.23066,-4.90297 8.23065,-4.90298 10.59272,9.07442 c 9.9688,8.53993 10.84458,9.77375 14.869,20.94783 2.78986,7.74624 4.97907,11.78706 6.2981,11.625 1.112,-0.13663 8.28967,-1.33754 15.95038,-2.66869 l 13.92857,-2.42028 0,-12.18641 c 0,-11.78521 0.21856,-12.59093 6.63887,-24.47416 3.65139,-6.75827 6.83678,-12.52672 7.07865,-12.81878 0.24187,-0.29206 4.61063,0.25596 9.70834,1.21783 10.34441,1.95186 9.29217,0.3446 12.39626,18.9345 1.53751,9.2079 1.41438,10.15238 -2.8655,21.98039 -2.45962,6.79749 -4.29177,12.48885 -4.07147,12.64746 4.71177,3.39226 27.103,15.17953 28.15202,14.81988 0.79829,-0.27369 4.84943,-4.58023 9.00255,-9.57008 6.9761,-8.38161 8.52263,-9.438 20.30933,-13.87272 l 12.75821,-4.80025 5.08923,5.87865 c 2.79907,3.23326 5.53904,6.62899 6.08881,7.54607 0.54977,0.91709 -2.04455,6.76442 -5.76518,12.99407 -6.19419,10.37126 -7.69156,11.86889 -17.75219,17.75522 -6.04307,3.53571 -11.0023,7.00724 -11.02051,7.71451 -0.0183,0.70726 2.31563,7.61798 5.18633,15.35714 3.61895,9.75638 5.91877,14.07069 7.5,14.06952 1.2543,-9.3e-4 6.9707,-0.89614 12.70311,-1.98936 10.42006,-1.9872 10.42577,-1.98654 23.57143,2.70176 l 13.14886,4.68944 0.41954,9.31679 0.41954,9.3168 -8.15887,3.05261 c -15.89207,5.94599 -18.87437,6.32689 -32.05681,4.0942 l -12.23376,-2.072 -5.26624,14.56129 c -2.89645,8.00871 -5.25595,15.12 -5.24333,15.80287 0.0128,0.68285 4.99475,3.99618 11.07143,7.36293 10.50011,5.81754 11.37924,6.70144 17.71197,17.80828 l 6.66347,11.68693 -2.7181,3.62029 c -1.49496,1.99115 -4.17209,5.33511 -5.94919,7.43102 l -3.23108,3.81075 -12.85165,-4.85782 c -10.57761,-3.99825 -13.73735,-5.93237 -17.85714,-10.93058 -2.75303,-3.34003 -6.61264,-7.82157 -8.57693,-9.959 l -3.57143,-3.88623 -13.57142,7.92583 c -7.46429,4.3592 -13.74919,8.09684 -13.96646,8.30585 -0.21727,0.20903 1.60376,5.7737 4.04673,12.36596 4.3249,11.67062 4.39808,12.26779 2.78221,22.70022 -2.66803,17.22532 -2.40288,16.70485 -9.04751,17.76102 -3.2768,0.52086 -7.29125,1.27903 -8.92097,1.68483 -1.62973,0.4058 -3.61975,-0.10714 -4.42225,-1.13973 l 0,0 z m 5.75622,-91.21091 c 40.6356,-15.20371 40.72047,-74.63235 0.12828,-89.86647 -11.6351,-4.36662 -28.19803,-3.77677 -38.37603,1.36669 -37.2726,18.83572 -35.50133,72.09244 2.92315,87.89042 10.85167,4.4616 24.40368,4.69537 35.32454,0.60936 l 6e-5,0 z"
+       id="path4584"
+       inkscape:connector-curvature="0"
+       clip-path="url(#clipPath4617)" />
+    <path
+       style="fill:#999999;stroke:none"
+       d="m 137.40915,254.8325 c -1.26388,-3.15876 -2.30675,-9.74805 -2.31748,-14.64286 -0.03,-13.68249 -0.66793,-14.93253 -8.47507,-16.60686 -3.72822,-0.79957 -10.89569,-1.87094 -15.92771,-2.38086 l -9.14914,-0.92711 -4.027767,10.62916 c -3.904909,10.30494 -9.421742,18.24315 -12.678473,18.24315 -1.736606,0 -17.384447,-8.69884 -21.68079,-12.05264 -4.20131,-3.27961 -1.931667,-10.19323 6.980559,-21.26363 l 7.845084,-9.74484 -6.385824,-8.1123 c -3.512203,-4.46177 -8.245923,-10.30856 -10.519376,-12.99287 l -4.133552,-4.88057 -12.329214,6.66628 c -6.781068,3.66646 -13.656601,6.66629 -15.278964,6.66629 -3.271731,0 -8.338082,-9.55112 -11.612425,-21.89182 -1.76747,-6.66142 -1.710297,-6.98112 1.710359,-9.56355 1.946426,-1.46946 9.163956,-3.80946 16.038956,-5.19999 l 12.5,-2.52823 0,-16.70704 0,-16.70704 -10.357143,-1.78814 c -5.696429,-0.98348 -12.843581,-3.02213 -15.882561,-4.53034 -5.022513,-2.4926 -5.458415,-3.15507 -4.789259,-7.2786 0.404887,-2.49503 2.547958,-9.193329 4.76238,-14.885117 3.592557,-9.234046 4.434488,-10.348706 7.816639,-10.348706 2.084728,0 9.100345,3.00841 15.59026,6.685357 l 11.799845,6.685356 4.166639,-4.899642 c 9.088134,-10.686935 15.464628,-19.545471 15.464628,-21.484214 0,-1.121577 -2.62404,-5.214683 -5.831201,-9.09579 -6.7947,-8.222527 -9.883084,-13.759459 -9.883084,-17.718639 0,-3.210132 18.974775,-15.886714 23.77982,-15.886714 3.625548,0 7.895445,5.827393 12.682653,17.308799 2.091384,5.015875 4.349691,9.69443 5.018461,10.396788 0.71142,0.747145 7.76951,0.222625 17.01037,-1.264124 l 15.79441,-2.541139 0,-11.921252 c 0,-7.621693 0.82879,-13.992614 2.29797,-17.664448 2.15452,-5.384664 2.66001,-5.743195 8.09727,-5.743195 3.18961,0 9.86981,0.708849 14.84489,1.575221 l 9.04558,1.575222 0,6.922461 c 0,3.807354 -1.65411,12.158671 -3.67581,18.558484 -2.0217,6.399813 -3.46813,11.829199 -3.21429,12.065302 0.25385,0.236103 6.82512,3.820095 14.60283,7.96443 l 14.14129,7.535151 8.71586,-9.435108 c 8.23632,-8.916025 15.3622,-13.90402 19.86332,-13.90402 1.78522,0 18.13823,18.020332 18.13823,19.987568 0,2.654106 -10.51563,12.705932 -18.94374,18.108223 -9.10246,5.834529 -9.82127,6.652683 -8.93776,10.1729 1.57242,6.264976 9.4061,25.907756 10.63515,26.667346 0.62578,0.38675 6.55497,-0.0216 13.17597,-0.90751 9.99681,-1.33756 13.11893,-1.25044 18.41143,0.51373 l 6.37324,2.12441 0,13.38956 0,13.38956 -6.42857,1.89426 c -5.17857,1.52593 -8.87329,1.5662 -19.00145,0.20712 -7.4181,-0.99542 -13.05582,-1.16059 -13.75084,-0.40286 -1.95698,2.1336 -10.3766,28.97456 -9.52241,30.35665 0.43701,0.70711 5.19671,3.90091 10.5771,7.09734 6.2538,3.71532 11.1796,7.92283 13.65558,11.66429 l 3.87307,5.8526 -2.86288,3.63956 c -4.38864,5.57927 -12.42466,14.31215 -14.15297,15.38031 -3.29983,2.0394 -12.69305,-3.81343 -21.67235,-13.50386 l -9.28571,-10.02111 -13.57143,8.13113 c -7.46428,4.47211 -13.79851,8.31193 -14.07606,8.53291 -0.27755,0.221 1.20602,5.53844 3.29682,11.81654 2.55534,7.673 3.65733,13.67335 3.36178,18.3049 l -0.43968,6.89015 -7.85714,1.64795 c -4.32143,0.90639 -10.84092,1.70996 -14.48775,1.78572 -6.45052,0.134 -6.69301,-0.0183 -8.92857,-5.60544 z m 19.61036,-73.3652 c 34.05446,-16.66129 35.92066,-67.13028 3.17384,-85.832465 -12.58073,-7.185038 -31.24883,-8.116887 -44.61884,-2.227222 -8.23256,3.62655 -18.548016,13.504017 -23.09118,22.110727 -3.416776,6.47285 -3.800721,8.7155 -3.800721,22.20021 0,12.90344 0.457912,15.85761 3.27616,21.1358 6.984552,13.08112 18.824081,22.45795 32.789441,25.96905 9.31337,2.34151 23.67947,0.84748 32.2713,-3.3561 z"
+       id="path2985"
+       inkscape:connector-curvature="0"
+       transform="translate(175.56216,278.4604)" />
+  </g>
+</svg>

build/img/gear_white.svg

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="272.70593"
+   height="275.19449"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="gear.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="159.11118"
+     inkscape:cy="75.475936"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1111"
+     inkscape:window-height="840"
+     inkscape:window-x="191"
+     inkscape:window-y="28"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4617">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;stroke:none"
+         id="path4619"
+         sodipodi:cx="141.42857"
+         sodipodi:cy="140.90877"
+         sodipodi:rx="124.28571"
+         sodipodi:ry="124.28571"
+         d="m 265.71429,140.90877 a 124.28571,124.28571 0 1 1 -248.57143,0 124.28571,124.28571 0 1 1 248.57143,0 z"
+         transform="translate(170.48656,275.14888)" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-175.56216,-278.4604)">
+    <path
+       style="fill:#b3b3b3;stroke:none"
+       d="m 322.90077,552.37609 c -0.8025,-1.03265 -4.1298,-6.77812 -7.394,-12.76771 -5.66062,-10.38686 -5.9349,-11.45971 -5.9349,-23.21429 0,-6.77827 -0.16071,-12.33471 -0.35714,-12.34764 -0.19643,-0.0129 -7.10714,-1.25351 -15.35714,-2.75686 -8.25,-1.50332 -15.42054,-2.29632 -15.93453,-1.7622 -0.51399,0.53413 -2.65068,5.852 -4.7482,11.8175 -3.29679,9.3763 -4.91271,11.81339 -11.92261,17.98135 -13.16776,11.58617 -12.78024,11.47418 -21.89865,6.32807 l -7.91867,-4.46902 2.59473,-13.70492 c 2.49374,-13.17148 2.90233,-14.05529 10.49705,-22.70579 4.34627,-4.95047 7.90231,-9.56676 7.90231,-10.2584 0,-1.47559 -18.31337,-23.80793 -20.06165,-24.4643 -0.65433,-0.24566 -6.31795,2.51133 -12.58583,6.12664 l -11.39614,6.57329 -13.13132,-0.41234 -13.13131,-0.41236 -3.2803,-8.73539 -3.28031,-8.7354 10.00696,-8.17517 c 10.84131,-8.85678 12.71635,-9.70148 27.21704,-12.26113 l 9.64286,-1.70214 0,-16.16553 0,-16.16553 -7.5,-1.47726 c -4.125,-0.81249 -9.8425,-1.8811 -12.70556,-2.37469 -3.46464,-0.5973 -8.76203,-3.85429 -15.83987,-9.73882 l -10.63432,-8.8414 3.17885,-8.52806 3.17886,-8.52805 13.60638,-0.40736 13.60637,-0.40735 10.9584,6.47878 c 6.02712,3.56333 11.38742,6.44805 11.91178,6.41048 1.07253,-0.0768 19.25751,-22.17096 20.00721,-24.30806 0.26531,-0.75631 -2.67819,-5.06316 -6.54112,-9.5708 -9.23405,-10.77518 -8.94789,-10.17209 -11.75184,-24.76724 l -2.43237,-12.66102 8.23066,-4.90297 8.23065,-4.90298 10.59272,9.07442 c 9.9688,8.53993 10.84458,9.77375 14.869,20.94783 2.78986,7.74624 4.97907,11.78706 6.2981,11.625 1.112,-0.13663 8.28967,-1.33754 15.95038,-2.66869 l 13.92857,-2.42028 0,-12.18641 c 0,-11.78521 0.21856,-12.59093 6.63887,-24.47416 3.65139,-6.75827 6.83678,-12.52672 7.07865,-12.81878 0.24187,-0.29206 4.61063,0.25596 9.70834,1.21783 10.34441,1.95186 9.29217,0.3446 12.39626,18.9345 1.53751,9.2079 1.41438,10.15238 -2.8655,21.98039 -2.45962,6.79749 -4.29177,12.48885 -4.07147,12.64746 4.71177,3.39226 27.103,15.17953 28.15202,14.81988 0.79829,-0.27369 4.84943,-4.58023 9.00255,-9.57008 6.9761,-8.38161 8.52263,-9.438 20.30933,-13.87272 l 12.75821,-4.80025 5.08923,5.87865 c 2.79907,3.23326 5.53904,6.62899 6.08881,7.54607 0.54977,0.91709 -2.04455,6.76442 -5.76518,12.99407 -6.19419,10.37126 -7.69156,11.86889 -17.75219,17.75522 -6.04307,3.53571 -11.0023,7.00724 -11.02051,7.71451 -0.0183,0.70726 2.31563,7.61798 5.18633,15.35714 3.61895,9.75638 5.91877,14.07069 7.5,14.06952 1.2543,-9.3e-4 6.9707,-0.89614 12.70311,-1.98936 10.42006,-1.9872 10.42577,-1.98654 23.57143,2.70176 l 13.14886,4.68944 0.41954,9.31679 0.41954,9.3168 -8.15887,3.05261 c -15.89207,5.94599 -18.87437,6.32689 -32.05681,4.0942 l -12.23376,-2.072 -5.26624,14.56129 c -2.89645,8.00871 -5.25595,15.12 -5.24333,15.80287 0.0128,0.68285 4.99475,3.99618 11.07143,7.36293 10.50011,5.81754 11.37924,6.70144 17.71197,17.80828 l 6.66347,11.68693 -2.7181,3.62029 c -1.49496,1.99115 -4.17209,5.33511 -5.94919,7.43102 l -3.23108,3.81075 -12.85165,-4.85782 c -10.57761,-3.99825 -13.73735,-5.93237 -17.85714,-10.93058 -2.75303,-3.34003 -6.61264,-7.82157 -8.57693,-9.959 l -3.57143,-3.88623 -13.57142,7.92583 c -7.46429,4.3592 -13.74919,8.09684 -13.96646,8.30585 -0.21727,0.20903 1.60376,5.7737 4.04673,12.36596 4.3249,11.67062 4.39808,12.26779 2.78221,22.70022 -2.66803,17.22532 -2.40288,16.70485 -9.04751,17.76102 -3.2768,0.52086 -7.29125,1.27903 -8.92097,1.68483 -1.62973,0.4058 -3.61975,-0.10714 -4.42225,-1.13973 l 0,0 z m 5.75622,-91.21091 c 40.6356,-15.20371 40.72047,-74.63235 0.12828,-89.86647 -11.6351,-4.36662 -28.19803,-3.77677 -38.37603,1.36669 -37.2726,18.83572 -35.50133,72.09244 2.92315,87.89042 10.85167,4.4616 24.40368,4.69537 35.32454,0.60936 l 6e-5,0 z"
+       id="path4584"
+       inkscape:connector-curvature="0"
+       clip-path="url(#clipPath4617)" />
+    <path
+       style="fill:#ffffff;stroke:none"
+       d="m 137.40915,254.8325 c -1.26388,-3.15876 -2.30675,-9.74805 -2.31748,-14.64286 -0.03,-13.68249 -0.66793,-14.93253 -8.47507,-16.60686 -3.72822,-0.79957 -10.89569,-1.87094 -15.92771,-2.38086 l -9.14914,-0.92711 -4.027767,10.62916 c -3.904909,10.30494 -9.421742,18.24315 -12.678473,18.24315 -1.736606,0 -17.384447,-8.69884 -21.68079,-12.05264 -4.20131,-3.27961 -1.931667,-10.19323 6.980559,-21.26363 l 7.845084,-9.74484 -6.385824,-8.1123 c -3.512203,-4.46177 -8.245923,-10.30856 -10.519376,-12.99287 l -4.133552,-4.88057 -12.329214,6.66628 c -6.781068,3.66646 -13.656601,6.66629 -15.278964,6.66629 -3.271731,0 -8.338082,-9.55112 -11.612425,-21.89182 -1.76747,-6.66142 -1.710297,-6.98112 1.710359,-9.56355 1.946426,-1.46946 9.163956,-3.80946 16.038956,-5.19999 l 12.5,-2.52823 0,-16.70704 0,-16.70704 -10.357143,-1.78814 c -5.696429,-0.98348 -12.843581,-3.02213 -15.882561,-4.53034 -5.022513,-2.4926 -5.458415,-3.15507 -4.789259,-7.2786 0.404887,-2.49503 2.547958,-9.193329 4.76238,-14.885117 3.592557,-9.234046 4.434488,-10.348706 7.816639,-10.348706 2.084728,0 9.100345,3.00841 15.59026,6.685357 l 11.799845,6.685356 4.166639,-4.899642 c 9.088134,-10.686935 15.464628,-19.545471 15.464628,-21.484214 0,-1.121577 -2.62404,-5.214683 -5.831201,-9.09579 -6.7947,-8.222527 -9.883084,-13.759459 -9.883084,-17.718639 0,-3.210132 18.974775,-15.886714 23.77982,-15.886714 3.625548,0 7.895445,5.827393 12.682653,17.308799 2.091384,5.015875 4.349691,9.69443 5.018461,10.396788 0.71142,0.747145 7.76951,0.222625 17.01037,-1.264124 l 15.79441,-2.541139 0,-11.921252 c 0,-7.621693 0.82879,-13.992614 2.29797,-17.664448 2.15452,-5.384664 2.66001,-5.743195 8.09727,-5.743195 3.18961,0 9.86981,0.708849 14.84489,1.575221 l 9.04558,1.575222 0,6.922461 c 0,3.807354 -1.65411,12.158671 -3.67581,18.558484 -2.0217,6.399813 -3.46813,11.829199 -3.21429,12.065302 0.25385,0.236103 6.82512,3.820095 14.60283,7.96443 l 14.14129,7.535151 8.71586,-9.435108 c 8.23632,-8.916025 15.3622,-13.90402 19.86332,-13.90402 1.78522,0 18.13823,18.020332 18.13823,19.987568 0,2.654106 -10.51563,12.705932 -18.94374,18.108223 -9.10246,5.834529 -9.82127,6.652683 -8.93776,10.1729 1.57242,6.264976 9.4061,25.907756 10.63515,26.667346 0.62578,0.38675 6.55497,-0.0216 13.17597,-0.90751 9.99681,-1.33756 13.11893,-1.25044 18.41143,0.51373 l 6.37324,2.12441 0,13.38956 0,13.38956 -6.42857,1.89426 c -5.17857,1.52593 -8.87329,1.5662 -19.00145,0.20712 -7.4181,-0.99542 -13.05582,-1.16059 -13.75084,-0.40286 -1.95698,2.1336 -10.3766,28.97456 -9.52241,30.35665 0.43701,0.70711 5.19671,3.90091 10.5771,7.09734 6.2538,3.71532 11.1796,7.92283 13.65558,11.66429 l 3.87307,5.8526 -2.86288,3.63956 c -4.38864,5.57927 -12.42466,14.31215 -14.15297,15.38031 -3.29983,2.0394 -12.69305,-3.81343 -21.67235,-13.50386 l -9.28571,-10.02111 -13.57143,8.13113 c -7.46428,4.47211 -13.79851,8.31193 -14.07606,8.53291 -0.27755,0.221 1.20602,5.53844 3.29682,11.81654 2.55534,7.673 3.65733,13.67335 3.36178,18.3049 l -0.43968,6.89015 -7.85714,1.64795 c -4.32143,0.90639 -10.84092,1.70996 -14.48775,1.78572 -6.45052,0.134 -6.69301,-0.0183 -8.92857,-5.60544 z m 19.61036,-73.3652 c 34.05446,-16.66129 35.92066,-67.13028 3.17384,-85.832465 -12.58073,-7.185038 -31.24883,-8.116887 -44.61884,-2.227222 -8.23256,3.62655 -18.548016,13.504017 -23.09118,22.110727 -3.416776,6.47285 -3.800721,8.7155 -3.800721,22.20021 0,12.90344 0.457912,15.85761 3.27616,21.1358 6.984552,13.08112 18.824081,22.45795 32.789441,25.96905 9.31337,2.34151 23.67947,0.84748 32.2713,-3.3561 z"
+       id="path2985"
+       inkscape:connector-curvature="0"
+       transform="translate(175.56216,278.4604)" />
+  </g>
+</svg>

build/img/padlock_close_green.svg

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3041"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="15"
+   height="15"
+   sodipodi:docname="padlock_close_green.svg">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview3043"
+     showgrid="false"
+     inkscape:zoom="32"
+     inkscape:cx="12.823367"
+     inkscape:cy="8.9449238"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3041"
+     borderlayer="true" />
+  <rect
+     style="fill:#44aa00;stroke:#44aa00;stroke-width:0.92522794"
+     id="rect3051"
+     width="10.232394"
+     height="6.4687548"
+     x="2.5534275"
+     y="8.074255" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4101"
+     sodipodi:type="arc"
+     sodipodi:cx="7.6713805"
+     sodipodi:cy="6.7928491"
+     sodipodi:rx="4.534133"
+     sodipodi:ry="4.5301714"
+     sodipodi:start="3.1415927"
+     sodipodi:end="0"
+     d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+     sodipodi:open="true" />
+  <rect
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4153"
+     width="2.0906768"
+     height="1.0984892"
+     x="2.0913804"
+     y="6.7554431" />
+  <rect
+     y="6.7632556"
+     x="11.157786"
+     height="1.0984892"
+     width="2.0906768"
+     id="rect4155"
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>

build/img/padlock_close_grey.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3041"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="15"
+   height="15"
+   sodipodi:docname="padlock_close_grey.svg">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview3043"
+     showgrid="false"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3041"
+     borderlayer="true" />
+  <rect
+     style="fill:#808080;stroke:#808080;stroke-width:0.92522794"
+     id="rect3051"
+     width="10.232394"
+     height="6.4687548"
+     x="2.5534275"
+     y="8.074255" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#808080">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#808080">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
+</svg>

build/img/padlock_close_orange.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3041"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="15"
+   height="15"
+   sodipodi:docname="padlock_close_orange.svg">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview3043"
+     showgrid="false"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3041"
+     borderlayer="true" />
+  <rect
+     style="fill:#ff7f2a;stroke:#ff7f2a;stroke-width:0.92522794"
+     id="rect3051"
+     width="10.232394"
+     height="6.4687548"
+     x="2.5534275"
+     y="8.074255" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#ff7f2a">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#ff7f2a;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#ff7f2a">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
+</svg>

build/img/padlock_open.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="15"
+   height="15"
+   id="svg3041">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <rect
+     width="11.059322"
+     height="6.9915257"
+     x="2.1610172"
+     y="8.0084743"
+     id="rect3051"
+     style="fill:#999999;stroke:none" />
+  <path
+     d="m 3.082628,5.0211864 c 0,0 -0.127119,-4.06779652 4.449152,-4.06779652 4.576268,0 4.703386,3.94067782 4.703386,3.94067782 l 0.06356,5.5932193 0,0"
+     id="path3848"
+     style="fill:none;stroke:#999999;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>

build/img/padlock_open_grey.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3041"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="15"
+   height="15"
+   sodipodi:docname="padlock_open-white.svg">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview3043"
+     showgrid="false"
+     inkscape:zoom="44.500587"
+     inkscape:cx="6.292871"
+     inkscape:cy="10.986979"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3041"
+     borderlayer="true" />
+  <rect
+     style="fill:#808080;stroke:#808080;stroke-width:0.92522794"
+     id="rect3051"
+     width="10.232394"
+     height="6.4687548"
+     x="2.5534275"
+     y="8.074255" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 7.5078125,0.00556144 C 5.0260054,0.00556144 3.491603,0.79834464 2.75,1.9469676 2.008397,3.0955907 2.0878906,4.3496954 2.0878906,5.0250926 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.3031738 0.0049,5.5357844 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361373 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,0.91300364 10.078064,0.00556144 7.5078125,0.00556144 Z"
+     id="path3848"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccssscccccccs" />
+</svg>

build/img/padlock_open_white.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3041"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="15"
+   height="15"
+   sodipodi:docname="padlock_open-white.svg">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1444"
+     inkscape:window-height="787"
+     id="namedview3043"
+     showgrid="false"
+     inkscape:zoom="44.500587"
+     inkscape:cx="9.2134583"
+     inkscape:cy="8.0232356"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3041" />
+  <rect
+     style="fill:#ffffff;stroke:#ffffff"
+     id="rect3051"
+     width="11.059322"
+     height="6.9915257"
+     x="2.1610172"
+     y="8.0084743" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.89999998000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 3.082628,5.0211864 c 0,0 -0.127119,-4.06779652 4.449152,-4.06779652 4.576268,0 4.703386,3.94067782 4.703386,3.94067782 l 0.06356,5.5932193 0,0"
+     id="path3848"
+     inkscape:connector-curvature="0" />
+</svg>

build/img/speech_balloon_white.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 25 25.000001"
+   sodipodi:docname="speech_balloon_white.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="25.186628"
+     inkscape:cy="14.479999"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-228.24219,-320.66798)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 240.77627,324.02578 a 12.489309,7.9254426 0 0 0 -12.48944,7.92538 12.489309,7.9254426 0 0 0 5.26146,6.45637 c -0.17862,1.91196 -1.06119,3.95363 -3.14604,4.64437 2.54121,-0.11444 5.60026,-1.93057 7.47209,-3.40137 a 12.489309,7.9254426 0 0 0 2.90193,0.22616 12.489309,7.9254426 0 0 0 12.48928,-7.92553 12.489309,7.9254426 0 0 0 -12.48928,-7.92538 z"
+       id="path4101"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

build/jsxc.lib.webrtc.js

@@ -1,21 +1,22 @@
-/**
- * jsxc v0.5.2 - 2014-01-28
+/*!
+ * jsxc v1.0.0-beta1 - 2014-10-29
  * 
  * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
  * 
- * Please see http://jsxc.org/
+ * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.5.2
+ * @version 1.0.0-beta1
+ * @license MIT
  */
 
-/* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
+/* global jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery, MediaStreamTrack */
 
 var RTC = null, RTCPeerconnection = null;
 
 jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
-        <p>%%Do_you_want_to_accept_the_call_from%% {{cid_name}}?</p>\
+        <p>%%Do_you_want_to_accept_the_call_from%% {{bid_name}}?</p>\
         <p class="jsxc_right">\
             <a href="#" class="button jsxc_reject">%%Reject%%</a> <a href="#" class="button creation jsxc_accept">%%Accept%%</a>\
          </p>';
@@ -23,10 +24,28 @@ jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
 jsxc.gui.template.allowMediaAccess = '<p>%%Please_allow_access_to_microphone_and_camera%%</p>';
 
 jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
+            <div class="jsxc_chatarea">\
+                <ul></ul>\
+            </div>\
             <div class="jsxc_videoContainer">\
                 <video class="jsxc_localvideo" autoplay></video>\
                 <video class="jsxc_remotevideo" autoplay></video>\
                 <div class="jsxc_status"></div>\
+               <div class="bubblingG">\
+                  <span id="bubblingG_1">\
+                  </span>\
+                  <span id="bubblingG_2">\
+                  </span>\
+                  <span id="bubblingG_3">\
+                  </span>\
+               </div>\
+                <div class="jsxc_noRemoteVideo">\
+                   <div>\
+                     <div></div>\
+                     <p>%%No_video_signal%%</p>\
+                     <div></div>\
+                   </div>\
+                </div>\
             </div>\
             <div class="jsxc_controlbar">\
                 <button type="button" class="jsxc_hangUp">%%hang_up%%</button>\
@@ -36,7 +55,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
                 </div>\
                 <!-- <button type="button" class="jsxc_mute_local">%%mute_my_audio%%</button>\
                 <button type="button" class="jsxc_pause_local">%%pause_my_video%%</button> --> \
-                <button type="button" class="jsxc_chat">%%chat%%</button>\
+                <button type="button" class="jsxc_showchat">%%chat%%</button>\
                 <button type="button" class="jsxc_fullscreen">%%fullscreen%%</button>\
                 <button type="button" class="jsxc_info">%%Info%%</button>\
             </div>\
@@ -44,9 +63,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
                <div class="jsxc_snapshotbar">\
                    <p>No pictures yet!</p>\
                </div>\n\
-               <div class="jsxc_chatarea">\
+               <!--<div class="jsxc_chatarea">\
                    <ul></ul>\
-               </div>\
+               </div>-->\
                <div class="jsxc_infobar"></div>\
             </div>\
         </div>';
@@ -76,7 +95,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       AUTO_ACCEPT: false,
 
       /** required disco features */
-      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1' ],
+      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1', 'urn:xmpp:jingle:apps:dtls:0' ],
 
       /** bare jid to current jid mapping */
       chatJids: {},
@@ -89,7 +108,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        */
       init: function() {
          var self = jsxc.webrtc;
-         
+
          // shortcut
          self.conn = jsxc.xmpp.conn;
 
@@ -110,6 +129,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
          self.conn.jingle.pc_constraints = RTC.pc_constraints;
 
          $(document).on('message.jsxc', $.proxy(self.onMessage, self));
+         $(document).on('presence.jsxc', $.proxy(self.onPresence, self));
 
          $(document).on('mediaready.jingle', $.proxy(self.onMediaReady, self));
          $(document).on('mediafailure.jingle', $.proxy(self.onMediaFailure, self));
@@ -122,6 +142,14 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
          $(document).on('iceconnectionstatechange.jingle', $.proxy(self.onIceConnectionStateChanged, self));
          $(document).on('nostuncandidates.jingle', $.proxy(self.noStunCandidates, self));
 
+         $(document).on('error.jingle', function(ev, sid, error) {
+            jsxc.error('[JINGLE]', error);
+         });
+
+         if (self.conn.disco) {
+            self.conn.disco.addFeature('urn:xmpp:jingle:apps:dtls:0');
+         }
+
          if (self.conn.caps) {
             $(document).on('caps.strophe', $.proxy(self.onCaps, self));
          }
@@ -163,8 +191,64 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
                jsxc.webrtc.conn.jingle.ice_config = iceConfig;
                jsxc.storage.setUserItem('iceConfig', iceConfig);
                jsxc.storage.setUserItem('iceValidity', (new Date()).getTime() + 1000 * data.ttl);
+            },
+            dataType: 'json'
+         });
+      },
+
+      /**
+       * Return list of video capable resources.
+       * 
+       * @memberOf jsxc.webrtc
+       * @param bid
+       * @returns {Array}
+       */
+      getCapableRes: function(bid) {
+         var self = jsxc.webrtc;
+         var res = jsxc.storage.getUserItem('res', bid) || [];
+
+         var available = [];
+         $.each(res, function(r) {
+            if (self.conn.caps.hasFeatureByJid(bid + '/' + r, self.reqVideoFeatures)) {
+               available.push(r);
             }
          });
+
+         return available;
+      },
+
+      /**
+       * Add "video" button to roster
+       * 
+       * @private
+       * @memberOf jsxc.webrtc
+       * @param event
+       * @param bid bid of roster item
+       * @param data data wich belongs to bid
+       * @param el the roster item
+       */
+      onAddRosterItem: function(event, bid, data, el) {
+         var self = jsxc.webrtc;
+
+         if (!self.conn) {
+            $(document).one('connectionReady.jsxc', function() {
+               self.onAddRosterItem(null, bid, data, el);
+            });
+            return;
+         }
+
+         var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
+
+         videoIcon.click(function() {
+            self.startCall(data.jid);
+            return false;
+         });
+
+         el.find('.jsxc_options.jsxc_left').append(videoIcon);
+
+         el.on('extra.jsxc', function() {
+            self.updateIcon(bid);
+         });
       },
 
       /**
@@ -178,6 +262,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       initWindow: function(event, win) {
          var self = jsxc.webrtc;
 
+         jsxc.debug('webrtc.initWindow');
+
          if (!self.conn) {
             $(document).one('connectionReady.jsxc', function() {
                self.initWindow(null, win);
@@ -185,46 +271,53 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             return;
          }
 
-         var li = $('<li>Video</li>').addClass('jsxc_video');
-         win.find('.jsxc_settings ul').append(li);
+         var div = $('<div>').addClass('jsxc_video');
+         win.find('.jsxc_transfer:eq(1)').after(div);
 
-         self.updateWindow(win);
+         self.updateIcon(jsxc.jidToBid(win.data('jid')));
       },
 
       /**
-       * Enable or disable "video" button and assign full jid.
+       * Enable or disable "video" icon and assign full jid.
        * 
        * @memberOf jsxc.webrtc
-       * @param win jQuery window object
+       * @param bid CSS conform jid
        */
-      updateWindow: function(win) {
-         if (!win || win.length === 0) {
-            return;
-         }
+      updateIcon: function(bid) {
+         jsxc.debug('Update icon', bid);
 
          var self = jsxc.webrtc;
-         var jid = win.data('jid');
-         var li = win.find('.jsxc_video');
+         var win = jsxc.gui.window.get(bid);
+         var jid = win.data('jid') || jsxc.storage.getUserItem('buddy', bid).jid;
 
-         // only start video call to a full jid
-         if (Strophe.getResourceFromJid(jid) === null) {
-            var cid = jsxc.jidToCid(jid);
-            var res = jsxc.storage.getUserItem('buddy_' + cid).res;
+         var el = win.find('.jsxc_video').add(jsxc.gui.roster.getItem(bid).find('.jsxc_video'));
 
-            if (Array.isArray(res) && res.length === 1) {
-               jid += '/' + res[0];
-            }
+         var capableRes = self.getCapableRes(jid);
+         var targetRes = Strophe.getResourceFromJid(jid);
+
+         if (targetRes === null) {
+            $.each(jsxc.storage.getUserItem('buddy', bid).res, function(index, val) {
+               if (capableRes.indexOf(val) > -1) {
+                  targetRes = val;
+                  return false;
+               }
+            });
          }
 
-         li.off('click');
+         el.off('click');
 
-         if (self.conn.caps.hasFeatureByJid(jid, self.reqVideoFeatures)) {
-            li.click(function() {
-               self.startCall(jid);
+         if (capableRes.indexOf(targetRes) > -1) {
+            el.click(function() {
+               self.startCall(jid + '/' + targetRes);
             });
-            li.removeClass('jsxc_disabled');
+
+            el.removeClass('jsxc_disabled');
+
+            el.attr('title', jsxc.translate('%%Start video call%%'));
          } else {
-            li.addClass('jsxc_disabled');
+            el.addClass('jsxc_disabled');
+
+            el.attr('title', jsxc.translate('%%Video call not possible.%%'));
          }
       },
 
@@ -238,14 +331,32 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        */
       onMessage: function(e, from) {
          var self = jsxc.webrtc;
-         var bJid = Strophe.getBareJidFromJid(from);
+         var bid = jsxc.jidToBid(from);
 
-         if (self.chatJids[bJid] !== from) {
-            self.updateWindow(jsxc.gui.getWindow(jsxc.jidToCid(bJid)));
-            self.chatJids[bJid] = from;
+         jsxc.debug('webrtc.onmessage', from);
+
+         if (self.chatJids[bid] !== from) {
+            self.updateIcon(bid);
+            self.chatJids[bid] = from;
          }
       },
 
+      /**
+       * Update icon on presence.
+       * 
+       * @memberOf
+       * @param ev
+       * @param status
+       * @private
+       */
+      onPresence: function(ev, jid) {
+         var self = jsxc.webrtc;
+
+         jsxc.debug('webrtc.onpresence', jid);
+
+         self.updateIcon(jsxc.jidToBid(jid));
+      },
+
       /**
        * Display status message to user.
        * 
@@ -257,6 +368,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
          var status = $('.jsxc_webrtc .jsxc_status');
          var duration = (typeof d === 'undefined' || d === null) ? 4000 : d;
 
+         jsxc.debug('[Webrtc]', txt);
+
          if (status.html()) {
             // attach old messages
             txt = status.html() + '<br />' + txt;
@@ -301,11 +414,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        */
       onCaps: function(event, jid) {
          var self = jsxc.webrtc;
-         var win = jsxc.gui.getWindow(jsxc.jidToCid(jid));
 
-         if (win.length > 0) {
-            self.updateWindow(win);
-         }
+         self.updateIcon(jsxc.jidToBid(jid));
       },
 
       /**
@@ -336,6 +446,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             self.setStatus((stream.getVideoTracks().length > 0) ? 'Use local video device.' : 'No local video device.');
 
             jsxc.debug('using video device "' + stream.getVideoTracks()[i].label + '"');
+            $('#jsxc_dialog .jsxc_localvideo').show();
          }
 
          $(document).one('cleanup.dialog.jsxc', $.proxy(self.hangUp, self));
@@ -348,8 +459,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        * @private
        * @memberOf jsxc.webrtc
        */
-      onMediaFailure: function() {
+      onMediaFailure: function(ev, err) {
          this.setStatus('media failure');
+
+         jsxc.gui.window.postMessage(jsxc.jidToBid(jsxc.webrtc.last_caller), 'sys', jsxc.translate('%%Media failure%%: ') + err.name);
+         jsxc.debug('media failure: ' + err.name);
       },
 
       /**
@@ -365,10 +479,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
 
          var self = this;
          var sess = this.conn.jingle.sessions[sid];
-         var jid = jsxc.jidToCid(sess.peerjid);
+         var bid = jsxc.jidToBid(sess.peerjid);
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Incoming call.%%'));
 
          // display notification
-         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + jid));
+         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + bid));
 
          // send signal to partner
          sess.sendRinging();
@@ -396,14 +512,19 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             return;
          }
 
-         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', jsxc.jidToCid(jid)));
+         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', bid), {
+            noClose: true
+         });
 
          dialog.find('.jsxc_accept').click(function() {
+            $(document).trigger('accept.call.jsxc');
+
             self.reqUserMedia();
          });
 
          dialog.find('.jsxc_reject').click(function() {
             jsxc.gui.dialog.close();
+            $(document).trigger('reject.call.jsxc');
 
             sess.sendTerminate('decline');
             sess.terminate();
@@ -420,25 +541,33 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        * @param reason Reason for termination
        * @param [text] Optional explanation
        */
-      onCallTerminated: function(event, sid, reason, text) { 
+      onCallTerminated: function(event, sid, reason, text) {
          this.setStatus('call terminated ' + sid + (reason ? (': ' + reason + ' ' + text) : ''));
 
+         var bid = jsxc.jidToBid(jsxc.webrtc.last_caller);
+
          if (this.localStream) {
             this.localStream.stop();
          }
 
-         $('.jsxc_remotevideo')[0].src = "";
-         $('.jsxc_localvideo')[0].src = "";
+         if ($('.jsxc_videoContainer').length) {
+            $('.jsxc_remotevideo')[0].src = "";
+            $('.jsxc_localvideo')[0].src = "";
+         }
 
          this.conn.jingle.localStream = null;
          this.localStream = null;
          this.remoteStream = null;
-         
-         $('#jsxc_windowList > ul').prepend($('#jsxc_dialog .jsxc_chatarea > ul > li').detach());
+
+         var win = $('#jsxc_dialog .jsxc_chatarea > ul > li');
+         $('#jsxc_windowList > ul').prepend(win.detach());
+         win.find('.slimScrollDiv').resizable('enable');
 
          $(document).off('cleanup.dialog.jsxc');
          $(document).off('error.jingle');
          jsxc.gui.dialog.close();
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Call terminated%%' + (reason ? (': %%' + reason + '%%') : '') + '.'));
       },
 
       /**
@@ -462,7 +591,6 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        */
       onRemoteStreamAdded: function(event, data, sid) {
          this.setStatus('Remote stream for session ' + sid + ' added.');
-         jsxc.debug('Stream data', data);
 
          var stream = data.stream;
          this.remoteStream = stream;
@@ -481,7 +609,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
          this.setStatus(isAudioDevice ? 'Use remote audio device.' : 'No remote audio device');
 
          if ($('.jsxc_remotevideo').length) {
-            RTC.attachMediaStream($('.jsxc_remotevideo'), stream);
+            RTC.attachMediaStream($('#jsxc_dialog .jsxc_remotevideo'), stream);
+
+            $('#jsxc_dialog .jsxc_' + (isVideoDevice ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
          }
       },
 
@@ -515,7 +645,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
          jsxc.debug('iceCon state for ' + sid, iceCon);
          jsxc.debug('sig state for ' + sid, sigState);
 
-         if (sigState === 'stable' && iceCon === 'connected') {
+         if (sigState === 'stable' && (iceCon === 'connected' || iceCon === 'completed')) {
+
+            $('#jsxc_dialog .jsxc_deviceAvailable').show();
+            $('#jsxc_dialog .bubblingG').hide();
+
             var localSDP = sess.peerconnection.localDescription.sdp;
             var remoteSDP = sess.peerconnection.remoteDescription.sdp;
 
@@ -544,6 +678,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             text += '</p>';
 
             $('#jsxc_dialog .jsxc_infobar').html(text);
+         } else if (iceCon === 'failed') {
+            jsxc.gui.window.postMessage(jsxc.jidToBid(sess.peerjid), 'sys', jsxc.translate('%%ICE connection failure%%.'));
+
+            $(document).off('cleanup.dialog.jsxc');
+
+            sess.sendTerminate('failed-transport');
+            sess.terminate();
+
+            $(document).trigger('callterminated.jingle');
          }
       },
 
@@ -562,8 +705,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        * 
        * @memberOf jsxc.webrtc
        * @param jid full jid
+       * @param um requested user media
        */
-      startCall: function(jid) {
+      startCall: function(jid, um) {
          var self = this;
 
          if (Strophe.getResourceFromJid(jid) === null) {
@@ -577,13 +721,13 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             'finish.mediaready.jsxc': function() {
                self.setStatus('Initiate call');
 
+               jsxc.gui.window.postMessage(jsxc.jidToBid(jid), 'sys', jsxc.translate('%%Call started.%%'));
+
                $(document).one('error.jingle', function(e, sid, error) {
                   if (error.source !== 'offer') {
                      return;
                   }
 
-                  self.conn.jingle.terminate(null, 'init fail');
-
                   $(document).off('cleanup.dialog.jsxc');
                   setTimeout(function() {
                      jsxc.gui.showAlert("Sorry, we couldn't establish a connection. Maybe your buddy is offline.");
@@ -593,11 +737,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
                self.conn.jingle.initiate(jid, self.conn.jid.toLowerCase());
             },
             'mediafailure.jingle': function() {
-
+               jsxc.gui.dialog.close();
             }
          });
 
-         this.reqUserMedia();
+         self.reqUserMedia(um);
       },
 
       /**
@@ -605,10 +749,10 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        * 
        * @memberOf jsxc.webrtc
        */
-      hangUp: function() {
+      hangUp: function(reason, text) {
          $(document).off('cleanup.dialog.jsxc');
 
-         jsxc.webrtc.conn.jingle.terminate(null);
+         jsxc.webrtc.conn.jingle.terminate(null, reason, text);
          $(document).trigger('callterminated.jingle');
       },
 
@@ -617,18 +761,35 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
        * 
        * @memberOf jsxc.webrtc
        */
-      reqUserMedia: function() {
+      reqUserMedia: function(um) {
          if (this.localStream) {
             $(document).trigger('mediaready.jingle', [ this.localStream ]);
             return;
          }
 
+         um = um || [ 'video', 'audio' ];
+
          jsxc.gui.dialog.open(jsxc.gui.template.get('allowMediaAccess'), {
             noClose: true
          });
          this.setStatus('please allow access to microphone and camera');
 
-         getUserMediaWithConstraints([ 'video', 'audio' ]);
+         if (typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
+            MediaStreamTrack.getSources(function(sourceInfo) {
+               var availableDevices = sourceInfo.map(function(el) {
+
+                  return el.kind;
+               });
+
+               um = um.filter(function(el) {
+                  return availableDevices.indexOf(el) !== -1;
+               });
+
+               getUserMediaWithConstraints(um);
+            });
+         } else {
+            getUserMediaWithConstraints(um);
+         }
       },
 
       /**
@@ -652,7 +813,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
 
          ctx.drawImage(video[0], 0, 0);
          var img = $('<img/>');
-         var url = canvas.toDataURL('image/jpeg');
+         var url = null;
+
+         try {
+            url = canvas.toDataURL('image/jpeg');
+         } catch (err) {
+            jsxc.warn('Error', err);
+            return;
+         }
+
          img[0].src = url;
          var link = $('<a/>').attr({
             target: '_blank',
@@ -710,15 +879,17 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
 
          if (self.remoteStream) {
             RTC.attachMediaStream(rv, self.remoteStream);
+
+            $('#jsxc_dialog .jsxc_' + (self.remoteStream.getVideoTracks().length > 0 ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
          }
 
          var toggleMulti = function(elem, open) {
             $('#jsxc_dialog .jsxc_multi > div').not(elem).slideUp();
-            
+
             var opt = {
-                  complete: jsxc.gui.dialog.resize
+               complete: jsxc.gui.dialog.resize
             };
-            
+
             if (open) {
                elem.slideDown(opt);
             } else {
@@ -726,10 +897,16 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             }
          };
 
-         var win = jsxc.gui.window.open(jsxc.jidToCid(jid));
-         
+         var win = jsxc.gui.window.open(jsxc.jidToBid(jid));
+
+         win.find('.slimScrollDiv').resizable('disable');
+         win.find('.jsxc_textarea').slimScroll({
+            height: 413
+         });
+         win.find('.jsxc_emoticons').css('top', (413 + 6) + 'px');
+
          $('#jsxc_dialog .jsxc_chatarea ul').append(win.detach());
-         
+
          $('#jsxc_dialog .jsxc_hangUp').click(function() {
             jsxc.webrtc.hangUp();
          });
@@ -743,8 +920,22 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
             toggleMulti($('#jsxc_dialog .jsxc_snapshotbar'));
          });
 
-         $('#jsxc_dialog .jsxc_chat').click(function() {
-            toggleMulti($('#jsxc_dialog .jsxc_chatarea'));
+         $('#jsxc_dialog .jsxc_showchat').click(function() {
+            var chatarea = $('#jsxc_dialog .jsxc_chatarea');
+
+            if (chatarea.is(':hidden')) {
+               chatarea.show();
+               $('#jsxc_dialog .jsxc_webrtc').width('900');
+               jsxc.gui.dialog.resize({
+                  width: '920px'
+               });
+            } else {
+               chatarea.hide();
+               $('#jsxc_dialog .jsxc_webrtc').width('650');
+               jsxc.gui.dialog.resize({
+                  width: '660px'
+               });
+            }
          });
 
          $('#jsxc_dialog .jsxc_info').click(function() {
@@ -788,8 +979,72 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       if (RTC !== null) {
          RTCPeerconnection = RTC.peerconnection;
 
+         $(document).on('add.roster.jsxc', jsxc.webrtc.onAddRosterItem);
          $(document).on('init.window.jsxc', jsxc.webrtc.initWindow);
          $(document).on('attached.jsxc', jsxc.webrtc.init);
       }
    });
+
+   $.extend(jsxc.l10n.en, {
+      Please_allow_access_to_microphone_and_camera: 'Please click the "Allow" button at the top, to allow access to microphone and camera.',
+      Incoming_call: 'Incoming call',
+      from: 'from',
+      Do_you_want_to_accept_the_call_from: 'Do you want to accept the call from',
+      Reject: 'Reject',
+      Accept: 'Accept',
+      hang_up: 'hang up',
+      snapshot: 'snapshot',
+      mute_my_audio: 'mute my audio',
+      pause_my_video: 'pause my video',
+      fullscreen: 'fullscreen',
+      Info: 'Info',
+      Local_IP: 'Local IP',
+      Remote_IP: 'Remote IP',
+      Local_Fingerprint: 'Local fingerprint',
+      Remote_Fingerprint: 'Remote fingerprint',
+      Video_call_not_possible: 'Video call not possible. Your buddy does not support video calls.',
+      Start_video_call: 'Start video call'
+   });
+
+   $.extend(jsxc.l10n.de, {
+      Please_allow_access_to_microphone_and_camera: 'Bitte klick auf den "Zulassen" Button oben, um den Zugriff auf Kamera und Mikrofon zu erlauben.',
+      Incoming_call: 'Eingehender Anruf',
+      from: 'von',
+      Do_you_want_to_accept_the_call_from: 'Möchtest Du den Anruf annehmen von',
+      Reject: 'Ablehnen',
+      Accept: 'Annehmen',
+      hang_up: 'Auflegen',
+      snapshot: 'Schnappschuss',
+      mute_my_audio: 'Mein Ton aus',
+      pause_my_video: 'Mein Video pausieren',
+      fullscreen: 'Vollbild',
+      Info: 'Info',
+      Local_IP: 'Lokale IP',
+      Remote_IP: 'Remote IP',
+      Local_Fingerprint: 'Lokaler Fingerprint',
+      Remote_Fingerprint: 'Remote Fingerprint',
+      Video_call_not_possible: 'Videoanruf nicht verfügbar. Dein Gesprächspartner unterstützt keine Videotelefonie.',
+      Start_video_call: 'Starte Videoanruf'
+   });
+
+   $.extend(jsxc.l10n.es, {
+      Please_allow_access_to_microphone_and_camera: 'Por favor, permitir el acceso al micrófono y la cámara.',
+      Incoming_call: 'Llamada entrante',
+      from: 'de',
+      Do_you_want_to_accept_the_call_from: 'Desea aceptar la llamada de',
+      Reject: 'Rechazar',
+      Accept: 'Aceptar',
+      hang_up: 'colgar',
+      snapshot: 'instantánea',
+      mute_my_audio: 'silenciar mi audio',
+      pause_my_video: 'pausar mi vídeo',
+      fullscreen: 'pantalla completa',
+      Info: 'Info',
+      Local_IP: 'IP local',
+      Remote_IP: 'IP remota',
+      Local_Fingerprint: 'Firma digital local',
+      Remote_Fingerprint: 'Firma digital remota',
+      Video_call_not_possible: 'Llamada de vídeo no es posible',
+      Start_video_call: 'Iniciar llamada de vídeo'
+   });
 }(jQuery));

build/jsxc.webrtc.css

@@ -0,0 +1,379 @@
+.jsxc_webrtc {
+	width: 900px;
+}
+
+.jsxc_webrtc li .jsxc_name {
+	cursor: auto;
+}
+
+.jsxc_webrtc li .jsxc_name:hover {
+	color: #939393;
+}
+
+.jsxc_videoContainer {
+	width: 640px;
+	height: 480px;
+	position: relative;
+	background-color: #a4a4a4;
+}
+
+.jsxc_videoContainer video, .jsxc_videoContainer .jsxc_noRemoteVideo {
+	display: none;
+}
+
+.jsxc_remotevideo, .jsxc_noRemoteVideo {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	z-index: 9000;
+	background-color: #a4a4a4;
+}
+
+.jsxc_localvideo {
+	width: 160px;
+	height: 120px;
+	position: absolute;
+	right: 10px;
+	bottom: 10px;
+	z-index: 9990;
+	background-color: black;
+	cursor: pointer;
+}
+
+.jsxc_noRemoteVideo p {
+	position: absolute;
+	bottom: 0px;
+	left:0px;
+	text-align: center;
+	color: #fff;
+	width: 100%;
+	z-index: 100;
+}
+
+.jsxc_noRemoteVideo > div {
+	width: 200px;
+	height: 200px;
+	overflow: hidden;
+	position: absolute;
+	top: 50%;
+	margin-top: -100px;
+	left: 50%;
+	margin-left: -100px;
+}
+
+.jsxc_noRemoteVideo > div > div {
+	background-color: #717171;
+}
+
+.jsxc_noRemoteVideo > div > div:first-child {
+	width: 50%;
+	height: 50%;
+	border-radius: 50%;
+	position: absolute;
+	left: 50%;
+	margin-left: -25%;
+	top: 10%;
+}
+
+.jsxc_noRemoteVideo > div > div:last-child {
+   position: absolute;
+	bottom: -50%;
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+
+.jsxc_webrtc .jsxc_status {
+	z-index: 9999;
+	border-radius: 20px;
+	display: none;
+	position: absolute;
+	top: 30px;
+	left: 50%;
+	background-color: lightgrey;
+	background-color: rgba(0, 0, 0, 0.5);
+	color: white;
+	padding: 15px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.jsxc_webrtc .slimScrollDiv {
+	opacity: 1 !important;
+}
+
+div:-moz-full-screen {
+	width: 100%;
+	height: 100%;
+	background-color: black;
+}
+
+div:-ms-full-screen {
+	width: 100%;
+	height: 100%;
+	background-color: black;
+}
+
+div:-webkit-full-screen {
+	width: 100%;
+	height: 100%;
+	background-color: black;
+}
+
+div:fullscreen {
+	width: 100%;
+	height: 100%;
+	background-color: black;
+}
+
+div:-moz-full-screen.jsxc_localvideo {
+	border: 1px solid white;
+}
+
+div:-webkit-full-screen.jsxc_localvideo {
+	border: 1px solid white;
+}
+
+div:-ms-full-screen.jsxc_localvideo {
+	border: 1px solid white;
+}
+
+div:fullscreen.jsxc_localvideo {
+	border: 1px solid white;
+}
+
+.jsxc_fullscreen.jsxc_localvideo {
+	border: 1px solid white;
+}
+
+.jsxc_controlbar {
+	width: 640px;
+}
+
+.jsxc_controlbar .jsxc_showchat {
+	float: right;
+}
+
+.jsxc_multi>div {
+	display: none;
+}
+
+.jsxc_snapshotbar {
+	width: 100%;
+	display: none;
+}
+
+.jsxc_snapshotbar img {
+	height: 50px;
+}
+
+.jsxc_buttongroup {
+	display: inline;
+}
+
+.jsxc_buttongroup button:first-child {
+	border-top-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	margin-right: 0px;
+}
+
+.jsxc_buttongroup button:last-child {
+	border-top-left-radius: 0px;
+	border-bottom-left-radius: 0px;
+	margin-left: 0px;
+}
+
+.jsxc_chatarea {
+	position: relative;
+	float:right;
+	height: 480px;
+	width: 250px;
+	background-color: #A4A4A4;
+}
+
+.jsxc_chatarea > ul {
+	width: 250px;
+	height: 480px;
+	list-style: none;
+	padding: 0px;
+}
+
+.jsxc_chatarea .jsxc_settings {
+	display: none !important;
+}
+
+.jsxc_chatarea .jsxc_close {
+	display: none !important;
+}
+
+.jsxc_chatarea .jsxc_video {
+   display: none !important;
+}
+
+.jsxc_chatarea .jsxc_bar {
+
+}
+
+.jsxc_chatarea .jsxc_window {
+	bottom: 0px;
+	box-shadow: none;
+}
+
+.jsxc_videoSuitable .jsxc_name {
+	font-style: italic;
+}
+
+div.jsxc_video {
+   background-image: url('img/camera_icon_grey.svg');
+   background-repeat: no-repeat;
+   background-position: center center;
+   background-size: 15px 15px;
+}
+
+div.jsxc_video:not(.jsxc_disabled):hover, #jsxc_buddylist .jsxc_options .jsxc_video {
+    background-image: url('img/camera_icon_white.svg');
+}
+
+#jsxc_buddylist .jsxc_options .jsxc_video.jsxc_disabled {
+	opacity: 0.2;
+}
+
+.bubblingG {
+text-align: center;
+width:129px;
+height:80px;
+position: absolute;
+top: 40%;
+left: 50%;
+margin-left: -64px;
+}
+
+.bubblingG span {
+display: inline-block;
+vertical-align: middle;
+width: 16px;
+height: 16px;
+margin: 40px auto;
+background: #000000;
+-moz-border-radius: 81px;
+-moz-animation: bubblingG 1.3s infinite alternate;
+-webkit-border-radius: 81px;
+-webkit-animation: bubblingG 1.3s infinite alternate;
+-ms-border-radius: 81px;
+-ms-animation: bubblingG 1.3s infinite alternate;
+-o-border-radius: 81px;
+-o-animation: bubblingG 1.3s infinite alternate;
+border-radius: 81px;
+animation: bubblingG 1.3s infinite alternate;
+}
+
+#bubblingG_1 {
+-moz-animation-delay: 0s;
+-webkit-animation-delay: 0s;
+-ms-animation-delay: 0s;
+-o-animation-delay: 0s;
+animation-delay: 0s;
+}
+
+#bubblingG_2 {
+-moz-animation-delay: 0.39s;
+-webkit-animation-delay: 0.39s;
+-ms-animation-delay: 0.39s;
+-o-animation-delay: 0.39s;
+animation-delay: 0.39s;
+}
+
+#bubblingG_3 {
+-moz-animation-delay: 0.78s;
+-webkit-animation-delay: 0.78s;
+-ms-animation-delay: 0.78s;
+-o-animation-delay: 0.78s;
+animation-delay: 0.78s;
+}
+
+@-moz-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-moz-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-moz-transform: translateY(-34px);
+}
+
+}
+
+@-webkit-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-webkit-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-webkit-transform: translateY(-34px);
+}
+
+}
+
+@-ms-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-ms-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-ms-transform: translateY(-34px);
+}
+
+}
+
+@-o-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-o-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-o-transform: translateY(-34px);
+}
+
+}
+
+@keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+transform: translateY(-34px);
+}
+
+}

build/lib/jquery.fullscreen.js

@@ -14,15 +14,15 @@
         var doc = document.documentElement;
 
         return ('requestFullscreen' in doc) ||
-                ('mozRequestFullscreen' in doc && document.mozFullscreenEnabled) ||
+                ('mozRequestFullScreen' in doc && document.mozFullScreenEnabled) ||
                 ('webkitRequestFullscreen' in doc);
     }
 
     function requestFullscreen(elem) {
         if (elem.requestFullscreen) {
             elem.requestFullscreen();
-        } else if (elem.mozRequestFullscreen) {
-            elem.mozRequestFullscreen();
+        } else if (elem.mozRequestFullScreen) {
+            elem.mozRequestFullScreen();
         } else if (elem.webkitRequestFullscreen) {
             elem.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
         }
@@ -38,7 +38,7 @@
     function cancelFullscreen() {
         if (document.exitFullscreen) {
             document.exitFullscreen();
-        } else if (document.mozCancelFullscreen) {
+        } else if (document.mozCancelFullScreen) {
             document.mozCancelFullScreen();
         } else if (document.webkitCancelFullScreen) {
             document.webkitCancelFullScreen();
@@ -61,16 +61,17 @@
         
         var self = this;
 
-        $(self).on('fullscreenerror mozfullscreenerror webkitfullscreenerror msfullscreenerror', function() {
+        // Chrome trigger event on self, Firefox on document
+        $(self).add(document).on('fullscreenerror mozfullscreenerror webkitfullscreenerror msfullscreenerror', function() {
             $(document).trigger('error.fullscreen');
         });
 
-        $(self).on('fullscreenchange mozfullscreenchange webkitfullscreenchange msfullscreenchange', function() {
-            if (fullscreenStatus()){
+        $(self).add(document).on('fullscreenchange mozfullscreenchange webkitfullscreenchange msfullscreenchange', function() {
+            if (fullscreenStatus()){ 
                 $(document).trigger('enabled.fullscreen');
             }else{
                 $(document).trigger('disabled.fullscreen');
-                $(self).off('fullscreenchange mozfullscreenchange webkitfullscreenchange msfullscreenchange');
+                $(self).add(document).off('fullscreenchange mozfullscreenchange webkitfullscreenchange msfullscreenchange');
             }
         });
 

build/lib/jquery.slimscroll.js

@@ -2,35 +2,81 @@
  * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
- * Version: 1.0.0
- * 
+ * Version: 1.3.3 + pr#94
+ *
  */
 (function($) {
 
-  jQuery.fn.extend({
+  $.fn.extend({
     slimScroll: function(options) {
 
       var defaults = {
-        wheelStep : 20,
+
+        // width in pixels of the visible scroll area
         width : 'auto',
+
+        // height in pixels of the visible scroll area
         height : '250px',
+
+        // width in pixels of the scrollbar and rail
         size : '7px',
+
+        // scrollbar color, accepts any hex/color value
         color: '#000',
+
+        // scrollbar position - left/right
         position : 'right',
+
+        // distance in pixels between the side edge and the scrollbar
         distance : '1px',
+
+        // default scroll position on load - top / bottom / $('selector')
         start : 'top',
+
+        // sets scrollbar opacity
         opacity : .4,
+
+        // enables always-on mode for the scrollbar
         alwaysVisible : false,
-        disableFadeOut: false,
+
+        // check if we should hide the scrollbar when user is hovering over
+        disableFadeOut : false,
+
+        // sets visibility of the rail
         railVisible : false,
+
+        // sets rail color
         railColor : '#333',
-        railOpacity : '0.2',
+
+        // sets rail opacity
+        railOpacity : .2,
+
+        // whether  we should use jQuery UI Draggable to enable bar dragging
+        railDraggable : true,
+
+        // defautlt CSS class of the slimscroll rail
         railClass : 'slimScrollRail',
+
+        // defautlt CSS class of the slimscroll bar
         barClass : 'slimScrollBar',
+
+        // defautlt CSS class of the slimscroll wrapper
         wrapperClass : 'slimScrollDiv',
+
+        // check if mousewheel should scroll the window if we reach top/bottom
         allowPageScroll : false,
-        scroll : 0,
-        touchScrollStep : 200
+
+        // scroll amount applied to each mouse wheel step
+        wheelStep : 20,
+
+        // scroll amount applied when user is using gestures
+        touchScrollStep : 200,
+
+        // sets border radius
+        borderRadius: '7px',
+
+        // sets border radius of the rail
+        railBorderRadius : '7px'
       };
 
       var o = $.extend(defaults, options);
@@ -38,7 +84,7 @@
       // do it for every element that matches selector
       this.each(function(){
 
-      var isOverPanel, isOverBar, isDragg, queueHide, touchDif, 
+      var isOverPanel, isOverBar, isDragg, queueHide, touchDif,
         barHeight, percentScroll, lastScroll,
         divS = '<div></div>',
         minBarHeight = 30,
@@ -48,20 +94,33 @@
         var me = $(this);
 
         // ensure we are not binding it again
-        if (me.parent().hasClass('slimScrollDiv'))
-        { 
+        if (me.parent().hasClass(o.wrapperClass))
+        {
             // start from last bar position
             var offset = me.scrollTop();
 
             // find bar and rail
-            bar = me.parent().find('.slimScrollBar');
-            rail = me.parent().find('.slimScrollRail');
-            
+            bar = me.parent().find('.' + o.barClass);
+            rail = me.parent().find('.' + o.railClass);
+
             getBarHeight();
 
             // check if we should scroll existing instance
-            if (options)
+            if ($.isPlainObject(options))
             {
+              // Pass height: auto to an existing slimscroll object to force a resize after contents have changed
+              if ( 'height' in options && options.height == 'auto' ) {
+                me.parent().css('height', 'auto');
+                me.css('height', 'auto');
+                var height = me.parent().parent().height();
+                me.parent().css('height', height);
+                me.css('height', height);
+              } else if ('height' in options) {
+                var h = options.height;
+                me.parent().css('height', h);
+                me.css('height', h);
+              }
+
               if ('scrollTo' in options)
               {
                 // jump to a static point
@@ -72,6 +131,14 @@
                 // jump by value pixels
                 offset += parseInt(o.scrollBy);
               }
+              else if ('destroy' in options)
+              {
+                // remove slimscroll elements
+                bar.remove();
+                rail.remove();
+                me.unwrap();
+                return;
+              }
 
               // scroll content by the given offset
               scrollContent(offset, false, true);
@@ -79,9 +146,16 @@
 
             return;
         }
+        else if ($.isPlainObject(options))
+        {
+            if ('destroy' in options)
+            {
+               return;
+            }
+        }
 
         // optionally set height to the parent's height
-        o.height = (o.height == 'auto') ? me.parent().innerHeight() : o.height;
+        o.height = (o.height == 'auto') ? me.parent().height() : o.height;
 
         // wrap content
         var wrapper = $(divS)
@@ -101,7 +175,7 @@
         });
 
         // create scrollbar rail
-        var rail  = $(divS)
+        var rail = $(divS)
           .addClass(o.railClass)
           .css({
             width: o.size,
@@ -109,7 +183,7 @@
             position: 'absolute',
             top: 0,
             display: (o.alwaysVisible && o.railVisible) ? 'block' : 'none',
-            'border-radius': o.size,
+            'border-radius': o.railBorderRadius,
             background: o.railColor,
             opacity: o.railOpacity,
             zIndex: 90
@@ -125,10 +199,10 @@
             top: 0,
             opacity: o.opacity,
             display: o.alwaysVisible ? 'block' : 'none',
-            'border-radius' : o.size,
-            BorderRadius: o.size,
-            MozBorderRadius: o.size,
-            WebkitBorderRadius: o.size,
+            'border-radius' : o.borderRadius,
+            BorderRadius: o.borderRadius,
+            MozBorderRadius: o.borderRadius,
+            WebkitBorderRadius: o.borderRadius,
             zIndex: 99
           });
 
@@ -144,18 +218,31 @@
         me.parent().append(bar);
         me.parent().append(rail);
 
-        // make it draggable
-        bar.draggable({ 
-          axis: 'y', 
-          containment: 'parent',
-          start: function() { isDragg = true; },
-          stop: function() { isDragg = false; hideBar(); },
-          drag: function(e) 
-          { 
-            // scroll content
-            scrollContent(0, $(this).position().top, false);
-          }
-        });
+        // make it draggable and no longer dependent on the jqueryUI
+        if (o.railDraggable){
+          bar.bind("mousedown", function(e) {
+            var $doc = $(document);
+            isDragg = true;
+            t = parseFloat(bar.css('top'));
+            pageY = e.pageY;
+
+            $doc.bind("mousemove.slimscroll", function(e){
+              currTop = t + e.pageY - pageY;
+              bar.css('top', currTop);
+              scrollContent(0, bar.position().top, false);// scroll content
+            });
+
+            $doc.bind("mouseup.slimscroll", function(e) {
+              isDragg = false;hideBar();
+              $doc.unbind('.slimscroll');
+            });
+            return false;
+          }).bind("selectstart.slimscroll", function(e){
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          });
+        }
 
         // on rail over
         rail.hover(function(){
@@ -191,18 +278,44 @@
         });
 
         me.bind('touchmove', function(e){
-          // prevent scrolling the page
-          e.originalEvent.preventDefault();
+          // prevent scrolling the page if necessary
+          if(!releaseScroll)
+          {
+            e.originalEvent.preventDefault();
+            }
           if (e.originalEvent.touches.length)
           {
             // see how far user swiped
             var diff = (touchDif - e.originalEvent.touches[0].pageY) / o.touchScrollStep;
             // scroll content
             scrollContent(diff, true);
+            touchDif = e.originalEvent.touches[0].pageY;
           }
         });
 
-        var _onWheel = function(e)
+        // set up initial height
+        getBarHeight();
+
+        // check start position
+        if (o.start === 'bottom')
+        {
+          // scroll content to bottom
+          bar.css({ top: me.outerHeight() - bar.outerHeight() });
+          scrollContent(0, true);
+        }
+        else if (o.start !== 'top')
+        {
+          // assume jQuery selector
+          scrollContent($(o.start).position().top, null, true);
+
+          // make sure bar stays hidden
+          if (!o.alwaysVisible) { bar.hide(); }
+        }
+
+        // attach scroll events
+        attachWheel();
+
+        function _onWheel(e)
         {
           // use mouse wheel only when mouse is over
           if (!isOverPanel) { return; }
@@ -213,8 +326,11 @@
           if (e.wheelDelta) { delta = -e.wheelDelta/120; }
           if (e.detail) { delta = e.detail / 3; }
 
-          // scroll content
-          scrollContent(delta, true);
+          var target = e.target || e.srcTarget || e.srcElement;
+          if ($(target).closest('.' + o.wrapperClass).is(me.parent())) {
+            // scroll content
+            scrollContent(delta, true);
+          }
 
           // stop window scroll
           if (e.preventDefault && !releaseScroll) { e.preventDefault(); }
@@ -223,16 +339,24 @@
 
         function scrollContent(y, isWheel, isJump)
         {
+          releaseScroll = false;
           var delta = y;
           var maxTop = me.outerHeight() - bar.outerHeight();
-          
+
           if (isWheel)
           {
             // move bar with mouse wheel
             delta = parseInt(bar.css('top')) + y * parseInt(o.wheelStep) / 100 * bar.outerHeight();
 
-            // move bar, make sure it doesn't go out  
+            // move bar, make sure it doesn't go out
             delta = Math.min(Math.max(delta, 0), maxTop);
+
+            // if scrolling down, make sure a fractional change to the
+            // scroll position isn't rounded away when the scrollbar's CSS is set
+            // this flooring of delta would happened automatically when
+            // bar.css is set below, but we floor here for clarity
+            delta = (y > 0) ? Math.ceil(delta) : Math.floor(delta);
+
             // scroll the scrollbar
             bar.css({ top: delta + 'px' });
           }
@@ -245,7 +369,6 @@
           {
             delta = y;
             var offsetTop = delta / me[0].scrollHeight * me.outerHeight();
-
             offsetTop = Math.min(Math.max(offsetTop, 0), maxTop);
             bar.css({ top: offsetTop + 'px' });
           }
@@ -253,6 +376,9 @@
           // scroll content
           me.scrollTop(delta);
 
+          // fire scrolling event
+          me.trigger('slimscrolling', ~~delta);
+
           // ensure bar is visible
           showBar();
 
@@ -260,31 +386,29 @@
           hideBar();
         }
 
-        var attachWheel = function()
+        function attachWheel()
         {
           if (window.addEventListener)
           {
             this.addEventListener('DOMMouseScroll', _onWheel, false );
             this.addEventListener('mousewheel', _onWheel, false );
-          } 
+          }
           else
           {
             document.attachEvent("onmousewheel", _onWheel)
           }
         }
 
-        // attach scroll events
-        attachWheel();
-
         function getBarHeight()
         {
           // calculate scrollbar height and make sure it is not too small
           barHeight = Math.max((me.outerHeight() / me[0].scrollHeight) * me.outerHeight(), minBarHeight);
           bar.css({ height: barHeight + 'px' });
-        }
 
-        // set up initial height
-        getBarHeight();
+          // hide scrollbar if content is not long enough
+          var display = barHeight == me.outerHeight() ? 'none' : 'block';
+          bar.css({ display: display });
+        }
 
         function showBar()
         {
@@ -293,18 +417,22 @@
           clearTimeout(queueHide);
 
           // when bar reached top or bottom
-          if (percentScroll == ~~ percentScroll)
+          if (percentScroll == ~~percentScroll)
           {
-            //release wheel 
+            //release wheel
             releaseScroll = o.allowPageScroll;
-            
+
             // publish approporiate event
             if (lastScroll != percentScroll)
             {
-                var msg = (~~percentScroll == 0) ? 'top' : 'bottom'; 
+                var msg = (~~percentScroll == 0) ? 'top' : 'bottom';
                 me.trigger('slimscroll', msg);
             }
           }
+          else
+          {
+            releaseScroll = false;
+          }
           lastScroll = percentScroll;
 
           // show only when required
@@ -324,7 +452,7 @@
           {
             queueHide = setTimeout(function(){
               if (!(o.disableFadeOut && isOverPanel) && !isOverBar && !isDragg)
-              { 
+              {
                 bar.fadeOut('slow');
                 rail.fadeOut('slow');
               }
@@ -332,30 +460,15 @@
           }
         }
 
-        // check start position
-        if (o.start == 'bottom') 
-        {
-          // scroll content to bottom
-          bar.css({ top: me.outerHeight() - bar.outerHeight() });
-          scrollContent(0, true);
-        }
-        else if (typeof o.start == 'object')
-        {
-          // scroll content
-          scrollContent($(o.start).position().top, null, true);
-
-          // make sure bar stays hidden
-          if (!o.alwaysVisible) { bar.hide(); }
-        }
       });
-      
+
       // maintain chainability
       return this;
     }
   });
 
-  jQuery.fn.extend({
-    slimscroll: jQuery.fn.slimScroll
+  $.fn.extend({
+    slimscroll: $.fn.slimScroll
   });
 
 })(jQuery);

build/lib/otr/build/dep/bigint.js

@@ -1680,25 +1680,18 @@
     , equalsInt     : equalsInt
     , sub           : sub
     , mod           : mod
-    , mod_          : mod_
     , modInt        : modInt
     , mult          : mult
     , divInt_       : divInt_
     , rightShift_   : rightShift_
-    , leftShift_    : leftShift_
     , dup           : dup
     , greater       : greater
     , add           : add
-    , addInt        : addInt
-    , addInt_       : addInt_
     , isZero        : isZero
     , bitSize       : bitSize
-    , randTruePrime : randTruePrime
     , millerRabin   : millerRabin
     , divide_       : divide_
     , trim          : trim
-    , expand        : expand
-    , bpe           : bpe
     , primes        : primes
     , findPrimes    : findPrimes
     , getSeed       : getSeed

build/lib/otr/build/otr.js

@@ -1,7 +1,7 @@
 /*!
 
-  otr.js v0.2.8 - 2013-11-11
-  (c) 2013 - Arlo Breault <arlolra@gmail.com>
+  otr.js v0.2.13 - 2014-09-07
+  (c) 2014 - Arlo Breault <arlolra@gmail.com>
   Freely distributed under the MPL v2.0 license.
 
   This file is concatenated for the browser.
@@ -141,6 +141,17 @@
     child.__super__ = parent.prototype
   }
 
+  // assumes 32-bit
+  function intCompare(x, y) {
+    var z = ~(x ^ y)
+    z &= z >> 16
+    z &= z >> 8
+    z &= z >> 4
+    z &= z >> 2
+    z &= z >> 1
+    return z & 1
+  }
+
   // constant-time string comparison
   HLP.compare = function (str1, str2) {
     if (str1.length !== str2.length)
@@ -148,7 +159,7 @@
     var i = 0, result = 0
     for (; i < str1.length; i++)
       result |= str1[i].charCodeAt(0) ^ str2[i].charCodeAt(0)
-    return result === 0
+    return intCompare(result, 0)
   }
 
   HLP.randomExponent = function () {
@@ -1095,7 +1106,6 @@
     this.ssid = null
     this.transmittedRS = false
     this.r = null
-    this.priv = otr.priv
 
     // bind methods
     var self = this
@@ -1144,10 +1154,10 @@
     },
 
     makeM: function (their_y, m1, c, m2) {
-      var pk = this.priv.packPublic()
+      var pk = this.otr.priv.packPublic()
       var kid = HLP.packINT(this.our_keyid)
       var m = hMac(this.our_dh.publicKey, their_y, pk, kid, m1)
-      m = this.priv.sign(m)
+      m = this.otr.priv.sign(m)
       var msg = pk + kid
       msg += BigInt.bigInt2bits(m[0], 20)  // pad to 20 bytes
       msg += BigInt.bigInt2bits(m[1], 20)
@@ -1161,19 +1171,21 @@
       HLP.debug.call(this.otr, 'success')
 
       if (BigInt.equals(this.their_y, this.our_dh.publicKey))
-        return this.otr.error('equal keys - we have a problem.', true)
+        return this.otr.error('equal keys - we have a problem.')
 
-      if ( this.their_keyid !== this.otr.their_keyid &&
-           this.their_keyid !== (this.otr.their_keyid - 1) ) {
+      this.otr.our_old_dh = this.our_dh
+      this.otr.their_priv_pk = this.their_priv_pk
 
-        // our keys
-        this.otr.our_old_dh = this.our_dh
+      if (!(
+        (this.their_keyid === this.otr.their_keyid &&
+         BigInt.equals(this.their_y, this.otr.their_y)) ||
+        (this.their_keyid === (this.otr.their_keyid - 1) &&
+         BigInt.equals(this.their_y, this.otr.their_old_y))
+      )) {
 
-        // their keys
         this.otr.their_y = this.their_y
         this.otr.their_old_y = null
         this.otr.their_keyid = this.their_keyid
-        this.otr.their_priv_pk = this.their_priv_pk
 
         // rotate keys
         this.otr.sessKeys[0] = [ new this.otr.DHSession(
@@ -1266,7 +1278,7 @@
 
           // verify gy is legal 2 <= gy <= N-2
           if (!HLP.checkGroup(this.their_y, N_MINUS_2))
-            return this.otr.error('Illegal g^y.', true)
+            return this.otr.error('Illegal g^y.')
 
           this.createKeys(this.their_y)
 
@@ -1302,11 +1314,11 @@
           var hash = CryptoJS.SHA256(CryptoJS.enc.Latin1.parse(gxmpi))
 
           if (!HLP.compare(this.hashed, hash.toString(CryptoJS.enc.Latin1)))
-            return this.otr.error('Hashed g^x does not match.', true)
+            return this.otr.error('Hashed g^x does not match.')
 
           // verify gx is legal 2 <= g^x <= N-2
           if (!HLP.checkGroup(this.their_y, N_MINUS_2))
-            return this.otr.error('Illegal g^x.', true)
+            return this.otr.error('Illegal g^x.')
 
           this.createKeys(this.their_y)
 
@@ -1320,7 +1332,7 @@
             , this.m1
             , HLP.packCtr(0)
           )
-          if (vsm[0]) return this.otr.error(vsm[0], true)
+          if (vsm[0]) return this.otr.error(vsm[0])
 
           // store their key
           this.their_keyid = vsm[1]
@@ -1362,7 +1374,7 @@
             , this.m1_prime
             , HLP.packCtr(0)
           )
-          if (vsm[0]) return this.otr.error(vsm[0], true)
+          if (vsm[0]) return this.otr.error(vsm[0])
 
           // store their key
           this.their_keyid = vsm[1]
@@ -1407,7 +1419,7 @@
       )
       if (send[0]) return this.otr.error(send[0])
 
-      this.otr._sendMsg(send[1], true)
+      this.otr.io(send[1])
     },
 
     initiateAKE: function (version) {
@@ -1499,7 +1511,7 @@
     sha256.update(CryptoJS.enc.Hex.parse(our ? this.our_fp : this.their_fp))
     sha256.update(CryptoJS.enc.Hex.parse(our ? this.their_fp : this.our_fp))
     sha256.update(CryptoJS.enc.Latin1.parse(this.ssid))
-    sha256.update(CryptoJS.enc.Latin1.parse(secret))  // utf8?
+    sha256.update(CryptoJS.enc.Latin1.parse(secret))
     var hash = sha256.finalize()
     this.secret = HLP.bits2bigInt(hash.toString(CryptoJS.enc.Latin1))
   }
@@ -1554,7 +1566,7 @@
 
     if (msg.type === 6) {
       this.init()
-      this.trigger('trust', [false])
+      this.trigger('abort')
       return
     }
 
@@ -1608,6 +1620,11 @@
 
         this.smpstate = CONST.SMPSTATE_EXPECT0
 
+        // assume utf8 question
+        question = CryptoJS.enc.Latin1
+          .parse(question)
+          .toString(CryptoJS.enc.Utf8)
+
         // invoke question
         this.trigger('question', [question])
         return
@@ -1914,6 +1931,11 @@
   var MAX_INT = Math.pow(2, 53) - 1  // doubles
   var MAX_UINT = Math.pow(2, 31) - 1  // bitwise operators
 
+  // an internal callback
+  function OTRCB(cb) {
+    this.cb = cb
+  }
+
   // OTR contructor
   function OTR(options) {
     if (!(this instanceof OTR)) return new OTR(options)
@@ -2084,22 +2106,32 @@
       })
     })
     this.sm.on('send', function (ssid, send) {
-      if (self.ssid === ssid)
-        self._sendMsg(send)
+      if (self.ssid === ssid) {
+        send = self.prepareMsg(send)
+        self.io(send)
+      }
     })
   }
 
-  OTR.prototype.io = function (msg) {
+  OTR.prototype.io = function (msg, meta) {
 
     // buffer
+    msg = ([].concat(msg)).map(function(m){
+       return { msg: m, meta: meta }
+    })
     this.outgoing = this.outgoing.concat(msg)
 
     var self = this
     ;(function send(first) {
       if (!first) {
         if (!self.outgoing.length) return
-        var msg = self.outgoing.shift()
-        self.trigger('io', [msg])
+        var elem = self.outgoing.shift(), cb = null
+        if (elem.meta instanceof OTRCB) {
+          cb = elem.meta.cb
+          elem.meta = null
+        }
+        self.trigger('io', [elem.msg, elem.meta])
+        if (cb) cb()
       }
       setTimeout(send, first ? 0 : self.send_interval)
     }(true))
@@ -2132,7 +2164,7 @@
     this.sendenc = HLP.mask(HLP.h1(sendbyte, secbytes), 0, 128)  // f16 bytes
     this.sendmac = CryptoJS.SHA1(CryptoJS.enc.Latin1.parse(this.sendenc))
     this.sendmac = this.sendmac.toString(CryptoJS.enc.Latin1)
-    this.sendmacused = false
+
     this.rcvenc = HLP.mask(HLP.h1(rcvbyte, secbytes), 0, 128)
     this.rcvmac = CryptoJS.SHA1(CryptoJS.enc.Latin1.parse(this.rcvenc))
     this.rcvmac = this.rcvmac.toString(CryptoJS.enc.Latin1)
@@ -2151,7 +2183,6 @@
     // reveal old mac keys
     var self = this
     this.sessKeys[1].forEach(function (sk) {
-      if (sk && sk.sendmacused) self.oldMacKeys.push(sk.sendmac)
       if (sk && sk.rcvmacused) self.oldMacKeys.push(sk.rcvmac)
     })
 
@@ -2179,7 +2210,6 @@
     // reveal old mac keys
     var self = this
     this.sessKeys.forEach(function (sk) {
-      if (sk[1] && sk[1].sendmacused) self.oldMacKeys.push(sk[1].sendmac)
       if (sk[1] && sk[1].rcvmacused) self.oldMacKeys.push(sk[1].rcvmac)
     })
 
@@ -2197,12 +2227,12 @@
 
   OTR.prototype.prepareMsg = function (msg, esk) {
     if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED || this.their_keyid === 0)
-      return this.error('Not ready to encrypt.')
+      return this.notify('Not ready to encrypt.')
 
     var sessKeys = this.sessKeys[1][0]
 
     if (sessKeys.send_counter >= MAX_INT)
-      return this.error('Should have rekeyed by now.')
+      return this.notify('Should have rekeyed by now.')
 
     sessKeys.send_counter += 1
 
@@ -2223,7 +2253,7 @@
     send += ctr.substring(0, 8)
 
     if (Math.ceil(msg.length / 8) >= MAX_UINT)  // * 16 / 128
-      return this.error('Message is too long.')
+      return this.notify('Message is too long.')
 
     var aes = HLP.encryptAes(
         CryptoJS.enc.Latin1.parse(msg)
@@ -2235,8 +2265,6 @@
     send += HLP.make1Mac(send, sessKeys.sendmac)
     send += HLP.packData(this.oldMacKeys.splice(0).join(''))
 
-    sessKeys.sendmacused = true
-
     send = HLP.wrapMsg(
         send
       , this.fragment_size
@@ -2244,7 +2272,7 @@
       , this.our_instance_tag
       , this.their_instance_tag
     )
-    if (send[0]) return this.error(send[0])
+    if (send[0]) return this.notify(send[0])
 
     // emit extra symmetric key
     if (esk) this.trigger('file', ['send', sessKeys.extra_symkey, esk])
@@ -2265,7 +2293,7 @@
     var ign = (msg[0] === '\x01')
 
     if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED || msg.length !== 8) {
-      if (!ign) this.error('Received an unreadable encrypted message.', true)
+      if (!ign) this.error('Received an unreadable encrypted message.')
       return
     }
 
@@ -2273,12 +2301,12 @@
     var their_keyid = this.their_keyid - HLP.readLen(msg[1])
 
     if (our_keyid < 0 || our_keyid > 1) {
-      if (!ign) this.error('Not of our latest keys.', true)
+      if (!ign) this.error('Not of our latest keys.')
       return
     }
 
     if (their_keyid < 0 || their_keyid > 1) {
-      if (!ign) this.error('Not of your latest keys.', true)
+      if (!ign) this.error('Not of your latest keys.')
       return
     }
 
@@ -2373,12 +2401,17 @@
 
   OTR.prototype.smpSecret = function (secret, question) {
     if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED)
-      return this.error('Must be encrypted for SMP.')
+      return this.notify('Must be encrypted for SMP.')
 
     if (typeof secret !== 'string' || secret.length < 1)
-      return this.error('Secret is required.')
+      return this.notify('Secret is required.')
 
     if (!this.sm) this._smInit()
+
+    // utf8 inputs
+    secret = CryptoJS.enc.Utf8.parse(secret).toString(CryptoJS.enc.Latin1)
+    question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)
+
     this.sm.rcvSecret(secret, question)
   }
 
@@ -2401,46 +2434,43 @@
       msg += '?'
     }
 
-    this._sendMsg(msg, true)
+    this.io(msg)
     this.trigger('status', [CONST.STATUS_SEND_QUERY])
   }
 
-  OTR.prototype.sendMsg = function (msg) {
+  OTR.prototype.sendMsg = function (msg, meta) {
     if ( this.REQUIRE_ENCRYPTION ||
          this.msgstate !== CONST.MSGSTATE_PLAINTEXT
     ) {
       msg = CryptoJS.enc.Utf8.parse(msg)
       msg = msg.toString(CryptoJS.enc.Latin1)
     }
-    this._sendMsg(msg)
-  }
 
-  OTR.prototype._sendMsg = function (msg, internal) {
-    if (!internal) {  // a user or sm msg
-
-      switch (this.msgstate) {
-        case CONST.MSGSTATE_PLAINTEXT:
-          if (this.REQUIRE_ENCRYPTION) {
-            this.storedMgs.push(msg)
-            this.sendQueryMsg()
-            return
-          }
-          if (this.SEND_WHITESPACE_TAG && !this.receivedPlaintext) {
-            msg += CONST.WHITESPACE_TAG  // 16 byte tag
-            if (this.ALLOW_V3) msg += CONST.WHITESPACE_TAG_V3
-            if (this.ALLOW_V2) msg += CONST.WHITESPACE_TAG_V2
-          }
-          break
-        case CONST.MSGSTATE_FINISHED:
-          this.storedMgs.push(msg)
-          this.error('Message cannot be sent at this time.')
+    switch (this.msgstate) {
+      case CONST.MSGSTATE_PLAINTEXT:
+        if (this.REQUIRE_ENCRYPTION) {
+          this.storedMgs.push({msg: msg, meta: meta})
+          this.sendQueryMsg()
           return
-        default:
-          msg = this.prepareMsg(msg)
-      }
-
+        }
+        if (this.SEND_WHITESPACE_TAG && !this.receivedPlaintext) {
+          msg += CONST.WHITESPACE_TAG  // 16 byte tag
+          if (this.ALLOW_V3) msg += CONST.WHITESPACE_TAG_V3
+          if (this.ALLOW_V2) msg += CONST.WHITESPACE_TAG_V2
+        }
+        break
+      case CONST.MSGSTATE_FINISHED:
+        this.storedMgs.push({msg: msg, meta: meta})
+        this.notify('Message cannot be sent at this time.', 'warn')
+        return
+      case CONST.MSGSTATE_ENCRYPTED:
+        msg = this.prepareMsg(msg)
+        break
+      default:
+        throw new Error('Unknown message state.')
     }
-    if (msg) this.io(msg)
+
+    if (msg) this.io(msg, meta)
   }
 
   OTR.prototype.receiveMsg = function (msg) {
@@ -2452,18 +2482,26 @@
 
     switch (msg.cls) {
       case 'error':
-        this.error(msg.msg)
+        this.notify(msg.msg)
         return
       case 'ake':
         if ( msg.version === CONST.OTR_VERSION_3 &&
           this.checkInstanceTags(msg.instance_tags)
-        ) return  // ignore
+        ) {
+          this.notify(
+            'Received a message intended for a different session.', 'warn')
+          return  // ignore
+        }
         this.ake.handleAKE(msg)
         return
       case 'data':
         if ( msg.version === CONST.OTR_VERSION_3 &&
           this.checkInstanceTags(msg.instance_tags)
-        ) return  // ignore
+        ) {
+          this.notify(
+            'Received a message intended for a different session.', 'warn')
+          return  // ignore
+        }
         msg.msg = this.handleDataMsg(msg)
         msg.encrypted = true
         break
@@ -2475,7 +2513,7 @@
         // check for encrypted
         if ( this.REQUIRE_ENCRYPTION ||
              this.msgstate !== CONST.MSGSTATE_PLAINTEXT
-        ) this.error('Received an unencrypted message.')
+        ) this.notify('Received an unencrypted message.', 'warn')
 
         // received a plaintext message
         // stop sending the whitespace tag
@@ -2486,7 +2524,7 @@
           this.doAKE(msg)
     }
 
-    if (msg.msg) this.trigger('ui', [msg.msg, msg.encrypted])
+    if (msg.msg) this.trigger('ui', [msg.msg, !!msg.encrypted])
   }
 
   OTR.prototype.checkInstanceTags = function (it) {
@@ -2510,43 +2548,43 @@
     } else if (this.ALLOW_V2 && ~msg.ver.indexOf(CONST.OTR_VERSION_2)) {
       this.ake.initiateAKE(CONST.OTR_VERSION_2)
     } else {
-      // is this an error?
-      this.error('OTR conversation requested, ' +
-        'but no compatible protocol version found.')
+      this.notify('OTR conversation requested, ' +
+        'but no compatible protocol version found.', 'warn')
     }
   }
 
-  OTR.prototype.error = function (err, send) {
-    if (send) {
-      if (!this.debug) err = "An OTR error has occurred."
-      err = '?OTR Error:' + err
-      this._sendMsg(err, true)
-      return
-    }
-    this.trigger('error', [err])
+  OTR.prototype.error = function (err) {
+    if (!this.debug) err = 'An OTR error has occurred.'
+    this.io('?OTR Error:' + err)
+    this.notify(err)
+  }
+
+  OTR.prototype.notify = function (err, severity) {
+    this.trigger('error', [err, severity || 'error'])
   }
 
   OTR.prototype.sendStored = function () {
     var self = this
-    ;(this.storedMgs.splice(0)).forEach(function (msg) {
-      self._sendMsg(msg)
+    ;(this.storedMgs.splice(0)).forEach(function (elem) {
+      var msg = self.prepareMsg(elem.msg)
+      self.io(msg, elem.meta)
     })
   }
 
   OTR.prototype.sendFile = function (filename) {
     if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED)
-      return this.error('Not ready to encrypt.')
+      return this.notify('Not ready to encrypt.')
 
     if (this.ake.otr_version !== CONST.OTR_VERSION_3)
-      return this.error('Protocol v3 required.')
+      return this.notify('Protocol v3 required.')
 
-    if (!filename) return this.error('Please specify a filename.')
+    if (!filename) return this.notify('Please specify a filename.')
 
     // utf8 filenames
     var l1name = CryptoJS.enc.Utf8.parse(filename)
     l1name = l1name.toString(CryptoJS.enc.Latin1)
 
-    if (l1name.length >= 65532) return this.error('filename is too long.')
+    if (l1name.length >= 65532) return this.notify('Filename is too long.')
 
     var msg = '\x00'  // null byte
     msg += '\x00\x08'  // type 8 tlv
@@ -2555,12 +2593,14 @@
     msg += l1name
 
     msg = this.prepareMsg(msg, filename)
-    if (msg) this._sendMsg(msg, true)
+    this.io(msg)
   }
 
-  OTR.prototype.endOtr = function () {
+  OTR.prototype.endOtr = function (cb) {
     if (this.msgstate === CONST.MSGSTATE_ENCRYPTED) {
-      this.sendMsg('\x00\x00\x01\x00\x00')
+      if (typeof cb === 'function')
+        cb = new OTRCB(cb)
+      this.sendMsg('\x00\x00\x01\x00\x00', cb)
       if (this.sm) {
         if (this.smw) this.sm.worker.terminate()  // destroy webworker
         this.sm = null
@@ -2582,6 +2622,7 @@
 
 }).call(this)
 
+
   return {
       OTR: this.OTR
     , DSA: this.DSA

build/lib/otr/lib/helpers.js

@@ -50,6 +50,17 @@
     child.__super__ = parent.prototype
   }
 
+  // assumes 32-bit
+  function intCompare(x, y) {
+    var z = ~(x ^ y)
+    z &= z >> 16
+    z &= z >> 8
+    z &= z >> 4
+    z &= z >> 2
+    z &= z >> 1
+    return z & 1
+  }
+
   // constant-time string comparison
   HLP.compare = function (str1, str2) {
     if (str1.length !== str2.length)
@@ -57,7 +68,7 @@
     var i = 0, result = 0
     for (; i < str1.length; i++)
       result |= str1[i].charCodeAt(0) ^ str2[i].charCodeAt(0)
-    return result === 0
+    return intCompare(result, 0)
   }
 
   HLP.randomExponent = function () {

build/lib/strophe.caps.js

@@ -7,6 +7,8 @@
  * 
  * Authors: - Michael Weibel <michael.weibel@gmail.com> - Klaus Herberth <klaus@jsxc.org>
  * Copyright: - Michael Weibel <michael.weibel@gmail.com>
+ * 
+ * @license MIT
  */
 
 (function($) {
@@ -119,9 +121,13 @@
          return null;
       },
       hasFeatureByJid: function(jid, feature) {
-         if (this._jidVerIndex[jid]) {
-            var length = ($.isArray(feature)) ? feature.length : 1;
-            for (i = 0; i < length; i++) {
+         if (this._jidVerIndex[jid] && feature !== null && typeof feature !== 'undefined') {
+            if(!$.isArray(feature)){
+               feature = $.makeArray(feature);
+            };
+            
+            var i;
+            for (i = 0; i < feature.length; i++) {
                if (this._knownCapabilities[this._jidVerIndex[jid]]['features'].indexOf(feature[i]) < 0)
                   return false;
             }

build/lib/strophe.jingle/strophe.jingle.adapter.js

@@ -7,6 +7,9 @@ TraceablePeerConnection = function(ice_config, constraints) {
     var RTCPeerconnection = navigator.mozGetUserMedia ? mozRTCPeerConnection : webkitRTCPeerConnection;
     this.peerconnection = new RTCPeerconnection(ice_config, constraints);
     this.updateLog = [];
+    this.stats = {};
+    this.statsinterval = null;
+    this.maxstats = 300; // limit to 300 values, i.e. 5 minutes; set to 0 to disable
 
     // override as desired
     this.trace = function(what, info) {
@@ -14,47 +17,47 @@ TraceablePeerConnection = function(ice_config, constraints) {
         self.updateLog.push({
             time: new Date(),
             type: what,
-            value: info
+            value: info || ""
         });
     };
     this.onicecandidate = null;
     this.peerconnection.onicecandidate = function (event) {
-        self.trace('onicecandidate', event.candidate);
+        self.trace('onicecandidate', JSON.stringify(event.candidate, null, ' '));
         if (self.onicecandidate !== null) {
             self.onicecandidate(event);
         }
     };
     this.onaddstream = null;
     this.peerconnection.onaddstream = function (event) {
-        self.trace('onaddstream', event.stream);
+        self.trace('onaddstream', event.stream.id);
         if (self.onaddstream !== null) {
             self.onaddstream(event);
         }
     };
     this.onremovestream = null;
     this.peerconnection.onremovestream = function (event) {
-        self.trace('onremovestream', event.stream);
+        self.trace('onremovestream', event.stream.id);
         if (self.onremovestream !== null) {
             self.onremovestream(event);
         }
     };
     this.onsignalingstatechange = null;
     this.peerconnection.onsignalingstatechange = function (event) {
-        self.trace('onsignalingstatechange', event);
+        self.trace('onsignalingstatechange', self.signalingState);
         if (self.onsignalingstatechange !== null) {
             self.onsignalingstatechange(event);
         }
     };
     this.oniceconnectionstatechange = null;
     this.peerconnection.oniceconnectionstatechange = function (event) {
-        self.trace('oniceconnectionstatechange', event);
+        self.trace('oniceconnectionstatechange', self.iceConnectionState);
         if (self.oniceconnectionstatechange !== null) {
             self.oniceconnectionstatechange(event);
         }
     };
     this.onnegotiationneeded = null;
     this.peerconnection.onnegotiationneeded = function (event) {
-        self.trace('onnegotiationneeded', event);
+        self.trace('onnegotiationneeded');
         if (self.onnegotiationneeded !== null) {
             self.onnegotiationneeded(event);
         }
@@ -66,20 +69,56 @@ TraceablePeerConnection = function(ice_config, constraints) {
             self.ondatachannel(event);
         }
     }
+    if (!navigator.mozGetUserMedia) {
+        this.statsinterval = window.setInterval(function() {
+            self.peerconnection.getStats(function(stats) {
+                var results = stats.result();
+                for (var i = 0; i < results.length; ++i) {
+                    //console.log(results[i].type, results[i].id, results[i].names())
+                    var now = new Date();
+                    results[i].names().forEach(function (name) {
+                        var id = results[i].id + '-' + name;
+                        if (!self.stats[id]) {
+                            self.stats[id] = {
+                                startTime: now,
+                                endTime: now,
+                                values: [],
+                                times: []
+                            };
+                        }
+                        self.stats[id].values.push(results[i].stat(name));
+                        self.stats[id].times.push(now.getTime());
+                        if (self.stats[id].values.length > self.maxstats) {
+                            self.stats[id].values.shift();
+                            self.stats[id].times.shift();
+                        }
+                        self.stats[id].endTime = now;
+                    });
+                }
+            });
+
+        }, 1000);
+    }
 };
 
-TraceablePeerConnection.prototype.__defineGetter__('signalingState', function() { return this.peerconnection.signalingState; });
-TraceablePeerConnection.prototype.__defineGetter__('iceConnectionState', function() { return this.peerconnection.iceConnectionState; });
-TraceablePeerConnection.prototype.__defineGetter__('localDescription', function() { return this.peerconnection.localDescription; });
-TraceablePeerConnection.prototype.__defineGetter__('remoteDescription', function() { return this.peerconnection.remoteDescription; });
+dumpSDP = function(description) {
+    return 'type: ' + description.type + '\r\n' + description.sdp;
+}
+
+if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
+    TraceablePeerConnection.prototype.__defineGetter__('signalingState', function() { return this.peerconnection.signalingState; });
+    TraceablePeerConnection.prototype.__defineGetter__('iceConnectionState', function() { return this.peerconnection.iceConnectionState; });
+    TraceablePeerConnection.prototype.__defineGetter__('localDescription', function() { return this.peerconnection.localDescription; });
+    TraceablePeerConnection.prototype.__defineGetter__('remoteDescription', function() { return this.peerconnection.remoteDescription; });
+}
 
 TraceablePeerConnection.prototype.addStream = function (stream) {
-    this.trace('addStream', stream);
+    this.trace('addStream', stream.id);
     this.peerconnection.addStream(stream);
 };
 
 TraceablePeerConnection.prototype.removeStream = function (stream) {
-    this.trace('removeStream', stream);
+    this.trace('removeStream', stream.id);
     this.peerconnection.removeStream(stream);
 };
 
@@ -90,7 +129,7 @@ TraceablePeerConnection.prototype.createDataChannel = function (label, opts) {
 
 TraceablePeerConnection.prototype.setLocalDescription = function (description, successCallback, failureCallback) {
     var self = this;
-    this.trace('setLocalDescription', description);
+    this.trace('setLocalDescription', dumpSDP(description));
     this.peerconnection.setLocalDescription(description, 
         function () {
             self.trace('setLocalDescriptionOnSuccess');
@@ -101,11 +140,16 @@ TraceablePeerConnection.prototype.setLocalDescription = function (description, s
             failureCallback(err);
         }
     );
+    /*
+    if (this.statsinterval === null && this.maxstats > 0) {
+        // start gathering stats
+    }
+    */
 };
 
 TraceablePeerConnection.prototype.setRemoteDescription = function (description, successCallback, failureCallback) {
     var self = this;
-    this.trace('setRemoteDescription', description);
+    this.trace('setRemoteDescription', dumpSDP(description));
     this.peerconnection.setRemoteDescription(description, 
         function () {
             self.trace('setRemoteDescriptionOnSuccess');
@@ -116,20 +160,29 @@ TraceablePeerConnection.prototype.setRemoteDescription = function (description,
             failureCallback(err);
         }
     );
+    /*
+    if (this.statsinterval === null && this.maxstats > 0) {
+        // start gathering stats
+    }
+    */
 };
 
 TraceablePeerConnection.prototype.close = function () {
     this.trace('stop');
+    if (this.statsinterval !== null) {
+        window.clearInterval(this.statsinterval);
+        this.statsinterval = null;
+    }
     this.peerconnection.close();
 };
 
 TraceablePeerConnection.prototype.createOffer = function (successCallback, failureCallback, constraints) {
     var self = this;
-    this.trace('createOffer', constraints);
+    this.trace('createOffer', JSON.stringify(constraints, null, ' '));
     this.peerconnection.createOffer(
-        function (sdp) {
-            self.trace('createOfferOnSuccess', sdp);
-            successCallback(sdp);
+        function (offer) {
+            self.trace('createOfferOnSuccess', dumpSDP(offer));
+            successCallback(offer);
         },
         function(err) {
             self.trace('createOfferOnFailure', err);
@@ -141,11 +194,11 @@ TraceablePeerConnection.prototype.createOffer = function (successCallback, failu
 
 TraceablePeerConnection.prototype.createAnswer = function (successCallback, failureCallback, constraints) {
     var self = this;
-    this.trace('createAnswer', constraints);
+    this.trace('createAnswer', JSON.stringify(constraints, null, ' '));
     this.peerconnection.createAnswer(
-        function (sdp) {
-            self.trace('createAnswerOnSuccess', sdp);
-            successCallback(sdp);
+        function (answer) {
+            self.trace('createAnswerOnSuccess', dumpSDP(answer));
+            successCallback(answer);
         },
         function(err) {
             self.trace('createAnswerOnFailure', err);
@@ -157,7 +210,7 @@ TraceablePeerConnection.prototype.createAnswer = function (successCallback, fail
 
 TraceablePeerConnection.prototype.addIceCandidate = function (candidate, successCallback, failureCallback) {
     var self = this;
-    this.trace('addIceCandidate', candidate);
+    this.trace('addIceCandidate', JSON.stringify(candidate, null, ' '));
     this.peerconnection.addIceCandidate(candidate);
     /* maybe later
     this.peerconnection.addIceCandidate(candidate, 
@@ -173,11 +226,14 @@ TraceablePeerConnection.prototype.addIceCandidate = function (candidate, success
     */
 };
 
-TraceablePeerConnection.prototype.getStats = function(callback) {
-    this.peerconnection.getStats(callback);
+TraceablePeerConnection.prototype.getStats = function(callback, errback) {
+    if (navigator.mozGetUserMedia) {
+        // ignore for now...
+    } else {
+        this.peerconnection.getStats(callback);
+    }
 };
 
-
 // mozilla chrome compat layer -- very similar to adapter.js
 setupRTC = function (){
     var RTC = null;
@@ -320,11 +376,11 @@ getUserMediaWithConstraints = function(um, resolution, bandwidth, fps) {
                 },
                 function (error) {
                     console.warn('Failed to get access to local media. Error ', error);
-                    $(document).trigger('mediafailure.jingle');
+                    $(document).trigger('mediafailure.jingle', [error]);
                 });
     } catch (e) {
         console.error('GUM failed: ', e);
         $(document).trigger('mediafailure.jingle');
     }
 }
-}(jQuery));
+}(jQuery));

build/lib/strophe.jingle/strophe.jingle.js

@@ -91,9 +91,13 @@ Strophe.addConnectionPlugin('jingle', {
             sess.ice_config = this.ice_config;
 
             sess.initiate($(iq).attr('from'), false);
-            // FIXME: setRemoteDescription should only be done when this call is to be accepted
             sess.setRemoteDescription($(iq).find('>jingle'), 'offer');
 
+            if ($(iq).find('>jingle>muted[xmlns="http://jitsi.org/protocol/meet#startmuted"]').length) {
+                console.log('got a request to start muted');
+                sess.startmuted = true;
+            }
+
             this.sessions[sess.sid] = sess;
             this.jid2session[sess.peerjid] = sess;
 
@@ -209,6 +213,7 @@ Strophe.addConnectionPlugin('jingle', {
         // validity have to be fetched before creating the peerconnection
         // TODO: implement refresh via updateIce as described in
         //      https://code.google.com/p/webrtc/issues/detail?id=1650
+        var self = this;
         this.connection.sendIQ(
             $iq({type: 'get', to: this.connection.domain})
                 .c('services', {xmlns: 'urn:xmpp:extdisco:1'}).c('service', {host: 'turn.' + this.connection.domain}),
@@ -248,7 +253,7 @@ Strophe.addConnectionPlugin('jingle', {
                         break;
                     }
                 });
-                this.ice_config.iceServers = iceservers;
+                self.ice_config.iceServers = iceservers;
             },
             function (err) {
                 console.warn('getting turn credentials failed', err);

build/lib/strophe.jingle/strophe.jingle.sdp.js

@@ -75,15 +75,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
         for (i = 0; i < lines.length; i++) {
             tmp = lines[i].split(' ');
             var semantics = tmp.shift().substr(8);
-            // new plan
-            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', type: semantics, semantics:semantics});
-            for (j = 0; j < tmp.length; j++) {
-                elem.c('content', {name: tmp[j]}).up();
-            }
-            elem.up();
-
-            // temporary plan, to be removed
-            elem.c('group', {xmlns: 'urn:ietf:rfc:5888', type: semantics});
+            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', semantics:semantics});
             for (j = 0; j < tmp.length; j++) {
                 elem.c('content', {name: tmp[j]}).up();
             }
@@ -620,6 +612,9 @@ SDPUtil = {
             case 'generation':
                 candidate.generation = elems[i + 1];
                 break;
+            case 'tcptype':
+                candidate.tcptype = elems[i + 1];
+                break;
             default: // TODO
                 console.log('parse_icecandidate not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
             }
@@ -647,6 +642,12 @@ SDPUtil = {
             }
             break;
         }
+        if (cand.hasOwnAttribute('tcptype')) {
+            line += 'tcptype';
+            line += ' ';
+            line += cand.tcptype;
+            line += ' ';
+        }
         line += 'generation';
         line += ' ';
         line += cand.hasOwnAttribute('generation') ? cand.generation : '0';
@@ -729,8 +730,10 @@ SDPUtil = {
     candidateToJingle: function (line) {
         // a=candidate:2979166662 1 udp 2113937151 192.168.2.100 57698 typ host generation 0
         //      <candidate component=... foundation=... generation=... id=... ip=... network=... port=... priority=... protocol=... type=.../>
-        if (line.substring(0, 12) != 'a=candidate:') {
-            console.log('parseCandidate called with a line that is not a candidate line');
+        if (line.indexOf('candidate:') === 0) {
+            line = 'a=' + line;
+        } else if (line.substring(0, 12) != 'a=candidate:') {            
+			console.log('parseCandidate called with a line that is not a candidate line');
             console.log(line);
             return null;
         }
@@ -752,6 +755,9 @@ SDPUtil = {
         candidate.port = elems[5];
         // elems[6] => "typ"
         candidate.type = elems[7];
+
+        candidate.generation = '0'; // fippo from jitsi-meet: default, may be overwritten below
+
         for (i = 8; i < elems.length; i += 2) {
             switch (elems[i]) {
             case 'raddr':
@@ -763,6 +769,9 @@ SDPUtil = {
             case 'generation':
                 candidate.generation = elems[i + 1];
                 break;
+            case 'tcptype':
+                candidate.tcptype = elems[i + 1];
+                break;
             default: // TODO
                 console.log('not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
             }
@@ -810,4 +819,4 @@ SDPUtil = {
         return line + '\r\n';
     }
 };
-}(jQuery));
+}(jQuery));

build/lib/strophe.jingle/strophe.jingle.session.js

@@ -23,7 +23,7 @@ JingleSession = function(me, sid, connection) {
     this.stopTime = null;
     this.media_constraints = null;
     this.pc_constraints = null;
-    this.ice_config = {},
+    this.ice_config = {};
     this.drip_container = [];
 
     this.usetrickle = true;
@@ -40,8 +40,18 @@ JingleSession = function(me, sid, connection) {
 
     this.addssrc = [];
     this.removessrc = [];
+    this.pendingop = null;
 
     this.wait = true;
+
+    // XEP-0172 support, non-standard
+    this.nickname = null;
+
+    // non-standard "please start muted" support for colibri/meet
+    this.startmuted = false;
+
+    // Filter for testcases with ICE Candidates
+    this.filter_candidates = null;
 }
 
 JingleSession.prototype.initiate = function (peerjid, isInitiator) {
@@ -159,6 +169,7 @@ JingleSession.prototype.accept = function () {
     this.peerconnection.setLocalDescription(new RTCSessionDescription({type: 'answer', sdp: sdp}),
         function () {
             //console.log('setLocalDescription success');
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
         },
         function (e) {
             console.error('setLocalDescription failed', e);
@@ -197,118 +208,50 @@ JingleSession.prototype.sendIceCandidate = function (candidate) {
             this.hadturncandidate = true;
         }
 
-        if (this.usetrickle) {
-            if (this.usedrip) {
-                if (this.drip_container.length === 0) {
-                    // start 10ms callout
-                    window.setTimeout(function () {
-                        if (self.drip_container.length === 0) return;
-                        var allcands = self.drip_container;
-                        self.drip_container = [];
-                        var cand = $iq({to: self.peerjid, type: 'set'})
-                            .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
-                               action: 'transport-info',
-                               initiator: self.initiator,
-                               sid: self.sid});
-                        for (var mid = 0; mid < self.localSDP.media.length; mid++) {
-                            var cands = allcands.filter(function (el) { return el.sdpMLineIndex == mid; });
-                            if (cands.length > 0) {
-                                var ice = SDPUtil.iceparams(self.localSDP.media[mid], self.localSDP.session);
-                                ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
-                                cand.c('content', {creator: self.initiator == self.me ? 'initiator' : 'responder',
-                                       name: cands[0].sdpMid
-                                }).c('transport', ice);
-                                for (var i = 0; i < cands.length; i++) {
-                                    cand.c('candidate', SDPUtil.candidateToJingle(cands[i].candidate)).up();
-                                }
-                                // add fingerprint
-                                if (SDPUtil.find_line(self.localSDP.media[mid], 'a=fingerprint:', self.localSDP.session)) {
-                                    var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(self.localSDP.media[mid], 'a=fingerprint:', self.localSDP.session));
-                                    tmp.required = true;
-                                    cand.c('fingerprint').t(tmp.fingerprint);
-                                    delete tmp.fingerprint;
-                                    cand.attrs(tmp);
-                                    cand.up();
-                                }
-                                cand.up(); // transport
-                                cand.up(); // content
-                            }
-                        }
-                        // might merge last-candidate notification into this, but it is called alot later. See webrtc issue #2340
-                        //console.log('was this the last candidate', self.lasticecandidate);
-                        self.connection.sendIQ(cand,
-                            function () {
-                                var ack = {};
-                                ack.source = 'transportinfo';
-                                $(document).trigger('ack.jingle', [self.sid, ack]);
-                            },
-                            function (stanza) {
-                                var error = ($(stanza).find('error').length) ? {
-                                    code: $(stanza).find('error').attr('code'),
-                                    reason: $(stanza).find('error :first')[0].tagName,
-                                }:{};
-                                error.source = 'transportinfo';
-                                $(document).trigger('error.jingle', [self.sid, error]);
-                            },
-                        10000);
-                    }, 10);
+        if(this.filter_candidates === null || jcand.type === this.filter_candidates) {
+            if (this.usetrickle) {
+                console.log('sendIceCandidate using trickle');
+                if (this.usedrip) {
+                    if (this.drip_container.length === 0) {
+                        // start 20ms callout
+                        window.setTimeout(function () {
+                            console.log('sending drip container');
+                            if (self.drip_container.length === 0) return;
+                            self.sendIceCandidates(self.drip_container);
+                            self.drip_container = [];
+                        }, 20);
+
+                    }
+                    this.drip_container.push(event.candidate);
+                    return;
+                } else {
+                    console.log('sending single candidate');
+                    self.sendIceCandidates([event.candidate]);
                 }
-                this.drip_container.push(event.candidate);
-                return;
             }
-            // map to transport-info
-            var cand = $iq({to: this.peerjid, type: 'set'})
-                .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
-                        action: 'transport-info',
-                        initiator: this.initiator,
-                        sid: this.sid})
-                .c('content', {creator: this.initiator == this.me ? 'initiator' : 'responder',
-                        name: candidate.sdpMid
-                        })
-                .c('transport', ice)
-                .c('candidate', jcand);
-            cand.up();
-            // add fingerprint
-            if (SDPUtil.find_line(this.localSDP.media[candidate.sdpMLineIndex], 'a=fingerprint:', this.localSDP.session)) {
-                var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(this.localSDP.media[candidate.sdpMLineIndex], 'a=fingerprint:', this.localSDP.session));
-                tmp.required = true;
-                cand.c('fingerprint').t(tmp.fingerprint);
-                delete tmp.fingerprint;
-                cand.attrs(tmp);
-                cand.up();
-            }
-            this.connection.sendIQ(cand,
-                function () {
-                    var ack = {};
-                    ack.source = 'transportinfo';
-                    $(document).trigger('ack.jingle', [self.sid, ack]);
-                },
-                function (stanza) {
-                    console.error('transport info error');
-                    var error = ($(stanza).find('error').length) ? {
-                        code: $(stanza).find('error').attr('code'),
-                        reason: $(stanza).find('error :first')[0].tagName,
-                    }:{};
-                    error.source = 'transportinfo';
-                    $(document).trigger('error.jingle', [self.sid, error]);
-                },
-            10000);
         }
     } else {
-        //console.log('sendIceCandidate: last candidate.');
+        console.log('sendIceCandidate: last candidate...');
         if (!this.usetrickle) {
-            //console.log('should send full offer now...');
+            console.log('should send full offer now...');
             var init = $iq({to: this.peerjid,
                        type: 'set'})
                 .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
                    action: this.peerconnection.localDescription.type == 'offer' ? 'session-initiate' : 'session-accept',
                    initiator: this.initiator,
                    sid: this.sid});
+            if (this.nickname != null) {
+                init.c('nick', {xmlns:'http://jabber.org/protocol/nick'}).t(this.nickname).up();
+            }
+            if (this.startmuted) {
+                init.c('muted', {xmlns:'http://jitsi.org/protocol/meet#startmuted'}).up();
+            }
             this.localSDP = new SDP(this.peerconnection.localDescription.sdp);
             this.localSDP.toJingle(init, this.initiator == this.me ? 'initiator' : 'responder');
+            console.log('try to send ack(offer)...');
             this.connection.sendIQ(init,
                 function () {
-                    //console.log('session initiate ack');
+                    console.log('Sent session initiate (ACK, offer)...');
                     var ack = {};
                     ack.source = 'offer';
                     $(document).trigger('ack.jingle', [self.sid, ack]);
@@ -330,11 +273,65 @@ JingleSession.prototype.sendIceCandidate = function (candidate) {
         console.log('Have we encountered any relay candidates? ' + this.hadturncandidate);
 
         if (!(this.hadstuncandidate || this.hadturncandidate) && this.peerconnection.signalingState != 'closed') {
+            console.log('no candidates found!');
             $(document).trigger('nostuncandidates.jingle', [this.sid]);
         }
     }
 };
 
+JingleSession.prototype.sendIceCandidates = function (candidates) {
+    console.log('sendIceCandidates', candidates);
+    var cand = $iq({to: this.peerjid, type: 'set'})
+        .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
+           action: 'transport-info',
+           initiator: this.initiator,
+           sid: this.sid});
+    for (var mid = 0; mid < this.localSDP.media.length; mid++) {
+        var cands = candidates.filter(function (el) { return el.sdpMLineIndex == mid; });
+        if (cands.length > 0) {
+            var ice = SDPUtil.iceparams(this.localSDP.media[mid], this.localSDP.session);
+            ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
+            cand.c('content', {creator: this.initiator == this.me ? 'initiator' : 'responder',
+                   name: cands[0].sdpMid
+            }).c('transport', ice);
+            for (var i = 0; i < cands.length; i++) {
+                cand.c('candidate', SDPUtil.candidateToJingle(cands[i].candidate)).up();
+            }
+            // add fingerprint
+            if (SDPUtil.find_line(this.localSDP.media[mid], 'a=fingerprint:', this.localSDP.session)) {
+                var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(this.localSDP.media[mid], 'a=fingerprint:', this.localSDP.session));
+                tmp.required = true;
+                cand.c('fingerprint').t(tmp.fingerprint);
+                delete tmp.fingerprint;
+                cand.attrs(tmp);
+                cand.up();
+            }
+            cand.up(); // transport
+            cand.up(); // content
+        }
+    }
+    // might merge last-candidate notification into this, but it is called alot later. See webrtc issue #2340
+    //console.log('was this the last candidate', this.lasticecandidate);
+    console.log('try to send ack(transportinfo)...');
+    this.connection.sendIQ(cand,
+        function () {
+            var ack = {};
+            ack.source = 'transportinfo';
+            console.log('Sent session initiate (ACK, transportinfo)...');
+            $(document).trigger('ack.jingle', [this.sid, ack]);
+        },
+        function (stanza) {
+            var error = ($(stanza).find('error').length) ? {
+                code: $(stanza).find('error').attr('code'),
+                reason: $(stanza).find('error :first')[0].tagName,
+            }:{};
+            error.source = 'transportinfo';
+            $(document).trigger('error.jingle', [this.sid, error]);
+        },
+    10000);
+};
+
+
 JingleSession.prototype.sendOffer = function () {
     //console.log('sendOffer...');
     var self = this;
@@ -360,6 +357,12 @@ JingleSession.prototype.createdOffer = function (sdp) {
                action: 'session-initiate',
                initiator: this.initiator,
                sid: this.sid});
+        if (this.nickname != null) {
+            init.c('nick', {xmlns:'http://jabber.org/protocol/nick'}).t(this.nickname).up();
+        }
+        if (this.startmuted) {
+            init.c('muted', {xmlns:'http://jitsi.org/protocol/meet#startmuted'}).up();
+        }
         this.localSDP.toJingle(init, this.initiator == this.me ? 'initiator' : 'responder');
         this.connection.sendIQ(init,
             function () {
@@ -382,6 +385,7 @@ JingleSession.prototype.createdOffer = function (sdp) {
     sdp.sdp = this.localSDP.raw;
     this.peerconnection.setLocalDescription(sdp, 
         function () {
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
             //console.log('setLocalDescription success');
         },
         function (e) {
@@ -566,11 +570,31 @@ JingleSession.prototype.sendAnswer = function (provisional) {
 
 JingleSession.prototype.createdAnswer = function (sdp, provisional) {
     //console.log('createAnswer callback');
-    console.log(sdp);
     var self = this;
     this.localSDP = new SDP(sdp.sdp);
     //this.localSDP.mangle();
     this.usepranswer = provisional === true;
+
+    if (this.startmuted) {
+        console.log('we got a request to start muted...');
+        this.connection.jingle.localStream.getAudioTracks().forEach(function (track) {
+            track.enabled = false;
+        });
+        // doing this freezes local video, too (which probably means it should be replaced
+        // by a symbol
+        this.connection.jingle.localStream.getVideoTracks().forEach(function (track) {
+            track.enabled = false;
+        });
+
+        // set video to recvonly
+        this.localSDP.media[1] = this.localSDP.media[1].replace('a=sendrecv', 'a=recvonly');
+        // and remove a=ssrc lines. Weird things happen otherwise
+        SDPUtil.find_lines(this.localSDP.media[1], 'a=ssrc:').forEach(function (line) {
+            self.localSDP.media[1] = self.localSDP.media[1].replace(line + '\r\n', '');
+        });
+        this.localSDP.raw = this.localSDP.session + this.localSDP.media.join('');
+    }
+
     if (this.usetrickle) {
         if (!this.usepranswer) {
             var accept = $iq({to: this.peerjid,
@@ -601,12 +625,13 @@ JingleSession.prototype.createdAnswer = function (sdp, provisional) {
             for (var i = 0; i < this.localSDP.media.length; i++) {
                 this.localSDP.media[i] = this.localSDP.media[i].replace('a=sendrecv\r\n', 'a=inactive\r\n');
             }
-            this.localSDP.raw = this.localSDP.session + '\r\n' + this.localSDP.media.join('');
+            this.localSDP.raw = this.localSDP.session + this.localSDP.media.join('');
         }
     }
     sdp.sdp = this.localSDP.raw;
     this.peerconnection.setLocalDescription(sdp,
         function () {
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
             //console.log('setLocalDescription success');
         },
         function (e) {
@@ -727,8 +752,8 @@ JingleSession.prototype.removeSource = function (elem) {
 
 JingleSession.prototype.modifySources = function() {
     var self = this;
-    if (!(this.addssrc.length || this.removessrc.length)) return;
     if (this.peerconnection.signalingState == 'closed') return;
+    if (!(this.addssrc.length || this.removessrc.length || this.pendingop !== null)) return;
     if (!(this.peerconnection.signalingState == 'stable' && this.peerconnection.iceConnectionState == 'connected')) {
         console.warn('modifySources not yet', this.peerconnection.signalingState, this.peerconnection.iceConnectionState);
         this.wait = true;
@@ -764,9 +789,28 @@ JingleSession.prototype.modifySources = function() {
         function() {
             self.peerconnection.createAnswer(
                 function(modifiedAnswer) {
+                    // change video direction, see https://github.com/jitsi/jitmeet/issues/41
+                    if (self.pendingop !== null) {
+                        var sdp = new SDP(modifiedAnswer.sdp);
+                        if (sdp.media.length > 1) {
+                            switch(self.pendingop) {
+                            case 'mute':
+                                sdp.media[1] = sdp.media[1].replace('a=sendrecv', 'a=recvonly');
+                                break;
+                            case 'unmute':
+                                sdp.media[1] = sdp.media[1].replace('a=recvonly', 'a=sendrecv');
+                                break;
+                            }
+                            sdp.raw = sdp.session + sdp.media.join('');
+                            modifiedAnswer.sdp = sdp.raw;
+                        }
+                        self.pendingop = null;
+                    }
+
                     self.peerconnection.setLocalDescription(modifiedAnswer,
                         function() {
                             //console.log('modified setLocalDescription ok');
+                            $(document).trigger('setLocalDescription.jingle', [self.sid]);
                         },
                         function(error) {
                             console.log('modified setLocalDescription failed');
@@ -784,6 +828,17 @@ JingleSession.prototype.modifySources = function() {
     );
 };
 
+// SDP-based mute by going recvonly/sendrecv
+// FIXME: should probably black out the screen as well
+JingleSession.prototype.hardMuteVideo = function (muted) {
+    this.pendingop = muted ? 'mute' : 'unmute';
+    this.modifySources();
+
+    this.connection.jingle.localStream.getVideoTracks().forEach(function (track) {
+        track.enabled = !muted;
+    });
+};
+
 JingleSession.prototype.sendMute = function (muted, content) {
     var info = $iq({to: this.peerjid,
              type: 'set'})

build/lib/strophe.js

@@ -3,9 +3,10 @@
  * Klaus Herberth, 2014
  */
 
-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
+/*! This code was written by Tyler Akins and has been placed in the
+   public domain.  It would be nice if you left this header intact.
+   Base64 code from Tyler Akins -- http://rumkin.com
+*/
 
 var Base64 = (function () {
     var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -84,7 +85,7 @@ var Base64 = (function () {
     return obj;
 })();
 
-/*
+/*!
  * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
  * in FIPS PUB 180-1
  * Version 2.1a Copyright Paul Johnston 2000 - 2002.
@@ -261,7 +262,7 @@ function binb2b64(binarray)
   return str;
 }
 
-/*
+/*!
  * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
  * Digest Algorithm, as defined in RFC 1321.
  * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
@@ -469,7 +470,7 @@ var MD5 = (function () {
     return obj;
 })();
 
-/*
+/*!
     This program is distributed under the terms of the MIT license.
     Please see the LICENSE file for details.
 

build/sound/credential

@@ -0,0 +1,11 @@
+Rotary-Phone6.mp3
+===
+Creator: David English
+Source: http://www.beepzoid.com/old-phones/
+License: unknown
+
+Ping1.mp3
+===
+Creator: CameronMusic
+Source: https://soundcloud.com/freefilmandgamemusic/ping-1?in=freefilmandgamemusic/sets/free-notification-sounds-and
+License: cc 3.0, http://creativecommons.org/licenses/by/3.0/

dep.json

@@ -0,0 +1,72 @@
+[
+  {
+     "file": "build/lib/strophe.js",
+     "license": "multiple",
+     "url": "http://strophe.im/strophejs/"
+  },
+  {
+     "file": "build/lib/strophe.muc.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.disco.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.caps.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.vcard.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.session.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.sdp.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.adapter.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/otr/build/dep/salsa20.js",
+     "license": "GPLv3",
+     "url": "https://github.com/neoatlantis/node-salsa20"
+  },
+  {
+     "file": "build/lib/otr/build/dep/bigint.js",
+     "license": "public domain",
+     "url": "www.leemon.com"
+  },
+  {
+     "file": "build/lib/otr/build/dep/crypto.js",
+     "license": "code.google.com/p/crypto-js/wiki/license",
+     "url": "code.google.com/p/crypto-js"
+  },
+  {
+     "file": "build/lib/otr/build/dep/eventemitter.js",
+     "license": "MIT",
+     "url": "http://git.io/ee"
+  },
+  {
+     "file": "build/lib/otr/build/otr.js",
+     "license": "MPL v2.0",
+     "url": "https://arlolra.github.io/otr/"
+  }
+ ]

example/ajax/getturncredentials.json

@@ -0,0 +1 @@
+{"url":"numb.viagenie.ca","username":"webrtc@live.com","credential":"muazkh","ttl":43200}

example/index.html

@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<html>
+	<head>
+	  <title>JSXC example application</title>
+	  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	  
+	  <link href="../lib/jquery-ui.min.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../lib/jquery.mCustomScrollbar.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../lib/jquery.colorbox.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../jsxc.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../jsxc.webrtc.css" media="all" rel="stylesheet" type="text/css" />
+	  
+	  <style type="text/css">
+	  body, * {font-size: 13px; font-family: "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif;}
+	  fieldset {float: left;}
+	  </style>
+	  
+	  <script src="../lib/jquery.min.js"></script>
+	  <script src="../lib/jquery.ui.min.js"></script>
+	  <script src="../lib/jquery.colorbox-min.js"></script>
+	  <script src="../lib/jquery.slimscroll.js"></script>
+	  <script src="../lib/jquery.fullscreen.js"></script>
+	  
+	  <!-- Nightly files:
+	  
+	  <script src="../lib/strophe.js"></script>
+	  <script src="../lib/strophe.muc.js"></script>
+	  <script src="../lib/strophe.disco.js"></script>
+	  <script src="../lib/strophe.caps.js"></script>
+	  <script src="../lib/strophe.vcard.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.session.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.sdp.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.adapter.js"></script>
+	  <script src="../lib/otr/build/dep/salsa20.js"></script>
+	  <script src="../lib/otr/build/dep/bigint.js"></script>
+	  <script src="../lib/otr/build/dep/crypto.js"></script>
+	  <script src="../lib/otr/build/dep/eventemitter.js"></script>
+	  <script src="../lib/otr/build/otr.js"></script>
+	  <script src="../jsxc.lib.js"></script>
+	  <script src="../jsxc.lib.webrtc.js"></script> 
+	  -->
+	  
+	  <!-- Build files: -->
+	  <script src="../build/jsxc.dep.js"></script>
+	  <script src="../build/jsxc.js"></script>
+	  
+	  <script src="js/example.js"></script>
+
+	</head>
+	
+	<body>
+	  <form id="form" method="post" action="login.html">
+		  <fieldset>
+		     <legend>Login</legend>
+		     <label for="username">Username:</label><input type="text" id="username" name="username" /><br />
+		     <label for="password">Password:</label><input type="password" id="password" name="password" /><br />
+		     <input type="submit" value="Log in" />
+		  </fieldset>
+	  </form>
+	</body>
+</html>

example/js/example.js

@@ -0,0 +1,33 @@
+$(function() {
+   jsxc.init({
+      loginForm: {
+         form: '#form',
+         jid: '#username',
+         pass: '#password'
+      },
+      logoutElement: $('#logout'),
+      checkFlash: false,
+      rosterAppend: 'body',
+      root: '/jsxc/',
+      turnCredentialsPath: 'ajax/getturncredentials.json',
+      displayRosterMinimized: function() {
+         return true;
+      },
+      otr: {
+         debug: true,
+         SEND_WHITESPACE_TAG: true,
+         WHITESPACE_START_AKE: true
+      },
+      loadSettings: function(username, password) {
+         return {
+            xmpp: {
+               url: '/http-bind/',
+               domain: 'localhost',
+               resource: 'example',
+               overwrite: true,
+               onlogin: true
+            }
+         };
+      }
+   });
+});

example/login.html

@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+   <head>
+     <title>JSXC example application</title>
+     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+     
+     <link href="../lib/jquery-ui.min.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../lib/jquery.mCustomScrollbar.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../lib/jquery.colorbox.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../jsxc.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../jsxc.webrtc.css" media="all" rel="stylesheet" type="text/css" />
+     
+     <style type="text/css">
+     body, * {font-size: 13px; font-family: "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif;}
+     fieldset {float: left;}
+     </style>
+     
+     <script src="../lib/jquery.min.js"></script>
+     <script src="../lib/jquery.ui.min.js"></script>
+     <script src="../lib/jquery.colorbox-min.js"></script>
+     <script src="../lib/jquery.slimscroll.js"></script>
+     <script src="../lib/jquery.fullscreen.js"></script>
+     <script src="../lib/strophe.js"></script>
+     <script src="../lib/strophe.muc.js"></script>
+     <script src="../lib/strophe.disco.js"></script>
+     <script src="../lib/strophe.caps.js"></script>
+     <script src="../lib/strophe.vcard.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.session.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.sdp.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.adapter.js"></script>
+     <script src="../lib/otr/build/dep/salsa20.js"></script>
+     <script src="../lib/otr/build/dep/bigint.js"></script>
+     <script src="../lib/otr/build/dep/crypto.js"></script>
+     <script src="../lib/otr/build/dep/eventemitter.js"></script>
+     <script src="../lib/otr/build/otr.js"></script>
+     <script src="../jsxc.lib.js"></script>
+     <script src="../jsxc.lib.webrtc.js"></script>
+     
+     <script src="js/example.js"></script>
+
+   </head>
+   
+   <body>
+     <h1>You are logged in :-).</h1>
+     
+     <a href="index.html" id="logout">Log out</a>
+   </body>
+</html>

img/XMPP_logo.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   xml:space="preserve"
+   height="147.22015"
+   viewBox="0 0 192.89149 147.21771"
+   width="192.89587"
+   version="1.1"
+   y="0px"
+   x="0px"
+   enable-background="new 0 0 176.486 181.437"
+   inkscape:version="0.91pre2 r"
+   sodipodi:docname="XMPP_logo.svg"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10"
+     inkscape:zoom="1.3007054"
+     inkscape:cx="71.332001"
+     inkscape:cy="72.501142"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><linearGradient
+     id="SVGID_1_"
+     y2="0.00048828"
+     gradientUnits="userSpaceOnUse"
+     x2="-1807.2"
+     gradientTransform="translate(1925.9953,9.9988343)"
+     y1="125.86"
+     x1="-1807.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop4" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop6" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop8" /></linearGradient><path
+     d="m 146.28531,24.187835 c 0.077,1.313 -1.786,0.968 -1.786,2.293 0,38.551 -44.720002,96.831035 -89.847002,108.190035 l 0,1.182 C 114.60931,130.34287 181.38231,69.052835 182.89231,10.002834 l -36.6,14.189001 z"
+     id="path10"
+     style="fill:url(#SVGID_1_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 130.22531,27.958835 c 0.077,1.313 0.121,2.633 0.121,3.958 0,38.551 -30.700002,90.497035 -75.827002,101.860035 l 0,1.637 c 59.065002,-3.823 105.810002,-63.023035 105.810002,-109.200035 0,-2.375 -0.125,-4.729 -0.371,-7.056 l -29.73,8.796 z"
+     id="path12"
+     inkscape:connector-curvature="0"
+     style="fill:#e96d1f" /><linearGradient
+     id="SVGID_2_"
+     y2="1.279e-13"
+     gradientUnits="userSpaceOnUse"
+     x2="-1073.2"
+     gradientTransform="matrix(-1,0,0,1,-998.20465,9.9988343)"
+     y1="126.85"
+     x1="-1073.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop15" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop17" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop19" /></linearGradient><path
+     d="m 46.594308,24.187835 c -0.077,1.313 1.787,0.968 1.787,2.293 0,38.551 46.558,97.366035 91.688002,108.730035 l 0,1.639 C 80.116308,131.32987 11.509308,69.049835 9.9993079,9.9998343 L 46.598308,24.188835 Z"
+     id="path21"
+     style="fill:url(#SVGID_2_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 64.726308,28.930835 c -0.076,1.313 -0.12,2.63 -0.12,3.957 0,38.551 30.699,90.497035 75.827002,101.860035 l 0,1.639 C 81.389308,133.59687 34.623308,73.362835 34.623308,27.186835 c 0,-2.375 0.128,-4.729 0.371,-7.056 l 29.73,8.798 z"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#a0ce67" /><path
+     d="m 34.708308,19.581835 7.617,2.722 c -0.041,0.962 -0.066,2.254 -0.066,3.225 0,41.219 37.271,98.204035 87.272002,107.120035 3.245,1.088 7.538,2.077 10.932,2.931 l 0,1.638 C 75.209308,131.65787 29.363308,65.351835 34.703308,19.577835 Z"
+     id="path25"
+     inkscape:connector-curvature="0"
+     style="fill:#439639" /><path
+     d="m 160.33531,18.758835 -7.833,2.625 c 0.041,0.963 0.191,2.203 0.191,3.173 0,41.219 -37.272,98.205035 -87.274002,107.120035 -3.243,1.089 -7.538,2.077 -10.93,2.932 l 0,1.639 C 122.83331,127.58787 165.66931,64.528835 160.32931,18.757835 Z"
+     id="path27"
+     inkscape:connector-curvature="0"
+     style="fill:#d9541e" /></svg>

img/camera_icon_grey.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   width="20"
+   height="20">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <g
+     id="layer1"
+     transform="matrix(0.03788594,0,0,0.03788594,-0.41340793,-2.6310716)">
+    <path
+       id="path3906"
+       style="fill:#808080;stroke:none"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 L 358.97338,350.18517 Z M 10.911922,182.40634 l 378.372678,0 0,302.65582 -378.372678,0 z" />
+  </g>
+</svg>

img/camera_icon_white.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="535.00458"
+   height="510.4368"
+   id="svg3896"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="camera_icon_white.svg">
+  <defs
+     id="defs3898" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="353.91934"
+     inkscape:cy="233.8456"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3901">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-5.7142771,-72.362177)">
+    <rect
+       style="fill:#ffffff;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3904"
+       width="378.37268"
+       height="302.65582"
+       x="10.911922"
+       y="182.40634" />
+    <path
+       style="fill:#ffffff;stroke:none"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 -179.83884,-133.77734 z"
+       id="path3906"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>