Use nunjucks for templating, cleanups

apps/kassa/templates/base.html

@@ -10,6 +10,7 @@
     <!--<link rel="stylesheet" href="{% static "dist/styles/vendor.css" %}">-->
     <link rel="stylesheet" href="{% static "dist/styles/app.css" %}">
     <script src="{% static "dist/scripts/vendor.js" %}"></script>
+    <script src="{% static "dist/scripts/templates.js" %}"></script>
     <script src="{% static "dist/scripts/app.js" %}"></script>
 </head>
 <body>

static/app/scripts/app.js

@@ -1,34 +1,5 @@
 function format_results(results) {
-    var html = '<div class="list-group">';
-    for(var i=0; i< results.length; i++) {
-        var res = results[i];
-
-        var label = '';
-        var is_member = res.is_member && res.is_member === "1";
-        var add_to_button = '';
-        var css_classes = 'list-group-item search-result';
-        var expires = res.expires;
-
-        if(is_member) {
-            label = ' <span class="label label-success">Member</span> ';
-            css_classes += ' member';
-        } else if(expires === '0000-00-00') {
-            add_to_button = '<input type="radio" name="random" id="'+res.id+'"> ';
-            label = ' <span class="label label-default">Registered</span> ';
-            css_classes += ' registered';
-        } else {
-            add_to_button = '<input type="radio" name="random" id="'+res.id+'"> ';
-            label = ' <span class="label label-warning">Expired: '+ expires +'</span> ';
-            css_classes += ' expired';
-        }
-
-        if(is_member) {
-            html += '<div class="'+css_classes+'">' + add_to_button + res.firstname + ' ' + res.lastname + label + '</div>';
-        } else {
-            html += '<label for="'+ res.id +'" data-phone-number="'+ res.number +'" class="'+css_classes+'">' + add_to_button + res.firstname + ' ' + res.lastname + label + '</label>';
-        }
-    }
-    return html + '</div>';
+    return nunjucks.render('search_results.html', {'results':results});
 }
 
 $(document).ready(function(){

static/app/styles/app.scss

@@ -2,7 +2,6 @@ $icon-font-path: '../fonts/';
 
 /* Vendor styles */
 @import "../../bower_components/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
-@import "../../bower_components/components-font-awesome/scss/font-awesome";
 
 /* Global styles */
 body {
@@ -42,7 +41,7 @@ body {
   &.selected {
     background-color: #eee;
   }
-  &.member {
+  &.has-card {
     padding-left: 44px;
   }
 }

static/app/templates/search_result.html

@@ -0,0 +1,21 @@
+{% if not res.cardno or res.legacy_card_number %}
+    <label for="{{ res.id }}" data-phone-number="{{ res.number }}" class="list-group-item search-result can-register-card{% if res.is_member == "1" %} member{% else %} not-member{% endif %}">
+    <input type="radio" name="user" id="{{ res.id }}">
+{% else %}
+    <div class="list-group-item search-result has-card{% if res.is_member %} member{% else %}not-member{% endif %}">
+{% endif %}
+<!-- Name -->
+{{ res.firstname }} {{ res.lastname }}
+<!-- Label -->
+{% if res.is_member == "1" %}
+    <span class="label label-success">Member</span>
+{% elif res.expires == "0000-00-00" %}
+    <span class="label label-default">Registered</span>
+{% else %}
+    <span class="label label-warning">Expired: {{res.expires}}</span>
+{% endif %}
+{% if not res.cardno or res.legacy_card_number %}
+    </label>
+{% else %}
+    </div>
+{% endif %}

static/app/templates/search_results.html

@@ -0,0 +1,5 @@
+<div class="list-group">
+    {% for res in results %}
+        {% include "search_result.html" %}
+    {% endfor %}
+</div>

static/bower.json

@@ -5,7 +5,8 @@
     "jquery": "2.1.4",
     "underscore": "1.8.3",
     "list.js": "1.1.1",
-    "bootstrap-sass": "3.3.5"
+    "bootstrap-sass": "3.3.5",
+    "nunjucks": "~1.3.4"
   },
   "devDependencies": {},
   "resolutions": {

static/dist/scripts/app.js

@@ -1,34 +1,5 @@
 function format_results(results) {
-    var html = '<div class="list-group">';
-    for(var i=0; i< results.length; i++) {
-        var res = results[i];
-
-        var label = '';
-        var is_member = res.is_member && res.is_member === "1";
-        var add_to_button = '';
-        var css_classes = 'list-group-item search-result';
-        var expires = res.expires;
-
-        if(is_member) {
-            label = ' <span class="label label-success">Member</span> ';
-            css_classes += ' member';
-        } else if(expires === '0000-00-00') {
-            add_to_button = '<input type="radio" name="random" id="'+res.id+'"> ';
-            label = ' <span class="label label-default">Registered</span> ';
-            css_classes += ' registered';
-        } else {
-            add_to_button = '<input type="radio" name="random" id="'+res.id+'"> ';
-            label = ' <span class="label label-warning">Expired: '+ expires +'</span> ';
-            css_classes += ' expired';
-        }
-
-        if(is_member) {
-            html += '<div class="'+css_classes+'">' + add_to_button + res.firstname + ' ' + res.lastname + label + '</div>';
-        } else {
-            html += '<label for="'+ res.id +'" data-phone-number="'+ res.number +'" class="'+css_classes+'">' + add_to_button + res.firstname + ' ' + res.lastname + label + '</label>';
-        }
-    }
-    return html + '</div>';
+    return nunjucks.render('search_results.html', {'results':results});
 }
 
 $(document).ready(function(){

static/dist/scripts/templates.js

@@ -0,0 +1,122 @@
+(function() {(window.nunjucksPrecompiled = window.nunjucksPrecompiled || {})["search_result.html"] = (function() {function root(env, context, frame, runtime, cb) {
+var lineno = null;
+var colno = null;
+var output = "";
+try {
+if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"legacy_card_number", env.opts.autoescape)) {
+output += "\n    <label for=\"";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"id", env.opts.autoescape), env.opts.autoescape);
+output += "\" data-phone-number=\"";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"number", env.opts.autoescape), env.opts.autoescape);
+output += "\" class=\"list-group-item search-result can-register-card";
+if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
+output += " member";
+;
+}
+else {
+output += " not-member";
+;
+}
+output += "\">\n    <input type=\"radio\" name=\"user\" id=\"";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"id", env.opts.autoescape), env.opts.autoescape);
+output += "\">\n";
+;
+}
+else {
+output += "\n    <div class=\"list-group-item search-result has-card";
+if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape)) {
+output += " member";
+;
+}
+else {
+output += "not-member";
+;
+}
+output += "\">\n";
+;
+}
+output += "\n<!-- Name -->\n";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"firstname", env.opts.autoescape), env.opts.autoescape);
+output += " ";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"lastname", env.opts.autoescape), env.opts.autoescape);
+output += "\n<!-- Label -->\n";
+if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
+output += "\n    <span class=\"label label-success\">Member</span>\n";
+;
+}
+else {
+if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"expires", env.opts.autoescape) == "0000-00-00") {
+output += "\n    <span class=\"label label-default\">Registered</span>\n";
+;
+}
+else {
+output += "\n    <span class=\"label label-warning\">Expired: ";
+output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"expires", env.opts.autoescape), env.opts.autoescape);
+output += "</span>\n";
+;
+}
+;
+}
+output += "\n";
+if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"legacy_card_number", env.opts.autoescape)) {
+output += "\n    </label>\n";
+;
+}
+else {
+output += "\n    </div>\n";
+;
+}
+cb(null, output);
+;
+} catch (e) {
+  cb(runtime.handleError(e, lineno, colno));
+}
+}
+return {
+root: root
+};
+})();
+})();
+
+(function() {(window.nunjucksPrecompiled = window.nunjucksPrecompiled || {})["search_results.html"] = (function() {function root(env, context, frame, runtime, cb) {
+var lineno = null;
+var colno = null;
+var output = "";
+try {
+output += "<div class=\"list-group\">\n    ";
+frame = frame.push();
+var t_3 = runtime.contextOrFrameLookup(context, frame, "results");
+if(t_3) {var t_2 = t_3.length;
+for(var t_1=0; t_1 < t_3.length; t_1++) {
+var t_4 = t_3[t_1];
+frame.set("res", t_4);
+frame.set("loop.index", t_1 + 1);
+frame.set("loop.index0", t_1);
+frame.set("loop.revindex", t_2 - t_1);
+frame.set("loop.revindex0", t_2 - t_1 - 1);
+frame.set("loop.first", t_1 === 0);
+frame.set("loop.last", t_1 === t_2 - 1);
+frame.set("loop.length", t_2);
+output += "\n        ";
+env.getTemplate("search_result.html", false, "search_results.html", function(t_7,t_5) {
+if(t_7) { cb(t_7); return; }
+t_5.render(context.getVariables(), frame.push(), function(t_8,t_6) {
+if(t_8) { cb(t_8); return; }
+output += t_6
+output += "\n    ";
+})});
+}
+}
+frame = frame.pop();
+output += "\n</div>";
+cb(null, output);
+;
+} catch (e) {
+  cb(runtime.handleError(e, lineno, colno));
+}
+}
+return {
+root: root
+};
+})();
+})();

static/dist/scripts/vendor.js

@@ -14595,3 +14595,9 @@ if (typeof jQuery === 'undefined') {
   })
 
 }(jQuery);
+
+// Browser bundle of nunjucks 1.3.3 
+
+(function(){var modules={};(function(){"use strict";function extend(cls,name,props){var F=function(){};F.prototype=cls.prototype;var prototype=new F;var fnTest=/xyz/.test(function(){xyz})?/\bparent\b/:/.*/;props=props||{};for(var k in props){var src=props[k];var parent=prototype[k];if(typeof parent==="function"&&typeof src==="function"&&fnTest.test(src)){prototype[k]=function(src,parent){return function(){var tmp=this.parent;this.parent=parent;var res=src.apply(this,arguments);this.parent=tmp;return res}}(src,parent)}else{prototype[k]=src}}prototype.typename=name;var new_cls=function(){if(prototype.init){prototype.init.apply(this,arguments)}};new_cls.prototype=prototype;new_cls.prototype.constructor=new_cls;new_cls.extend=function(name,props){if(typeof name==="object"){props=name;name="anonymous"}return extend(new_cls,name,props)};return new_cls}modules["object"]=extend(Object,"Object",{})})();(function(){"use strict";var ArrayProto=Array.prototype;var ObjProto=Object.prototype;var escapeMap={"&":"&amp;",'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;"};var escapeRegex=/[&"'<>]/g;var lookupEscape=function(ch){return escapeMap[ch]};var exports=modules["lib"]={};exports.withPrettyErrors=function(path,withInternals,func){try{return func()}catch(e){if(!e.Update){e=new exports.TemplateError(e)}e.Update(path);if(!withInternals){var old=e;e=new Error(old.message);e.name=old.name}throw e}};exports.TemplateError=function(message,lineno,colno){var err=this;if(message instanceof Error){err=message;message=message.name+": "+message.message}else{if(Error.captureStackTrace){Error.captureStackTrace(err)}}err.name="Template render error";err.message=message;err.lineno=lineno;err.colno=colno;err.firstUpdate=true;err.Update=function(path){var message="("+(path||"unknown path")+")";if(this.firstUpdate){if(this.lineno&&this.colno){message+=" [Line "+this.lineno+", Column "+this.colno+"]"}else if(this.lineno){message+=" [Line "+this.lineno+"]"}}message+="\n ";if(this.firstUpdate){message+=" "}this.message=message+(this.message||"");this.firstUpdate=false;return this};return err};exports.TemplateError.prototype=Error.prototype;exports.escape=function(val){return val.replace(escapeRegex,lookupEscape)};exports.isFunction=function(obj){return ObjProto.toString.call(obj)==="[object Function]"};exports.isArray=Array.isArray||function(obj){return ObjProto.toString.call(obj)==="[object Array]"};exports.isString=function(obj){return ObjProto.toString.call(obj)==="[object String]"};exports.isObject=function(obj){return ObjProto.toString.call(obj)==="[object Object]"};exports.groupBy=function(obj,val){var result={};var iterator=exports.isFunction(val)?val:function(obj){return obj[val]};for(var i=0;i<obj.length;i++){var value=obj[i];var key=iterator(value,i);(result[key]||(result[key]=[])).push(value)}return result};exports.toArray=function(obj){return Array.prototype.slice.call(obj)};exports.without=function(array){var result=[];if(!array){return result}var index=-1,length=array.length,contains=exports.toArray(arguments).slice(1);while(++index<length){if(exports.indexOf(contains,array[index])===-1){result.push(array[index])}}return result};exports.extend=function(obj,obj2){for(var k in obj2){obj[k]=obj2[k]}return obj};exports.repeat=function(char_,n){var str="";for(var i=0;i<n;i++){str+=char_}return str};exports.each=function(obj,func,context){if(obj==null){return}if(ArrayProto.each&&obj.each===ArrayProto.each){obj.forEach(func,context)}else if(obj.length===+obj.length){for(var i=0,l=obj.length;i<l;i++){func.call(context,obj[i],i,obj)}}};exports.map=function(obj,func){var results=[];if(obj==null){return results}if(ArrayProto.map&&obj.map===ArrayProto.map){return obj.map(func)}for(var i=0;i<obj.length;i++){results[results.length]=func(obj[i],i)}if(obj.length===+obj.length){results.length=obj.length}return results};exports.asyncIter=function(arr,iter,cb){var i=-1;function next(){i++;if(i<arr.length){iter(arr[i],i,next,cb)}else{cb()}}next()};exports.asyncFor=function(obj,iter,cb){var keys=exports.keys(obj);var len=keys.length;var i=-1;function next(){i++;var k=keys[i];if(i<len){iter(k,obj[k],i,len,next)}else{cb()}}next()};exports.indexOf=Array.prototype.indexOf?function(arr,searchElement,fromIndex){return Array.prototype.indexOf.call(arr,searchElement,fromIndex)}:function(arr,searchElement,fromIndex){var length=this.length>>>0;fromIndex=+fromIndex||0;if(Math.abs(fromIndex)===Infinity){fromIndex=0}if(fromIndex<0){fromIndex+=length;if(fromIndex<0){fromIndex=0}}for(;fromIndex<length;fromIndex++){if(arr[fromIndex]===searchElement){return fromIndex}}return-1};if(!Array.prototype.map){Array.prototype.map=function(){throw new Error("map is unimplemented for this js engine")}}exports.keys=function(obj){if(Object.prototype.keys){return obj.keys()}else{var keys=[];for(var k in obj){if(obj.hasOwnProperty(k)){keys.push(k)}}return keys}}})();(function(){"use strict";var util=modules["util"];var lib=modules["lib"];var Object=modules["object"];function travLine truncated
+while(target=this.parsePrimary()){node.targets.push(target);if(!this.skip(lexer.TOKEN_COMMA)){break}}if(!this.skipValue(lexer.TOKEN_OPERATOR,"=")){this.fail("parseSet: expected = in set tag",tag.lineno,tag.colno)}node.value=this.parseExpression();this.advanceAfterBlockEnd(tag.value);return node},parseStatement:function(){var tok=this.peekToken();var node;if(tok.type!==lexer.TOKEN_SYMBOL){this.fail("tag name expected",tok.lineno,tok.colno)}if(this.breakOnBlocks&&lib.indexOf(this.breakOnBlocks,tok.value)!==-1){return null}switch(tok.value){case"raw":return this.parseRaw();case"if":case"ifAsync":return this.parseIf();case"for":case"asyncEach":case"asyncAll":return this.parseFor();case"block":return this.parseBlock();case"extends":return this.parseExtends();case"include":return this.parseInclude();case"set":return this.parseSet();case"macro":return this.parseMacro();case"call":return this.parseCall();case"import":return this.parseImport();case"from":return this.parseFrom();default:if(this.extensions.length){for(var i=0;i<this.extensions.length;i++){var ext=this.extensions[i];if(lib.indexOf(ext.tags||[],tok.value)!==-1){return ext.parse(this,nodes,lexer)}}}this.fail("unknown block tag: "+tok.value,tok.lineno,tok.colno)}return node},parseRaw:function(){this.advanceAfterBlockEnd();var str="";var begun=this.peekToken();while(1){var tok=this.nextToken(true);if(!tok){this.fail("expected endraw, got end of file")}if(tok.type===lexer.TOKEN_BLOCK_START){var ws=null;var name=this.nextToken(true);if(name.type===lexer.TOKEN_WHITESPACE){ws=name;name=this.nextToken()}if(name.type===lexer.TOKEN_SYMBOL&&name.value==="endraw"){this.advanceAfterBlockEnd(name.value);break}else{str+=tok.value;if(ws){str+=ws.value}str+=name.value}}else if(tok.type===lexer.TOKEN_STRING){str+='"'+tok.value+'"'}else{str+=tok.value}}var output=new nodes.Output(begun.lineno,begun.colno,[new nodes.TemplateData(begun.lineno,begun.colno,str)]);return output},parsePostfix:function(node){var tok=this.peekToken();while(tok){if(tok.type===lexer.TOKEN_LEFT_PAREN){node=new nodes.FunCall(tok.lineno,tok.colno,node,this.parseSignature())}else if(tok.type===lexer.TOKEN_LEFT_BRACKET){var lookup=this.parseAggregate();if(lookup.children.length>1){this.fail("invalid index")}node=new nodes.LookupVal(tok.lineno,tok.colno,node,lookup.children[0])}else if(tok.type===lexer.TOKEN_OPERATOR&&tok.value==="."){this.nextToken();var val=this.nextToken();if(val.type!==lexer.TOKEN_SYMBOL){this.fail("expected name as lookup value, got "+val.value,val.lineno,val.colno)}var lookup=new nodes.Literal(val.lineno,val.colno,val.value);node=new nodes.LookupVal(tok.lineno,tok.colno,node,lookup)}else{break}tok=this.peekToken()}return node},parseExpression:function(){var node=this.parseInlineIf();return node},parseInlineIf:function(){var node=this.parseOr();if(this.skipSymbol("if")){var cond_node=this.parseOr();var body_node=node;node=new nodes.InlineIf(node.lineno,node.colno);node.body=body_node;node.cond=cond_node;if(this.skipSymbol("else")){node.else_=this.parseOr()}else{node.else_=null}}return node},parseOr:function(){var node=this.parseAnd();while(this.skipSymbol("or")){var node2=this.parseAnd();node=new nodes.Or(node.lineno,node.colno,node,node2)}return node},parseAnd:function(){var node=this.parseNot();while(this.skipSymbol("and")){var node2=this.parseNot();node=new nodes.And(node.lineno,node.colno,node,node2)}return node},parseNot:function(){var tok=this.peekToken();if(this.skipSymbol("not")){return new nodes.Not(tok.lineno,tok.colno,this.parseNot())}return this.parseIn()},parseIn:function(){var node=this.parseCompare();while(1){var tok=this.nextToken();if(!tok){break}var invert=tok.type===lexer.TOKEN_SYMBOL&&tok.value==="not";if(!invert){this.pushToken(tok)}if(this.skipSymbol("in")){var node2=this.parseCompare();node=new nodes.In(node.lineno,node.colno,node,node2);if(invert){node=new nodes.Not(node.lineno,node.colno,node)}}else{if(invert){this.pushToken(tok)}break}}return node},parseCompare:function(){var compareOps=["==","!=","<",">","<=",">="];var expr=this.parseAdd();var ops=[];while(1){var tok=this.nextToken();if(!tok){break}else if(lib.indexOf(compareOps,tok.value)!==-1){ops.push(new nodes.CompareOperand(tok.lineno,tok.colno,this.parseAdd(),tok.value))}else{this.pushToken(tok);break}}if(ops.length){return new nodes.Compare(ops[0].lineno,ops[0].colno,expr,ops)}else{return expr}},parseAdd:function(){var node=this.parseSub();while(this.skipValue(lexer.TOKEN_OPERATOR,"+")){var node2=this.parseSub();node=new nodes.Add(node.lineno,node.colno,node,node2)}return node},parseSub:function(){var node=this.parseMul();while(this.skipValue(lexer.TOKEN_OPERATOR,"-")){var node2=this.parseMul();node=new nodes.Sub(node.lineno,node.colno,node,node2)}return node},parseMul:function(){var node=this.parseDiv();while(this.skipValue(lexer.TOKEN_OPERATOR,"*")){var node2=this.parseDiv();node=new nodes.Mul(node.lineno,node.colno,node,node2)}return node},parseDiv:function(){var node=this.parseFloorDiv();while(Line truncated
+this.emitLine('context.getBlock("'+node.name.value+'")'+"(env, context, frame, runtime, "+this.makeCallback(id));this.emitLine(this.buffer+" += "+id+";");this.addScopeLevel()}},compileSuper:function(node,frame){var name=node.blockName.value;var id=node.symbol.value;this.emitLine("context.getSuper(env, "+'"'+name+'", '+"b_"+name+", "+"frame, runtime, "+this.makeCallback(id));this.emitLine(id+" = runtime.markSafe("+id+");");this.addScopeLevel();frame.set(id,id)},compileExtends:function(node,frame){if(this.isChild){this.fail("compileExtends: cannot extend multiple times",node.template.lineno,node.template.colno)}var k=this.tmpid();this.emit("env.getTemplate(");this._compileExpression(node.template,frame);this.emitLine(", true, "+this._templateName()+", "+this.makeCallback("parentTemplate"));this.emitLine("for(var "+k+" in parentTemplate.blocks) {");this.emitLine("context.addBlock("+k+", parentTemplate.blocks["+k+"]);");this.emitLine("}");this.addScopeLevel();this.isChild=true},compileInclude:function(node,frame){var id=this.tmpid();var id2=this.tmpid();this.emit("env.getTemplate(");this._compileExpression(node.template,frame);this.emitLine(", false, "+this._templateName()+", "+this.makeCallback(id));this.addScopeLevel();this.emitLine(id+".render("+"context.getVariables(), frame.push(), "+this.makeCallback(id2));this.emitLine(this.buffer+" += "+id2);this.addScopeLevel()},compileTemplateData:function(node,frame){this.compileLiteral(node,frame)},compileOutput:function(node,frame){var children=node.children;for(var i=0,l=children.length;i<l;i++){if(children[i]instanceof nodes.TemplateData){if(children[i].value){this.emit(this.buffer+" += ");this.compileLiteral(children[i],frame);this.emitLine(";")}}else{this.emit(this.buffer+" += runtime.suppressValue(");this.compile(children[i],frame);this.emit(", env.opts.autoescape);\n")}}},compileRoot:function(node,frame){if(frame){this.fail("compileRoot: root node can't have frame")}frame=new Frame;this.emitFuncBegin("root");this._compileChildren(node,frame);if(this.isChild){this.emitLine("parentTemplate.rootRenderFunc(env, context, frame, runtime, cb);")}this.emitFuncEnd(this.isChild);this.isChild=false;var blocks=node.findAll(nodes.Block);for(var i=0;i<blocks.length;i++){var block=blocks[i];var name=block.name.value;this.emitFuncBegin("b_"+name);var tmpFrame=new Frame;this.compile(block.body,tmpFrame);this.emitFuncEnd()}this.emitLine("return {");for(var i=0;i<blocks.length;i++){var block=blocks[i];var name="b_"+block.name.value;this.emitLine(name+": "+name+",")}this.emitLine("root: root\n};")},compile:function(node,frame){var _compile=this["compile"+node.typename];if(_compile){_compile.call(this,node,frame)}else{this.fail("compile: Cannot compile node: "+node.typename,node.lineno,node.colno)}},getCode:function(){return this.codebuf.join("")}});modules["compiler"]={compile:function(src,asyncFilters,extensions,name,opts){var c=new Compiler(name);if(extensions&&extensions.length){for(var i=0;i<extensions.length;i++){if("preprocess"in extensions[i]){src=extensions[i].preprocess(src,name)}}}c.compile(transformer.transform(parser.parse(src,extensions,opts),asyncFilters,name));return c.getCode()},Compiler:Compiler}})();(function(){"use strict";var lib=modules["lib"];var r=modules["runtime"];var filters={abs:function(n){return Math.abs(n)},batch:function(arr,linecount,fill_with){var res=[];var tmp=[];for(var i=0;i<arr.length;i++){if(i%linecount===0&&tmp.length){res.push(tmp);tmp=[]}tmp.push(arr[i])}if(tmp.length){if(fill_with){for(var i=tmp.length;i<linecount;i++){tmp.push(fill_with)}}res.push(tmp)}return res},capitalize:function(str){var ret=str.toLowerCase();return r.copySafeness(str,ret.charAt(0).toUpperCase()+ret.slice(1))},center:function(str,width){width=width||80;if(str.length>=width){return str}var spaces=width-str.length;var pre=lib.repeat(" ",spaces/2-spaces%2);var post=lib.repeat(" ",spaces/2);return r.copySafeness(str,pre+str+post)},"default":function(val,def){return val?val:def},dictsort:function(val,case_sensitive,by){if(!lib.isObject(val)){throw new lib.TemplateError("dictsort filter: val must be an object")}var array=[];for(var k in val){array.push([k,val[k]])}var si;if(by===undefined||by==="key"){si=0}else if(by==="value"){si=1}else{throw new lib.TemplateError("dictsort filter: You can only sort by either key or value")}array.sort(function(t1,t2){var a=t1[si];var b=t2[si];if(!case_sensitive){if(lib.isString(a)){a=a.toUpperCase()}if(lib.isString(b)){b=b.toUpperCase()}}return a>b?1:a===b?0:-1});return array},escape:function(str){if(typeof str==="string"||str instanceof r.SafeString){return lib.escape(str)}return str},safe:function(str){return r.markSafe(str)},first:function(arr){return arr[0]},groupby:function(arr,attr){return lib.groupBy(arr,attr)},indent:function(str,width,indentfirst){width=width||4;var res="";var lines=str.split("\n");var sp=lib.repeat(" ",width);for(var i=0;i<lines.length;i++){if(i===0&&!indentfirst){res+=lines[i]+"\n"}else{res+=sp+lines[i]+"\nLine truncated

static/dist/styles/app.css

@@ -1 +1 @@
-@charset "UTF-8";html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0}mark{background:#ff0;color:#000}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre{overflow:auto}samp{font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*,*:before,*:after{background:transparent!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url("../fonts/glyphicons-halflings-regular.eot");src:url("../fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("../fonts/glyphicons-halflings-regular.woff2") format("woff2"),url("../fonts/glyphicons-halflings-regular.woff") format("woff"),url("../fonts/glyphicons-halflings-regular.ttf") format("truetype"),url("../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{cLine truncated
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0}mark{background:#ff0;color:#000}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre{overflow:auto}samp{font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*,*:before,*:after{background:transparent!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url("../fonts/glyphicons-halflings-regular.eot");src:url("../fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("../fonts/glyphicons-halflings-regular.woff2") format("woff2"),url("../fonts/glyphicons-halflings-regular.woff") format("woff"),url("../fonts/glyphicons-halflings-regular.ttf") format("truetype"),url("../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.gLine truncated

static/gulpfile.js

@@ -34,13 +34,8 @@ gulp.task('diststyles', function () {
 });
 
 gulp.task('vendorscripts', function () {
-    var extra_js = [
-        __dirname + '/bower_compontents/foundation/js/foundation/foundation.topbar.js',
-        __dirname + '/bower_compontents/foundation/js/foundation/foundation.reveal.js'
-    ];
-    var vendor_scripts = bowerFiles().concat(extra_js);
     //console.log(vendor_scripts);
-    return gulp.src(vendor_scripts)
+    return gulp.src(bowerFiles())
         .pipe($.filter('**/*.js'))
         //.pipe($.uglify())
         .pipe($.concat('vendor.js'))
@@ -99,11 +94,19 @@ gulp.task('extras', function () {
         .pipe(gulp.dest('dist'));
 });
 
-gulp.task('clean', function (cb) {
-    del(['.tmp', 'dist'], cb);
+gulp.task('templates', function () {
+    return gulp.src('app/templates/*.html')
+        .pipe($.nunjucks())
+        .pipe($.concat('templates.js'))
+        .pipe(gulp.dest('dist/scripts'))
+        .pipe($.size());
 });
 
-gulp.task('build', ['vendorscripts', 'vendorstyles', 'distscripts', 'diststyles', 'images', 'fonts', 'extras']);
+gulp.task('clean', function (cb) {
+    del(['dist'], cb);
+});
+
+gulp.task('build', ['vendorscripts', 'vendorstyles', 'distscripts', 'diststyles', 'images', 'fonts', 'extras', 'templates']);
 
 gulp.task('default', ['clean'], function () {
     gulp.start('build');
@@ -126,6 +129,7 @@ gulp.task('watch', ['serve'], function () {
 
     gulp.watch('app/styles/**/*.scss', ['styles']);
     gulp.watch('app/scripts/**/*.js', ['scripts']);
+    gulp.watch('app/templates/**/*.html', ['templates']);
     gulp.watch('app/images/**/*', ['images']);
     gulp.watch('bower.json', ['vendorscripts']);
 });

static/package.json

@@ -15,6 +15,7 @@
     "gulp-imagemin": "^2.2.1",
     "gulp-jshint": "^1.11.0",
     "gulp-load-plugins": "^0.10.0",
+    "gulp-nunjucks": "^1.0.3",
     "gulp-plumber": "~1.0.1",
     "gulp-rename": "~1.2.2",
     "gulp-sass": "~2.0.1",