add all tabs corresponding to each visualization, update name and structure and create a simple squeleton
authornowmad@23.1.168.192.in-addr.arpa
Fri, 13 Nov 2015 11:04:04 +0100
changeset 16 70e9a764d6d7
parent 15 1b4c222d4f0c
child 17 ac3dc090e987
add all tabs corresponding to each visualization, update name and structure and create a simple squeleton
cms/app-client/app/controllers/second-page.js
cms/app-client/app/controllers/visus/visu-carto.js
cms/app-client/app/index.html
cms/app-client/app/router.js
cms/app-client/app/templates/application.hbs
cms/app-client/app/templates/first-page.hbs
cms/app-client/app/templates/player.hbs
cms/app-client/app/templates/results.hbs
cms/app-client/app/templates/second-page.hbs
cms/app-client/app/templates/visus/visu-carto.hbs
cms/app-client/app/templates/visus/visu-chrono.hbs
cms/app-client/app/templates/visus/visu-discours.hbs
cms/app-client/app/templates/visus/visu-langues.hbs
cms/app-client/app/templates/visus/visu-thematiques.hbs
--- a/cms/app-client/app/controllers/second-page.js	Fri Nov 13 11:03:09 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"
-});
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/controllers/visus/visu-carto.js	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,6 @@
+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	Fri Nov 13 11:03:09 2015 +0100
+++ b/cms/app-client/app/index.html	Fri Nov 13 11:04:04 2015 +0100
@@ -21,10 +21,10 @@
       <h1>Corpus de la parole</h1>
       <div class="menu">
         <ul class="menu_main">
-          <li> <a href=""> CORPUS </a> </li>
-          <li> <a href=""> LANGUES </a> </li>
-          <li> <a href=""> PROJET </a> </li>
-          <li> <a href=""> RECHERCHE </a> </li>
+          <li> <a href="#"> CORPUS </a> </li>
+          <li> <a href="#"> LANGUES </a> </li>
+          <li> <a href="#"> PROJET </a> </li>
+          <li> <a href="#"> RECHERCHE </a> </li>
         </ul>
       </div>
     </div>
--- a/cms/app-client/app/router.js	Fri Nov 13 11:03:09 2015 +0100
+++ b/cms/app-client/app/router.js	Fri Nov 13 11:04:04 2015 +0100
@@ -6,8 +6,11 @@
 });
 
 Router.map(function() {
-  this.route('first-page');
-  this.route('second-page');
+  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' });
 });
 
 export default Router;
--- a/cms/app-client/app/templates/application.hbs	Fri Nov 13 11:03:09 2015 +0100
+++ b/cms/app-client/app/templates/application.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -1,12 +1,29 @@
-<div class="container">
-  {{link-to 'Corpus' 'index' class='navbar-brand'}}
-  <ul class="nav nav-tabs">
-    {{#link-to 'first-page' tagName="li"}}
-      {{link-to 'First Page' 'first-page'}}
+<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}}
+    {{#link-to 'visus/visu-carto' tagName="li" class='corpus-app-em-tab'}}
+      {{link-to 'Cartographie' 'visus/visu-carto'}}
     {{/link-to}}
-    {{#link-to 'second-page' tagName="li"}}
-      {{link-to 'Second Page' 'second-page'}}
+    {{#link-to 'visus/visu-thematiques' tagName="li" class='corpus-app-em-tab'}}
+      {{link-to 'Thématiques' 'visus/visu-thematiques'}}
+    {{/link-to}}
+    {{#link-to 'visus/visu-discours' tagName="li" class='corpus-app-em-tab'}}
+      {{link-to 'Discours' 'visus/visu-discours'}}
+    {{/link-to}}
+    {{#link-to 'visus/visu-chrono' tagName="li" class='corpus-app-em-tab'}}
+      {{link-to 'Chronologie' 'visus/visu-chrono'}}
     {{/link-to}}
   </ul>
   {{outlet}}
 </div>
+
+<div class="corpus-app-wrapper">
+  <div class="corpus-app-player">
+    {{partial "player"}}
+  </div>
+  <div class="corpus-app-results">
+    {{partial "results"}}
+  </div>
+</div>
--- a/cms/app-client/app/templates/first-page.hbs	Fri Nov 13 11:03:09 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<h2>This is a first page</h2>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/player.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,4 @@
+<h2>This is the player</h2>
+<div class="corpus-app-content">
+  PLAYER
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/results.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,4 @@
+<h2>This is the results</h2>
+<div class="corpus-app-content">
+  RESULTS
+</div>
--- a/cms/app-client/app/templates/second-page.hbs	Fri Nov 13 11:03:09 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<h2>This is a second page !</h2>
-<p>With a Logo !</p>
-<img src={{logoUrl}} alt="Logo">
-<p>{{ENV}}</p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/visus/visu-carto.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,3 @@
+<h2>Recherche par cartographie</h2>
+<p>With a Logo !</p>
+<img src={{logoUrl}} alt="Logo">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/visus/visu-chrono.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,1 @@
+<h2>Recherche par chronologie</h2>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/visus/visu-discours.hbs	Fri Nov 13 11:04:04 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/visus/visu-langues.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,1 @@
+<h2>Recherche par langues</h2>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/templates/visus/visu-thematiques.hbs	Fri Nov 13 11:04:04 2015 +0100
@@ -0,0 +1,1 @@
+<h2>Recherche par thematiques</h2>