' +
' ' +
- '' +
+ '' +
'
' +
'' + theme.name + '
' + '' + theme.description + '
' + @@ -29,11 +29,11 @@ var nodebb_admin = (function(nodebb_admin) { themeContainer.innerHTML = ''; themeContainer.appendChild(themeFrag); } - + nodebb_admin.themes = themes; - + return nodebb_admin; - + }(nodebb_admin || {})); diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 3cc4f1fb12..76473647c6 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -91,7 +91,9 @@ if(!isAdmin) { bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) { - socket.emit('api:admin.user.deleteUser', uid); + if (confirm) { + socket.emit('api:admin.user.deleteUser', uid); + } }); } @@ -112,9 +114,11 @@ parent.attr('data-banned', 0); } else { bootbox.confirm('Do you really want to ban "' + parent.attr('data-username') +'"?', function(confirm) { - socket.emit('api:admin.user.banUser', uid); - banBtn.addClass('btn-warning'); - parent.attr('data-banned', 1); + if (confirm) { + socket.emit('api:admin.user.banUser', uid); + banBtn.addClass('btn-warning'); + parent.attr('data-banned', 1); + } }); } } @@ -172,14 +176,14 @@ if(data && data.length === 0) { $('#user-notfound-notify').html('User not found!') .show() - .addClass('label-important') + .addClass('label-danger') .removeClass('label-success'); } else { $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') .show() .addClass('label-success') - .removeClass('label-important'); + .removeClass('label-danger'); } initUsers(); diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 569d46958e..70e8937701 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -83,12 +83,12 @@ li.setAttribute('data-pid', posts[i].pid); - li.innerHTML = '' + - '' + posts[i].username + ': ' + posts[i].content + + posts[i].content + '
' + - 'posted ' + utils.relativeTime(posts[i].timestamp) + ' ago' + + '' + posts[i].username + ' - ' + utils.relativeTime(posts[i].timestamp) + ' ago' + ''; frag.appendChild(li.cloneNode(true)); diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index eba06ee4cf..c892b300eb 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -152,7 +152,7 @@ alert_id: 'new_notif', title: 'New notification', message: 'You have unread notifications.', - type: 'notify', + type: 'warning', timeout: 2000 }); utils.refreshTitle(); diff --git a/public/src/forum/register.js b/public/src/forum/register.js index 62d4b32fef..89ee708e5a 100644 --- a/public/src/forum/register.js +++ b/public/src/forum/register.js @@ -7,26 +7,31 @@ username_notify = $('#username-notify'), email_notify = $('#email-notify'), password_notify = $('#password-notify'), - password_confirm_notify = $('#password-confirm-notify'), - validationError = false; + password_confirm_notify = $('#password-confirm-notify'), + validationError = false, + successIcon = ''; function showError(element, msg) { element.html(msg); - element.attr('class', 'alert alert-error'); + element.parent() + .removeClass('alert-success') + .addClass('alert-danger'); element.show(); validationError = true; } - + function showSuccess(element, msg) { element.html(msg); - element.attr('class', 'alert alert-success'); + element.parent() + .removeClass('alert-danger') + .addClass('alert-success'); element.show(); } function validateEmail() { if(!emailEl.val()) { validationError = true; - email_notify.hide(); + //email_notify.hide(); return; } @@ -44,9 +49,9 @@ function validateUsername() { if(!username.val()) { validationError = true; - username_notify.hide(); + //username_notify.hide(); return; - } + } if(username.val().length < config.minimumUsernameLength) { showError(username_notify, 'Username too short!'); @@ -59,17 +64,20 @@ } } + username.on('keyup', function() { + jQuery('#yourUsername').html(this.value.length > 0 ? this.value : 'username'); + }); username.on('blur', function() { validateUsername(); }); - + function validatePassword() { if(!password.val()){ validationError = true; - password_notify.hide(); + //password_notify.hide(); return; } - + if (password.val().length < config.minimumPasswordLength) { showError(password_notify, 'Password too short!'); } else if(password.val().length > config.maximumPasswordLength) { @@ -77,31 +85,31 @@ } else if(!utils.isPasswordValid(password.val())) { showError(password_notify, 'Invalid password!'); } else { - showSuccess(password_notify, 'OK!'); + showSuccess(password_notify, successIcon); } - + if(password.val() !== password_confirm.val() && password_confirm.val() !== '') { showError(password_confirm_notify, 'Passwords must match!'); } } - + $(password).on('blur', function() { validatePassword(); }); - + function validatePasswordConfirm() { if(!password.val() || password_notify.hasClass('alert-error')) { - password_confirm_notify.hide(); + //password_confirm_notify.hide(); return; } - + if(password.val() !== password_confirm.val()) { showError(password_confirm_notify, 'Passwords must match!'); } else { - showSuccess(password_confirm_notify, 'OK!'); + showSuccess(password_confirm_notify, successIcon); } } - + $(password_confirm).on('blur', function() { validatePasswordConfirm(); }); @@ -112,15 +120,15 @@ if (data.exists === true) { showError(username_notify, 'Username already taken!'); } else { - showSuccess(username_notify, 'OK!'); + showSuccess(username_notify, successIcon); } }); - + socket.on('user.email.exists', function(data) { if (data.exists === true) { showError(email_notify, 'Email address already taken!'); } else { - showSuccess(email_notify, 'OK!'); + showSuccess(email_notify, successIcon); } }); @@ -131,7 +139,7 @@ function validateForm() { validationError = false; - + validateEmail(); validateUsername(); validatePassword(); @@ -139,9 +147,9 @@ return validationError; } - + register.on('click', function(e) { if (validateForm()) e.preventDefault(); }); - -}()); + +}()); \ No newline at end of file diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 2edf4659e6..0b39c690de 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -124,7 +124,7 @@ } else { app.alert({ 'alert_id': 'thread_move', - type: 'error', + type: 'danger', title: 'Unable to Move Topic', message: 'This topic could not be moved to ' + targetCatLabel + '.Please try again later', timeout: 5000 @@ -183,7 +183,7 @@ if (data.status && data.status === 'ok') set_follow_state(data.follow); else { app.alert({ - type: 'error', + type: 'danger', alert_id: 'topic_follow', title: 'Please Log In', message: 'Please register or log in in order to subscribe to this topic', @@ -246,9 +246,8 @@ }); $('.post-container').on('click', '.favourite', function() { - var ids = this.id.replace('favs_', '').split('_'), - pid = ids[0], - uid = ids[1]; + var pid = $(this).parents('li').attr('data-pid'); + var uid = $(this).parents('li').attr('data-uid'); var element = $(this).find('i'); if(element.attr('class') == 'icon-star-empty') { @@ -260,9 +259,8 @@ }); $('.post-container').delegate('.edit', 'click', function(e) { - var pid = ($(this).attr('id') || $(this.parentNode).attr('id')).split('_')[1]; - - var main = $(this).parents('.main-post'); + var pid = $(this).parents('li').attr('data-pid'), + main = $(this).parents('.main-post'); require(['composer'], function(cmp) { cmp.push(null, null, pid); @@ -270,10 +268,10 @@ }); $('.post-container').delegate('.delete', 'click', function(e) { - var pid = ($(this).attr('id') || $(this.parentNode).attr('id')).split('_')[1], - postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')), - deleteAction = !postEl.hasClass('deleted') ? true : false, - confirmDel = confirm((deleteAction ? 'Delete' : 'Restore') + ' this post?'); + var pid = $(this).parents('li').attr('data-pid'), + postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')), + deleteAction = !postEl.hasClass('deleted') ? true : false, + confirmDel = confirm((deleteAction ? 'Delete' : 'Restore') + ' this post?'); if (confirmDel) { deleteAction ? @@ -282,18 +280,17 @@ } }); - $('.post-container').delegate('.chat', 'click', function(e) { - - var username = $(this).parents('li').attr('data-username'); - var touid = $(this).parents('li').attr('data-uid'); + $('.topic-buttons').delegate('.chat', 'click', function(e) { + var username = $(this).parents('li.row').attr('data-username'); + var touid = $(this).parents('li.row').attr('data-uid'); if(username === app.username || !app.username) return; require(['chat'], function(chat) { var chatModal = chat.createModalIfDoesntExist(username, touid); - chatModal.show(); - chat.bringModalToTop(chatModal); + chatModal.modal(); + chat.bringModalToTop(chatModal); // I don't think this is necessary }); }); @@ -602,4 +599,60 @@ deleteEl.addClass('none'); } } + + + + var postAuthorImage, postAuthorInfo, pagination; + var postcount = templates.get('postcount'); + + function updateHeader() { + jQuery('.post-author-info').css('bottom', '0px'); + postAuthorImage = postAuthorImage || document.getElementById('post-author-image'); + postAuthorInfo = postAuthorInfo || document.getElementById('post-author-info'); + pagination = pagination || document.getElementById('pagination'); + + pagination.style.display = 'block'; + + var windowHeight = jQuery(window).height(); + var scrollTop = jQuery(window).scrollTop(); + var scrollBottom = scrollTop + windowHeight; + + if (scrollTop < 50) { + postAuthorImage.src = (jQuery('.main-avatar img').attr('src')); + postAuthorInfo.innerHTML = 'Posted by ' + jQuery('.main-post').attr('data-username') + ', ' + jQuery('.main-post').find('.relativeTimeAgo').html(); + pagination.innerHTML = '0 / ' + postcount; + return; + } + + + var count = 0; + + jQuery('.sub-posts').each(function() { + count++; + this.postnumber = count; + + + var el = jQuery(this); + var elTop = el.offset().top; + var height = Math.floor(el.height()); + var elBottom = elTop + (height < 300 ? height : 300); + + var inView = ((elBottom >= scrollTop) && (elTop <= scrollBottom) + && (elBottom <= scrollBottom) && (elTop >= scrollTop)); + + + if (inView) { + pagination.innerHTML = this.postnumber + ' / ' + postcount; + postAuthorImage.src = (jQuery(this).find('.profile-image-block img').attr('src')); + postAuthorInfo.innerHTML = 'Posted by ' + jQuery(this).attr('data-username') + ', ' + jQuery(this).find('.relativeTimeAgo').html(); + } + }); + + if(scrollTop + windowHeight == jQuery(document).height()) { + pagination.innerHTML = postcount + ' / ' + postcount; + } + } + + window.onscroll = updateHeader; + window.onload = updateHeader; })(); \ No newline at end of file diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 0cba6d649b..2592b800fa 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -8,6 +8,8 @@ parts = url.split('/'), active = parts[parts.length-1]; + var lastSearch = null; + app.addCommasToNumbers(); jQuery('.nav-pills li').removeClass('active'); @@ -27,22 +29,30 @@ timeoutId = setTimeout(function() { var username = $('#search-user').val(); - jQuery('.icon-spinner').removeClass('none'); - socket.emit('api:admin.user.search', username); + if (username == '') { + jQuery('#user-notfound-notify').html(''); + jQuery('#user-notfound-notify').parent().removeClass('btn-warning label-warning btn-success label-success'); + return; + } + + if (lastSearch === username) return; + lastSearch = username; + + jQuery('#user-notfound-notify').html(''); + + setTimeout(function() { + socket.emit('api:admin.user.search', username); + }, 500); //replace this with global throttling function/constant + }, 250); }); socket.removeAllListeners('api:admin.user.search'); socket.on('api:admin.user.search', function(data) { - - jQuery('.icon-spinner').addClass('none'); - if(data === null) { - $('#user-notfound-notify').html('You need to be logged in to search!') - .show() - .addClass('label-important') - .removeClass('label-success'); + $('#user-notfound-notify').html('You need to be logged in to search!'); + $('#user-notfound-notify').parent().addClass('btn-warning label-warning'); return; } @@ -55,16 +65,12 @@ if(data && data.length === 0) { - $('#user-notfound-notify').html('User not found!') - .show() - .addClass('label-important') - .removeClass('label-success'); + $('#user-notfound-notify').html('User not found!'); + $('#user-notfound-notify').parent().addClass('btn-warning label-warning'); } else { - $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') - .show() - .addClass('label-success') - .removeClass('label-important'); + $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!'); + $('#user-notfound-notify').parent().addClass('btn-success label-success'); } }); diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 47b8b72223..1e9e46a885 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -8,7 +8,7 @@ define(['taskbar'], function(taskbar) { }; function createImageLabel(img, postImages) { - var imageLabel = $('
'+ img.name +'
');
+ var imageLabel = $(''+ img.name +'
');
var closeButton = $('');
closeButton.on('click', function(e) {
@@ -30,9 +30,9 @@ define(['taskbar'], function(taskbar) {
imagelist = $('.post-window .imagelist'),
uuid = dropDiv.parents('[data-uuid]').attr('data-uuid'),
posts = composer.posts[uuid];
-
+
$(reader).on('loadend', function(e) {
- var bin = this.result;
+ var bin = this.result;
bin = bin.split(',')[1];
var img = {
@@ -47,13 +47,13 @@ define(['taskbar'], function(taskbar) {
imagelist.append(imageLabel);
dropDiv.hide();
});
-
+
reader.readAsDataURL(file);
}
function initializeFileReader() {
jQuery.event.props.push( "dataTransfer" );
-
+
var draggingDocument = false;
if(window.FileReader) {
@@ -77,12 +77,12 @@ define(['taskbar'], function(taskbar) {
drop.off('dragleave');
});
});
-
+
function cancel(e) {
e.preventDefault();
return false;
}
-
+
drop.on('dragover', cancel);
drop.on('dragenter', cancel);
@@ -96,7 +96,7 @@ define(['taskbar'], function(taskbar) {
for (var i=0; i' +
'
' +
@@ -125,7 +125,7 @@ define(['taskbar'], function(taskbar) {
''+
'
Drag and Drop Images Here
' +
'
' +
- '' +
+ '' +
'' +
'' +
'
' +
@@ -157,7 +157,7 @@ define(['taskbar'], function(taskbar) {
composer.load(uuid);
} else {
app.alert({
- type: 'error',
+ type: 'danger',
timeout: 5000,
alert_id: 'post_error',
title: 'Please Log In to Post',
@@ -284,7 +284,7 @@ define(['taskbar'], function(taskbar) {
composer.reposition(post_uuid);
composer.active = post_uuid;
-
+
composer.postContainer.setAttribute('data-uuid', post_uuid);
if (parseInt(post_data.tid) > 0) {
titleEl.value = 'Replying to: ' + post_data.title;
@@ -312,7 +312,7 @@ define(['taskbar'], function(taskbar) {
}
composer.reposition = function(post_uuid) {
- var postWindowEl = composer.postContainer.querySelector('.span5'),
+ var postWindowEl = composer.postContainer.querySelector('.col-md-5'),
taskbarBtn = document.querySelector('#taskbar [data-uuid="' + post_uuid + '"]'),
btnRect = taskbarBtn.getBoundingClientRect(),
taskbarRect = document.getElementById('taskbar').getBoundingClientRect(),
@@ -330,13 +330,13 @@ define(['taskbar'], function(taskbar) {
var postData = composer.posts[post_uuid],
titleEl = composer.postContainer.querySelector('input'),
bodyEl = composer.postContainer.querySelector('textarea');
-
+
titleEl.value = titleEl.value.trim();
bodyEl.value = bodyEl.value.trim();
-
+
if (titleEl.value.length < config.minimumTitleLength) {
return app.alert({
- type: 'error',
+ type: 'danger',
timeout: 2000,
title: 'Title too short',
message: "Please enter a longer title. At least " + config.minimumTitleLength+ " characters.",
@@ -346,7 +346,7 @@ define(['taskbar'], function(taskbar) {
if (bodyEl.value.length < config.minimumPostLength) {
return app.alert({
- type: 'error',
+ type: 'danger',
timeout: 2000,
title: 'Content too short',
message: "Please enter a longer post. At least " + config.minimumPostLength + " characters.",
diff --git a/public/src/modules/mobileMenu.js b/public/src/modules/mobileMenu.js
index 115a0c750a..e1479dd03b 100644
--- a/public/src/modules/mobileMenu.js
+++ b/public/src/modules/mobileMenu.js
@@ -99,10 +99,11 @@ define(function() {
mobileMenu.init = function() {
+ return; // disabling until this can be pluginified.
overlay = overlay || document.getElementById('mobile-menu-overlay');
menuBtn = menuBtn || document.getElementById('mobile-menu-btn');
postBtn = postBtn || document.getElementById('mobile-post-btn');
-
+
menuBtn.onclick = function() {
animateIcons();
}
@@ -111,7 +112,7 @@ define(function() {
displayCategories();
mobileMenu.onNavigate();
});
-
+
}
return {
diff --git a/public/src/utils.js b/public/src/utils.js
index 790fc9754c..50323b7327 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -1,5 +1,5 @@
(function (module) {
-
+
var utils, fs;
try {
@@ -39,15 +39,15 @@
});
});
},
-
+
relativeTime: function(timestamp, min) {
var now = +new Date(),
difference = now - Math.floor(parseFloat(timestamp));
difference = Math.floor(difference / 1000);
-
+
if (difference < 60) return difference + (min ? 's' : ' second') + (difference !== 1 && !min ? 's' : '');
-
+
difference = Math.floor(difference / 60);
if (difference < 60) return difference + (min ? 'm' : ' minute') + (difference !== 1 && !min ? 's' : '');
@@ -63,7 +63,7 @@
difference = Math.floor(difference / 12);
return difference + (min ? 'y' : ' year') + (difference !== 1 && !min ? 's' : '');
},
-
+
//http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/
slugify: function(str) {
str = str.replace(/^\s+|\s+$/g, ''); // trim
@@ -93,7 +93,7 @@
isUserNameValid: function(name) {
return (name && name !== "" && (/^[a-zA-Z0-9 _-]+$/.test(name)));
},
-
+
isPasswordValid: function(password) {
return password && password.indexOf(' ') === -1;
},
@@ -132,10 +132,12 @@
a.href = document.location;
url = a.pathname.slice(1);
}
+ var notificationIcon;
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
- if (numNotifications > 0) document.querySelector('.notifications a i').className = 'icon-circle active';
+ notificationIcon = notificationIcon || document.querySelector('.notifications a i');
+ if (numNotifications > 0 && notificationIcon) notificationIcon.className = 'icon-circle active';
});
jQuery.getJSON(RELATIVE_PATH + '/api/unread/total', function(data) {
@@ -169,16 +171,16 @@
if (!String.prototype.ltrim) {
String.prototype.ltrim=function(){return this.replace(/^\s+/,'');};
}
-
+
if (!String.prototype.rtrim) {
- String.prototype.rtrim=function(){return this.replace(/\s+$/,'');};
+ String.prototype.rtrim=function(){return this.replace(/\s+$/,'');};
}
-
+
if (!String.prototype.fulltrim) {
- String.prototype.fulltrim=function(){return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g,'').replace(/\s+/g,' ');};
+ String.prototype.fulltrim=function(){return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g,'').replace(/\s+/g,' ');};
}
-
+
if ('undefined' !== typeof window) {
window.utils = module.exports;
}
diff --git a/public/templates/403.tpl b/public/templates/403.tpl
index 4cbd7e91dc..62b460deb3 100644
--- a/public/templates/403.tpl
+++ b/public/templates/403.tpl
@@ -1,4 +1,4 @@
-
+
Access Denied
\ No newline at end of file
diff --git a/public/templates/404.tpl b/public/templates/404.tpl
index f3a998992e..1825280f6f 100644
--- a/public/templates/404.tpl
+++ b/public/templates/404.tpl
@@ -1,4 +1,4 @@
-You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?
+
Not found
\ No newline at end of file
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 9a661ce22c..16e87313c6 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -1,5 +1,5 @@
-You seem to have stumbled upon a page that does not exist. Return to the home page
+
@@ -7,16 +7,16 @@
-
-
+
+
-
- 
+
offline
- banned
+ banned
@@ -24,7 +24,7 @@
+
-
email
@@ -80,9 +80,9 @@
+
-
+
{posts.content}
{posts.relativeTime} ago
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 46edaf49a0..ac9c896bb5 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -1,65 +1,69 @@
+
-
-
-
{username}
@@ -67,99 +71,100 @@
-
-
+
+
-
-
-
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index d5d51fc26e..5cc28d198d 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,6 +1,6 @@
+
+
+
-
+
+
+
+
-
- +
-
+
{username}
@@ -8,18 +8,20 @@
-
-
+
+
-
-
diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl
index 06366a5bb3..3dfdc6fd33 100644
--- a/public/templates/admin/categories.tpl
+++ b/public/templates/admin/categories.tpl
@@ -10,38 +10,37 @@
-privacy
- +
+
+
-
+
+
+
+
-
-
-
+
- +
+
-