Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 01:45:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

label-important to label-danger

Browse Source
This commit is contained in:
psychobunny
2013-08-24 00:43:03 +08:00
parent a008cf971d
commit 8be896aebb
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/forum/accountedit.js
View File

@@ -221,10 +221,10 @@ $(document).ready(function() {
passwordvalid = utils.isPasswordValid(password.val()); passwordvalid = utils.isPasswordValid(password.val());
if (password.val().length < 6) { if (password.val().length < 6) {
password_notify.html('Password too short'); password_notify.html('Password too short');
password_notify.attr('class', 'label label-important'); password_notify.attr('class', 'label label-danger');
} else if(!passwordvalid) { } else if(!passwordvalid) {
password_notify.html('Invalid password'); password_notify.html('Invalid password');
password_notify.attr('class', 'label label-important'); password_notify.attr('class', 'label label-danger');
} else { } else {
password_notify.html('OK!'); password_notify.html('OK!');
password_notify.attr('class', 'label label-success'); password_notify.attr('class', 'label label-success');
@@ -236,7 +236,7 @@ $(document).ready(function() {
function onPasswordConfirmChanged() { function onPasswordConfirmChanged() {
if(password.val() !== password_confirm.val()) { if(password.val() !== password_confirm.val()) {
password_confirm_notify.html('Passwords must match!'); password_confirm_notify.html('Passwords must match!');
password_confirm_notify.attr('class', 'label label-important'); password_confirm_notify.attr('class', 'label label-danger');
passwordsmatch = false; passwordsmatch = false;
} else { } else {
password_confirm_notify.html('OK!'); password_confirm_notify.html('OK!');

4
public/src/forum/admin/users.js
View File

@@ -169,14 +169,14 @@
if(data && data.length === 0) { if(data && data.length === 0) {
$('#user-notfound-notify').html('User not found!') $('#user-notfound-notify').html('User not found!')
.show() .show()
.addClass('label-important') .addClass('label-danger')
.removeClass('label-success'); .removeClass('label-success');
} }
else { else {
$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
.show() .show()
.addClass('label-success') .addClass('label-success')
.removeClass('label-important'); .removeClass('label-danger');
} }
initUsers(); initUsers();

6
public/src/forum/users.js
View File

@@ -41,7 +41,7 @@
if(data === null) { if(data === null) {
$('#user-notfound-notify').html('You need to be logged in to search!') $('#user-notfound-notify').html('You need to be logged in to search!')
.show() .show()
.addClass('label-important') .addClass('label-danger')
.removeClass('label-success'); .removeClass('label-success');
return; return;
} }
@@ -57,14 +57,14 @@
if(data && data.length === 0) { if(data && data.length === 0) {
$('#user-notfound-notify').html('User not found!') $('#user-notfound-notify').html('User not found!')
.show() .show()
.addClass('label-important') .addClass('label-danger')
.removeClass('label-success'); .removeClass('label-success');
} }
else { else {
$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
.show() .show()
.addClass('label-success') .addClass('label-success')
.removeClass('label-important'); .removeClass('label-danger');
} }
}); });

2
public/src/modules/composer.js
View File

@@ -8,7 +8,7 @@ define(['taskbar'], function(taskbar) {
}; };
function createImageLabel(img, postImages) { function createImageLabel(img, postImages) {
var imageLabel = $('<div class="label"><span>'+ img.name +'</span></div>'); var imageLabel = $('<div class="label label-primary"><span>'+ img.name +'</span></div>');
var closeButton = $('<button class="close">&times;</button>'); var closeButton = $('<button class="close">&times;</button>');
closeButton.on('click', function(e) { closeButton.on('click', function(e) {

2
public/templates/account.tpl
View File

@@ -16,7 +16,7 @@
<span><i class="icon-circle-blank"></i> <span>offline</span></span> <span><i class="icon-circle-blank"></i> <span>offline</span></span>
</div> </div>
<div class="{show_banned}"> <div class="{show_banned}">
<span class="label label-important">banned</span> <span class="label label-danger">banned</span>
</div> </div>
<div id="user-actions"> <div id="user-actions">
<a id="follow-btn" href="#" class="btn hide">Follow</a> <a id="follow-btn" href="#" class="btn hide">Follow</a>

4
public/templates/accountedit.tpl
View File

@@ -140,14 +140,14 @@
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputNewPassword">Password</label> <label class="control-label" for="inputNewPassword">Password</label>
<div class="controls"> <div class="controls">
<input type="password" id="inputNewPassword" placeholder="New Password" value=""><br/><span id="password-notify" class="label label-important"></span> <input type="password" id="inputNewPassword" placeholder="New Password" value=""><br/><span id="password-notify" class="label label-danger"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputNewPasswordAgain">Confirm Password</label> <label class="control-label" for="inputNewPasswordAgain">Confirm Password</label>
<div class="controls"> <div class="controls">
<input type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-important"></span> <input type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-danger"></span>
</div> </div>
</div> </div>

2
public/templates/admin/users.tpl
View File

@@ -11,7 +11,7 @@
<div class="search {search_display} well"> <div class="search {search_display} well">
<input id="search-user" type="text" placeholder="Enter a username to search"/><br /> <input id="search-user" type="text" placeholder="Enter a username to search"/><br />
<i class="icon-spinner icon-spin none"></i> <i class="icon-spinner icon-spin none"></i>
<span id="user-notfound-notify" class="label label-important hide">User not found!</span><br/> <span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
</div> </div>
<ul id="users-container" class="users"> <ul id="users-container" class="users">

2
public/templates/topic.tpl
View File

@@ -85,7 +85,7 @@
<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span> <i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div> <div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div>
</div> </div>
<span class="label label-important {posts.show_banned}">banned</span> <span class="label label-danger {posts.show_banned}">banned</span>
</div> </div>
<div class="span11 col-md-12-tablet"> <div class="span11 col-md-12-tablet">
<div class="post-block speech-bubble"> <div class="post-block speech-bubble">

2
public/templates/users.tpl
View File

@@ -11,7 +11,7 @@
<div class="search {search_display} well"> <div class="search {search_display} well">
<input id="search-user" type="text" placeholder="Enter a username to search"/><br /> <input id="search-user" type="text" placeholder="Enter a username to search"/><br />
<i class="icon-spinner icon-spin none"></i> <i class="icon-spinner icon-spin none"></i>
<span id="user-notfound-notify" class="label label-important hide">User not found!</span><br/> <span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
</div> </div>
<ul id="users-container" class="users"> <ul id="users-container" class="users">