| author | nowmad@nowmads-macbook-pro.local |
| Thu, 10 Dec 2015 17:04:51 +0100 | |
| changeset 50 | 182f46ea5a56 |
| parent 23 | 037687868bc4 (current diff) |
| parent 49 | 66739650678f (diff) |
| child 51 | 70dff07a76ff |
| cms/app-client/app/controllers/visus/visu-carto.js | file | annotate | diff | comparison | revisions | |
| cms/app-client/app/templates/visus/visu-carto.hbs | file | annotate | diff | comparison | revisions | |
| cms/app-client/app/templates/visus/visu-chrono.hbs | file | annotate | diff | comparison | revisions | |
| cms/app-client/app/templates/visus/visu-discours.hbs | file | annotate | diff | comparison | revisions | |
| cms/app-client/app/templates/visus/visu-langues.hbs | file | annotate | diff | comparison | revisions | |
| cms/app-client/app/templates/visus/visu-thematiques.hbs | file | annotate | diff | comparison | revisions |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/adapters/application.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,16 @@ +import DS from 'ember-data'; + +export default DS.FixtureAdapter.extend({ + host: 'http://127.0.0.1', + namespace: 'api', + queryFixtures: function(records, query, type) { + return records.filter(function(record) { + for(var key in query) { + if (!query.hasOwnProperty(key)) { continue; } + var value = query[key]; + if (record[key] !== value) { return false; } + } + return true; + }); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/components/visu-carto.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,130 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + // storage: Ember.inject.service(), + didInsertElement: function(){ + console.log('test: ', this.get("query")); + + this.get("query").map(item => { + console.log(item.get('name')); + }); + + var continentsDataProvider; + var backIconSVG = "M16,1.466C7.973,1.466,1.466,7.973,1.466,16c0,8.027,6.507,14.534,14.534,14.534c8.027,0,14.534-6.507,14.534-14.534C30.534,7.973,24.027,1.466,16,1.466zM27.436,17.39c0.001,0.002,0.004,0.002,0.005,0.004c-0.022,0.187-0.054,0.37-0.085,0.554c-0.015-0.012-0.034-0.025-0.047-0.036c-0.103-0.09-0.254-0.128-0.318-0.115c-0.157,0.032,0.229,0.305,0.267,0.342c0.009,0.009,0.031,0.03,0.062,0.058c-1.029,5.312-5.709,9.338-11.319,9.338c-4.123,0-7.736-2.18-9.776-5.441c0.123-0.016,0.24-0.016,0.28-0.076c0.051-0.077,0.102-0.241,0.178-0.331c0.077-0.089,0.165-0.229,0.127-0.292c-0.039-0.064,0.101-0.344,0.088-0.419c-0.013-0.076-0.127-0.256,0.064-0.407s0.394-0.382,0.407-0.444c0.012-0.063,0.166-0.331,0.152-0.458c-0.012-0.127-0.152-0.28-0.24-0.318c-0.09-0.037-0.28-0.05-0.356-0.151c-0.077-0.103-0.292-0.203-0.368-0.178c-0.076,0.025-0.204,0.05-0.305-0.015c-0.102-0.062-0.267-0.139-0.33-0.189c-0.065-0.05-0.229-0.088-0.305-0.088c-0.077,0-0.065-0.052-0.178,0.101c-0.114,0.153,0,0.204-0.204,0.177c-0.204-0.023,0.025-0.036,0.141-0.189c0.113-0.152-0.013-0.242-0.141-0.203c-0.126,0.038-0.038,0.115-0.241,0.153c-0.203,0.036-0.203-0.09-0.076-0.115s0.355-0.139,0.355-0.19c0-0.051-0.025-0.191-0.127-0.191s-0.077-0.126-0.229-0.291c-0.092-0.101-0.196-0.164-0.299-0.204c-0.09-0.579-0.15-1.167-0.15-1.771c0-2.844,1.039-5.446,2.751-7.458c0.024-0.02,0.048-0.034,0.069-0.036c0.084-0.009,0.31-0.025,0.51-0.059c0.202-0.034,0.418-0.161,0.489-0.153c0.069,0.008,0.241,0.008,0.186-0.042C8.417,8.2,8.339,8.082,8.223,8.082S8.215,7.896,8.246,7.896c0.03,0,0.186,0.025,0.178,0.11C8.417,8.091,8.471,8.2,8.625,8.167c0.156-0.034,0.132-0.162,0.102-0.195C8.695,7.938,8.672,7.853,8.642,7.794c-0.031-0.06-0.023-0.136,0.14-0.153C8.944,7.625,9.168,7.708,9.16,7.573s0-0.28,0.046-0.356C9.253,7.142,9.354,7.09,9.299,7.065C9.246,7.04,9.176,7.099,9.121,6.972c-0.054-0.127,0.047-0.22,0.108-0.271c0.02-0.015,0.067-0.06,0.124-0.112C11.234,5.257,13.524,4.466,16,4.466c3.213,0,6.122,1.323,8.214,3.45c-0.008,0.022-0.01,0.052-0.031,0.056c-0.077,0.013-0.166,0.063-0.179-0.051c-0.013-0.114-0.013-0.331-0.102-0.203c-0.089,0.127-0.127,0.127-0.127,0.191c0,0.063,0.076,0.127,0.051,0.241C23.8,8.264,23.8,8.341,23.84,8.341c0.036,0,0.126-0.115,0.239-0.141c0.116-0.025,0.319-0.088,0.332,0.026c0.013,0.115,0.139,0.152,0.013,0.203c-0.128,0.051-0.267,0.026-0.293-0.051c-0.025-0.077-0.114-0.077-0.203-0.013c-0.088,0.063-0.279,0.292-0.279,0.292s-0.306,0.139-0.343,0.114c-0.04-0.025,0.101-0.165,0.203-0.228c0.102-0.064,0.178-0.204,0.14-0.242c-0.038-0.038-0.088-0.279-0.063-0.343c0.025-0.063,0.139-0.152,0.013-0.216c-0.127-0.063-0.217-0.14-0.318-0.178s-0.216,0.152-0.305,0.204c-0.089,0.051-0.076,0.114-0.191,0.127c-0.114,0.013-0.189,0.165,0,0.254c0.191,0.089,0.255,0.152,0.204,0.204c-0.051,0.051-0.267-0.025-0.267-0.025s-0.165-0.076-0.268-0.076c-0.101,0-0.229-0.063-0.33-0.076c-0.102-0.013-0.306-0.013-0.355,0.038c-0.051,0.051-0.179,0.203-0.28,0.152c-0.101-0.051-0.101-0.102-0.241-0.051c-0.14,0.051-0.279-0.038-0.355,0.038c-0.077,0.076-0.013,0.076-0.255,0c-0.241-0.076-0.189,0.051-0.419,0.089s-0.368-0.038-0.432,0.038c-0.064,0.077-0.153,0.217-0.19,0.127c-0.038-0.088,0.126-0.241,0.062-0.292c-0.062-0.051-0.33-0.025-0.367,0.013c-0.039,0.038-0.014,0.178,0.011,0.229c0.026,0.05,0.064,0.254-0.011,0.216c-0.077-0.038-0.064-0.166-0.141-0.152c-0.076,0.013-0.165,0.051-0.203,0.077c-0.038,0.025-0.191,0.025-0.229,0.076c-0.037,0.051,0.014,0.191-0.051,0.203c-0.063,0.013-0.114,0.064-0.254-0.025c-0.14-0.089-0.14-0.038-0.178-0.012c-0.038,0.025-0.216,0.127-0.229,0.012c-0.013-0.114,0.025-0.152-0.089-0.229c-0.115-0.076-0.026-0.076,0.127-0.025c0.152,0.05,0.343,0.075,0.622-0.013c0.28-0.089,0.395-0.127,0.28-0.178c-0.115-0.05-0.229-0.101-0.406-0.127c-0.179-0.025-0.42-0.025-0.7-0.127c-0.279-0.102-0.343-0.14-0.457-0.165c-0.115-0.026-0.813-0.14-1.132-0.089c-0.317,0.051-1.193,0.28-1.245,0.318s-0.128,0.19-0.292,0.318c-0.165,0.127-0.47,0.419-0.712,0.47c-0.241,0.051-0.521,0.254-0.521,0.305c0,0.051,0.101,0.242,0.076,0.28c-0.025,0.038,0.05,0.229,0.191,0.28c0.139,0.05,0.381,0.038,0.393-0.039c0.014-0.076,0.204-0.241,0.217-0.127c0.013,0.115,0.14,0.292,0.114,0.368c-0.025,0.077,0,0.153,0.09,0.14c0.088-0.012,0.559-0.114,0.559-0.114s0.153-0.064,0.127-0.166c-0.026-0.101,0.166-0.241,0.203-0.279c0.038-0.038,0.178-0.191,0.014-0.241c-0.167-0.051-0.293-0.064-0.115-0.216s0.292,0,0.521-0.229c0.229-0.229-0.051-0.292,0.191-0.305c0.241-0.013,0.496-0.025,0.444,0.051c-0.05,0.076-0.342,0.242-0.508,0.318c-0.166,0.077-0.14,0.216-0.076,0.292c0.063,0.076,0.09,0.254,0.204,0.229c0.113-0.025,0.254-0.114,0.38-0.101c0.128,0.012,0.383-0.013,0.42-0.013c0.039,0,0.216,0.178,0.114,0.203c-0.101,0.025-0.229,0.013-0.445,0.025c-0.215,0.013-0.456,0.013-0.456,0.051c0,0.039,0.292,0.127,0.19,0.191c-0.102,0.063-0.203-0.013-0.331-0.026c-0.127-0.012-0.203,0.166-0.241,0.267c-0.039,0.102,0.063,0.28-0.127,0.216c-0.191-0.063-0.331-0.063-0.381-0.038c-0.051,0.025-0.203,0.076-0.331,0.114c-0.126,0.038-0.076-0.063-0.242-0.063c-0.164,0-0.164,0-0.164,0l-0.103,0.013c0,0-0.101-0.063-0.114-0.165c-0.013-0.102,0.05-0.216-0.013-0.241c-0.064-0.026-0.292,0.012-0.33,0.088c-0.038,0.076-0.077,0.216-0.026,0.28c0.052,0.063,0.204,0.19,0.064,0.152c-0.14-0.038-0.317-0.051-0.419,0.026c-0.101,0.076-0.279,0.241-0.279,0.241s-0.318,0.025-0.318,0.102c0,0.077,0,0.178-0.114,0.191c-0.115,0.013-0.268,0.05-0.42,0.076c-0.153,0.025-0.139,0.088-0.317,0.102s-0.204,0.089-0.038,0.114c0.165,0.025,0.418,0.127,0.431,0.241c0.014,0.114-0.013,0.242-0.076,0.356c-0.043,0.079-0.305,0.026-0.458,0.026c-0.152,0-0.456-0.051-0.584,0c-0.127,0.051-0.102,0.305-0.064,0.419c0.039,0.114-0.012,0.178-0.063,0.216c-0.051,0.038-0.065,0.152,0,0.204c0.063,0.051,0.114,0.165,0.166,0.178c0.051,0.013,0.215-0.038,0.279,0.025c0.064,0.064,0.127,0.216,0.165,0.178c0.039-0.038,0.089-0.203,0.153-0.166c0.064,0.039,0.216-0.012,0.331-0.025s0.177-0.14,0.292-0.204c0.114-0.063,0.05-0.063,0.013-0.14c-0.038-0.076,0.114-0.165,0.204-0.254c0.088-0.089,0.253-0.013,0.292-0.115c0.038-0.102,0.051-0.279,0.151-0.267c0.103,0.013,0.243,0.076,0.331,0.076c0.089,0,0.279-0.14,0.332-0.165c0.05-0.025,0.241-0.013,0.267,0.102c0.025,0.114,0.241,0.254,0.292,0.279c0.051,0.025,0.381,0.127,0.433,0.165c0.05,0.038,0.126,0.153,0.152,0.254c0.025,0.102,0.114,0.102,0.128,0.013c0.012-0.089-0.065-0.254,0.025-0.242c0.088,0.013,0.191-0.026,0.191-0.026s-0.243-0.165-0.331-0.203c-0.088-0.038-0.255-0.114-0.331-0.241c-0.076-0.127-0.267-0.153-0.254-0.279c0.013-0.127,0.191-0.051,0.292,0.051c0.102,0.102,0.356,0.241,0.445,0.33c0.088,0.089,0.229,0.127,0.267,0.242c0.039,0.114,0.152,0.241,0.19,0.292c0.038,0.051,0.165,0.331,0.204,0.394c0.038,0.063,0.165-0.012,0.229-0.063c0.063-0.051,0.179-0.076,0.191-0.178c0.013-0.102-0.153-0.178-0.203-0.216c-0.051-0.038,0.127-0.076,0.191-0.127c0.063-0.05,0.177-0.14,0.228-0.063c0.051,0.077,0.026,0.381,0.051,0.432c0.025,0.051,0.279,0.127,0.331,0.191c0.05,0.063,0.267,0.089,0.304,0.051c0.039-0.038,0.242,0.026,0.294,0.038c0.049,0.013,0.202-0.025,0.304-0.05c0.103-0.025,0.204-0.102,0.191,0.063c-0.013,0.165-0.051,0.419-0.179,0.546c-0.127,0.127-0.076,0.191-0.202,0.191c-0.06,0-0.113,0-0.156,0.021c-0.041-0.065-0.098-0.117-0.175-0.097c-0.152,0.038-0.344,0.038-0.47,0.19c-0.128,0.153-0.178,0.165-0.204,0.114c-0.025-0.051,0.369-0.267,0.317-0.331c-0.05-0.063-0.355-0.038-0.521-0.038c-0.166,0-0.305-0.102-0.433-0.127c-0.126-0.025-0.292,0.127-0.418,0.254c-0.128,0.127-0.216,0.038-0.331,0.038c-0.115,0-0.331-0.165-0.331-0.165s-0.216-0.089-0.305-0.089c-0.088,0-0.267-0.165-0.318-0.165c-0.05,0-0.19-0.115-0.088-0.166c0.101-0.05,0.202,0.051,0.101-0.229c-0.101-0.279-0.33-0.216-0.419-0.178c-0.088,0.039-0.724,0.025-0.775,0.025c-0.051,0-0.419,0.127-0.533,0.178c-0.116,0.051-0.318,0.115-0.369,0.14c-0.051,0.025-0.318-0.051-0.433,0.013c-0.151,0.084-0.291,0.216-0.33,0.216c-0.038,0-0.153,0.089-0.229,0.28c-0.077,0.19,0.013,0.355-0.128,0.419c-0.139,0.063-0.394,0.204-0.495,0.305c-0.102,0.101-0.229,0.458-0.355,0.623c-0.127,0.165,0,0.317,0.025,0.419c0.025,0.101,0.114,0.292-0.025,0.471c-0.14,0.178-0.127,0.266-0.191,0.279c-0.063,0.013,0.063,0.063,0.088,0.19c0.025,0.128-0.114,0.255,0.128,0.369c0.241,0.113,0.355,0.217,0.418,0.367c0.064,0.153,0.382,0.407,0.382,0.407s0.229,0.205,0.344,0.293c0.114,0.089,0.152,0.038,0.177-0.05c0.025-0.09,0.178-0.104,0.355-0.104c0.178,0,0.305,0.04,0.483,0.014c0.178-0.025,0.356-0.141,0.42-0.166c0.063-0.025,0.279-0.164,0.443-0.063c0.166,0.103,0.141,0.241,0.23,0.332c0.088,0.088,0.24,0.037,0.355-0.051c0.114-0.09,0.064-0.052,0.203,0.025c0.14,0.075,0.204,0.151,0.077,0.267c-0.128,0.113-0.051,0.293-0.128,0.47c-0.076,0.178-0.063,0.203,0.077,0.278c0.14,0.076,0.394,0.548,0.47,0.638c0.077,0.088-0.025,0.342,0.064,0.495c0.089,0.151,0.178,0.254,0.077,0.331c-0.103,0.075-0.28,0.216-0.292,0.47s0.051,0.431,0.102,0.521s0.177,0.331,0.241,0.419c0.064,0.089,0.14,0.305,0.152,0.445c0.013,0.14-0.024,0.306,0.039,0.381c0.064,0.076,0.102,0.191,0.216,0.292c0.115,0.103,0.152,0.318,0.152,0.318s0.039,0.089,0.051,0.229c0.012,0.14,0.025,0.228,0.152,0.292c0.126,0.063,0.215,0.076,0.28,0.013c0.063-0.063,0.381-0.077,0.546-0.063c0.165,0.013,0.355-0.075,0.521-0.19s0.407-0.419,0.496-0.508c0.089-0.09,0.292-0.255,0.268-0.356c-0.025-0.101-0.077-0.203,0.024-0.254c0.102-0.052,0.344-0.152,0.356-0.229c0.013-0.077-0.09-0.395-0.115-0.457c-0.024-0.064,0.064-0.18,0.165-0.306c0.103-0.128,0.421-0.216,0.471-0.267c0.051-0.053,0.191-0.267,0.217-0.433c0.024-0.167-0.051-0.369,0-0.457c0.05-0.09,0.013-0.165-0.103-0.268c-0.114-0.102-0.089-0.407-0.127-0.457c-0.037-0.051-0.013-0.319,0.063-0.345c0.076-0.023,0.242-0.279,0.344-0.393c0.102-0.114,0.394-0.47,0.534-0.496c0.139-0.025,0.355-0.229,0.368-0.343c0.013-0.115,0.38-0.547,0.394-0.635c0.013-0.09,0.166-0.42,0.102-0.497c-0.062-0.076-0.559,0.115-0.622,0.141c-0.064,0.025-0.241,0.127-0.446,0.113c-0.202-0.013-0.114-0.177-0.127-0.254c-0.012-0.076-0.228-0.368-0.279-0.381c-0.051-0.012-0.203-0.166-0.267-0.317c-0.063-0.153-0.152-0.343-0.254-0.458c-0.102-0.114-0.165-0.38-0.268-0.559c-0.101-0.178-0.189-0.407-0.279-0.572c-0.021-0.041-0.045-0.079-0.067-0.117c0.118-0.029,0.289-0.082,0.31-0.009c0.024,0.088,0.165,0.279,0.19,0.419s0.165,0.089,0.178,0.216c0.014,0.128,0.14,0.433,0.19,0.47c0.052,0.038,0.28,0.242,0.318,0.318c0.038,0.076,0.089,0.178,0.127,0.369c0.038,0.19,0.076,0.444,0.179,0.482c0.102,0.038,0.444-0.064,0.508-0.102s0.482-0.242,0.635-0.255c0.153-0.012,0.179-0.115,0.368-0.152c0.191-0.038,0.331-0.177,0.458-0.28c0.127-0.101,0.28-0.355,0.33-0.444c0.052-0.088,0.179-0.152,0.115-0.253c-0.063-0.103-0.331-0.254-0.433-0.268c-0.102-0.012-0.089-0.178-0.152-0.178s-0.051,0.088-0.178,0.153c-0.127,0.063-0.255,0.19-0.344,0.165s0.026-0.089-0.113-0.203s-0.192-0.14-0.192-0.228c0-0.089-0.278-0.255-0.304-0.382c-0.026-0.127,0.19-0.305,0.254-0.19c0.063,0.114,0.115,0.292,0.279,0.368c0.165,0.076,0.318,0.204,0.395,0.229c0.076,0.025,0.267-0.14,0.33-0.114c0.063,0.024,0.191,0.253,0.306,0.292c0.113,0.038,0.495,0.051,0.559,0.051s0.33,0.013,0.381-0.063c0.051-0.076,0.089-0.076,0.153-0.076c0.062,0,0.177,0.229,0.267,0.254c0.089,0.025,0.254,0.013,0.241,0.179c-0.012,0.164,0.076,0.305,0.165,0.317c0.09,0.012,0.293-0.191,0.293-0.191s0,0.318-0.012,0.433c-0.014,0.113,0.139,0.534,0.139,0.534s0.19,0.393,0.241,0.482s0.267,0.355,0.267,0.47c0,0.115,0.025,0.293,0.103,0.293c0.076,0,0.152-0.203,0.24-0.331c0.091-0.126,0.116-0.305,0.153-0.432c0.038-0.127,0.038-0.356,0.038-0.444c0-0.09,0.075-0.166,0.255-0.242c0.178-0.076,0.304-0.292,0.456-0.407c0.153-0.115,0.141-0.305,0.446-0.305c0.305,0,0.278,0,0.355-0.077c0.076-0.076,0.151-0.127,0.19,0.013c0.038,0.14,0.254,0.343,0.292,0.394c0.038,0.052,0.114,0.191,0.103,0.344c-0.013,0.152,0.012,0.33,0.075,0.33s0.191-0.216,0.191-0.216s0.279-0.189,0.267,0.013c-0.014,0.203,0.025,0.419,0.025,0.545c0,0.053,0.042,0.135,0.088,0.21c-0.005,0.059-0.004,0.119-0.009,0.178C27.388,17.153,27.387,17.327,27.436,17.39zM20.382,12.064c0.076,0.05,0.102,0.127,0.152,0.203c0.052,0.076,0.14,0.05,0.203,0.114c0.063,0.064-0.178,0.14-0.075,0.216c0.101,0.077,0.151,0.381,0.165,0.458c0.013,0.076-0.279,0.114-0.369,0.102c-0.089-0.013-0.354-0.102-0.445-0.127c-0.089-0.026-0.139-0.343-0.025-0.331c0.116,0.013,0.141-0.025,0.267-0.139c0.128-0.115-0.189-0.166-0.278-0.191c-0.089-0.025-0.268-0.305-0.331-0.394c-0.062-0.089-0.014-0.228,0.141-0.331c0.076-0.051,0.279,0.063,0.381,0c0.101-0.063,0.203-0.14,0.241-0.165c0.039-0.025,0.293,0.038,0.33,0.114c0.039,0.076,0.191,0.191,0.141,0.229c-0.052,0.038-0.281,0.076-0.356,0c-0.075-0.077-0.255,0.012-0.268,0.152C20.242,12.115,20.307,12.013,20.382,12.064zM16.875,12.28c-0.077-0.025,0.025-0.178,0.102-0.229c0.075-0.051,0.164-0.178,0.241-0.305c0.076-0.127,0.178-0.14,0.241-0.127c0.063,0.013,0.203,0.241,0.241,0.318c0.038,0.076,0.165-0.026,0.217-0.051c0.05-0.025,0.127-0.102,0.14-0.165s0.127-0.102,0.254-0.102s0.013,0.102-0.076,0.127c-0.09,0.025-0.038,0.077,0.113,0.127c0.153,0.051,0.293,0.191,0.459,0.279c0.165,0.089,0.19,0.267,0.088,0.292c-0.101,0.025-0.406,0.051-0.521,0.038c-0.114-0.013-0.254-0.127-0.419-0.153c-0.165-0.025-0.369-0.013-0.433,0.077s-0.292,0.05-0.395,0.05c-0.102,0-0.228,0.127-0.253,0.077C16.875,12.534,16.951,12.306,16.875,12.28zM17.307,9.458c0.063-0.178,0.419,0.038,0.355,0.127C17.599,9.675,17.264,9.579,17.307,9.458zM17.802,18.584c0.063,0.102-0.14,0.431-0.254,0.407c-0.113-0.027-0.076-0.318-0.038-0.382C17.548,18.545,17.769,18.529,17.802,18.584zM13.189,12.674c0.025-0.051-0.039-0.153-0.127-0.013C13.032,12.71,13.164,12.725,13.189,12.674zM20.813,8.035c0.141,0.076,0.339,0.107,0.433,0.013c0.076-0.076,0.013-0.204-0.05-0.216c-0.064-0.013-0.104-0.115,0.062-0.203c0.165-0.089,0.343-0.204,0.534-0.229c0.19-0.025,0.622-0.038,0.774,0c0.152,0.039,0.382-0.166,0.445-0.254s-0.203-0.152-0.279-0.051c-0.077,0.102-0.444,0.076-0.521,0.051c-0.076-0.025-0.686,0.102-0.812,0.102c-0.128,0-0.179,0.152-0.356,0.229c-0.179,0.076-0.42,0.191-0.509,0.229c-0.088,0.038-0.177,0.19-0.101,0.216C20.509,7.947,20.674,7.959,20.813,8.035zM14.142,12.674c0.064-0.089-0.051-0.217-0.114-0.217c-0.12,0-0.178,0.191-0.103,0.254C14.002,12.776,14.078,12.763,14.142,12.674zM14.714,13.017c0.064,0.025,0.114,0.102,0.165,0.114c0.052,0.013,0.217,0,0.167-0.127s-0.167-0.127-0.204-0.127c-0.038,0-0.203-0.038-0.267,0C14.528,12.905,14.65,12.992,14.714,13.017zM11.308,10.958c0.101,0.013,0.217-0.063,0.305-0.101c0.088-0.038,0.216-0.114,0.216-0.229c0-0.114-0.025-0.216-0.077-0.267c-0.051-0.051-0.14-0.064-0.216-0.051c-0.115,0.02-0.127,0.14-0.203,0.14c-0.076,0-0.165,0.025-0.14,0.114s0.077,0.152,0,0.19C11.117,10.793,11.205,10.946,11.308,10.958zM11.931,10.412c0.127,0.051,0.394,0.102,0.292,0.153c-0.102,0.051-0.28,0.19-0.305,0.267s0.216,0.153,0.216,0.153s-0.077,0.089-0.013,0.114c0.063,0.025,0.102-0.089,0.203-0.089c0.101,0,0.304,0.063,0.406,0.063c0.103,0,0.267-0.14,0.254-0.229c-0.013-0.089-0.14-0.229-0.254-0.28c-0.113-0.051-0.241-0.28-0.317-0.331c-0.076-0.051,0.076-0.178-0.013-0.267c-0.09-0.089-0.153-0.076-0.255-0.14c-0.102-0.063-0.191,0.013-0.254,0.089c-0.063,0.076-0.14-0.013-0.217,0.012c-0.102,0.035-0.063,0.166-0.012,0.229C11.714,10.221,11.804,10.361,11.931,10.412zM24.729,17.198c-0.083,0.037-0.153,0.47,0,0.521c0.152,0.052,0.241-0.202,0.191-0.267C24.868,17.39,24.843,17.147,24.729,17.198zM20.114,20.464c-0.159-0.045-0.177,0.166-0.304,0.306c-0.128,0.141-0.267,0.254-0.317,0.241c-0.052-0.013-0.331,0.089-0.242,0.279c0.089,0.191,0.076,0.382-0.013,0.472c-0.089,0.088,0.076,0.342,0.052,0.482c-0.026,0.139,0.037,0.229,0.215,0.229s0.242-0.064,0.318-0.229c0.076-0.166,0.088-0.331,0.164-0.47c0.077-0.141,0.141-0.434,0.179-0.51c0.038-0.075,0.114-0.316,0.102-0.457C20.254,20.669,20.204,20.489,20.114,20.464zM10.391,8.802c-0.069-0.06-0.229-0.102-0.306-0.11c-0.076-0.008-0.152,0.06-0.321,0.06c-0.168,0-0.279,0.067-0.347,0C9.349,8.684,9.068,8.65,9.042,8.692C9.008,8.749,8.941,8.751,9.008,8.87c0.069,0.118,0.12,0.186,0.179,0.178s0.262-0.017,0.288,0.051C9.5,9.167,9.569,9.226,9.712,9.184c0.145-0.042,0.263-0.068,0.296-0.119c0.033-0.051,0.263-0.059,0.263-0.059S10.458,8.861,10.391,8.802z"; + + var franceDataProvider = { + mapVar: AmCharts.maps.franceDepartmentsLow, + getAreasFromMap:true, + + areas: [ + { + id: "FR-01", + color: "#2D7073", + selectable: true, + autoZoom: false} + ] + }; + + var worldDataProvider = { + map: "worldLow", + getAreasFromMap: true, + images: [{ + svgPath: backIconSVG, + id: "backButton", + label: "Back to continents map", + rollOverColor: "#CC0000", + labelRollOverColor: "#CC0000", + useTargetsZoomValues: true, + left: 30, + bottom: 30, + labelFontSize: 15, + selectable: true + }], + areas: [ + { + id: "FR", + linkToObject: franceDataProvider, + color: "#2D7073", + passZoomValuesToTarget: false}, + { + id: "DE", + color: "#7CACAE", + passZoomValuesToTarget: false}, + { + id: "BE", + color: "#B0D1D3", + passZoomValuesToTarget: false}, + ] + }; + + + var continentsDataProvider = { + map: "continentsLow", + + areas: [{ + id: "africa", + linkToObject: worldDataProvider, + color: "#7CACAE", + passZoomValuesToTarget: true + }, { + id: "asia", + linkToObject: worldDataProvider, + color: "#E0EEEF", + passZoomValuesToTarget: true + }, { + id: "australia", + linkToObject: worldDataProvider, + color: "#E0EEEF", + passZoomValuesToTarget: true + }, { + id: "europe", + linkToObject: worldDataProvider, + color: "#2D7073", + passZoomValuesToTarget: true + }, { + id: "north_america", + linkToObject: worldDataProvider, + color: "#B0D1D3", + passZoomValuesToTarget: true + }, { + id: "south_america", + linkToObject: worldDataProvider, + color: "#E0EEEF", + passZoomValuesToTarget: true + }] + + }; + + + var map = AmCharts.makeChart("mapdiv", { + type: "map", + + + areasSettings: { + autoZoom: true, + rollOverOutlineColor: "#000000", + selectedOutlineColor: "#CC0000", + selectedColor: "green", + color: "#E0EEEF" + }, + + dataProvider: continentsDataProvider + + }); + + function handleGoHome() { + map.dataProvider = continentsDataProvider; + map.validateNow(); + } + function handleMapObjectClick (event) { + if (event.mapObject.id == "backButton") { + handleGoHome(); + } + console.log(event.mapObject.title); + } + + // monitor when home icon was clicked and also go to continents map + map.addListener("homeButtonClicked", handleGoHome); + map.addListener("clickMapObject", handleMapObjectClick); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/components/visu-chrono.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,28 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + didInsertElement: function(){ + var isMouseDown = false, + isHighlighted; + $("#our_table li") + .mousedown(function () { + isMouseDown = true; + $(this).toggleClass("highlighted"); + isHighlighted = $(this).hasClass("highlighted"); + return false; // prevent text selection + }) + .mouseover(function () { + if (isMouseDown) { + $(this).toggleClass("highlighted", isHighlighted); + } + }) + .bind("selectstart", function () { + return false; + }) + + $(document) + .mouseup(function () { + isMouseDown = false; + }); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/components/visu-langues.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,68 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + didInsertElement: function(){ + var data = google.visualization.arrayToDataTable([ + ['Location', 'Parent', 'Market trade volume (size)', 'Market increase/decrease (color)'], + ['Global', null, 0, 0], + ['Français', 'Global', 859, 859], + ['Alsacien', 'Global', 851, 851], + ['Breton', 'Global', 403, 403], + ['Occitan', 'Global', 344, 344], + ['Judéo-espagnol', 'Global', 77, 77], + ['Undetermined', 'Global', 45, 45], + ['Langues régionales', 'Global', 175, 175], + ['Langues non territoriales', 'Global', 48, 48], + ['Les Creoles', 'Global', 47, 47], + ['Guyane', 'Global', 59, 59], + ['Mayotte', 'Global', 20, 20], + ['Polynésie française', 'Global', 13, 13], + ['Wallis et Futuna', 'Global', 43, 43], + ['Nouvelle-Calédonie', 'Global', 68, 68], + ['Langues d’oïl', 'Langues régionales', 75, 75], + ['Francoprovençal', 'Langues régionales', 60, 60], + ['Corse', 'Langues régionales', 40, 40], + ['Langue des signes française (LSF)', 'Langues non territoriales', 40, 40], + ['Berbère', 'Langues non territoriales', 8, 8], + ['Creole de la Réunion', 'Les Creoles', 32, 32], + ['Creole de la Guadeloupe', 'Les Creoles', 15, 15], + ['Ndyuka-Trio Pidgin (njt)', 'Guyane', 31, 31], + ['Palikúr (plu)', 'Guyane', 6, 6], + ['Guianese Creole French (gcr)', 'Guyane', 4, 4], + ['Eastern Maroon Creole (djk)', 'Guyane', 16, 16], + ['Sranan Tongo (srn)', 'Guyane', 2, 2], + ['Maore Comorian (swb)', 'Mayotte', 2, 2], + ['Mauritian Sign Language (lsy)', 'Mayotte', 18, 18], + ['West Uvean (uve)', 'Polynésie française', 13, 13], + ['East Futuna (fud)', 'Wallis et Futuna', 23, 23], + ['Wallisian (wls)', 'Wallis et Futuna', 20, 20], + ['Nemi (nem)', 'Nouvelle-Calédonie', 15, 15], + ['Xârâcùù (ane)', 'Nouvelle-Calédonie', 12, 12], + ['Cemuhî (cam)', 'Nouvelle-Calédonie', 9, 9], + ['Xaragure (axx)', 'Nouvelle-Calédonie', 9, 9], + ['Iaai (iai)', 'Nouvelle-Calédonie', 8, 8], + ['Nêlêmwa-Nixumwak (nee)', 'Nouvelle-Calédonie', 4, 4], + ['Dehu (dhv)', 'Nouvelle-Calédonie', 2, 2], + ['Nengone (nen)', 'Nouvelle-Calédonie', 2, 2], + ['Ajië (aji)', 'Nouvelle-Calédonie', 1, 1], + ['Numee (kdk)', 'Nouvelle-Calédonie', 1, 1], + ['Yuaga (nua)', 'Nouvelle-Calédonie', 1, 1], + ['Bwatoo (bwa)', 'Nouvelle-Calédonie', 4, 4] + ]); + + + + + + var tree = new google.visualization.TreeMap(document.getElementById('chart_div')); + + tree.draw(data, { + minColor: '#E0EEEF', + midColor: '#7CACAE', + maxColor: '#2D7073', + headerHeight: 15, + fontColor: 'black', + showScale: true + }); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/controllers/results.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,17 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + queryParams: ['location'], + location: null, + filteredSounds: Ember.computed('location', 'model', function() { + var location = this.get('location'); + console.log("model ? ", this.get('model')); + var sounds = this.get('model'); + + if (location) { + return sounds.filterBy('location', location); + } else { + return sounds; + } + }) +});
--- a/cms/app-client/app/controllers/visus/visu-carto.js Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -import Ember from 'ember'; -import config from '../../config/environment'; - -export default Ember.Controller.extend({ - logoUrl: config.APP.baseStatic + "assets/images/logo.png" -});
--- a/cms/app-client/app/index.html Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/app/index.html Thu Dec 10 17:04:51 2015 +0100 @@ -26,14 +26,35 @@ <li> <a href="#"> PROJET </a> </li> <li> <a href="#"> RECHERCHE </a> </li> </ul> + <ul id="menu_main" class="menu_main"> + <li id="langues" class="sub-menu"> Langues </li> + <li id="cartographie" class="sub-menu"> Cartographie </li> + <li id="thematiques" class="sub-menu"> Thématiques </li> + <li id="discours" class="sub-menu"> Discours </li> + <li id="chronologie" class="sub-menu"> Chronologie </li> + </ul> + <ul class="menu_main"> + <li class="sub-menu"> <a href="#/langues"> Langues </a> </li> + <li class="sub-menu"> <a href="#/cartographie"> Cartographie </a> </li> + <li class="sub-menu"> <a href="#/thematiques"> Thématiques </a> </li> + <li class="sub-menu"> <a href="#/discours"> Discours </a> </li> + <li class="sub-menu"> <a href="#/chronologie"> Chronologie </a> </li> + </ul> </div> </div> {{content-for 'body'}} <div id="corpus-app"></div> - + + <script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1.1','packages':['treemap']}]}"></script> <script src="assets/vendor.js"></script> <script src="assets/app-client.js"></script> + <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> + <script> + $("#menu_main .sub-menu").click(function(){ + window.history.pushState('', '', this.id); + }) + </script> {{content-for 'body-footer'}} </body>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/models/sound.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,37 @@ +import DS from 'ember-data'; + +var Sound = DS.Model.extend({ + name: DS.attr('string'), + audio: DS.attr('url') +}); + +Sound.reopenClass({ + FIXTURES: [ + { + id: 1, + name: "Sound 1", + location: "france", + language: "alsacien", + datetime: 1990, + audio: "http://sound1.mp3" + }, + { + id: 2, + name: "Sound 2", + location: "france", + language: "breton", + datetime: 1965, + audio: "http://sound2.mp3" + }, + { + id: 3, + name: "Sound 3", + location: "spain", + language: "judeo-espagnol", + datetime: 2002, + audio: "http://sound3.mp3" + } + ] +}); + +export default Sound;
--- a/cms/app-client/app/router.js Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/app/router.js Thu Dec 10 17:04:51 2015 +0100 @@ -6,11 +6,17 @@ }); Router.map(function() { - this.route('visus/visu-langues', { path: '/langues' }); - this.route('visus/visu-carto', { path: '/cartographie' }); - this.route('visus/visu-thematiques', { path: '/thematiques' }); - this.route('visus/visu-discours', { path: '/discours' }); - this.route('visus/visu-chrono', { path: '/chronologie' }); + this.route('tabs/langues', { path: '/langues' }); + this.route('tabs/carto', { path: '/cartographie' }); + this.route('tabs/thematiques', { path: '/thematiques' }); + this.route('tabs/discours', { path: '/discours' }); + this.route('tabs/chrono', { path: '/chronologie' }); +}); + +Router.reopen({ + onUrlChange: function() { + console.log(this.get('url')); + }.observes('currentPath') }); export default Router;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/routes/application.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model() { + return this.store.findAll('sound'); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/routes/tabs/carto.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,10 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + renderTemplate() { + this.render({ outlet: 'carto' }); + }, + model() { + return this.store.find('sound', { location: "france" }); + } +});
--- a/cms/app-client/app/styles/app.scss Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/app/styles/app.scss Thu Dec 10 17:04:51 2015 +0100 @@ -1,11 +1,19 @@ #corpus-app { border: 1px solid; - width: 940px; + width: 1108px; height: 900px; display: block; margin-left: auto; margin-right: auto; margin-bottom: 10px; + + @import 'chrono'; +} + +.mapdiv{ + width: 470px; + background-color: #FFFFFF; + height: 500px; } .corpus-app {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/chrono.scss Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,19 @@ +#our_table ul { + margin: 0; +} + +#our_table li { + width:30px; + height:30px; + text-align:center; + vertical-align:middle; + background-color:#B0D1D3; + display: inline-block; + margin: 1px -1px; + line-height: 30px; + cursor: pointer; +} + +#our_table li.highlighted { + background-color:#2D7073; +}
--- a/cms/app-client/app/templates/application.hbs Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/app/templates/application.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -1,22 +1,23 @@ <div class="corpus-app-container"> <ul class="corpus-app-em-tab-list"> - {{#link-to 'visus/visu-langues' tagName="li" class='corpus-app-em-tab'}} - {{link-to 'Langues' 'visus/visu-langues'}} + {{#link-to 'tabs/langues' tagName="li" class='corpus-app-em-tab'}} + {{link-to 'Langues' 'tabs/langues'}} {{/link-to}} - {{#link-to 'visus/visu-carto' tagName="li" class='corpus-app-em-tab'}} - {{link-to 'Cartographie' 'visus/visu-carto'}} + {{#link-to 'tabs/carto' tagName="li" class='corpus-app-em-tab'}} + {{link-to 'Cartographie' 'tabs/carto'}} {{/link-to}} - {{#link-to 'visus/visu-thematiques' tagName="li" class='corpus-app-em-tab'}} - {{link-to 'Thématiques' 'visus/visu-thematiques'}} + {{#link-to 'tabs/thematiques' tagName="li" class='corpus-app-em-tab'}} + {{link-to 'Thématiques' 'tabs/thematiques'}} {{/link-to}} - {{#link-to 'visus/visu-discours' tagName="li" class='corpus-app-em-tab'}} - {{link-to 'Discours' 'visus/visu-discours'}} + {{#link-to 'tabs/discours' tagName="li" class='corpus-app-em-tab'}} + {{link-to 'Discours' 'tabs/discours'}} {{/link-to}} - {{#link-to 'visus/visu-chrono' tagName="li" class='corpus-app-em-tab'}} - {{link-to 'Chronologie' 'visus/visu-chrono'}} + {{#link-to 'tabs/chrono' tagName="li" class='corpus-app-em-tab'}} + {{link-to 'Chronologie' 'tabs/chrono'}} {{/link-to}} </ul> {{outlet}} + <div class="carto">{{outlet "carto"}}</div> </div> <div class="corpus-app-wrapper">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/components/visu-carto.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,1 @@ +<div id="mapdiv" style="width:100%; height:800px;"></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/components/visu-chrono.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,74 @@ +<div cellpadding="0" cellspacing="0" id="our_table"> + <ul> 1960 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> + <ul> 1970 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> + <ul> 1980 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> + <ul> 1990 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> + <ul> 2000 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> + <ul> 2010 - + <li>0</li> + <li>1</li> + <li>2</li> + <li>3</li> + <li>4</li> + <li>5</li> + <li>6</li> + <li>7</li> + <li>8</li> + <li>9</li> + </ul> +</div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/components/visu-langues.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,1 @@ +<div id="chart_div" style="width: 560px; height: 780px;"></div>
--- a/cms/app-client/app/templates/results.hbs Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/app/templates/results.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -1,4 +1,9 @@ <h2>This is the results</h2> <div class="corpus-app-content"> RESULTS + {{#each model as |item| }} + <p> + <strong>{{ item.name }}</strong> + </p> + {{/each}} </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/tabs/carto.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,2 @@ +<h2>Recherche par cartographie</h2> +{{visu-carto query=model}}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/tabs/chrono.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,2 @@ +<h2>Recherche par chronologie</h2> +{{visu-chrono}}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/tabs/discours.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,1 @@ +<h2>Recherche par discours</h2>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/tabs/langues.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,2 @@ +<h2>Recherche par langues</h2> +{{visu-langues}}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/tabs/thematiques.hbs Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,1 @@ +<h2>Recherche par thematiques</h2>
--- a/cms/app-client/app/templates/visus/visu-carto.hbs Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -<h2>Recherche par cartographie</h2> -<p>With a Logo !</p> -<img src={{logoUrl}} alt="Logo">
--- a/cms/app-client/app/templates/visus/visu-chrono.hbs Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -<h2>Recherche par chronologie</h2>
--- a/cms/app-client/app/templates/visus/visu-discours.hbs Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -<h2>Recherche par discours</h2>
--- a/cms/app-client/app/templates/visus/visu-langues.hbs Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -<h2>Recherche par langues</h2>
--- a/cms/app-client/app/templates/visus/visu-thematiques.hbs Thu Dec 10 16:05:53 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -<h2>Recherche par thematiques</h2>
--- a/cms/app-client/bower.json Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/bower.json Thu Dec 10 17:04:51 2015 +0100 @@ -12,6 +12,7 @@ "jquery": "^1.11.3", "loader.js": "ember-cli/loader.js#3.2.1", "qunit": "~1.18.0", - "bootstrap-sass": "~3.3.5" + "bootstrap-sass": "~3.3.5", + "ammap3": "~3.17.3" } }
--- a/cms/app-client/config/environment.js Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/config/environment.js Thu Dec 10 17:04:51 2015 +0100 @@ -6,7 +6,11 @@ modulePrefix: 'app-client', environment: environment, baseURL: '/corpus', - locationType: 'auto', + // locationType: '', + // contentSecurityPolicy: { + // 'default-src': "'none'", + // 'style-src': "'self' 'http://localhost:4200'" + // }, APP: { baseStatic: '', // Here you can pass flags/options to your application instance
--- a/cms/app-client/ember-cli-build.js Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/ember-cli-build.js Thu Dec 10 17:04:51 2015 +0100 @@ -26,6 +26,10 @@ // modules that you would like to import into your application // please specify an object with the list of modules as keys // along with the exports of each module as its value. + app.import('bower_components/ammap3/ammap/ammap.js'); + app.import('bower_components/ammap3/ammap/maps/js/worldLow.js'); + app.import('bower_components/ammap3/ammap/maps/js/continentsLow.js'); + app.import('bower_components/ammap3/ammap/maps/js/franceDepartmentsLow.js'); return app.toTree(); };
--- a/cms/app-client/public/styles.css Thu Dec 10 16:05:53 2015 +0100 +++ b/cms/app-client/public/styles.css Thu Dec 10 17:04:51 2015 +0100 @@ -3,9 +3,9 @@ } .header { /*background-color: green;*/ - width: 940px; + width: 1108px; height: 90px; - display: block; + display: table; margin-left: auto; margin-right: auto; margin-bottom: 1px; @@ -37,8 +37,8 @@ position:relative; left:50%; padding: 0; - display: inline-block; - width: 100%; + display: table; + width: auto; float: none; margin: 0 auto 0 auto; } @@ -64,3 +64,8 @@ font-weight: 900; background-color: bisque; } + +.sub-menu{ + margin-right: 10px; + cursor: pointer; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/integration/components/visu-carto-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,26 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('visu-carto', 'Integration | Component | visu carto', { + integration: true +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{visu-carto}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#visu-carto}} + template block text + {{/visu-carto}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/integration/components/visu-chrono-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,26 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('visu-chrono', 'Integration | Component | visu chrono', { + integration: true +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{visu-chrono}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#visu-chrono}} + template block text + {{/visu-chrono}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/integration/components/visu-langues-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,26 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('visu-langues', 'Integration | Component | visu langues', { + integration: true +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{visu-langues}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#visu-langues}} + template block text + {{/visu-langues}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/adapters/application-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('adapter:application', 'Unit | Adapter | application', { + // Specify the other units that are required for this test. + // needs: ['serializer:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + var adapter = this.subject(); + assert.ok(adapter); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/controllers/results-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('controller:results', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + var controller = this.subject(); + assert.ok(controller); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/models/sound-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('sound', 'Unit | Model | sound', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + var model = this.subject(); + // var store = this.store(); + assert.ok(!!model); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/routes/application-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:application', 'Unit | Route | application', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + var route = this.subject(); + assert.ok(route); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/routes/results-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:results', 'Unit | Route | results', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + var route = this.subject(); + assert.ok(route); +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/unit/routes/sound-test.js Thu Dec 10 17:04:51 2015 +0100 @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:sound', 'Unit | Route | sound', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + var route = this.subject(); + assert.ok(route); +});