# HG changeset patch # User Chloe Laisne # Date 1468802268 -7200 # Node ID d7ab83ecf7379455ddc5181b696345c73960ad1b # Parent 0f29cc270f9eabc254edce08f4b8b8ee17f3160b Checked/indeterminate states with /langues endpoint checkboxes diff -r 0f29cc270f9e -r d7ab83ecf737 cms/app-client/app/helpers/is-checked.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/helpers/is-checked.js Mon Jul 18 02:37:48 2016 +0200 @@ -0,0 +1,20 @@ +import Ember from 'ember'; + +export function isChecked(params) { + var dates = params[0]; + + var decade = []; + var next = params[1] + 10; + while(params[1] < next) { + decade.push(params[1]); + params[1] ++; + } + + var filter = decade.filter(function(date){ return dates.indexOf(date) > -1; }); + if(filter.length === decade.length) { + return true + } + return false; +} + +export default Ember.Helper.helper(isChecked); diff -r 0f29cc270f9e -r d7ab83ecf737 cms/app-client/app/helpers/is-indeterminate.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/helpers/is-indeterminate.js Mon Jul 18 02:37:48 2016 +0200 @@ -0,0 +1,20 @@ +import Ember from 'ember'; + +export function isIndeterminate(params) { + var dates = params[0]; + + var decade = []; + var next = params[1] + 10; + while(params[1] < next) { + decade.push(params[1]); + params[1] ++; + } + + var filter = decade.filter(function(date){ return dates.indexOf(date) > -1; }); + if(filter.length !== decade.length && filter.length) { + return true + } + return false; +} + +export default Ember.Helper.helper(isIndeterminate); diff -r 0f29cc270f9e -r d7ab83ecf737 cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Sun Jul 17 23:58:55 2016 +0200 +++ b/cms/app-client/app/styles/app.scss Mon Jul 18 02:37:48 2016 +0200 @@ -75,9 +75,9 @@ } .corpus-app-container h2 { - padding: 20px; - font-size: 16px; - color: $dark-blue; + color: $dark-grey; + line-height: 60px; + font-size: 14px; } .corpus-window { diff -r 0f29cc270f9e -r d7ab83ecf737 cms/app-client/app/styles/tabs/chrono.scss --- a/cms/app-client/app/styles/tabs/chrono.scss Sun Jul 17 23:58:55 2016 +0200 +++ b/cms/app-client/app/styles/tabs/chrono.scss Mon Jul 18 02:37:48 2016 +0200 @@ -1,10 +1,11 @@ #chrono-table{ - margin-top: 40px; - line-height: 40px; + margin-top: 54px; + line-height: 43px; } #chrono-table .interval { margin-bottom: 5px; + overflow: hidden; } #chrono-table .decades { @@ -21,21 +22,20 @@ } #chrono-table li { - width: 40px; - height: 40px; + width: 43px; + height: 43px; text-align: center; vertical-align: middle; display: inline-block; margin: 0px 0px 0px 5px; cursor: pointer; - background-color: $medium-grey; - color: $light-blue; + background-color: $light-blue; + color: $medium-blue; font-size: 12px; box-sizing: border-box; } #chrono-table li.highlighted { color: $light-white; - border: 1px solid $light-white; background-color: $medium-blue; } diff -r 0f29cc270f9e -r d7ab83ecf737 cms/app-client/app/templates/components/visu-chrono.hbs --- a/cms/app-client/app/templates/components/visu-chrono.hbs Sun Jul 17 23:58:55 2016 +0200 +++ b/cms/app-client/app/templates/components/visu-chrono.hbs Mon Jul 18 02:37:48 2016 +0200 @@ -1,5 +1,5 @@
- 1960 + {{input type="checkbox" checked=(is-checked filter.date 1960) indeterminate=(is-indeterminate filter.date 1960) click=(action 'selectDecade' 1960)}}
- 1970 + {{input type="checkbox" checked=(is-checked filter.date 1970) indeterminate=(is-indeterminate filter.date 1970) click=(action 'selectDecade' 1970)}}
- 1980 + {{input type="checkbox" checked=(is-checked filter.date 1980) indeterminate=(is-indeterminate filter.date 1980) click=(action 'selectDecade' 1980)}}
- 1990 + {{input type="checkbox" checked=(is-checked filter.date 1990) indeterminate=(is-indeterminate filter.date 1990) click=(action 'selectDecade' 1990)}}
- 2000 + {{input type="checkbox" checked=(is-checked filter.date 2000) indeterminate=(is-indeterminate filter.date 2000) click=(action 'selectDecade' 2000)}}
- 2010 + {{input type="checkbox" checked=(is-checked filter.date 2010) indeterminate=(is-indeterminate filter.date 2010) click=(action 'selectDecade' 2010)}}