From 450cd26ff0cd44b0485c4f2340156c3aa396e4b1 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Fri, 19 Aug 2016 13:55:32 -0400 Subject: [PATCH] added new scores --- data/articles/changement_de_parc.toml.md | 24 ++++++++++++++++++++++++ data/resultats.yaml | 8 ++++---- gulpfile.js | 2 +- script/articles/articles.js | 3 ++- script/views/mainPage.js | 4 ++-- 5 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 data/articles/changement_de_parc.toml.md diff --git a/data/articles/changement_de_parc.toml.md b/data/articles/changement_de_parc.toml.md new file mode 100644 index 0000000..dd107a5 --- /dev/null +++ b/data/articles/changement_de_parc.toml.md @@ -0,0 +1,24 @@ +[title] +innerMarkdown = """ +## Parc Beaubien +""" + +[meta] +innerMarkdown = """ +Vendredi 19 aout 2016 +""" + +[body] +innerMarkdown = """ + +Bonjour à tous les phénixiens phénixiennes. + +Dès la semaine prochaine, **nous nous relocaliserons au parc Beaubien**, dans +Rosemont. [Google map](http://bit.ly/2bPWCY8) vous aidera a trouver votre +chemin. + + +Votre comité de balle les phénix. + + +""" diff --git a/data/resultats.yaml b/data/resultats.yaml index f510afb..c9aa77a 100644 --- a/data/resultats.yaml +++ b/data/resultats.yaml @@ -236,16 +236,16 @@ time: "18:45" away: jaune home: rouge - home_points: ~ - away_points: ~ + home_points: 9 + away_points: 7 - date: 2016/8/18 # year/month/day time: "20:20" away: gris home: bleu - home_points: ~ - away_points: ~ + home_points: 10 + away_points: 17 - date: 2016/8/25 # year/month/day time: "18:45" diff --git a/gulpfile.js b/gulpfile.js index a081d6a..fbdc8b5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -120,7 +120,7 @@ gulp.task('webserver', function(){ return gulp.src('.') .pipe(webserver({ host: '0.0.0.0', - port: 2222, + port: 4321, livereload: false, directoryListing: false, })); diff --git a/script/articles/articles.js b/script/articles/articles.js index 33e31ca..b1ad0eb 100644 --- a/script/articles/articles.js +++ b/script/articles/articles.js @@ -1,4 +1,4 @@ -define(['m', 'articles/inscription', 'articles/inscription_rappel', 'articles/walter_stewart'], function (m, inscription, inscription_rappel, walter_stewart) { +define(['m', 'articles/inscription', 'articles/inscription_rappel', 'articles/walter_stewart', 'articles/changement_de_parc'], function (m, inscription, inscription_rappel, walter_stewart, changement_de_parc) { var simplifyArticleStructure = function(article){ var ret = {}; _.each(article, function(section, sectionName){ @@ -8,6 +8,7 @@ define(['m', 'articles/inscription', 'articles/inscription_rappel', 'articles/wa }; var articles = [ + changement_de_parc, walter_stewart, inscription_rappel, inscription diff --git a/script/views/mainPage.js b/script/views/mainPage.js index dbdbb25..9729bfe 100644 --- a/script/views/mainPage.js +++ b/script/views/mainPage.js @@ -102,7 +102,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar var mainMap = {}; mainMap.getMap = function(){ - var iframeUrl = "//www.openstreetmap.org/export/embed.html?bbox=-73.63646507263184%2C45.56388364174337%2C-73.60814094543457%2C45.57732744542051&layer=mapnik&marker=45.570605945819395%2C-73.6223030090332"; + var iframeUrl = "//www.openstreetmap.org/export/embed.html?bbox=-73.59346926212311%2C45.552108282609666%2C-73.58638823032379%2C45.555413895697654&layer=transportmap"; var externalLink = "http://www.openstreetmap.org/#map=18/45.56830/-73.61476"; var iframeParams = { style: {border: '1px solid black', 'min-height': '300px'}, @@ -124,7 +124,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar m('div.uk-panel-badge.uk-badge', [ m('i.fa.fa-map-o', {style: {'font-size': '1.7em'}}) ]), - m('h3.uk-panel-title', 'Parc George-Vernot'), + m('h3.uk-panel-title', 'Parc Beaubien'), mainMap.getMap() ]); };