Merge branch 'dev' into oauth2

This commit is contained in:
Andrew Manning
2018-02-22 15:10:20 -05:00
19 changed files with 162 additions and 159 deletions

View File

@@ -1,5 +1,7 @@
$(document).ready(function() {
// $("#id_permissions_role").sSelect();
$("#newchannel-submit-button").attr('disabled','disabled');
$("#id_name").blur(function() {
$("#name-spinner").show();
var zreg_name = $("#id_name").val();
@@ -13,17 +15,26 @@
});
});
$("#id_nickname").blur(function() {
$("#nick-spinner").show();
var zreg_nick = $("#id_nickname").val();
$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
$("#id_nickname").val(data);
if(data.error) {
$("#help_nickname").html("");
zFormError("#help_nickname",data.error);
}
$("#nick-spinner").hide();
});
$("#id_nickname").click(function() {
$("#newchannel-submit-button").attr('disabled','disabled');
});
});
function validate_channel() {
$("#nick-spinner").show();
var zreg_nick = $("#id_nickname").val();
$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
$("#id_nickname").val(data);
if(data.error) {
$("#help_nickname").html("");
zFormError("#help_nickname",data.error);
}
else {
$("#newchannel-submit-button").removeAttr('disabled');
}
$("#nick-spinner").hide();
});
}

View File

@@ -24,7 +24,9 @@
{{include file="field_input.tpl" field=$nickname}}
<div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
<button class="btn btn-secondary" name="validate" id="newchannel-validate-button" value="{{$validate}}" onclick="validate_channel(); return false;">{{$validate}}</button>
<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" >{{$submit}}</button>
<div id="newchannel-submit-end" class="clear"></div>
<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>