added default pages

.gitignore

@@ -3,3 +3,4 @@ lib/*
 css/*
 /api/resultats.json
 /index.html
+/main-built.js

script/main.js

@@ -7,10 +7,14 @@ requirejs.config({
 });
 
 
-requirejs(['m', 'views/mainPage', 'views/calendarPage'], function(m, mainPage, calendarPage){
+requirejs(['m', 'views/mainPage', 'views/calendarPage', 'views/rulesPage', 'views/photosPage', 'views/confidentialPage', 'views/contactPage'], function(m, mainPage, calendarPage, rulesPage, photosPage, confidentialPage, contactPage){
     m.route.mode = "hash";
     m.route(document.body, "/", {
         "/": mainPage,
         "/calendrier": calendarPage,
+        "/reglement": rulesPage,
+        "/photos": photosPage,
+        "/membre": confidentialPage,
+        "/contact": contactPage
     });
 });

script/views/confidentialPage.js

@@ -0,0 +1,20 @@
+define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
+
+    var rulesPageBody = {};
+
+    rulesPageBody.view = function(){
+        return m('h1', 'En construction');
+    };
+
+    var confidentialPage = {};
+
+    confidentialPage.view  = function(){
+        return [
+                m.component(topNavBar),
+                m.component(rulesPageBody),
+                m.component(footer)
+            ];
+    };
+
+    return confidentialPage;
+});

script/views/contactPage.js

@@ -0,0 +1,20 @@
+define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
+
+    var rulesPageBody = {};
+
+    rulesPageBody.view = function(){
+        return m('h1', 'En construction');
+    };
+
+    var contactPage = {};
+
+    contactPage.view  = function(){
+        return [
+                m.component(topNavBar),
+                m.component(rulesPageBody),
+                m.component(footer)
+            ];
+    };
+
+    return contactPage;
+});

script/views/mainPage.js

@@ -76,7 +76,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     var mainMap = {};
 
     mainMap.getMap = function(){
-        var iframeUrl = "http://www.openstreetmap.org/export/embed.html?bbox=-73.55889558792114%2C45.53089890181621%2C-73.55181455612183%2C45.53426212742867&layer=mapnik";
+        var iframeUrl = "//www.openstreetmap.org/export/embed.html?bbox=-73.55889558792114%2C45.53089890181621%2C-73.55181455612183%2C45.53426212742867&layer=mapnik";
         var externalLink = "http://www.openstreetmap.org/#map=18/45.53258/-73.55536";
         var iframeParams = {
             style: {border: '1px solid black', 'min-height': '300px'},

script/views/photosPage.js

@@ -0,0 +1,20 @@
+define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
+
+    var rulesPageBody = {};
+
+    rulesPageBody.view = function(){
+        return m('h1', 'En construction');
+    };
+
+    var photosPage = {};
+
+    photosPage.view  = function(){
+        return [
+                m.component(topNavBar),
+                m.component(rulesPageBody),
+                m.component(footer)
+            ];
+    };
+
+    return photosPage;
+});

script/views/rulesPage.js

@@ -0,0 +1,47 @@
+define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
+
+    var rulesPage = {};
+
+    rulesPage.missionTest = function(){
+        return "La ligue de balle Les Phénix a été fondée en 2004 afin "+
+               "d'offrir aux membres de la communauté gaie et lesbienne et à "+
+               "leurs amis hétéros l'opportunité de s'amuser et de pratiquer "+
+               "un sport dans une ambiance amicale et décontractée. "+
+               "L'ouverture d'esprit, la camaraderie et le plaisir de "+
+               "pratiquer un sport à l'extérieur caractérisent cette ligue."
+    };
+
+    rulesPage.mission = function(){
+        return  m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
+                            m('h2', 'Mission'),
+                            m('p', rulesPage.missionTest())
+                    ]);
+
+    };
+
+    rulesPage.rules = function(){
+        return  m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
+                    m('h2', 'Règlements 2015'),
+                    m('ul',[
+                        m('li', m('h3', 'Règlements généraux')),
+                        m('li',  m('h3','Règles et procédures')),
+                        m('li',  m('h3','Règlements de terrain')),
+                    ])
+                ]);
+    };
+
+    rulesPage.view  = function(){
+        return [
+                m.component(topNavBar),
+
+                m('div.uk-margin-top.uk-margin-bottom.uk-grid',
+                m('div.uk-width-large-3-5.uk-container-center', [
+                    rulesPage.mission(),
+                    rulesPage.rules()
+                ])),
+                m.component(footer)
+            ];
+    };
+
+    return rulesPage;
+});

script/views/topNavBar.js

@@ -2,7 +2,7 @@ define(['m', '_', 'util'], function (m, _, util) {
     var topNavBar = {};
 
     topNavBar._urlMapping = {
-        acceuil: 'Acceuil',
+        '': 'Acceuil',
         calendrier: 'Calendrier',
         reglement: 'Règlement',
         photos: 'Photos',
@@ -19,7 +19,7 @@ define(['m', '_', 'util'], function (m, _, util) {
     };
 
     topNavBar._isActive = function(id_){
-        return id_ == m.route.param("page");
+        return topNavBar._getUrlForId(id_) == window.location.hash;
     };
 
     topNavBar._getItem = function(name, id){
@@ -31,7 +31,7 @@ define(['m', '_', 'util'], function (m, _, util) {
     topNavBar.view = function(controller){
         return  m("nav.uk-navbar.uk-navbar-attached",[
                         m("ul.uk-navbar-nav.uk-navbar-center.uk-visible-large",
-                            m('li.uk-parent', util.facebookLink()),
+                            m('li.uk-parent', m('div.uk-navbar-brand', util.facebookLink())),
                             _.map(topNavBar._urlMapping, topNavBar._getItem)),
                         m("ul.uk-navbar-nav.uk-hidden-large",
                             m('li.uk-parent', util.facebookLink()),