mirror_html/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-03-21 04:49:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Lars Jung 2014-08-17 00:46:04 +02:00
commit 1d7e8c5a6b
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
**h5ai** uses [semantic versioning](http://semver.org/).
## v0.26.1 - *2014-08-17*
* fixes links
## v0.26.0 - *2014-08-16*
* removes True Type fonts

35
makefile.js
View File

@ -21,19 +21,6 @@ module.exports = function (make) {
make.defaults('build');
make.before(function () {
var moment = make.moment();
make.env = {
pkg: pkg,
stamp: moment.format('YYYY-MM-DD HH:mm:ss')
};
$.info({ method: 'before', message: pkg.version + ' ' + make.env.stamp });
});
make.target('check-version', [], 'add git info to dev builds').async(function (done, fail) {
if (!pkg.develop) {
@ -85,29 +72,32 @@ module.exports = function (make) {
make.target('build', ['check-version'], 'build all updated files').sync(function () {
var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.url + ' */';
var env = {pkg: pkg};
var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n';
$(src + ': _h5ai/client/js/*.js')
.newerThan(mapSrc, $(src + ': _h5ai/client/js/**'))
.includify()
.uglifyjs({header: header})
.uglifyjs()
.wrap(header)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/*.less')
.newerThan(mapSrc, $(src + ': _h5ai/client/css/**'))
.less()
.cssmin({header: header})
.cssmin()
.wrap(header)
.WRITE(mapSrc);
$(src + ': **/*.jade')
.newerThan(mapSrc)
.handlebars(make.env)
.handlebars(env)
.jade()
.WRITE(mapSrc);
$(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade')
.newerThan(mapSrc)
.handlebars(make.env)
.handlebars(env)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/fonts/**')
@ -122,27 +112,32 @@ module.exports = function (make) {
make.target('build-uncompressed', ['check-version'], 'build all updated files without compression').sync(function () {
var env = {pkg: pkg};
var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n';
$(src + ': _h5ai/client/js/*.js')
.newerThan(mapSrc, $(src + ': _h5ai/client/js/**'))
.includify()
// .uglifyjs()
.wrap(header)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/*.less')
.newerThan(mapSrc, $(src + ': _h5ai/client/css/**'))
.less()
// .cssmin()
.wrap(header)
.WRITE(mapSrc);
$(src + ': **/*.jade')
.newerThan(mapSrc)
.handlebars(make.env)
.handlebars(env)
.jade()
.WRITE(mapSrc);
$(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade')
.newerThan(mapSrc)
.handlebars(make.env)
.handlebars(env)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/fonts/**')

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "h5ai",
"version": "0.26.0",
"version": "0.26.1",
"develop": false,
"description": "a modern HTTP web server index",
"homepage": "http://larsjung.de/h5ai/",

2
src/_h5ai/conf/options.json
View File

@ -1,6 +1,6 @@
/*
{{pkg.name}} {{pkg.version}}
{{pkg.url}}
{{pkg.homepage}}
Options
*/

2
src/_h5ai/conf/types.json
View File

@ -1,6 +1,6 @@
/*
{{pkg.name}} {{pkg.version}}
{{pkg.url}}
{{pkg.homepage}}
File types mapped to file extensions
*/

4
src/_h5ai/index.html.jade
View File

@ -19,7 +19,7 @@ html.no-js.browser( lang="en" )
body#h5ai-info
h1
a( href="{{pkg.url}}" ) {{pkg.name}}
a( href="{{pkg.homepage}}" ) {{pkg.name}}
div#support
| show your love and support for h5ai with a small donation
@ -38,6 +38,6 @@ html.no-js.browser( lang="en" )
a( href="http://browsehappy.com" ) modern browsers
| ! ⚡
span.right
a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
a( href="{{pkg.homepage}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
| powered by {{pkg.name}} {{pkg.version}}
span.center

6
src/_h5ai/server/php/inc/page.php.jade
View File

@ -13,8 +13,8 @@ html.no-js.browser( lang="en" )
head
meta( charset="utf-8" )
meta( http-equiv="X-UA-Compatible", content="IE=edge" )
title index · powered by {{pkg.name}} {{pkg.version}} ({{pkg.url}})
meta( name="description", content="index - powered by {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
title index · powered by {{pkg.name}} {{pkg.version}} ({{pkg.homepage}})
meta( name="description", content="index - powered by {{pkg.name}} {{pkg.version}} ({{pkg.homepage}})" )
meta( name="viewport", content="width=device-width, initial-scale=1" )
link( rel="shortcut icon", href!="#{app_href}client/images/favicon/favicon-16-32.ico" )
link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/favicon-152.png" )
@ -35,7 +35,7 @@ html.no-js.browser( lang="en" )
a( href="http://browsehappy.com" ) modern browsers
| ! ⚡
span.right
a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
a( href="{{pkg.homepage}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
| powered by {{pkg.name}} {{pkg.version}}
span.center