fixed indents

v1.18.x
Baris Usakli 12 years ago
parent 64a9e5844d
commit 9309722898

@ -103,9 +103,9 @@ var ajaxify = {};
function evalScript(elem) { function evalScript(elem) {
var data = (elem.text || elem.textContent || elem.innerHTML || "" ), var data = (elem.text || elem.textContent || elem.innerHTML || "" ),
head = document.getElementsByTagName("head")[0] || head = document.getElementsByTagName("head")[0] ||
document.documentElement, document.documentElement,
script = document.createElement("script"); script = document.createElement("script");
script.type = "text/javascript"; script.type = "text/javascript";
try { try {

@ -82,10 +82,10 @@ var socket,
// takes a string like 1000 and returns 1,000 // takes a string like 1000 and returns 1,000
app.addCommas = function(text) { app.addCommas = function(text) {
return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"); return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
} }
// Willingly stolen from: http://phpjs.org/functions/strip_tags/ // Willingly stolen from: http://phpjs.org/functions/strip_tags/
app.strip_tags = function(input, allowed) { app.strip_tags = function(input, allowed) {
allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>) allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,

@ -7,8 +7,8 @@ $(document).ready(function() {
$('#uploadForm').submit(function() { $('#uploadForm').submit(function() {
status('uploading the file ...'); status('uploading the file ...');
$('#upload-progress-bar').css('width', '0%'); $('#upload-progress-bar').css('width', '0%');
$('#upload-progress-box').show(); $('#upload-progress-box').show();
@ -18,16 +18,16 @@ $(document).ready(function() {
return false; return false;
} }
$(this).ajaxSubmit({ $(this).ajaxSubmit({
error: function(xhr) { error: function(xhr) {
error('Error: ' + xhr.status); error('Error: ' + xhr.status);
}, },
uploadProgress : function(event, position, total, percent) { uploadProgress : function(event, position, total, percent) {
$('#upload-progress-bar').css('width', percent+'%'); $('#upload-progress-bar').css('width', percent+'%');
}, },
success: function(response) { success: function(response) {
if(response.error) { if(response.error) {
@ -36,166 +36,166 @@ $(document).ready(function() {
} }
var imageUrlOnServer = response.path; var imageUrlOnServer = response.path;
$('#user-current-picture').attr('src', imageUrlOnServer); $('#user-current-picture').attr('src', imageUrlOnServer);
$('#user-uploaded-picture').attr('src', imageUrlOnServer); $('#user-uploaded-picture').attr('src', imageUrlOnServer);
uploadedPicture = imageUrlOnServer; uploadedPicture = imageUrlOnServer;
setTimeout(function() { setTimeout(function() {
hideAlerts(); hideAlerts();
$('#upload-picture-modal').modal('hide'); $('#upload-picture-modal').modal('hide');
}, 750); }, 750);
socket.emit('api:updateHeader', { fields: ['username', 'picture'] }); socket.emit('api:updateHeader', { fields: ['username', 'picture'] });
success('File uploaded successfully!'); success('File uploaded successfully!');
} }
}); });
return false; return false;
}); });
function hideAlerts() { function hideAlerts() {
$('#alert-status').hide(); $('#alert-status').hide();
$('#alert-success').hide(); $('#alert-success').hide();
$('#alert-error').hide(); $('#alert-error').hide();
$('#upload-progress-box').hide(); $('#upload-progress-box').hide();
} }
function status(message) { function status(message) {
hideAlerts(); hideAlerts();
$('#alert-status').text(message).show(); $('#alert-status').text(message).show();
} }
function success(message) { function success(message) {
hideAlerts(); hideAlerts();
$('#alert-success').text(message).show(); $('#alert-success').text(message).show();
} }
function error(message) { function error(message) {
hideAlerts(); hideAlerts();
$('#alert-error').text(message).show(); $('#alert-error').text(message).show();
} }
function changeUserPicture(type) { function changeUserPicture(type) {
var userData = { var userData = {
uid: $('#inputUID').val(), uid: $('#inputUID').val(),
type: type, type: type,
_csrf:$('#csrf_token').val() _csrf:$('#csrf_token').val()
}; };
$.post('/users/changepicture', $.post('/users/changepicture',
userData, userData,
function(data) { function(data) {
socket.emit('api:updateHeader', { fields: ['username', 'picture'] }); socket.emit('api:updateHeader', { fields: ['username', 'picture'] });
} }
); );
} }
var selectedImageType = ''; var selectedImageType = '';
$('#submitBtn').on('click',function(){ $('#submitBtn').on('click',function(){
var userData = { var userData = {
uid:$('#inputUID').val(), uid:$('#inputUID').val(),
email:$('#inputEmail').val(), email:$('#inputEmail').val(),
fullname:$('#inputFullname').val(), fullname:$('#inputFullname').val(),
website:$('#inputWebsite').val(), website:$('#inputWebsite').val(),
birthday:$('#inputBirthday').val(), birthday:$('#inputBirthday').val(),
location:$('#inputLocation').val(), location:$('#inputLocation').val(),
signature:$('#inputSignature').val(), signature:$('#inputSignature').val(),
_csrf:$('#csrf_token').val() _csrf:$('#csrf_token').val()
}; };
$.post('/users/doedit', $.post('/users/doedit',
userData, userData,
function(data) { function(data) {
if(data.error) { if(data.error) {
app.alert({ app.alert({
'alert_id': 'user_profile_updated', 'alert_id': 'user_profile_updated',
type: 'error', type: 'error',
title: 'Profile Update Error', title: 'Profile Update Error',
message: data.error, message: data.error,
timeout: 2000 timeout: 2000
}); });
return; return;
} }
app.alert({ app.alert({
'alert_id': 'user_profile_updated', 'alert_id': 'user_profile_updated',
type: 'success', type: 'success',
title: 'Profile Updated', title: 'Profile Updated',
message: 'Your profile has been updated successfully', message: 'Your profile has been updated successfully',
timeout: 2000 timeout: 2000
}); });
} }
); );
return false; return false;
}); });
function updateImages() { function updateImages() {
var currentPicture = $('#user-current-picture').attr('src'); var currentPicture = $('#user-current-picture').attr('src');
if(gravatarPicture) { if(gravatarPicture) {
$('#user-gravatar-picture').attr('src', gravatarPicture); $('#user-gravatar-picture').attr('src', gravatarPicture);
$('#gravatar-box').show(); $('#gravatar-box').show();
} }
else else
$('#gravatar-box').hide(); $('#gravatar-box').hide();
if(uploadedPicture) { if(uploadedPicture) {
$('#user-uploaded-picture').attr('src', uploadedPicture); $('#user-uploaded-picture').attr('src', uploadedPicture);
$('#uploaded-box').show(); $('#uploaded-box').show();
} }
else else
$('#uploaded-box').hide(); $('#uploaded-box').hide();
if(currentPicture == gravatarPicture) if(currentPicture == gravatarPicture)
$('#gravatar-box .icon-ok').show(); $('#gravatar-box .icon-ok').show();
else else
$('#gravatar-box .icon-ok').hide(); $('#gravatar-box .icon-ok').hide();
if(currentPicture == uploadedPicture) if(currentPicture == uploadedPicture)
$('#uploaded-box .icon-ok').show(); $('#uploaded-box .icon-ok').show();
else else
$('#uploaded-box .icon-ok').hide(); $('#uploaded-box .icon-ok').hide();
} }
$('#changePictureBtn').on('click', function() { $('#changePictureBtn').on('click', function() {
selectedImageType = ''; selectedImageType = '';
updateImages(); updateImages();
$('#change-picture-modal').modal('show'); $('#change-picture-modal').modal('show');
return false; return false;
}); });
$('#gravatar-box').on('click', function(){ $('#gravatar-box').on('click', function(){
$('#gravatar-box .icon-ok').show(); $('#gravatar-box .icon-ok').show();
$('#uploaded-box .icon-ok').hide(); $('#uploaded-box .icon-ok').hide();
selectedImageType = 'gravatar'; selectedImageType = 'gravatar';
}); });
$('#uploaded-box').on('click', function(){ $('#uploaded-box').on('click', function(){
$('#gravatar-box .icon-ok').hide(); $('#gravatar-box .icon-ok').hide();
$('#uploaded-box .icon-ok').show(); $('#uploaded-box .icon-ok').show();
selectedImageType = 'uploaded'; selectedImageType = 'uploaded';
}); });
$('#savePictureChangesBtn').on('click', function() { $('#savePictureChangesBtn').on('click', function() {
$('#change-picture-modal').modal('hide'); $('#change-picture-modal').modal('hide');
if(selectedImageType) { if(selectedImageType) {
changeUserPicture(selectedImageType); changeUserPicture(selectedImageType);
if(selectedImageType == 'gravatar') if(selectedImageType == 'gravatar')
$('#user-current-picture').attr('src', gravatarPicture); $('#user-current-picture').attr('src', gravatarPicture);
else if(selectedImageType == 'uploaded') else if(selectedImageType == 'uploaded')
$('#user-current-picture').attr('src', uploadedPicture); $('#user-current-picture').attr('src', uploadedPicture);
} }
}); });
$('#upload-picture-modal').on('hide', function() { $('#upload-picture-modal').on('hide', function() {
@ -204,17 +204,17 @@ $(document).ready(function() {
$('#uploadPictureBtn').on('click', function(){ $('#uploadPictureBtn').on('click', function(){
$('#change-picture-modal').modal('hide'); $('#change-picture-modal').modal('hide');
$('#upload-picture-modal').modal('show'); $('#upload-picture-modal').modal('show');
hideAlerts(); hideAlerts();
return false; return false;
}); });
$('#pictureUploadSubmitBtn').on('click', function() { $('#pictureUploadSubmitBtn').on('click', function() {
$('#uploadForm').submit(); $('#uploadForm').submit();
}); });
}); });

@ -4,26 +4,26 @@
theirid = templates.get('theirid'), theirid = templates.get('theirid'),
followersCount = templates.get('followersCount'); followersCount = templates.get('followersCount');
$(document).ready(function() { $(document).ready(function() {
if(parseInt(followersCount, 10) === 0) { if(parseInt(followersCount, 10) === 0) {
$('#no-followers-notice').show(); $('#no-followers-notice').show();
} }
var editLink = $('#editLink'); var editLink = $('#editLink');
if(yourid !== theirid) { if(yourid !== theirid) {
editLink.hide(); editLink.hide();
} }
$('.reputation').each(function(index, element) { $('.reputation').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
$('.postcount').each(function(index, element) { $('.postcount').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
}); });
}()); }());

@ -4,12 +4,12 @@
theirid = templates.get('theirid'), theirid = templates.get('theirid'),
followingCount = templates.get('followingCount'); followingCount = templates.get('followingCount');
$(document).ready(function() { $(document).ready(function() {
if(parseInt(followingCount, 10) === 0) { if(parseInt(followingCount, 10) === 0) {
$('#no-following-notice').show(); $('#no-following-notice').show();
} }
var editLink = $('#editLink'); var editLink = $('#editLink');
if(yourid !== theirid) { if(yourid !== theirid) {
editLink.hide(); editLink.hide();
@ -22,23 +22,23 @@
var followingUid = $(this).attr('followingUid'); var followingUid = $(this).attr('followingUid');
$.post('/users/unfollow', {uid: followingUid, _csrf:$('#csrf_token').val()}, $.post('/users/unfollow', {uid: followingUid, _csrf:$('#csrf_token').val()},
function(data) { function(data) {
removeBtn.parent().remove(); removeBtn.parent().remove();
} }
); );
return false; return false;
}); });
} }
$('.reputation').each(function(index, element) { $('.reputation').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
$('.postcount').each(function(index, element) { $('.postcount').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
}); });
}()); }());

@ -12,8 +12,8 @@
function addCommasToNumbers() { function addCommasToNumbers() {
$('.formatted-number').each(function(index, element) { $('.formatted-number').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
} }
jQuery('document').ready(function() { jQuery('document').ready(function() {

@ -1,15 +1,15 @@
(function() { (function() {
$(document).ready(function() { $(document).ready(function() {
$('.reputation').each(function(index, element) { $('.reputation').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
$('.postcount').each(function(index, element) { $('.postcount').each(function(index, element) {
$(element).html(app.addCommas($(element).html())); $(element).html(app.addCommas($(element).html()));
}); });
}); });
}()); }());

@ -8,7 +8,7 @@ define(['taskbar'], function(taskbar) {
$('.modal').each(function() { $('.modal').each(function() {
var thisZ = parseInt($(this).css('zIndex'), 10); var thisZ = parseInt($(this).css('zIndex'), 10);
if (thisZ > topZ) { if (thisZ > topZ) {
topZ = thisZ; topZ = thisZ;
} }
}); });
chatModal.css('zIndex', topZ+1); chatModal.css('zIndex', topZ+1);
@ -88,7 +88,7 @@ define(['taskbar'], function(taskbar) {
var chatContent = chatModal.find('#chat-content'); var chatContent = chatModal.find('#chat-content');
chatContent.append(message); chatContent.append(message);
chatContent.scrollTop( chatContent.scrollTop(
chatContent[0].scrollHeight - chatContent.height() chatContent[0].scrollHeight - chatContent.height()
); );
} }

@ -20,10 +20,10 @@
var main_dir = global.configuration.ROOT_DIRECTORY + '/public/templates/'; var main_dir = global.configuration.ROOT_DIRECTORY + '/public/templates/';
var results = []; var results = [];
fs.readdir(dir, function(err, list) { fs.readdir(dir, function(err, list) {
if (err) return done(err); if (err) return done(err);
var pending = list.length; var pending = list.length;
if (!pending) return done(null, results); if (!pending) return done(null, results);
list.forEach(function(file) { list.forEach(function(file) {
file = dir + '/' + file; file = dir + '/' + file;
fs.stat(file, function(err, stat) { fs.stat(file, function(err, stat) {
if (stat && stat.isDirectory()) { if (stat && stat.isDirectory()) {
@ -34,7 +34,7 @@
} else { } else {
results.push(file.replace(main_dir, '').replace('.tpl', '')); results.push(file.replace(main_dir, '').replace('.tpl', ''));
if (!--pending) done(null, results); if (!--pending) done(null, results);
} }
}); });
}); });
}); });

@ -30,20 +30,20 @@
<br/> <br/>
<span class="account-bio-label">full name</span> <span class="account-bio-label">full name</span>
<span>{fullname}</span> <span>{fullname}</span>
<br/> <br/>
<span class="account-bio-label">website</span> <span class="account-bio-label">website</span>
<span><a href="{website}">{website}</a></span> <span><a href="{website}">{website}</a></span>
<br/> <br/>
<span class="account-bio-label">location</span> <span class="account-bio-label">location</span>
<span>{location}</span> <span>{location}</span>
<br/> <br/>
<span class="account-bio-label">age</span> <span class="account-bio-label">age</span>
<span>{age}</span> <span>{age}</span>
<br/> <br/>
<hr/> <hr/>
<span class="account-bio-label">member for</span> <span class="account-bio-label">member for</span>
<span>{joindate}</span> <span>{joindate}</span>

@ -1,66 +1,65 @@
<div class="well"> <div class="well">
<!-- Change Picture Modal --> <!-- Change Picture Modal -->
<div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">Change Picture</h3> <h3 id="myModalLabel">Change Picture</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div id="gravatar-box">
<img id="user-gravatar-picture" src="" class="img-polaroid user-profile-picture">
<span class="user-picture-label">Gravatar</span>
<i class='icon-ok icon-2x'></i>
</div>
<br/>
<div id="uploaded-box">
<img id="user-uploaded-picture" src="" class="img-polaroid user-profile-picture">
<span class="user-picture-label">Uploaded picture</span>
<i class='icon-ok icon-2x'></i>
</div>
<a id="uploadPictureBtn" href="#">Upload new picture</a>
</div>
<div id="gravatar-box"> <div class="modal-footer">
<img id="user-gravatar-picture" src="" class="img-polaroid user-profile-picture"> <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<span class="user-picture-label">Gravatar</span> <button id="savePictureChangesBtn" class="btn btn-primary">Save changes</button>
<i class='icon-ok icon-2x'></i> </div>
</div>
<br/>
<div id="uploaded-box">
<img id="user-uploaded-picture" src="" class="img-polaroid user-profile-picture">
<span class="user-picture-label">Uploaded picture</span>
<i class='icon-ok icon-2x'></i>
</div>
<a id="uploadPictureBtn" href="#">Upload new picture</a>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="savePictureChangesBtn" class="btn btn-primary">Save changes</button>
</div>
</div> </div>
<!-- Upload picture modal--> <!-- Upload picture modal-->
<div id="upload-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="upload-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">Upload Picture</h3> <h3 id="myModalLabel">Upload Picture</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="uploadForm" action="/users/uploadpicture" method="post" enctype="multipart/form-data"> <form id="uploadForm" action="/users/uploadpicture" method="post" enctype="multipart/form-data">
<input id="userPhotoInput" type="file" name="userPhoto" > <input id="userPhotoInput" type="file" name="userPhoto" >
</form> </form>
<div id="upload-progress-box" class="progress progress-striped active hide"> <div id="upload-progress-box" class="progress progress-striped active hide">
<div id="upload-progress-bar" class="bar" style="width: 0%;"></div> <div id="upload-progress-bar" class="bar" style="width: 0%;"></div>
</div>
<div id="alert-status" class="alert hide"></div>
<div id="alert-success" class="alert alert-success hide"></div>
<div id="alert-error" class="alert alert-error hide"></div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button>
</div> </div>
<div id="alert-status" class="alert hide"></div>
<div id="alert-success" class="alert alert-success hide"></div>
<div id="alert-error" class="alert alert-error hide"></div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button>
</div>
</div> </div>
<div class="account-username-box"> <div class="account-username-box">
<span class="account-username"> <span class="account-username">
<a href="/users/{username}">{username}</a> > <a href="/users/{username}">{username}</a> >
<a href="/users/{username}/edit">edit</a> <a href="/users/{username}/edit">edit</a>
@ -74,68 +73,68 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span3" style="text-align: center; margin-bottom:20px;"> <div class="span3" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block text-center"> <div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br/> <img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br/>
<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a> <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
</div> </div>
</div> </div>
<div class="span9"> <div class="span9">
<div class="inline-block"> <div class="inline-block">
<form class='form-horizontal'> <form class='form-horizontal'>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputEmail">Email</label> <label class="control-label" for="inputEmail">Email</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputEmail" placeholder="Email" value="{email}"> <input type="text" id="inputEmail" placeholder="Email" value="{email}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputFullname">Full Name</label> <label class="control-label" for="inputFullname">Full Name</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputFullname" placeholder="Full Name" value="{fullname}"> <input type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputWebsite">Website</label> <label class="control-label" for="inputWebsite">Website</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputWebsite" placeholder="http://website.com" value="{website}"> <input type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputLocation">Location</label> <label class="control-label" for="inputLocation">Location</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputLocation" placeholder="Location" value="{location}"> <input type="text" id="inputLocation" placeholder="Location" value="{location}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputBirthday">Birthday</label> <label class="control-label" for="inputBirthday">Birthday</label>
<div class="controls"> <div class="controls">
<input type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}"> <input type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputSignature">Signature</label> <label class="control-label" for="inputSignature">Signature</label>
<div class="controls"> <div class="controls">
<textarea id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea> <textarea id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea>
</div> </div>
</div> </div>
<input type="hidden" id="inputUID" value="{uid}"> <input type="hidden" id="inputUID" value="{uid}">
<div class="form-actions"> <div class="form-actions">
<a id="submitBtn" href="#" class="btn btn-primary">Save changes</a> <a id="submitBtn" href="#" class="btn btn-primary">Save changes</a>
<a href="/users/{username}" class="btn">Cancel</a> <a href="/users/{username}" class="btn">Cancel</a>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" /> <input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />

@ -8,7 +8,7 @@
</ul> </ul>
<div class="row-fluid admin-categories"> <div class="row-fluid admin-categories">
<ul class="span12" id="entry-container"> <ul class="span12" id="entry-container">
<!-- BEGIN categories --> <!-- BEGIN categories -->

@ -39,11 +39,11 @@
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li> <li>
<a href="/admin/index"><i class="icon-home"></i> Home</a> <a href="/admin/index"><i class="icon-home"></i> Home</a>
</li> </li>
<li> <li>
<a href="/admin/settings"><i class="icon-cogs"></i> Settings</a> <a href="/admin/settings"><i class="icon-cogs"></i> Settings</a>
</li> </li>
</ul> </ul>
<ul class="nav pull-right" id="right-menu"> <ul class="nav pull-right" id="right-menu">
<li><a href="/users" id="user_label"></a></li> <li><a href="/users" id="user_label"></a></li>

@ -16,15 +16,15 @@
</div> </div>
<div> <div>
<!-- BEGIN following --> <!-- BEGIN following -->
<div class="users-box well"> <div class="users-box well">
<a href="/users/{following.username}"> <a href="/users/{following.username}">
<img src="{following.picture}" class="user-8080-picture"/> <img src="{following.picture}" class="user-8080-picture"/>
</a> </a>
<br/> <br/>
<a href="/users/{following.username}">{following.username}</a> <a href="/users/{following.username}">{following.username}</a>
<br/> <br/>
<div title="reputation"> <div title="reputation">
<span class='reputation'>{following.reputation}</span> <span class='reputation'>{following.reputation}</span>
<i class='icon-star'></i> <i class='icon-star'></i>

@ -71,29 +71,29 @@
</div> </div>
</div> </div>
</div> </div>
<div id="disconnect-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="disconnect-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<h3 id="myModalLabel">Socket Disconnect</h3> <h3 id="myModalLabel">Socket Disconnect</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<span id="disconnect-text">Looks like you disconnected, try reloading the page.</span> <span id="disconnect-text">Looks like you disconnected, try reloading the page.</span>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a id="reload-button" href="/" class="btn btn-primary">Reload</a> <a id="reload-button" href="/" class="btn btn-primary">Reload</a>
</div> </div>
</div> </div>
<div id="chat-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="chat-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 id="myModalLabel">Chat with <span id="chat-with-name"></span></h3> <h3 id="myModalLabel">Chat with <span id="chat-with-name"></span></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<textarea id="chat-content" cols="40" rows="10" readonly></textarea><br/> <textarea id="chat-content" cols="40" rows="10" readonly></textarea><br/>
<input id="chat-message-input" type="text" name="chat-message" placeholder="type chat message here press enter to send"/><br/> <input id="chat-message-input" type="text" name="chat-message" placeholder="type chat message here press enter to send"/><br/>
<button type="button" id="chat-message-send-btn" href="#" class="btn btn-primary">Send</button> <button type="button" id="chat-message-send-btn" href="#" class="btn btn-primary">Send</button>
</div> </div>
</div> </div>
<div id="alert_window"></div> <div id="alert_window"></div>

@ -12,7 +12,7 @@
<!-- BEGIN main_posts --> <!-- BEGIN main_posts -->
<a name="{main_posts.pid}"></a> <a name="{main_posts.pid}"></a>
<li class="row post-row main-post" data-pid="{main_posts.pid}" data-uid="{main_posts.uid}" data-deleted="{main_posts.deleted}"> <li class="row post-row main-post" data-pid="{main_posts.pid}" data-uid="{main_posts.uid}" data-deleted="{main_posts.deleted}">
<div class="span12"> <div class="span12">
<div class="post-block"> <div class="post-block">

@ -1,13 +1,13 @@
<h1>Users</h1> <h1>Users</h1>
<div> <div>
<!-- BEGIN users --> <!-- BEGIN users -->
<div class="users-box well"> <div class="users-box well">
<a href="/users/{users.username}"> <a href="/users/{users.username}">
<img src="{users.picture}" class="user-8080-picture"/> <img src="{users.picture}" class="user-8080-picture"/>
</a> </a>
<br/> <br/>
<a href="/users/{users.username}">{users.username}</a> <a href="/users/{users.username}">{users.username}</a>
<br/> <br/>
<div title="reputation"> <div title="reputation">
<span class='reputation'>{users.reputation}</span> <span class='reputation'>{users.reputation}</span>
<i class='icon-star'></i> <i class='icon-star'></i>

@ -3,7 +3,7 @@ var express = require('express'),
server = require('http').createServer(WebServer), server = require('http').createServer(WebServer),
RedisStore = require('connect-redis')(express), RedisStore = require('connect-redis')(express),
path = require('path'), path = require('path'),
redis = require('redis'), redis = require('redis'),
redisServer = redis.createClient(global.config.redis.port, global.config.redis.host), redisServer = redis.createClient(global.config.redis.port, global.config.redis.host),
marked = require('marked'), marked = require('marked'),
utils = require('../public/src/utils.js'), utils = require('../public/src/utils.js'),

Loading…
Cancel
Save