See below
* Fix login panel rendering bug * Make registration form i18n aware. * Make providers link configurable.
This commit is contained in:
parent
f5115b295f
commit
e4307f7ab8
12
converse.js
12
converse.js
|
@ -232,6 +232,7 @@
|
||||||
bosh_service_url: undefined, // The BOSH connection manager URL.
|
bosh_service_url: undefined, // The BOSH connection manager URL.
|
||||||
cache_otr_key: false,
|
cache_otr_key: false,
|
||||||
debug: false,
|
debug: false,
|
||||||
|
domain_placeholder: " e.g. conversejs.org", // Placeholder text to show in the domain input on the registration form
|
||||||
default_box_height: 400, // The default height, in pixels, for the control box, chat boxes and chatrooms.
|
default_box_height: 400, // The default height, in pixels, for the control box, chat boxes and chatrooms.
|
||||||
expose_rid_and_sid: false,
|
expose_rid_and_sid: false,
|
||||||
forward_messages: false,
|
forward_messages: false,
|
||||||
|
@ -243,6 +244,7 @@
|
||||||
no_trimming: false, // Set to true for phantomjs tests (where browser apparently has no width)
|
no_trimming: false, // Set to true for phantomjs tests (where browser apparently has no width)
|
||||||
play_sounds: false,
|
play_sounds: false,
|
||||||
prebind: false,
|
prebind: false,
|
||||||
|
providers_link: 'https://xmpp.net/directory.php', // Link to XMPP providers shown on registration page
|
||||||
roster_groups: false,
|
roster_groups: false,
|
||||||
show_controlbox_by_default: false,
|
show_controlbox_by_default: false,
|
||||||
show_only_online_users: false,
|
show_only_online_users: false,
|
||||||
|
@ -4480,7 +4482,11 @@
|
||||||
this.$parent.append(this.$el.html(
|
this.$parent.append(this.$el.html(
|
||||||
converse.templates.register_panel({
|
converse.templates.register_panel({
|
||||||
'label_domain': __("Your XMPP provider's domain name:"),
|
'label_domain': __("Your XMPP provider's domain name:"),
|
||||||
'label_register': __('Fetch registration form')
|
'label_register': __('Fetch registration form'),
|
||||||
|
'help_providers': __('Tip: A list of public XMPP providers is available'),
|
||||||
|
'help_providers_link': __('here'),
|
||||||
|
'href_providers': converse.providers_link,
|
||||||
|
'domain_placeholder': converse.domain_placeholder
|
||||||
})
|
})
|
||||||
));
|
));
|
||||||
this.$tabs.append(converse.templates.register_tab({label_register: __('Register')}));
|
this.$tabs.append(converse.templates.register_tab({label_register: __('Register')}));
|
||||||
|
@ -4885,6 +4891,9 @@
|
||||||
render: function () {
|
render: function () {
|
||||||
this.$tabs.append(converse.templates.login_tab({label_sign_in: __('Sign in')}));
|
this.$tabs.append(converse.templates.login_tab({label_sign_in: __('Sign in')}));
|
||||||
this.$el.find('input#jid').focus();
|
this.$el.find('input#jid').focus();
|
||||||
|
if (!this.$el.is(':visible')) {
|
||||||
|
this.$el.show();
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -4930,7 +4939,6 @@
|
||||||
converse.connection.connect(jid, password, converse.onConnect);
|
converse.connection.connect(jid, password, converse.onConnect);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
remove: function () {
|
remove: function () {
|
||||||
this.$tabs.empty();
|
this.$tabs.empty();
|
||||||
this.$el.parent().empty();
|
this.$el.parent().empty();
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
0.8.4 (2014-12-01)
|
0.8.6 (Unreleased)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* Bugfix. Login panel didn't appear under certain conditions. [jcbrand]
|
||||||
|
* Text on the registration form was not configurable or i18n aware. [jcbrand]
|
||||||
|
|
||||||
|
0.8.5 (2014-12-01)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
* #117 JIDs or nicknames not shown in chat rooms. [jcbrand]
|
* #117 JIDs or nicknames not shown in chat rooms. [jcbrand]
|
||||||
|
|
|
@ -1116,6 +1116,13 @@ Default: ``false``
|
||||||
|
|
||||||
If set to true, debugging output will be logged to the browser console.
|
If set to true, debugging output will be logged to the browser console.
|
||||||
|
|
||||||
|
domain_placeholder
|
||||||
|
------------------
|
||||||
|
|
||||||
|
Default: ``e.g. conversejs.org``
|
||||||
|
|
||||||
|
The placeholder text shown in the domain input on the registration form.
|
||||||
|
|
||||||
keepalive
|
keepalive
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
@ -1297,6 +1304,15 @@ Here is a code example::
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
|
providers_link
|
||||||
|
--------------
|
||||||
|
|
||||||
|
Default: ``https://xmpp.net/directory.php``
|
||||||
|
|
||||||
|
The hyperlink on the registration form which points to a directory of public
|
||||||
|
XMPP servers.
|
||||||
|
|
||||||
|
|
||||||
roster_groups
|
roster_groups
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<form id="converse-register">
|
<form id="converse-register">
|
||||||
<span class="reg-feedback"></span>
|
<span class="reg-feedback"></span>
|
||||||
<label>{{label_domain}}</label>
|
<label>{{label_domain}}</label>
|
||||||
<input type="text" name="domain" placeholder=" e.g. conversejs.org">
|
<input type="text" name="domain" placeholder="{{domain_placeholder}}">
|
||||||
<p class="form-help">Tip: A list of public XMPP providers is available <a href="https://xmpp.net/directory.php" class="url" target="_blank">here</a>.</p>
|
<p class="form-help">{{help_providers}} <a href="{{href_providers}}" class="url" target="_blank">{{help_providers_link}}</a>.</p>
|
||||||
<input class="submit" type="submit" value="{{label_register}}">
|
<input class="submit" type="submit" value="{{label_register}}">
|
||||||
</form>
|
</form>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user