Skip to content

Add --title option to set HTML/header title #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kennon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add --title option to set HTML/header title #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ if (program.daemonize) {
path.join(__dirname, 'web', 'index.html'),
files,
filesNamespace,
program.theme
program.theme,
program.title
);

const builder = serverBuilder();
Expand Down
6 changes: 4 additions & 2 deletions lib/connect_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ ConnectBuilder.prototype.index = function index(
path,
files,
filesNamespace,
themeOpt
themeOpt,
titleOpt
) {
const theme = themeOpt || 'default';
const title = titleOpt || `tail -f ${files}`;

this.app.use(this.urlPath, (req, res) => {
fs.readFile(path, (err, data) => {
Expand All @@ -43,7 +45,7 @@ ConnectBuilder.prototype.index = function index(
res.end(
data
.toString('utf-8')
.replace(/__TITLE__/g, files)
.replace(/__TITLE__/g, title)
.replace(/__THEME__/g, theme)
.replace(/__NAMESPACE__/g, filesNamespace)
.replace(/__PATH__/g, this.urlPath),
Expand Down
6 changes: 5 additions & 1 deletion lib/daemonize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = (script, params, opts) => {
'-l',
params.lines,
'-t',
params.theme,
params.theme
];

if (options.doAuthorization) {
Expand All @@ -42,6 +42,10 @@ module.exports = (script, params, opts) => {
args.push('--url-path', params.urlPath);
}

if (params.title) {
args.push('--title', params.title);
}

if (!params.uiIndent) {
args.push('--ui-no-indent');
}
Expand Down
6 changes: 6 additions & 0 deletions lib/options_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ program
String,
'/'
)
.option(
'--title <title>',
'Title of page, default "tail -f <files>"',
String,
false
)
.option('--ui-hide-topbar', 'hide topbar (log file name and search box)')
.option('--ui-no-indent', "don't indent log lines")
.option(
Expand Down
16 changes: 12 additions & 4 deletions test/connect_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,20 @@ describe('connectBuilder', () => {
.expect('Content-Type', 'text/html', done);
});

it('should build app that replace index title', (done) => {
it('should build app that populates index title with files', (done) => {
const app = connectBuilder('/')
.index(path.join(__dirname, 'fixtures/index_with_title'), '/testfile')
.build();

request(app).get('/').expect('<head><title>/testfile</title></head>', done);
request(app).get('/').expect('<head><title>tail -f /testfile</title></head>', done);
});

it('should build app that populates index title with title argument', (done) => {
const app = connectBuilder('/')
.index(path.join(__dirname, 'fixtures/index_with_title'), '/testfile', false, false, 'TEST TITLE')
.build();

request(app).get('/').expect('<head><title>TEST TITLE</title></head>', done);
});

it('should build app that sets socket.io namespace based on files', (done) => {
Expand Down Expand Up @@ -103,7 +111,7 @@ describe('connectBuilder', () => {
request(app)
.get('/')
.expect(
'<head><title>/testfile</title><link href="dark.css" rel="stylesheet" type="text/css"/></head>',
'<head><title>tail -f /testfile</title><link href="dark.css" rel="stylesheet" type="text/css"/></head>',
done
);
});
Expand All @@ -116,7 +124,7 @@ describe('connectBuilder', () => {
request(app)
.get('/')
.expect(
'<head><title>/testfile</title><link href="default.css" rel="stylesheet" type="text/css"/></head>',
'<head><title>tail -f /testfile</title><link href="default.css" rel="stylesheet" type="text/css"/></head>',
done
);
});
Expand Down
4 changes: 2 additions & 2 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>

<head>
<title>tail -f __TITLE__</title>
<title>__TITLE__</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="__PATH__/styles/__THEME__.css">
Expand All @@ -14,7 +14,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-sm-8">
<span class="navbar-brand text-overflow" title="__TITLE__">tail -f __TITLE__</span>
<span class="navbar-brand text-overflow" title="__TITLE__">__TITLE__</span>
</div>
<div class="col-sm-1 text-right">
<button type="button" class="btn btn-light btn-pause" data-toggle="button" aria-pressed="false" autocomplete="off"></button>
Expand Down