Merge branch 'develop'

CHANGELOG.md

@@ -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

makefile.js

@@ -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/**')

package.json

@@ -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/",

src/_h5ai/conf/options.json

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

src/_h5ai/conf/types.json

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

src/_h5ai/index.html.jade

@@ -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

src/_h5ai/server/php/inc/page.php.jade

@@ -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}})
+        title index · powered by {{pkg.name}} {{pkg.version}} ({{pkg.homepage}})
-        meta( name="description", content="index - powered by {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
+        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