UI improvements, TODO updates
This commit is contained in:
nikolark committed
1 parent
adfc85f747
commit
2eb9ba5f30
7 files changed
+66
-48
No files matched your search
@@ -15,8 +15,6 @@
|
||||
|
||||
## TODO
|
||||
* Existing members adds membercard to user
|
||||
* Add labels for active/member status
|
||||
* Add label for existing card
|
||||
* support tablet (1280x800) resolution
|
||||
* Selected user in form: on select, display user details in register form.
|
||||
|
||||
@@ -24,22 +22,17 @@
|
||||
* tlf field
|
||||
* validates in javascript with phonenumber-package
|
||||
* onkeyup could shows matching user data from inside (name, expires)
|
||||
* cardnumber field
|
||||
* js validation
|
||||
* js lookup from membercardnumber table
|
||||
* verify form consistency
|
||||
* submit button
|
||||
* change text to "... and renew" if existing member
|
||||
* grey if form invalid
|
||||
* blue if form valid
|
||||
* grey out on submit
|
||||
* verify consistency
|
||||
|
||||
### Other
|
||||
* Inside auth and models
|
||||
* local users tied to inside user
|
||||
* maybe user add page
|
||||
* Inside auth
|
||||
|
||||
### Backend
|
||||
* store in inside-table din_phonenumber, din_usedmembercard, din_user
|
||||
* lookup inside user table
|
||||
* lookup sms-tables in inside
|
||||
|
||||
@@ -51,7 +51,7 @@ function validate_cardnumber(val) {
|
||||
return 'Card number should start with 1.';
|
||||
}
|
||||
if(val.length !== 9) {
|
||||
return 'Card Number should be 9 digits long';
|
||||
return 'Card number should be 9 digits long';
|
||||
}
|
||||
|
||||
return '';
|
||||
|
||||
@@ -27,10 +27,13 @@ body {
|
||||
.label {
|
||||
font-size: 1em;
|
||||
}
|
||||
.card {
|
||||
.label-card {
|
||||
border: 1px solid #555;
|
||||
color: #555;
|
||||
}
|
||||
.label-is-active {
|
||||
background-color: darkred;
|
||||
}
|
||||
[type=radio] {
|
||||
margin-right: 4px;
|
||||
|
||||
@@ -40,12 +43,22 @@ body {
|
||||
}
|
||||
&.selected {
|
||||
background-color: #eee;
|
||||
.selected-icon {
|
||||
visibility: visible;
|
||||
}
|
||||
}
|
||||
&.has-card {
|
||||
padding-left: 44px;
|
||||
}
|
||||
}
|
||||
|
||||
.selected-icon {
|
||||
visibility: hidden;
|
||||
float: right;
|
||||
bottom: 48px;
|
||||
position: relative;
|
||||
font-size: 1.5em;
|
||||
color: #5cb85c;
|
||||
}
|
||||
|
||||
/* Footer */
|
||||
.credits {
|
||||
|
||||
@@ -7,21 +7,28 @@
|
||||
{% endif %}
|
||||
<!-- Name -->
|
||||
{{ res.firstname }} {{ res.lastname }}
|
||||
<!-- Card label -->
|
||||
{% if res.cardno and not res.card_is_legacy %}
|
||||
<span class="card label"><span class="glyphicon glyphicon-user"></span> {{ res.cardno }}</span>
|
||||
{% else %}
|
||||
<span class="card label"><span class="glyphicon glyphicon-user"></span> No card</span>
|
||||
{% endif %}
|
||||
<!-- Membership label -->
|
||||
{% if res.is_member == "1" %}
|
||||
<span class="label label-success">Member: {{res.expires|default('Lifelong')}}</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 %}
|
||||
<div class="labels">
|
||||
<!-- Membership -->
|
||||
{% if res.is_member == "1" %}
|
||||
<span class="label label-success">Member: {{res.expires|default('Lifelong')}}</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 %}
|
||||
<!-- Card -->
|
||||
{% if res.cardno and not res.card_is_legacy %}
|
||||
<span class="label label-card "><span class="glyphicon glyphicon-user"></span> {{ res.cardno }}</span>
|
||||
{% else %}
|
||||
<span class="label label-card "><span class="glyphicon glyphicon-user"></span> No card</span>
|
||||
{% endif %}
|
||||
<!-- Is active -->
|
||||
{% if res.is_active == "1" %}
|
||||
<span class="label label-is-active">Active</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if not res.cardno or res.card_is_legacy %}
|
||||
<div class="selected-icon"><span class="glyphicon glyphicon-ok"></span></div>
|
||||
</label>
|
||||
{% else %}
|
||||
</div>
|
||||
|
||||
Vendored
+1
-1
@@ -51,7 +51,7 @@ function validate_cardnumber(val) {
|
||||
return 'Card number should start with 1.';
|
||||
}
|
||||
if(val.length !== 9) {
|
||||
return 'Card Number should be 9 digits long';
|
||||
return 'Card number should be 9 digits long';
|
||||
}
|
||||
|
||||
return '';
|
||||
|
||||
Vendored
+24
-19
@@ -41,40 +41,45 @@ 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<!-- Card label -->\n";
|
||||
if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) && !runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"card_is_legacy", env.opts.autoescape)) {
|
||||
output += "\n <span class=\"card label\"><span class=\"glyphicon glyphicon-user\"></span> ";
|
||||
output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape), env.opts.autoescape);
|
||||
output += "</span>\n";
|
||||
;
|
||||
}
|
||||
else {
|
||||
output += "\n <span class=\"card label\"><span class=\"glyphicon glyphicon-user\"></span> No card</span>\n";
|
||||
;
|
||||
}
|
||||
output += "\n<!-- Membership label -->\n";
|
||||
output += "\n<div class=\"labels\">\n <!-- Membership -->\n ";
|
||||
if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
|
||||
output += "\n <span class=\"label label-success\">Member: ";
|
||||
output += "\n <span class=\"label label-success\">Member: ";
|
||||
output += runtime.suppressValue(env.getFilter("default").call(context, runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"expires", env.opts.autoescape),"Lifelong"), env.opts.autoescape);
|
||||
output += "</span>\n";
|
||||
output += "</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";
|
||||
output += "\n <span class=\"label label-default\">Registered</span>\n ";
|
||||
;
|
||||
}
|
||||
else {
|
||||
output += "\n <span class=\"label label-warning\">Expired: ";
|
||||
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 += "</span>\n ";
|
||||
;
|
||||
}
|
||||
;
|
||||
}
|
||||
output += "\n";
|
||||
output += "\n <!-- Card -->\n ";
|
||||
if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) && !runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"card_is_legacy", env.opts.autoescape)) {
|
||||
output += "\n <span class=\"label label-card \"><span class=\"glyphicon glyphicon-user\"></span> ";
|
||||
output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape), env.opts.autoescape);
|
||||
output += "</span>\n ";
|
||||
;
|
||||
}
|
||||
else {
|
||||
output += "\n <span class=\"label label-card \"><span class=\"glyphicon glyphicon-user\"></span> No card</span>\n ";
|
||||
;
|
||||
}
|
||||
output += "\n <!-- Is active -->\n ";
|
||||
if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_active", env.opts.autoescape) == "1") {
|
||||
output += "\n <span class=\"label label-is-active\">Active</span>\n ";
|
||||
;
|
||||
}
|
||||
output += "\n</div>\n";
|
||||
if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"card_is_legacy", env.opts.autoescape)) {
|
||||
output += "\n </label>\n";
|
||||
output += "\n <div class=\"selected-icon\"><span class=\"glyphicon glyphicon-ok\"></span></div>\n </label>\n";
|
||||
;
|
||||
}
|
||||
else {
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
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
|
||||
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
|
||||
Reference in new issue
Block a user