From dd6e3d873d2ff04cb2549530fa838ad58b06cdbc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Feb 2016 13:04:48 +0100 Subject: some work on mod/register --- view/css/mod_register.css | 86 --------------------------- view/js/mod_new_channel.js | 10 +++- view/js/mod_register.js | 58 +++++++++--------- view/pdl/mod_register.pdl | 1 - view/tpl/field_password.tpl | 2 +- view/tpl/new_channel.tpl | 2 - view/tpl/register.tpl | 139 ++++++++++++++++++-------------------------- 7 files changed, 98 insertions(+), 200 deletions(-) delete mode 100644 view/css/mod_register.css delete mode 100644 view/pdl/mod_register.pdl (limited to 'view') diff --git a/view/css/mod_register.css b/view/css/mod_register.css deleted file mode 100644 index 68ccac131..000000000 --- a/view/css/mod_register.css +++ /dev/null @@ -1,86 +0,0 @@ - -h2 { - margin: 20px 0 20px 5%; -} - -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 820px; - font-size: 1.1em; -} - - -#register-desc, #register-invite-desc, #register-text, #register-sites { - font-weight: bold; - margin-bottom: 15px; - padding: 8px; - border: 1px solid #ccc; -} - -@media (min-width: 560px) { -.register-label, .register-input { - float: left; - width: 50%; -} -} - -@media (max-width: 559px) { -.register-label, .register-input { - float: left; - max-width: 400px; -} -} - -.register-feedback { - float: left; - margin-left: 45px; -} - -.register-field-end { - clear: both; - margin-bottom: 20px; -} - -#newchannel-form { - font-size: 1.4em; - margin-left: 15%; - margin-top: 20px; - width: 50%; -} - -#newchannel-form .descriptive-paragraph { - color: #888; - margin-left: 20px; - margin-bottom: 25px; -} - -.newchannel-label { - float: left; - width: 275px; -} - -.newchannel-role-morehelp { - float: left; - width: 32px; -} -.newchannel-input { - float: left; - width: 275px; - padding: 5px; -} - -.newchannel-feedback { - float: left; - margin-left: 5px; -} - -.newchannel-field-end { - clear: both; - margin-bottom: 20px; -} - -.descriptive-paragraph { - margin-left: 20px; - margin-bottom: 25px; -} diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index 58573f736..17b354a4b 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -5,7 +5,10 @@ var zreg_name = $("#id_name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $("#id_nickname").val(data); - zFormError("#newchannel-name-feedback",data.error); + if(data.error) { + $("#help_name").html(""); + zFormError("#help_name",data.error); + } $("#name-spinner").spin(false); }); }); @@ -15,7 +18,10 @@ var zreg_nick = $("#id_nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#id_nickname").val(data); - zFormError("#newchannel-nickname-feedback",data.error); + if(data.error) { + $("#help_nickname").html(""); + zFormError("#help_nickname",data.error); + } $("#nick-spinner").spin(false); }); }); diff --git a/view/js/mod_register.js b/view/js/mod_register.js index 8430b4655..f1f3e7f71 100644 --- a/view/js/mod_register.js +++ b/view/js/mod_register.js @@ -1,50 +1,56 @@ $(document).ready(function() { - $("#register-email").blur(function() { - var zreg_email = $("#register-email").val(); + $("#id_email").blur(function() { + var zreg_email = $("#id_email").val(); $.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email), function(data) { - $("#register-email-feedback").html(data.message); - zFormError("#register-email-feedback",data.error); + $("#help_email").html(data.message); + zFormError("#help_email",data.error); }); }); - $("#register-password").blur(function() { - if(($("#register-password").val()).length < 6 ) { - $("#register-password-feedback").html(aStr.pwshort); - zFormError("#register-password-feedback", true); + $("#id_password").blur(function() { + if(($("#id_password").val()).length < 6 ) { + $("#help_password").html(aStr.pwshort); + zFormError("#help_password", true); } else { - $("#register-password-feedback").html(""); - zFormError("#register-password-feedback", false); + $("#help_password").html(""); + zFormError("#help_password", false); } }); - $("#register-password2").blur(function() { - if($("#register-password").val() != $("#register-password2").val()) { - $("#register-password2-feedback").html(aStr.pwnomatch); - zFormError("#register-password2-feedback", true); + $("#id_password2").blur(function() { + if($("#id_password").val() != $("#id_password2").val()) { + $("#help_password2").html(aStr.pwnomatch); + zFormError("#help_password2", true); } else { - $("#register-password2-feedback").html(""); - zFormError("#register-password2-feedback", false); + $("#help_password2").html(""); + zFormError("#help_password2", false); } }); - - $("#newchannel-name").blur(function() { + $("#id_name").blur(function() { $("#name-spinner").spin('small'); - var zreg_name = $("#newchannel-name").val(); + var zreg_name = $("#id_name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { - $("#newchannel-nickname").val(data); - zFormError("#newchannel-name-feedback",data.error); + $("#id_nickname").val(data); + if(data.error) { + $("#help_name").html(""); + zFormError("#help_name",data.error); + } $("#name-spinner").spin(false); }); }); - $("#newchannel-nickname").blur(function() { + + $("#id_nickname").blur(function() { $("#nick-spinner").spin('small'); - var zreg_nick = $("#newchannel-nickname").val(); + var zreg_nick = $("#id_nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { - $("#newchannel-nickname").val(data); - zFormError("#newchannel-nickname-feedback",data.error); + $("#id_nickname").val(data); + if(data.error) { + $("#help_nickname").html(""); + zFormError("#help_nickname",data.error); + } $("#nick-spinner").spin(false); }); }); -}); \ No newline at end of file +}); diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl deleted file mode 100644 index 90026f7fe..000000000 --- a/view/pdl/mod_register.pdl +++ /dev/null @@ -1 +0,0 @@ -[template]full[/template] diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index d19bc9414..1643fa855 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@
{{if $field.4}} {{$field.4}} {{/if}} - {{$field.3}} + {{$field.3}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f5e97ff27..cc1983ac4 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -19,11 +19,9 @@ {{/if}} {{include file="field_input.tpl" field=$name}} -
{{include file="field_input.tpl" field=$nickname}} -
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 997b4489a..4a827ca16 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,83 +1,58 @@ -
-

{{$title}}

- -
- - - -{{if $reg_is}} -
{{$reg_is}}
-{{/if}} -{{if $registertext}}
{{$registertext}}
-{{/if}} -{{if $other_sites}}
{{$other_sites}}
-{{/if}} - -{{if $invitations}} -

{{$invite_desc}}

- - - -
-
-{{/if}} - - {{if $auto_create}} - - {{if $default_role}} - - {{else}} -
{{$help_role}}
- {{include file="field_select_grouped.tpl" field=$role}} -
- {{/if}} - - -
-
-
-
{{$help_name}}
- - - {{/if}} - - - -
-
- - - -
-
- - - -
-
- - {{if $auto_create}} - - -
-
{{$nick_hub}}
-
-
-
{{$nick_desc}}
- - {{/if}} - - {{if $enable_tos}} - - -
-
- {{else}} - - {{/if}} - - -
- -
+
+
+

{{$title}}

+
+
+
+ {{if $reg_is}} +
+
{{$reg_is}}
+
{{$other_sites}}
+
+ {{/if}} + + {{if $registertext}} +
{{$registertext}}
+ {{/if}} + + {{if $invitations}} +
+
{{$invite_desc}}
+
+ {{include file="field_input.tpl" field=$invite_code}} + {{/if}} + + {{include file="field_input.tpl" field=$email}} + + {{include file="field_password.tpl" field=$pass1}} + + {{include file="field_password.tpl" field=$pass2}} + + {{if $auto_create}} + {{if $default_role}} + + {{else}} +
+ {{$help_role}} +
+ {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} +
+ + {{include file="field_input.tpl" field=$nickname}} +
+ {{/if}} + + {{if $enable_tos}} + {{include file="field_checkbox.tpl" field=$tos}} + {{else}} + + {{/if}} + + +
+
+
-- cgit v1.2.3