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

image upload changes

Browse Source
v1.18.x
Baris Soner Usakli 12 years ago
parent 5785b16ae9
commit 5796140f58
3 changed files with 95 additions and 89 deletions
Show Stats Download Patch File Download Diff File

7
config.default.js
Unescape Escape View File

@ -4,6 +4,13 @@ var config = {
// "base_url" is expected to be a publically accessible URL to your NodeBB instance (Default base_url: 'http://localhost', port: '4567') // "base_url" is expected to be a publically accessible URL to your NodeBB instance (Default base_url: 'http://localhost', port: '4567')
"base_url": "http://localhost", "base_url": "http://localhost",
// public url for uploaded files
"upload_url": "http://dev.domain.com/uploads/",
// relative path for uploads
"upload_path": "/uploads/",
"use_port": true, "use_port": true,
"port": 4567, "port": 4567,

168
public/templates/accountedit.tpl
Unescape Escape View File

@ -198,10 +198,7 @@ $(document).ready(function() {
hideAlerts(); hideAlerts();
$('#alert-error').text(message).show(); $('#alert-error').text(message).show();
} }
});
(function() {
function submitUserData() { function submitUserData() {
var userData = { var userData = {
@ -234,103 +231,102 @@ $(document).ready(function() {
} }
); );
} }
$(document).ready(function(){
var selectedImageType = '';
$('#submitBtn').on('click',function(){ var selectedImageType = '';
$('#submitBtn').on('click',function(){
submitUserData(); submitUserData();
}); });
function updateImages() { function updateImages() {
var currentPicture = $('#user-current-picture').attr('src'); var currentPicture = $('#user-current-picture').attr('src');
var gravatarPicture = $('#user-data-gravatarpicture').html(); var gravatarPicture = $('#user-data-gravatarpicture').html();
var uploadedPicture = $('#user-data-uploadedpicture').html(); var uploadedPicture = $('#user-data-uploadedpicture').html();
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
$('#uploaded-box').hide();
if(currentPicture == gravatarPicture)
$('#gravatar-box .icon-ok').show();
else
$('#gravatar-box .icon-ok').hide();
if(currentPicture == uploadedPicture)
$('#uploaded-box .icon-ok').show();
else
$('#uploaded-box .icon-ok').hide();
} }
else
$('#uploaded-box').hide();
$('#changePictureBtn').on('click', function() {
selectedImageType = '';
updateImages();
$('#change-picture-modal').modal('show');
return false; if(currentPicture == gravatarPicture)
}); $('#gravatar-box .icon-ok').show();
else
$('#gravatar-box').on('click', function(){ $('#gravatar-box .icon-ok').hide();
$('#gravatar-box .icon-ok').show();
if(currentPicture == uploadedPicture)
$('#uploaded-box .icon-ok').show();
else
$('#uploaded-box .icon-ok').hide(); $('#uploaded-box .icon-ok').hide();
selectedImageType = 'gravatar'; }
});
$('#changePictureBtn').on('click', function() {
selectedImageType = '';
updateImages();
$('#uploaded-box').on('click', function(){ $('#change-picture-modal').modal('show');
$('#gravatar-box .icon-ok').hide();
$('#uploaded-box .icon-ok').show();
selectedImageType = 'uploaded';
});
$('#savePictureChangesBtn').on('click', function() { return false;
$('#change-picture-modal').modal('hide'); });
$('#gravatar-box').on('click', function(){
$('#gravatar-box .icon-ok').show();
$('#uploaded-box .icon-ok').hide();
selectedImageType = 'gravatar';
});
$('#uploaded-box').on('click', function(){
$('#gravatar-box .icon-ok').hide();
$('#uploaded-box .icon-ok').show();
selectedImageType = 'uploaded';
});
$('#savePictureChangesBtn').on('click', function() {
$('#change-picture-modal').modal('hide');
if(selectedImageType) { if(selectedImageType) {
changeUserPicture(selectedImageType); changeUserPicture(selectedImageType);
if(selectedImageType == 'gravatar')
$('#user-current-picture').attr('src', $('#user-data-gravatarpicture').html());
else if(selectedImageType == 'uploaded')
$('#user-current-picture').attr('src', $('#user-data-uploadedpicture').html());
}
}); if(selectedImageType == 'gravatar')
$('#user-current-picture').attr('src', $('#user-data-gravatarpicture').html());
else if(selectedImageType == 'uploaded')
$('#user-current-picture').attr('src', $('#user-data-uploadedpicture').html());
}
$('#upload-picture-modal').on('hide', function() { });
$('#userPhotoInput').val('');
}); $('#upload-picture-modal').on('hide', function() {
$('#userPhotoInput').val('');
});
$('#uploadPictureBtn').on('click', function(){
$('#change-picture-modal').modal('hide');
$('#upload-picture-modal').modal('show');
hideAlerts();
$('#uploadPictureBtn').on('click', function(){ $('#pictureUploadSubmitBtn').on('click', function() {
$('#uploadForm').submit();
$('#change-picture-modal').modal('hide');
$('#upload-picture-modal').modal('show');
$('#pictureUploadSubmitBtn').on('click', function() {
$('#uploadForm').submit();
});
return false;
}); });
}); return false;
}()); });
});
</script> </script>

9
src/webserver.js
Unescape Escape View File

@ -241,11 +241,14 @@ var express = require('express'),
return; return;
} }
var uploadPath = config['upload_path'] + uid + '-' + filename; filename = uid + '-' + filename
var uploadPath = config.upload_path + filename;
console.log(uploadPath);
fs.rename( fs.rename(
tempPath, tempPath,
global.configuration['ROOT_DIRECTORY']+ uploadPath, global.configuration['ROOT_DIRECTORY'] + uploadPath,
function(error) { function(error) {
if(error) { if(error) {
res.send({ res.send({
@ -254,7 +257,7 @@ var express = require('express'),
return; return;
} }
var imageUrl = config.base_url + config.install_path + uploadPath; var imageUrl = config.upload_url + filename;
res.send({ res.send({
path: imageUrl path: imageUrl

Write Preview
Loading…
Cancel
Save