Browse Source
- Rewrite the WidgetWrapper and clean the old BOSH related code
- Rewrite the WidgetWrapper and clean the old BOSH related code
- Rewrite the AccountNext widget and move everything XMPP related to Moxl - New behaviour for the Websocket unregistrationpull/16/head
Jaussoin Timothée
11 years ago
22 changed files with 272 additions and 464 deletions
-
34app/assets/js/movim_websocket.js
-
291app/widgets/AccountNext/AccountNext.php
-
45app/widgets/AccountNext/_accountnext_form.tpl
-
10app/widgets/AccountNext/_accountnext_oob.tpl
-
9app/widgets/AccountNext/_accountnext_registered.tpl
-
12app/widgets/AccountNext/accountnext.js
-
8app/widgets/AccountNext/accountnext.tpl
-
6app/widgets/AccountNext/locales.ini
-
2app/widgets/ContactPubsubSubscription/ContactPubsubSubscription.php
-
7app/widgets/Login/Login.php
-
2app/widgets/Login/login.js
-
1app/widgets/Menu/Menu.php
-
4app/widgets/Subscribe/subscribe.js
-
16lib/XMPPtoForm.php
-
16linker.php
-
1locales/locales.ini
-
4src/Movim/Daemon/Session.php
-
10system/Event.php
-
1system/Session.php
-
254system/widget/WidgetWrapper.php
-
3themes/movim/css/style.css
-
BINthemes/movim/img/icons/placeholder/clipboard.png
@ -1,47 +1,14 @@ |
|||||
<form name="data"> |
<form name="data"> |
||||
<fieldset> |
|
||||
{$instr} |
|
||||
|
<div id="subscription_error"> |
||||
|
|
||||
<div class="clear"></div> |
|
||||
|
</div> |
||||
|
<fieldset> |
||||
{$formh} |
{$formh} |
||||
|
|
||||
<input |
|
||||
type="hidden" |
|
||||
value="{$domain}" |
|
||||
name="ndd" |
|
||||
id="ndd" |
|
||||
/> |
|
||||
|
|
||||
<input |
|
||||
type="hidden" |
|
||||
value="{$ndd}" |
|
||||
name="to" |
|
||||
id="to" |
|
||||
/> |
|
||||
|
|
||||
<input |
|
||||
type="hidden" |
|
||||
value="{$id}" |
|
||||
name="id" |
|
||||
id="id" |
|
||||
/> |
|
||||
|
|
||||
<input |
|
||||
id="submitb" |
|
||||
type="submit" |
|
||||
style="display: none;" |
|
||||
value="submit" |
|
||||
name="submitb" |
|
||||
/> |
|
||||
|
|
||||
<a |
<a |
||||
class="button color green icon yes" |
|
||||
style="float: right;" |
|
||||
onclick=" |
|
||||
localStorage.username = document.querySelector('#username').value+'@'+'{$ndd}'; |
|
||||
{$submitdata}" |
|
||||
|
class="button color green oppose" |
||||
|
onclick="{$submitdata}" |
||||
> |
> |
||||
{$c->__('button.validate')} |
|
||||
|
<i class="fa fa-check"></i> {$c->__('button.validate')} |
||||
</a> |
</a> |
||||
</fieldset> |
</fieldset> |
||||
</form> |
</form> |
||||
@ -0,0 +1,10 @@ |
|||||
|
<p> |
||||
|
{$c->__('oob.about')} <a href="{$url}" target="_blank">{$url}</a> |
||||
|
</p> |
||||
|
|
||||
|
<a |
||||
|
class="button oppose color green" |
||||
|
href="{$c->route('login')}" |
||||
|
> |
||||
|
<i class="fa fa-home"></i> {$c->__('page.login')} |
||||
|
</a> |
||||
@ -0,0 +1,9 @@ |
|||||
|
<div class="placeholder icon clipboard"> |
||||
|
{$c->__('create.successfull')} |
||||
|
|
||||
|
<h1 id="username">username@server.com</h1> |
||||
|
|
||||
|
<a class="button color green" href="{$c->route('login')}"> |
||||
|
<i class="fa fa-home"></i> {$c->__('page.login')} |
||||
|
</a> |
||||
|
</div> |
||||
@ -1 +1,13 @@ |
|||||
|
var AccountNext = { |
||||
|
host : '', |
||||
|
setHost : function(host) { |
||||
|
this.host = host; |
||||
|
}, |
||||
|
setUsername : function(user) { |
||||
|
document.querySelector('#username').innerHTML = user + '@' + this.host; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
function setUsername(user) { |
||||
|
AccountNext.setUsername(user); |
||||
|
} |
||||
@ -1,12 +1,16 @@ |
|||||
<div id="subscribe"> |
<div id="subscribe"> |
||||
<h1 class="paddedtopbottom">{$c->__('create.title')} {$c->__('on')} {$ndd}</h1> |
|
||||
|
<h1 class="paddedtopbottom">{$c->__('create.title')} {$c->__('on')} {$host}</h1> |
||||
|
|
||||
<div id="subscription_form" class="paddedtopbottom"> |
<div id="subscription_form" class="paddedtopbottom"> |
||||
{$c->__('loading')} |
{$c->__('loading')} |
||||
</div> |
</div> |
||||
|
|
||||
<script type="text/javascript"> |
<script type="text/javascript"> |
||||
{$getsubscriptionform} |
|
||||
|
MovimWebsocket.attach(function() |
||||
|
{ |
||||
|
{$getsubscriptionform} |
||||
|
AccountNext.host = '{$host}'; |
||||
|
}); |
||||
</script> |
</script> |
||||
</div> |
</div> |
||||
|
|
||||
@ -1,4 +1,10 @@ |
|||||
create.title = 'Create a new account' |
create.title = 'Create a new account' |
||||
create.notfound = 'No account creation form found on the server' |
create.notfound = 'No account creation form found on the server' |
||||
create.on = 'on' |
create.on = 'on' |
||||
|
create.successfull = 'Your acccount has been successfully registered' |
||||
loading = 'Loading' |
loading = 'Loading' |
||||
|
|
||||
|
error.not_acceptable = 'Not Acceptable' |
||||
|
error.service_unavailable = 'The registration system of this server is currently unavailable' |
||||
|
|
||||
|
oob.about = 'This server use an external system for the registration, please click on the following URL.' |
||||
@ -0,0 +1,4 @@ |
|||||
|
MovimWebsocket.attach(function() |
||||
|
{ |
||||
|
remoteUnregister(); |
||||
|
}); |
||||
|
After Width: 512 | Height: 512 | Size: 8.3 KiB |
Write
Preview
Loading…
Cancel
Save
Reference in new issue