hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into socketAL

Browse Source
v1.18.x
Julian Lam 11 years ago
parent dfa9f203e6 92ca739002
commit 5a589c885a
6 changed files with 151 additions and 139 deletions
Show Stats Download Patch File Download Diff File

6
public/src/forum/admin/settings.js
Unescape Escape View File

@ -89,6 +89,12 @@ define(['uploader'], function(uploader) {
uploader.hideAlerts(); uploader.hideAlerts();
}); });
$('#settings-tab a').click(function (e) {
e.preventDefault();
$(this).tab('show');
return false;
});
}; };
Settings.remove = function(key) { Settings.remove = function(key) {

13
public/src/forum/footer.js
Unescape Escape View File

@ -250,18 +250,9 @@
}); });
function updateUnreadCount(count) { function updateUnreadCount(count) {
var badge = $('#numUnreadBadge');
badge.html(count > 20 ? '20+' : count);
if (count > 0) { $('#unread-count').toggleClass('unread-count', count > 0);
badge $('#unread-count').attr('data-content', count > 20 ? '20+' : count);
.removeClass('badge-inverse')
.addClass('badge-important');
} else {
badge
.removeClass('badge-important')
.addClass('badge-inverse');
}
} }
socket.on('event:unread.updateCount', updateUnreadCount); socket.on('event:unread.updateCount', updateUnreadCount);

6
public/src/forum/topic.js
Unescape Escape View File

@ -996,13 +996,13 @@ define(['composer'], function(composer) {
return; return;
} }
var container = $(document.body), var container = $(window),
scrollTo = $('#post_anchor_' + pid), scrollTo = $('#post_anchor_' + pid),
tid = $('#post-container').attr('data-tid'); tid = $('#post-container').attr('data-tid');
function animateScroll() { function animateScroll() {
$('body,html').animate({ $('window,html').animate({
scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height() scrollTop: scrollTo.offset().top + container.scrollTop() - $('#header-menu').height()
}, 400); }, 400);
} }

8
public/src/modules/chat.js
Unescape Escape View File

@ -58,6 +58,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
chatModal.attr('id', 'chat-modal-' + touid); chatModal.attr('id', 'chat-modal-' + touid);
chatModal.attr('UUID', uuid); chatModal.attr('UUID', uuid);
chatModal.css("position", "fixed");
chatModal.appendTo($('body')); chatModal.appendTo($('body'));
chatModal.draggable({ chatModal.draggable({
start:function() { start:function() {
@ -96,9 +97,10 @@ define(['taskbar', 'string'], function(taskbar, S) {
} }
module.center = function(chatModal) { module.center = function(chatModal) {
chatModal.css("position", "fixed");
chatModal.css("left", Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + "px"); chatModal.css("left", Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + "px");
chatModal.css("top", "0px"); chatModal.css("top", "0px");
chatModal.css("zIndex", 2000);
chatModal.find('#chat-message-input').focus();
return chatModal; return chatModal;
} }
@ -109,7 +111,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
checkOnlineStatus(chatModal); checkOnlineStatus(chatModal);
taskbar.updateActive(uuid); taskbar.updateActive(uuid);
scrollToBottom(chatModal.find('#chat-content')); scrollToBottom(chatModal.find('#chat-content'));
chatModal.find('#chat-message-input').focus(); module.center(chatModal);
} }
module.minimize = function(uuid) { module.minimize = function(uuid) {
@ -163,10 +165,12 @@ define(['taskbar', 'string'], function(taskbar, S) {
}; };
function scrollToBottom(chatContent) { function scrollToBottom(chatContent) {
if(chatContent[0]) {
chatContent.scrollTop( chatContent.scrollTop(
chatContent[0].scrollHeight - chatContent.height() chatContent[0].scrollHeight - chatContent.height()
); );
} }
}
module.toggleNew = function(uuid, state) { module.toggleNew = function(uuid, state) {
taskbar.toggleNew(uuid, state); taskbar.toggleNew(uuid, state);

73
public/templates/admin/settings.tpl
Unescape Escape View File

@ -1,8 +1,18 @@
<h1><i class="fa fa-cogs"></i> Settings</h1> <h1><i class="fa fa-cogs"></i> Settings</h1>
<hr /> <hr />
<h3>General Settings</h3> <ul id="settings-tab" class="nav nav-tabs">
<div class="alert alert-warning"> <li class="active"><a href="#general" data-toggle="tab">General</a></li>
<li><a href="#privilege-thresholds" data-toggle="tab">Privilege Thresholds</a></li>
<li><a href="#email" data-toggle="tab">Email</a></li>
<li><a href="#user" data-toggle="tab">User</a></li>
<li><a href="#post" data-toggle="tab">Post</a></li>
<li><a href="#web-crawler" data-toggle="tab">Web Crawler</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="general">
<div class="alert alert-warning">
<form> <form>
<label>Site Title</label> <label>Site Title</label>
<input class="form-control" type="text" placeholder="Your Community Name" data-field="title" /><br /> <input class="form-control" type="text" placeholder="Your Community Name" data-field="title" /><br />
@ -12,19 +22,18 @@
<input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br /> <input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br />
<label>Site Logo</label> <label>Site Logo</label>
<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br /> <input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br />
<input id="uploadLogoBtn" type="button" class="btn btn-default" value="Upload Logo"></input> <br /> <input id="uploadLogoBtn" type="button" class="btn btn-default" value="Upload Logo"></input> <br /> <br/>
<label>Imgur Client ID</label> <label>Imgur Client ID</label>
<input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br /> <input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br />
<label>Maximum User Image Size</label>
<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" /><br />
<label>Favicon</label><br /> <label>Favicon</label><br />
<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" /><br /> <input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" /><br />
<input id="uploadFaviconBtn" type="button" class="btn btn-default" value="Upload Favicon"></input> <br /> <input id="uploadFaviconBtn" type="button" class="btn btn-default" value="Upload Favicon"></input> <br />
</form> </form>
</div> </div>
</div>
<form> <div class="tab-pane" id="privilege-thresholds">
<h3>Privilege Thresholds</h3> <form>
<div class="alert alert-warning"> <div class="alert alert-warning">
<p>Use <strong>privilege thresholds</strong> to manage how much reputation a user must gain to receive moderator access.</p><br /> <p>Use <strong>privilege thresholds</strong> to manage how much reputation a user must gain to receive moderator access.</p><br />
<strong>Manage Thread</strong><br /> <input type="text" class="form-control" value="1000" data-field="privileges:manage_topic"><br /> <strong>Manage Thread</strong><br /> <input type="text" class="form-control" value="1000" data-field="privileges:manage_topic"><br />
@ -35,10 +44,10 @@
</label> </label>
</div> </div>
</div> </div>
</form> </form>
</div>
<form> <div class="tab-pane" id="email">
<h3>Email Settings</h3> <form>
<div class="alert alert-warning"> <div class="alert alert-warning">
<div> <div>
<p> <p>
@ -51,32 +60,29 @@
<input type="text" class="form-control input-lg" data-field="email:from" placeholder="info@example.org" /><br /> <input type="text" class="form-control input-lg" data-field="email:from" placeholder="info@example.org" /><br />
</div> </div>
</div> </div>
</form> </form>
</div>
<form> <div class="tab-pane" id="user">
<h3>Profile Settings</h3> <form>
<div class="alert alert-warning"> <div class="alert alert-warning">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" data-field="profile:convertProfileImageToPNG"> <strong>Convert profile image uploads to PNG</strong> <input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong>
</label> </label>
</div> </div>
</div>
</form>
<form>
<h3>User Settings</h3>
<div class="alert alert-warning">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong> <input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong> <input type="checkbox" data-field="profile:convertProfileImageToPNG"> <strong>Convert profile image uploads to PNG</strong>
</label> </label>
</div> </div>
<label>Maximum User Image File Size</label>
<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" /><br />
<strong>Minimum Username Length</strong><br /> <strong>Minimum Username Length</strong><br />
<input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br /> <input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br />
<strong>Maximum Username Length</strong><br /> <strong>Maximum Username Length</strong><br />
@ -86,10 +92,11 @@
<strong>Maximum Signature Length</strong><br /> <strong>Maximum Signature Length</strong><br />
<input type="text" class="form-control" value="255" data-field="maximumSignatureLength"><br /> <input type="text" class="form-control" value="255" data-field="maximumSignatureLength"><br />
</div> </div>
</form> </form>
</div>
<form> <div class="tab-pane" id="post">
<h3>Post Settings</h3> <form>
<div class="alert alert-warning"> <div class="alert alert-warning">
<strong>Post Delay</strong><br /> <input type="text" class="form-control" value="10000" data-field="postDelay"><br /> <strong>Post Delay</strong><br /> <input type="text" class="form-control" value="10000" data-field="postDelay"><br />
<strong>Minimum Title Length</strong><br /> <input type="text" class="form-control" value="3" data-field="minimumTitleLength"><br /> <strong>Minimum Title Length</strong><br /> <input type="text" class="form-control" value="3" data-field="minimumTitleLength"><br />
@ -123,15 +130,19 @@
</div> </div>
<strong>Maximum File Size</strong><br /> <input type="text" class="form-control" value="2048" data-field="maximumFileSize"><br /> <strong>Maximum File Size</strong><br /> <input type="text" class="form-control" value="2048" data-field="maximumFileSize"><br />
</div> </div>
</form> </form>
</div>
<form> <div class="tab-pane" id="web-crawler">
<h3>Web Crawler Settings</h3> <form>
<div class="alert alert-warning"> <div class="alert alert-warning">
<strong>Custom Robots.txt <small>Leave blank for default</small></strong><br /> <strong>Custom Robots.txt <small>Leave blank for default</small></strong><br />
<textarea class="form-control" data-field="robots.txt"></textarea> <textarea class="form-control" data-field="robots.txt"></textarea>
</div> </div>
</form> </form>
</div>
</div>
<button class="btn btn-lg btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>

2
public/templates/header.tpl
Unescape Escape View File

@ -58,7 +58,7 @@
<a href="{relative_path}/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a> <a href="{relative_path}/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a>
</li> </li>
<li class="nodebb-loggedin"> <li class="nodebb-loggedin">
<a href="{relative_path}/unread"><i class="fa fa-envelope" title="[[global:header.unread]]"> <span id="numUnreadBadge" class="">0</span></i></a> <a href="{relative_path}/unread"><i id="unread-count" class="fa fa-inbox" data-content="0" title="[[global:header.unread]]"></i></a>
</li> </li>
<li> <li>
<a href="{relative_path}/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a> <a href="{relative_path}/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a>

Write Preview
Loading…
Cancel
Save