Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use class instead of id for controlbox-panes element

Browse Source
This commit is contained in:
JC Brand 2013-08-31 14:29:58 +02:00
parent fcd488c452
commit f0204dd54b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
converse.css
View File

@ -216,7 +216,6 @@ li.chat-info {
padding-top: 10px; padding-top: 10px;
} }
div#settings,
div#chatrooms, div#chatrooms,
div#login-dialog { div#login-dialog {
height: 274px; height: 274px;
@ -609,7 +608,7 @@ dd.available-chatroom:hover a.room-info {
background-color: #DCEAC5; background-color: #DCEAC5;
} }
div#controlbox-panes { .controlbox-panes {
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */ background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */
background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */ background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */
background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */ background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */

8
converse.js
View File

@ -1318,7 +1318,7 @@
'<ul id="controlbox-tabs"></ul>'+ '<ul id="controlbox-tabs"></ul>'+
'<a class="close-chatbox-button icon-close"></a>'+ '<a class="close-chatbox-button icon-close"></a>'+
'</div>'+ '</div>'+
'<div id="controlbox-panes"></div>' '<div class="controlbox-panes"></div>'
), ),
switchTab: function (ev) { switchTab: function (ev) {
@ -1345,15 +1345,15 @@
if ((!converse.prebind) && (!converse.connection)) { if ((!converse.prebind) && (!converse.connection)) {
// Add login panel if the user still has to authenticate // Add login panel if the user still has to authenticate
this.$el.html(this.template(this.model.toJSON())); this.$el.html(this.template(this.model.toJSON()));
this.loginpanel = new converse.LoginPanel({'$parent': this.$el.find('#controlbox-panes'), 'model': this}); this.loginpanel = new converse.LoginPanel({'$parent': this.$el.find('.controlbox-panes'), 'model': this});
this.loginpanel.render(); this.loginpanel.render();
} else if (!this.contactspanel) { } else if (!this.contactspanel) {
this.$el.html(this.template(this.model.toJSON())); this.$el.html(this.template(this.model.toJSON()));
this.contactspanel = new converse.ContactsPanel({'$parent': this.$el.find('#controlbox-panes')}); this.contactspanel = new converse.ContactsPanel({'$parent': this.$el.find('.controlbox-panes')});
this.contactspanel.render(); this.contactspanel.render();
converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus}); converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus});
converse.xmppstatusview.render(); converse.xmppstatusview.render();
this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('#controlbox-panes')}); this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('.controlbox-panes')});
this.roomspanel.render(); this.roomspanel.render();
} }
return this; return this;

4
mockup.html
View File

@ -27,7 +27,7 @@
<li><a class="current" href="#login">Sign in</a></li> <li><a class="current" href="#login">Sign in</a></li>
</ul> </ul>
<a class="close-chatbox-button icon-close"></a></div> <a class="close-chatbox-button icon-close"></a></div>
<div id="controlbox-panes"> <div class="controlbox-panes">
<div id="login-dialog"> <div id="login-dialog">
<form id="converse-login"> <form id="converse-login">
<label>XMPP/Jabber Username:</label><input type="text" id="jid"> <label>XMPP/Jabber Username:</label><input type="text" id="jid">
@ -46,7 +46,7 @@
</ul> </ul>
<a class="close-chatbox-button icon-close"></a> <a class="close-chatbox-button icon-close"></a>
</div> </div>
<div id="controlbox-panes"> <div class="controlbox-panes">
<div id="users" class="oc-chat-content" style="display: block;"> <div id="users" class="oc-chat-content" style="display: block;">
<form class="set-xmpp-status" action="" method="post"> <form class="set-xmpp-status" action="" method="post">
<span id="xmpp-status-holder"> <span id="xmpp-status-holder">