From 9dc7f80d3b6658f981db002c7ebab63e04b1b649 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Wed, 8 Jul 2015 23:47:17 +0200 Subject: [PATCH] Use nunjucks for templating, cleanups --- apps/kassa/templates/base.html | 1 + static/app/scripts/app.js | 31 +----- static/app/styles/app.scss | 3 +- static/app/templates/search_result.html | 21 ++++ static/app/templates/search_results.html | 5 + static/bower.json | 3 +- static/dist/scripts/app.js | 31 +----- static/dist/scripts/templates.js | 122 +++++++++++++++++++++++ static/dist/scripts/vendor.js | 6 ++ static/dist/styles/app.css | 2 +- static/gulpfile.js | 22 ++-- static/package.json | 1 + 12 files changed, 175 insertions(+), 73 deletions(-) create mode 100644 static/app/templates/search_result.html create mode 100644 static/app/templates/search_results.html create mode 100644 static/dist/scripts/templates.js diff --git a/apps/kassa/templates/base.html b/apps/kassa/templates/base.html index 52648e5..d3a8966 100644 --- a/apps/kassa/templates/base.html +++ b/apps/kassa/templates/base.html @@ -10,6 +10,7 @@ + diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js index 94f4975..404c2cc 100644 --- a/static/app/scripts/app.js +++ b/static/app/scripts/app.js @@ -1,34 +1,5 @@ function format_results(results) { - var html = '
'; - 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 = ' Member '; - css_classes += ' member'; - } else if(expires === '0000-00-00') { - add_to_button = ' '; - label = ' Registered '; - css_classes += ' registered'; - } else { - add_to_button = ' '; - label = ' Expired: '+ expires +' '; - css_classes += ' expired'; - } - - if(is_member) { - html += '
' + add_to_button + res.firstname + ' ' + res.lastname + label + '
'; - } else { - html += ''; - } - } - return html + '
'; + return nunjucks.render('search_results.html', {'results':results}); } $(document).ready(function(){ diff --git a/static/app/styles/app.scss b/static/app/styles/app.scss index 99c2151..fe7af61 100644 --- a/static/app/styles/app.scss +++ b/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; } } diff --git a/static/app/templates/search_result.html b/static/app/templates/search_result.html new file mode 100644 index 0000000..2cd5100 --- /dev/null +++ b/static/app/templates/search_result.html @@ -0,0 +1,21 @@ +{% if not res.cardno or res.legacy_card_number %} +