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

Closes #3302

Browse Source 
- Fixes issue where the served path for the favicon was incorrect (included relative path when one was not needed)
- Also fixes issue where favicons were just plain not served for subfolder installations
- Fixed unsemantic HTML in ACP/General regarding Site Logo and Favicon fieldsets
This commit is contained in:
Julian Lam
2015-08-17 11:31:31 -04:00
parent c70267bd23
commit 08fb30378a
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/admin/uploads.js
View File

@@ -38,7 +38,7 @@ uploadsController.uploadFavicon = function(req, res, next) {
return next(err);
}
res.json([{name: uploadedFile.name, url: nconf.get('relative_path') + image.url}]);
res.json([{name: uploadedFile.name, url: image.url}]);
});
}
};

2
src/middleware/index.js
View File

@@ -22,7 +22,7 @@ var middleware = {};
function setupFavicon(app) {
var faviconPath = path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
if (fs.existsSync(faviconPath)) {
app.use(favicon(faviconPath));
app.use(nconf.get('relative_path'), favicon(faviconPath));
}
}

33
src/views/admin/settings/general.tpl
View File

@@ -31,25 +31,36 @@
<div class="panel panel-default">
<div class="panel-heading">Site Logo</div>
<div class="panel-body">
<form>
<label>Image</label>
<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br />
<div class="form-group">
<label for="logoUrl">Image</label>
<div class="input-group">
<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" readonly />
<span class="input-group-btn">
<input data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" type="button" class="btn btn-default" value="Upload"></input>
<br/><br/>
<label>URL</label>
<input type="text" class="form-control" placeholder="The URL of the site logo" data-field="brand:logo:url" /><br />
</form>
</span>
</div>
</div>
<div class="form-group">
<label for="brand:logo:url">URL</label>
<input id ="brand:logo:url" type="text" class="form-control" placeholder="The URL of the site logo" data-field="brand:logo:url" />
<p class="help-block">
When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.
</p>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">Favicon</div>
<div class="panel-body">
<form>
<label>Favicon</label><br />
<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" /><br />
<div class="form-group">
<div class="input-group">
<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" readonly />
<span class="input-group-btn">
<input data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" type="button" class="btn btn-default" value="Upload"></input>
</form>
</span>
</div>
</div>
</div>
</div>