aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/js/mod_new_channel.js8
-rw-r--r--view/js/mod_register.js8
-rwxr-xr-xview/tpl/main_slider.tpl4
-rwxr-xr-xview/tpl/new_channel.tpl4
-rwxr-xr-xview/tpl/register.tpl4
5 files changed, 14 insertions, 14 deletions
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index 17b354a4b..e670e1a35 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,7 +1,7 @@
$(document).ready(function() {
// $("#id_permissions_role").sSelect();
$("#id_name").blur(function() {
- $("#name-spinner").spin('small');
+ $("#name-spinner").show();
var zreg_name = $("#id_name").val();
$.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
$("#id_nickname").val(data);
@@ -9,12 +9,12 @@
$("#help_name").html("");
zFormError("#help_name",data.error);
}
- $("#name-spinner").spin(false);
+ $("#name-spinner").hide();
});
});
$("#id_nickname").blur(function() {
- $("#nick-spinner").spin('small');
+ $("#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);
@@ -22,7 +22,7 @@
$("#help_nickname").html("");
zFormError("#help_nickname",data.error);
}
- $("#nick-spinner").spin(false);
+ $("#nick-spinner").hide();
});
});
diff --git a/view/js/mod_register.js b/view/js/mod_register.js
index f1f3e7f71..6607579a2 100644
--- a/view/js/mod_register.js
+++ b/view/js/mod_register.js
@@ -28,7 +28,7 @@ $(document).ready(function() {
});
$("#id_name").blur(function() {
- $("#name-spinner").spin('small');
+ $("#name-spinner").show();
var zreg_name = $("#id_name").val();
$.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
$("#id_nickname").val(data);
@@ -36,12 +36,12 @@ $(document).ready(function() {
$("#help_name").html("");
zFormError("#help_name",data.error);
}
- $("#name-spinner").spin(false);
+ $("#name-spinner").hide();
});
});
$("#id_nickname").blur(function() {
- $("#nick-spinner").spin('small');
+ $("#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);
@@ -49,7 +49,7 @@ $(document).ready(function() {
$("#help_nickname").html("");
zFormError("#help_nickname",data.error);
}
- $("#nick-spinner").spin(false);
+ $("#nick-spinner").hide();
});
});
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index d4f0dd936..4cc265f59 100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,5 +1,5 @@
<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
-<div id="profile-jot-text-loading" style="display:none;"></div>
+<div id="profile-jot-text-loading" class="spinner-wrapper"><div class="spinner m"></div></div>
<script>
$(document).ready(function() {
var old_cmin = 0;
@@ -27,7 +27,7 @@ $(document).ready(function() {
return;
if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
return;
- setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
+
slideTimer = setTimeout(networkTimerRefresh,2000);
}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index cc1983ac4..c4837064f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -19,10 +19,10 @@
{{/if}}
{{include file="field_input.tpl" field=$name}}
- <div id="name-spinner"></div>
+ <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{include file="field_input.tpl" field=$nickname}}
- <div id="nick-spinner"></div>
+ <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>
<div id="newchannel-submit-end" class="clear"></div>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index c84934626..493dba4c8 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -39,10 +39,10 @@
{{/if}}
{{include file="field_input.tpl" field=$name}}
- <div id="name-spinner"></div>
+ <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{include file="field_input.tpl" field=$nickname}}
- <div id="nick-spinner"></div>
+ <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{/if}}
{{if $enable_tos}}