Merge branch 'master' of github.com:daktary-team/daktary

daktary-team · May 6, 2016 · 305151d · 305151d
2 parents 14b2fdd + 5a158eb
commit 305151d
Show file tree

Hide file tree

Showing 28 changed files with 269 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -46,23 +46,22 @@ Dans un [Firefox](https://www.mozilla.org/fr/firefox/developer/) **récent** lan
 http://127.0.0.1:8000/tests
 
 ## Intégration
+* Affichage home
 * Affichage repo
 * Affichage folder
-* Affichage ressources
 * Bouton recherche avec entrée
 * Résultats recherche : nombre (en dur)
 * Résultats recherche : afficher ou non la requète
 * Résultats recherche : cacher breadcrumbs
 * Résultats recherche : afficher repo où a été effectué la recherche
-* Espace manquant breadcrumbs
-* Affichage champs recherche grand
-* Changer "Liste des repos" 
-* Meta : semantique + affichage
-* Affichage fiches (typo, justified text)
-* Fiche : liens -> couleurs, title hover
+* Résultats recherche : afficher si pas de résultat
+* Meta fiche: semantique + affichage
+* Affichage fiches : typo, justified text, couleurs
+* Affichage fiches : éléments html (img, embed, abbr, acronym, cite, code, small, sub, sup, ol)
+* Affichage fiches : édition prose.io, lien help, retour haut de page
 * Responsive : mobile first ?
-* notification : ex. aucune fiche trouvée
 
+* Class autour notes pied de page
 * Simplify tests writes merge on async
 
 ## Discussion intégration
diff --git a/css/daktary.css b/css/daktary.css
@@ -1,13 +1,23 @@
 /*
 GENERAL
 */
+
+
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
 body {
-  font-family: "Lucida Grande","Lucida Sans Unicode","Lucida Sans",Geneva,Verdana,sans-serif;
+  font-family: "Open Sans", Arial, sans-serif;
   font-size: 1rem;
-  color: #6c6c6c;
+  color: #4d4d4d;
   -webkit-font-smoothing: antialiased;
   background:  #f8f8f8;
+  border-top: 3px solid #29abe2;
 }
+
 .container {
   margin: 0px auto;
   width: 620px;
@@ -17,10 +27,32 @@ p {
   margin-bottom: 10px;
 }
 a {
-  color: #9b4e4e;
+  color: #29abe2;
 }
-h1,
+
 h2,
 h3 {
-  color: #9b4e4e;
+  color: #29abe2;
+}
+
+h1 {
+font-family: "Montserrat", Arial, sans-serif;
+}
+h1 span {
+  color: #29abe2;
+}
+
+header {
+  display: table;
+  width: 100%;
+    padding: 20px 0 30px;
+  margin-bottom: 30px;
+  border-bottom: 1px solid #000;
+}
+header h1,
+header .search-engine-wrapper {
+  display: table-cell;
 }
+header .search-engine-wrapper {
+  width: 50%;
+}
diff --git a/css/layout-home.css b/css/layout-home.css
@@ -0,0 +1,25 @@
+.home-intro {
+  padding: 5px 15px;
+  height: 310px;  
+  margin-bottom: 30px;
+  text-align: center;
+  background: url(../img/home-intro.jpg) center 0 no-repeat;
+}
+.home-intro h2 {
+  margin-bottom: 20px;
+  color: #4d4d4d;
+  line-height: 1.2;
+}
+.home-intro h2 span {
+  display: block;
+  font-weight: normal;
+}
+.home-intro a {
+  padding: 5px 10px;
+  background-color: #29abe2;
+  color: #fff;
+  text-decoration: none;
+}
+.home-intro a + a {
+  margin-left: 30px;
+}
diff --git a/css/layout-repositories.css b/css/layout-repositories.css
@@ -1,17 +1 @@
-/*
-GENERAL
-*/
-header {
-  padding: 20px 0 30px;
-  border-bottom: 1px solid #000;
-}
-aside {
-  position: fixed;
-  left: 0;
-  top: 0;
-  padding: 15px;
-  height: 100%;
-  max-width: 25%;
-  background-color: #efefef;
-  overflow-y: auto;
-}
+
diff --git a/css/tpl-breadcrumb.css b/css/tpl-breadcrumb.css
@@ -3,9 +3,12 @@
   padding: 20px 0;
 }
 .breadcrumb li {
-  display: inline-block;
+  display: inline;
   list-style-type: none;
 }
+.breadcrumb li:not(:first-child) {
+  margin-left: 5px;
+}
 .breadcrumb li:not(:first-child):before {
   content: '> ';
 }
diff --git a/css/tpl-contribution.css b/css/tpl-contribution.css
@@ -50,6 +50,26 @@ CONTRIBUTIONS
   font-size: 1.188rem;
   line-height: 1.473684211em;
 }
+#contribution ul {
+  margin-left: 20px;
+}
+#contribution ul ul {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+  margin-left: 36px;
+}
+#contribution li {
+  position: relative;
+  padding-left: 20px;
+  list-style-type: none;  
+}
+#contribution li:before {
+  content: '>';
+  position: absolute;
+  left: 0;
+  top: 0;
+  font-weight: bold;  
+}
 #contribution img {
   display: block;
   vertical-align: middle;
@@ -64,15 +84,15 @@ CONTRIBUTIONS
   transition: all .2s ease-in-out;
 }
 #contribution a {
-  transition: all 200ms linear 0s;
-  border-bottom: 1px solid #1995D3;
-  color: #333;
+  color: #4d4d4d;
   text-decoration: none;
+  border-bottom: 1px solid #4d4d4d;
 }
 #contribution a:hover,
 #contribution a:focus {
-  border-bottom: 1px solid #0067AF;
-  background: #EBF4F6;
+  color: #29abe2;
+  border-bottom-color: #29abe2;
+;
 }
 #contribution blockquote p {
   font-family: Georgia,Cambria,"Times New Roman",Times,serif;

diff --git a/css/tpl-crews.css b/css/tpl-crews.css
@@ -2,28 +2,31 @@
 /*
 REPOSITORIES LIST
 */
-aside h3 {
-  margin-bottom: 20px;
-}
 #gh-crew-list ul {
+  display: flex;
+  flex-wrap: wrap;
   padding-bottom: 20px;
 }
 #gh-crew-list li {
-  margin-bottom: 15px;
+  position: relative;
+  width: 30%;
+  margin-bottom: 30px;
+  padding: 10px 10px 30px;
   line-height: 1;
   list-style-type: none;
+  box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75);
 }
-#gh-crew-list li:before {
-  content: '> ';
+#gh-crew-list li:not(:nth-child(3n+1)) {
+  margin-left: 5%;
 }
 #gh-crew-list a {
-  color: #000;
-  text-decoration: none;
-}
-#gh-crew-list a:hover {
-  text-decoration: underline;
+display: table;
 }
-#gh-crew-list a.selected {
-  color: #9b4e4e;
-  font-weight: bold;
+#gh-crew-list h3 {
+  display: table-row;
+  min-height: 80%;
 }
+#gh-crew-list p {
+  display: table-row;
+  min-height: 20%;
+}
diff --git a/css/tpl-list.css b/css/tpl-list.css
@@ -1,9 +1,6 @@
 /*
 CONTRIBUTIONS LIST
 */
-header h1 {
-  text-align: center;
-}
 
 /*list of article*/
 .gh-list {

diff --git a/css/tpl-search.css b/css/tpl-search.css
@@ -6,3 +6,12 @@
   padding: 5px;
   width: calc(100% - 105px);
 }
+
+.search-engine-wrapper input[type="submit"] {
+  padding: 5px;
+  color: #fff;
+  font-size: 0.8rem;
+  background-color: #29abe2;
+  border: none;
+  cursor: pointer;  
+}
diff --git a/dist/dk.js b/dist/dk.js
@@ -8,19 +8,23 @@ var CREWS = { crews: [{ title: 'Bienvenue sur multiBàO',
     owner: 'multibao'
   }, {
     title: 'Réseau Transition BE',
-    label: 'Réseau Transition BE',
+    label: 'association Réseau Transition Wallonie Bruxelles',
     owner: 'reseautransitionwb'
   }, {
     title: 'Réseau Coop-tic',
-    label: 'Coop-TIC',
+    label: 'associations Outils Réseaux (FR) et CRIE Mouscron (BE); établissement SupAgro Florac (FR)',
     owner: 'supagroflorac'
+  }, {
+    title: 'Captain Berrotte',
+    label: 'stagiaires travaillant sur multiBàO',
+    owner: 'captain-berrotte'
   }, {
     title: 'Traducteurs agiles',
-    label: 'Traducteurs agiles',
+    label: 'Les Traducteurs Agiles sont une communauté d’Agilistes et de … Traducteurs.',
     owner: 'les-traducteurs-agiles'
   }, {
     title: 'Onpassealacte',
-    label: 'Onpassealacte',
+    label: 'Media web citoyen montrant des initiatives positives en vidéos',
     owner: 'onpassealacte'
   }] };
 /**
@@ -226,7 +230,7 @@ var Router = (function () {
     key: 'go',
     value: function go(url) {
       this._resetRoute();
-      this.url = url;
+      this.url = url || '/';
       this._findAndSetCurrentRoute();
       this.injectLayout();
     }
@@ -405,7 +409,7 @@ window.addEventListener('hashchange', function () {
   return window.location.reload(true);
 });
 window.addEventListener('load', function () {
-  var ghUrl = window.location.toString().split('#')[1] || 'multibao/contributions/tree/master/pages';
+  var ghUrl = window.location.toString().split('#')[1];
   router.go(ghUrl);
   if (router.isNoRoute()) {
     window.location = './404.html';
@@ -431,7 +435,7 @@ var layout = new Layout();
 
 {
   layout.create('folders');
-  layout.folders.html('\n  <header>\n    <h1>MultiBao</h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <aside>\n    <h3>Liste des collectifs</h3>\n    <div id="gh-crew-list" data-template="crews">\n    </div>\n  </aside>\n  <main>\n    <div id="breadcrumb" class="breadcrumb" data-template="breadcrumb">\n    </div>\n    <section id="gh-list" class="gh-list" data-template="folders">\n    </section>\n  </main>');
+  layout.folders.html('\n  <header>\n    <h1>multi<span>BàO</span></h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <main>\n    <div id="breadcrumb" class="breadcrumb" data-template="breadcrumb">\n    </div>\n    <section id="gh-list" class="gh-list" data-template="folders">\n    </section>\n  </main>');
 }
 /**
  * Layout for manage and display Github repositories.
@@ -441,7 +445,7 @@ var layout = new Layout();
 
 {
   layout.create('repos');
-  layout.repos.html('\n  <header>\n    <h1>MultiBao</h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <aside>\n    <h3>Liste des collectifs</h3>\n    <div id="gh-crew-list" data-template="crews">\n    </div>\n  </aside>\n  <main>\n    <div id="breadcrumb" class="breadcrumb" data-template="breadcrumb">\n    </div>\n    <section id="gh-list" class="gh-list" data-template="repos">\n    </section>\n  </main>');
+  layout.repos.html('\n  <header>\n    <h1>multi<span>BàO</span></h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <main>\n    <div id="breadcrumb" class="breadcrumb" data-template="breadcrumb">\n    </div>\n    <section id="gh-list" class="gh-list" data-template="repos">\n    </section>\n  </main>');
 }
 /**
  * Layout for manage and display Github repositories.
@@ -451,13 +455,17 @@ var layout = new Layout();
 
 {
   layout.create('searchList');
-  layout.searchList.html('\n  <header>\n    <h1>MultiBao</h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <aside>\n    <h3>Liste des collectifs</h3>\n    <div id="gh-crew-list" data-template="crews">\n    </div>\n  </aside>\n  <main>\n    <section id="gh-list" class="gh-list" data-template="searchList">\n    </section>\n  </main>');
+  layout.searchList.html('\n  <header>\n    <h1>multi<span>BàO</span></h1>\n    <div id="search-engine-wrapper" class="search-engine-wrapper" data-template="search">\n    </div>\n  </header>\n  <main>\n    <section id="gh-list" class="gh-list" data-template="searchList">\n    </section>\n  </main>');
 }
 // Create a router
 'use strict';
 
 var router = new Router();
 
+router.route('/', function () {
+  this.currentRoute = 'home';
+  layout.home.render();
+});
 router.route('search/code', function () {
   this.currentRoute = 'search';
   layout.searchList.render();
@@ -552,7 +560,7 @@ template.crews.data = function () {
   template.create('search');
 
   template.search.data = function () {
-    template.search.html('\n      <h2>Recherche</h2>\n      <div class="search-engine">\n        <fieldset>\n          <input id="gh-search" type="text">\n          <input id="button-gh-search" value="Rechercher" type="submit">\n        </fieldset>\n      </div>\n    ');
+    template.search.html('\n      <div class="search-engine">\n        <fieldset>\n          <input id="gh-search" type="text" placeholder="Recherche">\n          <input id="button-gh-search" value="Rechercher" type="submit">\n        </fieldset>\n      </div>\n    ');
     template.search.events({
       'click #button-gh-search': function clickButtonGhSearch() {
         if (document.querySelector('#gh-search').value.length > 2) {
@@ -611,8 +619,8 @@ template.crews.data = function () {
     var repoTpl = _ownerTpl$repoTpl$foldersTpl.repoTpl;
     var foldersTpl = _ownerTpl$repoTpl$foldersTpl.foldersTpl;
 
-    template.breadcrumb.html('<ul>\n        <li><a href="/">Accueil</a></li>\n        <li><a href="' + ownerTpl.link + '">' + ownerTpl.label + '</a></li>\n        ' + (repoTpl.label ? '<li><a href="' + repoTpl.link + '">' + repoTpl.label + '</a></li>' : '') + foldersTpl.map(function (folder) {
-      return '<li><a href="' + folder.link + '">' + folder.label + '</a></li>';
+    template.breadcrumb.html('<ul>\n        <li><a href="/">Accueil</a></li><!--\n        --><li><a href="' + ownerTpl.link + '">' + ownerTpl.label + '</a></li><!--\n        ' + (repoTpl.label ? '--><li><a href="' + repoTpl.link + '">' + repoTpl.label + '</a></li><!--' : '') + foldersTpl.map(function (folder) {
+      return '--><li><a href="' + folder.link + '">' + folder.label + '</a></li>';
     }).join('\n') + '</ul>');
   };
 }

diff --git a/dist/dk.min.css b/dist/dk.min.css
diff --git a/dist/dk.min.js b/dist/dk.min.js
diff --git a/img/home-intro.jpg b/img/home-intro.jpg