# HG changeset patch # User nowmad@23.1.168.192.in-addr.arpa # Date 1453464947 -3600 # Node ID 2e6bfce6f99cf060c8c87ab935c9957e80cda672 # Parent 32c0f831de4565207344827c7a3825578f86b99a add details tab for perma-link to documents diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/components/visu-chrono.js --- a/cms/app-client/app/components/visu-chrono.js Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/components/visu-chrono.js Fri Jan 22 13:15:47 2016 +0100 @@ -10,7 +10,7 @@ var isMouseDown = false, isHighlighted; - Ember.$("#our_table li").mousedown(function () { + Ember.$("#chrono-table li").mousedown(function () { isMouseDown = true; Ember.$(this).toggleClass("highlighted"); isHighlighted = Ember.$(this).hasClass("highlighted"); diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/router.js --- a/cms/app-client/app/router.js Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/router.js Fri Jan 22 13:15:47 2016 +0100 @@ -6,6 +6,7 @@ }); Router.map(function() { + this.route('tabs/detail', { path: '/detail/:document_id' }); this.route('tabs/langues', { path: '/langues' }); this.route('tabs/carto', { path: '/cartographie' }); this.route('tabs/thematiques', { path: '/thematiques' }); diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/routes/tabs/carto.js --- a/cms/app-client/app/routes/tabs/carto.js Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/routes/tabs/carto.js Fri Jan 22 13:15:47 2016 +0100 @@ -1,9 +1,6 @@ import Ember from 'ember'; export default Ember.Route.extend({ - renderTemplate() { - this.render({ outlet: 'carto' }); - }, actions: { queryParamsDidChange: function() { console.log("carto params"); diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/routes/tabs/detail.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/routes/tabs/detail.js Fri Jan 22 13:15:47 2016 +0100 @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model(params) { + console.log("test"); + return this.store.findRecord('document', params.document_id); + } +}); diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/styles/app.scss Fri Jan 22 13:15:47 2016 +0100 @@ -12,6 +12,7 @@ @import 'tabs/langues'; @import 'tabs/discours'; @import 'tabs/thematiques'; + @import 'tabs/detail'; } .mapdiv{ diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/styles/tabs/chrono.scss --- a/cms/app-client/app/styles/tabs/chrono.scss Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/styles/tabs/chrono.scss Fri Jan 22 13:15:47 2016 +0100 @@ -1,19 +1,23 @@ -#our_table ul { +#chrono-table{ + margin-top: 40px; +} + +#chrono-table ul { margin: 0; } -#our_table li { +#chrono-table li { width:40px; height:40px; text-align:center; vertical-align:middle; background-color:#B0D1D3; display: inline-block; - margin: 1px -1px; + margin: 2px 0; line-height: 30px; cursor: pointer; } -#our_table li.highlighted { +#chrono-table li.highlighted { background-color:#2D7073; } diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/styles/tabs/detail.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/detail.scss Fri Jan 22 13:15:47 2016 +0100 @@ -0,0 +1,18 @@ +.notice{ + // padding: 10px; +} + +.notice-header, +.notice-body, +.notice-footer{ + padding: 5px 10px 0; +} + +.notice-header h2{ + margin: 0; +} + +.notice-body b{ + display: inline-block; + min-width: 140px; +} diff -r 32c0f831de45 -r 2e6bfce6f99c cms/app-client/app/templates/components/visu-chrono.hbs --- a/cms/app-client/app/templates/components/visu-chrono.hbs Fri Jan 22 11:23:23 2016 +0100 +++ b/cms/app-client/app/templates/components/visu-chrono.hbs Fri Jan 22 13:15:47 2016 +0100 @@ -1,4 +1,4 @@ -
Titre {{model.title}}
+Langue {{model.language}}
+Enregistré le {{model.modified}}
+Interviewer {{model.publishers}}
+Description {{model.description}}
+Type de Discours {{model.type}}
+Localisation {{model.spatial}}
+