Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
c62dca4b
Commit
c62dca4b
authored
Oct 05, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1199 Provide a link back to the login form
parent
d30efcb3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
CHANGES.md
CHANGES.md
+1
-0
dist/converse.js
dist/converse.js
+7
-3
src/templates/register_panel.html
src/templates/register_panel.html
+1
-1
src/templates/registration_form.html
src/templates/registration_form.html
+5
-1
No files found.
CHANGES.md
View file @
c62dca4b
...
...
@@ -5,6 +5,7 @@
-
Bugfix. Handler not triggered when submitting MUC password form 2nd time
-
Bugfix. MUC features weren't being refreshed when saving the config form
-
#1190 MUC Participants column disappears in certain viewport widths
-
#1199 Can't get back from to login screen from registration screen
-
#1214 Setting
`allow_contact_requests`
to
`false`
has no effect
-
#1222 Adding a bookmark should prefill the room name
...
...
dist/converse.js
View file @
c62dca4b
...
...
@@ -80298,7 +80298,7 @@ var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./no
module.exports = function(o) {
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
function print() { __p += __j.call(arguments, '') }
__p += '<!-- src/templates/register_panel.html -->\n<div class="row">\n <form id="converse-register" class="converse-form">\n <legend>' +
__p += '<!-- src/templates/register_panel.html -->\n<div class="row">\n <form id="converse-register" class="converse-form">\n <legend
class="col-form-label"
>' +
__e(o.__("Create your account")) +
'</legend>\n\n <div class="form-group">\n <label>' +
__e(o.__("Please enter the XMPP provider to register with:")) +
...
...
@@ -80343,7 +80343,7 @@ var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./no
module.exports = function(o) {
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
function print() { __p += __j.call(arguments, '') }
__p += '<!-- src/templates/registration_form.html -->\n<legend>' +
__p += '<!-- src/templates/registration_form.html -->\n<legend
class="col-form-label"
>' +
__e(o.__("Account Registration:")) +
' ' +
__e(o.domain) +
...
...
@@ -80359,7 +80359,11 @@ __p += '\n <input type="button" class="btn btn-secondary button-cancel" v
__e(o.__('Choose a different provider')) +
'"/>\n ';
} ;
__p += '\n</fieldset>\n';
__p += '\n <div class="switch-form">\n <p>' +
__e( o.__("Already have a chat account?") ) +
'</p>\n <p><a class="login-here toggle-register-login" href="#converse/login">' +
__e(o.__("Log in here")) +
'</a></p>\n </div>\n</fieldset>\n';
return __p
};
src/templates/register_panel.html
View file @
c62dca4b
<div
class=
"row"
>
<form
id=
"converse-register"
class=
"converse-form"
>
<legend>
{{{o.__("Create your account")}}}
</legend>
<legend
class=
"col-form-label"
>
{{{o.__("Create your account")}}}
</legend>
<div
class=
"form-group"
>
<label>
{{{o.__("Please enter the XMPP provider to register with:")}}}
</label>
...
...
src/templates/registration_form.html
View file @
c62dca4b
<legend>
{{{o.__("Account Registration:")}}} {{{o.domain}}}
</legend>
<legend
class=
"col-form-label"
>
{{{o.__("Account Registration:")}}} {{{o.domain}}}
</legend>
<p
class=
"title"
>
{{{o.title}}}
</p>
<p
class=
"form-help instructions"
>
{{{o.instructions}}}
</p>
<div
class=
"form-errors hidden"
></div>
...
...
@@ -8,4 +8,8 @@
{[ if (!o.registration_domain) { ]}
<input
type=
"button"
class=
"btn btn-secondary button-cancel"
value=
"{{{o.__('Choose a different provider')}}}"
/>
{[ } ]}
<div
class=
"switch-form"
>
<p>
{{{ o.__("Already have a chat account?") }}}
</p>
<p><a
class=
"login-here toggle-register-login"
href=
"#converse/login"
>
{{{o.__("Log in here")}}}
</a></p>
</div>
</fieldset>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment