Merge branch 'master' of github.com:jcbrand/converse.js

converse.js

@@ -3085,10 +3085,14 @@
                 return this;
             },
 
-            restore: _.debounce(function (ev) {
+            restore: function(ev) {
                 if (ev && ev.preventDefault) {
                     ev.preventDefault();
                 }
+                this._restore();
+            },
+
+            _restore: _.debounce(function () {
                 this.remove();
                 this.model.maximize();
             }, 200)

index.html

@@ -207,16 +207,14 @@
                 <div class="row">
                     <div class="col-lg-8 col-lg-offset-2">
                         <h2>Contact</h2>
-                        <p>
-                            <ul class="contact">
-                                <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a>.</li>
-                                <li>Chat with me via XMPP: <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
-                                <li>For technical support, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a>.</li>
-                                <li>Also check out the <a href="http://librelist.com/browser/conversejs" target="_blank">mailing list archives</a>.</li>
-                                <li>Please file <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">bugs on Github</a>.</li>
-                                <li>I'm available for features and <a href="http://opkode.com/contact" target="_blank">consulting</a>.</li>
-                            <ul>
-                        </p>
+                        <ul class="contact">
+                            <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a>.</li>
+                            <li>Chat with me via XMPP: <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
+                            <li>For technical support, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a>.</li>
+                            <li>Also check out the <a href="http://librelist.com/browser/conversejs" target="_blank">mailing list archives</a>.</li>
+                            <li>Please file <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">bugs on Github</a>.</li>
+                            <li>I'm available for features and <a href="http://opkode.com/contact" target="_blank">consulting</a>.</li>
+                        <ul>
                     </div>
                 </div>
             </div>

src/templates/add_contact_form.html

@@ -6,4 +6,4 @@
             placeholder="{{label_contact_username}}"/>
         <button type="submit">{{label_add}}</button>
     </form>
-<li>
+</li>

src/templates/login_panel.html

@@ -5,4 +5,4 @@
     <input type="password" name="password" placeholder="Password">
     <input class="login-submit" type="submit" value="{{label_login}}">
     <span class="conn-feedback"></span>
-</form">
+</form>

src/templates/search_contact.html

@@ -6,4 +6,4 @@
             placeholder="{{label_contact_name}}"/>
         <button type="submit">{{label_search}}</button>
     </form>
-<li>
+</li>