diff --git a/images/Phenix_logo.svg b/images/Phenix_logo.svg
index bc55ca8..3301c88 100644
--- a/images/Phenix_logo.svg
+++ b/images/Phenix_logo.svg
@@ -1,5055 +1,2971 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/images/inscription-phenix.svg b/images/inscription-phenix.svg
new file mode 100644
index 0000000..9a1af4d
--- /dev/null
+++ b/images/inscription-phenix.svg
@@ -0,0 +1,7838 @@
+
+
+
+
diff --git a/script/main.js b/script/main.js
index b2bd400..3f6f432 100644
--- a/script/main.js
+++ b/script/main.js
@@ -7,15 +7,17 @@ requirejs.config({
});
-requirejs(['m', 'views/mainPage', 'views/newsPage', 'views/calendarPage', 'views/rulesPage', 'views/photosPage', 'views/confidentialPage', 'views/contactPage'], function(m, mainPage, newsPage, calendarPage, rulesPage, photosPage, confidentialPage, contactPage){
+requirejs(['m', 'views/mainPage', 'views/historicPage', 'views/newsPage', 'views/calendarPage', 'views/rulesPage', 'views/photosPage', 'views/confidentialPage', 'views/contactPage', 'views/inscriptionForm'], function(m, mainPage, historicPage, newsPage, calendarPage, rulesPage, photosPage, confidentialPage, contactPage, inscriptionForm){
m.route.mode = "hash";
m.route(document.body, "/", {
"/": mainPage,
"/nouvelles": newsPage,
+ "/inscription-form": inscriptionForm,
"/calendrier": calendarPage,
"/reglement": rulesPage,
"/photos": photosPage,
"/membre": confidentialPage,
+ "/historique": historicPage,
"/contact": contactPage
});
});
diff --git a/script/views/calendarPage.js b/script/views/calendarPage.js
index 2e94acb..f329cce 100644
--- a/script/views/calendarPage.js
+++ b/script/views/calendarPage.js
@@ -64,6 +64,15 @@ define(['m', '_', 'util', 'resultParser', 'teams', 'views/topNavBar', 'views/foo
};
+ var tabView = {};
+
+ tabView.view = function(){
+ return m('div.uk-margin', m('h2', 'Calendrier 2017'),
+ m('ul.uk-tab', [
+ m('li.uk-active', m('a', 'Saison')),
+ m('li', m('a', 'Éliminatoire'))
+ ]));
+ };
var schedulView = {};
@@ -129,6 +138,7 @@ define(['m', '_', 'util', 'resultParser', 'teams', 'views/topNavBar', 'views/foo
m('div.uk-grid.uk-margin-top.uk-margin-bottom',
m('div.uk-width-large-3-5.uk-width-medium-4-5.uk-width-small-1-1.uk-container-center',[
m.component(statsView),
+ m.component(tabView),
m.component(schedulView)])),
m.component(footer)];
};
diff --git a/script/views/historicPage.js b/script/views/historicPage.js
new file mode 100644
index 0000000..6b4bc6d
--- /dev/null
+++ b/script/views/historicPage.js
@@ -0,0 +1,28 @@
+define(['m', '_', 'util', 'views/topNavBar', 'views/calendarPage'], function(m, _, util, topNavBar, calendarPage) {
+
+ var yearSelector = {};
+
+ yearSelector.view = function(){
+ return m('div.uk-grid',
+ m('div.uk-width-large-3-5.uk-width-medium-1-1.uk-container-center',
+ yearSelector.tab()));
+ };
+
+ yearSelector.tab = function(){
+ return m('ul.uk-tab.uk-margin-top', [
+ m('li.uk-active', m('a', 'Saison 2016'))
+ ]);
+ };
+
+ var historicPage = {};
+
+ historicPage.view = function(){
+ return [
+ m.component(topNavBar),
+ m.component(yearSelector)
+ // m.component(calendarPage)
+ ];
+ };
+
+ return historicPage;
+});
diff --git a/script/views/inscriptionForm.js b/script/views/inscriptionForm.js
new file mode 100644
index 0000000..705c9fd
--- /dev/null
+++ b/script/views/inscriptionForm.js
@@ -0,0 +1,53 @@
+define(['m', '_',], function (m, _ ) {
+
+ var inscriptionForm = {};
+
+ inscriptionForm.title = function(){
+ return m('h1.uk-width-1-1.uk-text-center', 'Inscription Balle Phénix');
+ };
+
+ inscriptionForm._field = function(label){
+ return m('label', label, m('input.uk-form-width-large', {type: 'text'}));
+ };
+
+ inscriptionForm.identification = function(){
+ return m('form.uk-form', m('fieldset',
+ m('legend', 'Identification'),
+ m('div.uk-margin-top.uk-margin-bottom.uk-grid',
+ m('div.uk-width-1-2', inscriptionForm._field('Nom')),
+ m('div.uk-width-1-2', inscriptionForm._field('Prénom'))),
+ m('div.uk-margin-top.uk-margin-bottom.uk-grid',
+ m('div.uk-width-1-2', inscriptionForm._field('Adresse')),
+ m('div.uk-width-1-2', inscriptionForm._field('Chanson préférée'))),
+ m('div.uk-margin-top.uk-margin-bottom.uk-grid',
+ m('div.uk-width-1-3', inscriptionForm._field('Ville')),
+ m('div.uk-width-1-3', inscriptionForm._field('Code postal')),
+ m('div.uk-width-1-3', inscriptionForm._field('Tél')))
+
+ ));
+ };
+
+ inscriptionForm.inscription = function(){
+ return m('form.uk-form',
+ m('h2.uk-width-1-1.uk-text-center', 'Inscription'),
+ m('div.uk-margin-top.uk-margin-bottom.uk-grid',
+ m('div.uk-width-1-1',
+ inscriptionForm._field('Inscription en duo. Inscrivez le nom du joueur')))
+
+
+ );
+ };
+
+
+ inscriptionForm.view = function(){
+ return [
+ inscriptionForm.title(),
+ inscriptionForm.identification(),
+ inscriptionForm.inscription()
+
+ ];
+ // return m('form', m('label', 'Nom', m('input', {type: 'text'})));
+ };
+
+ return inscriptionForm;
+});
diff --git a/script/views/playersPage.js b/script/views/playersPage.js
index 0130b42..f15441b 100644
--- a/script/views/playersPage.js
+++ b/script/views/playersPage.js
@@ -49,7 +49,7 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
playersSelectionBar.chooseScore = function(model){
return m('form.uk-grid', {style: {'margin-top': '1em'}},
- m('div.uk-width-1-6', m('label', m('b', 'Quote'))),
+ m('div.uk-width-1-6', m('label', m('b', 'Cote'))),
m('div.uk-width-5-6',
m('div.uk-grid', [
playersSelectionBar.scoreInput(1, model.activatedScores),
@@ -57,8 +57,15 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
playersSelectionBar.scoreInput(3, model.activatedScores),
playersSelectionBar.scoreInput(4, model.activatedScores),
playersSelectionBar.scoreInput(5, model.activatedScores)
- ]))
- );
+ ])));
+ };
+
+ playersSelectionBar.searchBar = function(){
+ var icon = m('i.fa.fa-search', {'aria-hidden': true}, '');
+ return m('form.uk-grid', {style: {'margin-top': '1em'}},
+ m('div.uk-width-1-1.', {style: 'text-align: right;'},
+ m('label', m('b', icon, " Rechercher ")),
+ m('input', {type: 'text'})));
};
playersSelectionBar.controller = function(model){
@@ -66,9 +73,12 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
};
playersSelectionBar.view = function(model){
- return m('div', [
- playersSelectionBar.chooseTeams(model),
- playersSelectionBar.chooseScore(model)
+ return m('div.uk-grid', [
+ m('div.uk-width-1-2',
+ playersSelectionBar.chooseTeams(model),
+ playersSelectionBar.chooseScore(model)),
+ m('div.uk-width-1-2',
+ playersSelectionBar.searchBar(model))
]);
};
@@ -267,11 +277,18 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
return model;
};
+ playersPage.downloadButton = function(){
+ return m('button.uk-button.uk-button-success.uk-border-rounded',
+ m('i.fa.fa-download', {'aria-hidden': true}),
+ " Télécharger");
+ };
+
playersPage.view = function(model){
return m('div.uk-grid.uk-margin-top.uk-margin-bottom',
m('div.uk-width-large-3-5.uk-width-small-1-1.uk-container-center', [
m.component(playersSelectionBar, model),
m.component(playersTable, model),
+ playersPage.downloadButton()
]));
};
diff --git a/script/views/topNavBar.js b/script/views/topNavBar.js
index 1e33c43..edc41b0 100644
--- a/script/views/topNavBar.js
+++ b/script/views/topNavBar.js
@@ -8,6 +8,7 @@ define(['m', '_', 'util'], function (m, _, util) {
{name: 'Calendrier', path: 'calendrier', fa: 'fa-calendar'},
{name: 'Règlement', path: 'reglement', fa: 'fa-legal'},
{name: 'Membre', path: 'membre', fa: 'fa-lock'},
+ {name: 'Historique', path: 'historique', fa: 'fa-history'},
{name: 'Nous Joindre', path: 'contact', fa: 'fa-phone'}
];