working evening

bower.json

@@ -21,6 +21,7 @@
     "uikit": "~2.24.3",
     "mithril": "~0.2.1",
     "lodash": "~4.2.1",
-    "almond": "~0.3.1"
+    "almond": "~0.3.1",
+    "requirejs": "~2.1.22"
   }
 }

gulpfile.js

@@ -56,12 +56,14 @@ gulp.task('prod', ['default', 'template-prod']);
 gulp.task('webserver', function(){
     return gulp.src('.')
     .pipe(webserver({
+        host: '0.0.0.0',
+        port: 2222,
         livereload: false,
         directoryListing: false,
     }));
 });
 
-gulp.task('dev', ['default', 'webserver', 'template-dev'], function(){
+gulp.task('dev', ['default', 'webserver', 'template-dev', 'bower'], function(){
     gulp.watch('./scss/*.scss', ['sass']);
     gulp.watch('*.tmpl.html', ['template-dev']);
     return gulp.watch('./data/*.yaml', ['compile-results']);

index.tmpl.html

@@ -1,9 +1,11 @@
 <!doctype html>
 <html>
     <head>
+        <meta charset="utf-8" >
         <title>Balle Phenix</title>
-        <meta charset="utf-8" />
+        <link rel="shortcut icon" href="/favicon.ico">
         <meta name="viewport" content="width=device-width, initial-scale=1">
+
         <link rel="stylesheet" href="css/style.css" />
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
     </head>

script/main.js

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

script/util.js

@@ -1,7 +1,7 @@
 define(['m'], function(m) {
     var util = {};
-    util.loremIpsum = function(){
+    util.loremIpsum = function(n){
-        return "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a"+
+        var loremIpsum =  "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a"+
                " diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula "+
                "ac quam viverra nec consectetur ante hendrerit. Donec et mollis"+
                " dolor. Praesent et diam eget libero egestas mattis sit amet"+
@@ -13,6 +13,10 @@ define(['m'], function(m) {
                "magna consequat sagittis. Curabitur dapibus enim sit amet elit "+
                "pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero "+
                "in urna ultrices accumsan. Donec sed od";
+        loremIpsum = loremIpsum.split(' ');
+        n = n || loremIpsum.length;
+        return loremIpsum.splice(0, n).join(" ");
+
     };
 
     util.formatDate = function(date){

script/views/confidentialPage.js

@@ -1,4 +1,4 @@
-define(['m', '_', 'teams', 'views/topNavBar', 'views/footer'], function (m, _ , teams, topNavBar, footer) {
+define(['m', '_', 'teams', 'spritz', 'views/topNavBar', 'views/footer'], function (m, _ , teams, spritz, topNavBar, footer) {
 
 
     var confidentialSelection = {};

script/views/mainPage.js

@@ -16,7 +16,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
             m('div.uk-panel-badge.uk-badge', [
                 m('i.fa.fa-newspaper-o')
             ]),
-            m('h3.uk-panel-title', 'Nouvelles'),
+            m('h3.uk-panel-title', m('a.uk-link-muted', {href: '#/nouvelles'}, 'Nouvelles')),
             m('p', util.loremIpsum())
         ]);
     };
@@ -68,7 +68,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     mainPageSchedule.view = function(){
         return m('div.uk-panel.uk-panel-box',[
             m('div.uk-panel-badge.uk-badge', m('i.fa.fa-clock-o')),
-            m('h3.uk-panel-title', 'Horaire'),
+            m('h3.uk-panel-title', m('a.uk-link-muted', {href: '#/calendrier'}, 'Horaire')),
             m.component(nextGameDaySchedule)
         ]);
     };
@@ -81,7 +81,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
         var iframeParams = {
             style: {border: '1px solid black', 'min-height': '300px'},
             width: '100%',
-            height: '100%',
+            // height: '100%',
             frameborder: 0,
             scrolling: 'no',
             marginheight: 0,

script/views/newsPage.js

@@ -0,0 +1,36 @@
+define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
+
+    var newsPageBody = {};
+
+    newsPageBody.logo = function(){
+        var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
+        return m('div.uk-cover-background.uk-container-center', {style: style});
+    };
+
+    newsPageBody.getArticle = function(){
+        return m('article.uk-article',
+            m('h1.uk-article-title', util.loremIpsum(5)),
+            m('p.uk-article-meta.uk-margin-bottom', util.loremIpsum(8)),
+            util.loremIpsum()
+        );
+    };
+
+    newsPageBody.view = function(){
+        return m('div', [newsPageBody.getArticle(), newsPageBody.getArticle(), newsPageBody.getArticle(), newsPageBody.getArticle()]);
+
+    };
+
+    var newsPage = {};
+
+    newsPage.view  = function(){
+        return [
+                m.component(topNavBar),
+                m('div.uk-grid.uk-margin-top.uk-margin-bottom',
+                    m('div.uk-width-large-2-5.uk-width-small-1-1.uk-container-center',
+                        m.component(newsPageBody))),
+                m.component(footer)
+            ];
+    };
+
+    return newsPage;
+});

script/views/rulesPage.js

@@ -17,12 +17,14 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     };
 
     rulesPage.rules = function(){
+        var urlASBM = 'http://montreal.baseballquebec.com/fr/publication/nouvelle/recherche_un_directeur_general_asbm.html';
         return  m('div.uk-panel.uk-panel-box.uk-panel-box-secondary.uk-width-large-2-3', [
                     m('h2', 'Règlements 2016'),
                     m('ul',[
-                        m('li', m('h3', m('a', 'Règlements généraux'))),
+                        m('li', m('h3', m('a', {href: 'files/reglements_generaux.pdf'}, 'Règlements généraux'))),
-                        m('li',  m('h3', m('a','Règles et procédures'))),
+                        m('li',  m('h3', m('a', {href: 'files/regles_procedures2015.pdf'},'Règles et procédures'))),
-                        m('li',  m('h3', m('a','Règlements de terrain'))),
+                        m('li',  m('h3', m('a', {href: 'files/reglements_de_terrain2015.pdf'},'Règlements de terrain'))),
+                        m('li',  m('h3', m('a', {href: urlASBM}, 'Association des Sports de Balle à Montréal (ASBM)'))),
                     ])
                 ]);
     };

script/views/topNavBar.js

@@ -3,9 +3,10 @@ define(['m', '_', 'util'], function (m, _, util) {
 
     topNavBar._urlMapping = {
         '': 'Acceuil',
+        nouvelles: 'Nouvelles',
         calendrier: 'Calendrier',
         reglement: 'Règlement',
-        photos: 'Photos',
+        // photos: 'Photos',
         membre: 'Membre',
         contact: 'Nous Joindre'
     };