Merge branch 'release/0.5.2'

Fonsart · Mar 15, 2016 · 4b59bfb · 4b59bfb
2 parents 334a4e0 + cdc8679
commit 4b59bfb
Show file tree

Hide file tree

Showing 54 changed files with 959 additions and 100 deletions.
diff --git a/assets/components/atoms/label-hierarchy.hbs b/assets/components/atoms/label-hierarchy.hbs
@@ -0,0 +1,14 @@
+---
+notes: |
+  ##### Introduced : 0.5.2
+  ##### Updated : -
+  ##### Usage : `{{> label-hierarchy }}`
+  ##### Options :
+  - **parent** - String
+  - **child** - String
+  - **closable** - Boolean (default `false`)
+---
+<span class="label label-default">
+  <strong>{{#if parent}}{{ parent }}{{^}}Default parent{{/if}}</strong> &rsaquo; {{#if child}}{{ child }}{{^}}Default child{{/if}}
+  {{#if closable}}<button class="label-close">&times;</button>{{/if}}
+</span>
diff --git a/assets/components/atoms/label.hbs b/assets/components/atoms/label.hbs
@@ -8,6 +8,6 @@ notes: |
   - **closable** - Boolean (default `false`)
 ---
 <span class="label label-default">
-  {{#if text}}{{ text }}{{^}}Default label{{/if}}
-  <button class="label-close">&times;</button>
+  {{#if text}}{{{ text }}}{{^}}Default label{{/if}}
+  {{#if closable}}<button class="label-close">&times;</button>{{/if}}
 </span>
diff --git a/assets/components/atoms/textarea.hbs b/assets/components/atoms/textarea.hbs
@@ -12,5 +12,5 @@ notes: |
 
 <div class="form-group{{#if textarea-variant}} {{textarea-variant}}{{/if}}">
   <label for="{{#if textarea-id}}{{textarea-id}}{{^}}email{{/if}}">{{#if textarea-label}}{{textarea-label}}{{^}}Message{{/if}}</label>
-  <textarea class="form-control" id="{{#if textarea-id}}{{textarea-id}}{{^}}email{{/if}}" rows="3">{{#if textarea-help}}{{{textarea-help}}}{{^}}Votre message{{/if}}</textarea>
+  <textarea class="form-control" id="{{#if textarea-id}}{{textarea-id}}{{^}}email{{/if}}" rows="8">{{#if textarea-help}}{{{textarea-help}}}{{^}}Votre message{{/if}}</textarea>
 </div>
diff --git a/assets/components/molecules/group-teaser.hbs b/assets/components/molecules/group-teaser.hbs
@@ -16,7 +16,7 @@ notes: |
     </h5>
   </div>
   <div class="group-counter">
-    <h6>Groupe</h6>
+    <h6>Thème</h6>
     <small><i class="glyphicon glyphicon-user"></i></small>&thinsp;{{group-object.members_count}}
     <small><i class="glyphicon glyphicon-file"></i></small>&thinsp;{{group-object.medias_count}}
   </div>

diff --git a/assets/components/molecules/media-features-bar.hbs b/assets/components/molecules/media-features-bar.hbs
@@ -4,11 +4,11 @@ notes: |
   ##### Updated : -
   ##### Usage : `{{> media-features-bar }}`
 ---
-<div class="media-features-bar">
+<div class="media-features-bar bg-concrete">
   <div class="row">
     <div class="col-sm-4">
-      <button class="btn btn-link">
-        <i class="glyphicon glyphicon-share-alt"></i> Partager
+      <button class="btn btn-link active">
+        <span class="text-danger">Suivre</span>&nbsp;&nbsp;<i class="glyphicon glyphicon-heart"></i>
       </button>
       <a href="#" class="btn btn-link">
         <i class="glyphicon glyphicon-comment"></i> Commenter (4)
@@ -20,11 +20,11 @@ notes: |
       </a>
     </div>
     <div class="col-sm-4 text-right">
-      <span class="media-features-bar-infos">
-        220 vues&nbsp;&nbsp;<i class="glyphicon glyphicon-eye-open"></i>
-      </span>
-      <button class="btn btn-link active">
-        <i class="glyphicon glyphicon-heart"></i>
+      <button class="btn btn-link">
+        <i class="glyphicon glyphicon-share-alt"></i> Partager
+      </button>
+      <button class="btn btn-link">
+        <i class="glyphicon glyphicon-plus"></i> Ajouter
       </button>
       <button class="btn btn-link">
         <i class="glyphicon glyphicon-alert"></i>

diff --git a/assets/components/molecules/media-infobar.hbs b/assets/components/molecules/media-infobar.hbs
@@ -14,6 +14,12 @@ notes: |
     <a href="http://maps.google.com/">Voir sur la carte</a>
   </p>
 
+  <h5>Popularité</h5>
+  <p>
+    <i class="glyphicon glyphicon-eye-open"></i> 220 vues<br>
+    <i class="glyphicon glyphicon-heart text-danger"></i> 40 suivent
+  </p>
+
   <h5>Auteur</h5>
   <p>
     {{#each media.authors }}
@@ -47,15 +53,15 @@ notes: |
     <a href="#" class="label label-default">{{this}}</a>
   {{/each}}
 
-  <h5>Groupes</h5>
+  <h5>Thèmes</h5>
   <div class="spacer spacer-xs"></div>
   {{#each media.groups }}
     <a href="#" class="label label-default">{{this}}</a>
   {{/each}}
-  <h5>Albums</h5>
+  <h5>Collections</h5>
   <div class="spacer spacer-xs"></div>
   {{#each media.albums }}
-    <a href="#" class="label label-default">Groupe {{@key}} &rsaquo; {{this}}</a>
+    <a href="#" class="label label-default"><strong>Thème {{@key}}</strong> &rsaquo; {{this}}</a>
   {{/each}}
 
 </div>
diff --git a/assets/components/molecules/media-item.hbs b/assets/components/molecules/media-item.hbs
@@ -27,9 +27,7 @@ notes: |
       {{/each}}<br>
     </p>
     <div class="text-clear">
-      {{mediaobject.views_count}}&thinsp;<small><i class="glyphicon glyphicon-eye-open"></i></small> |
-      {{mediaobject.bookmarks_count}}&thinsp;<small><i class="glyphicon glyphicon-star"></i></small> |
-      {{mediaobject.comments.length}}&thinsp;<small><i class="glyphicon glyphicon-comment"></i></small>
+      {{mediaobject.views_count}}&thinsp;<small><i class="glyphicon glyphicon-eye-open"></i></small> | {{mediaobject.bookmarks_count}}&thinsp;<small><i class="glyphicon glyphicon-heart"></i></small> | {{mediaobject.comments.length}}&thinsp;<small><i class="glyphicon glyphicon-comment"></i></small>
     </div>
     <span class="media-icon glyphicon glyphicon-{{#ifarticle mediaobject.type}}list-alt {{#ifaudio mediaobject.type}}glyphicon-headphones{{/ifaudio}}{{/ifarticle}}{{#ifvideo mediaobject.type}}film{{/ifvideo}}{{#ifphoto mediaobject.type}}picture{{/ifphoto}}"></span>
   </div>

diff --git a/assets/components/molecules/progression.hbs b/assets/components/molecules/progression.hbs
@@ -0,0 +1,17 @@
+---
+notes: |
+  ##### Introduced : 0.5.2
+  ##### Updated : -
+  ##### Usage : `{{> progression }}`
+---
+<div class="progression">
+  <div class="progress">
+    <div class="progress-bar" role="progressbar" aria-valuenow="15" aria-valuemin="0" aria-valuemax="100" style="width: 15%;">
+      <span class="sr-only">15% Complete</span>
+    </div>
+  </div>
+  <h5>Profil comlété</h5>
+  <p>
+    Plus votre profil est comple, plus il sera intéressant pour les autres personnes présentes sur Notre Histoire.
+  </p>
+</div>
diff --git a/assets/components/molecules/results-heading.hbs b/assets/components/molecules/results-heading.hbs
@@ -11,6 +11,7 @@ notes: |
     {{> label closable=true text="chalet" }}
     {{> label closable=true text="montagne" }}
     {{> label closable=true text="chien" }}
+    {{> label-hierarchy closable=true parent="Vie quotidienne" child="Transport" }}
     {{> label closable=true text="arc-en-ciel" }}
     {{> label closable=true text="1980-1990" }}
   </p>

diff --git a/assets/components/molecules/results-navbar.hbs b/assets/components/molecules/results-navbar.hbs
@@ -11,16 +11,13 @@ notes: |
         Trier par
       </strong>
       <select class="form-control">
-        <option>Alphabetical</option>
-        <option>Les plus vus</option>
-        <option>Most commented</option>
-        <option>Most followed</option>
-        <option selected="selected">Most relevant</option>
-        <option>Newest</option>
-        <option>Oldest</option>
-        <option>Origin_date récent</option>
-        <option>Origin_date vieux</option>
-        <option>Recently updated</option>
+        <option>Popularité</option>
+        <option>Date de publication (nouveautés)</option>
+        <option>Date de publication (le plus ancien)</option>
+        <option selected="selected">Pertinence</option>
+        <option>Date d'origine (le plus récent)</option>
+        <option>Date d'orginie (le plus ancien)</option>
+        <option>Récemment mis à jour</option>
       </select>
       <span class="vertical-separator"></span>
       <button id="display-grid" class="btn btn-default active">

diff --git a/assets/components/molecules/signup-form.hbs b/assets/components/molecules/signup-form.hbs
@@ -10,7 +10,7 @@ notes: |
   {{> input
         input-id="nom"
         input-type="text"
-        input-label="Nom Prénom"
+        input-label="Nom et Prénom"
         input-help="À qui avons-nous l'honneur ?"
   }}
   {{> input
@@ -42,5 +42,5 @@ notes: |
         textarea-help="Ne soyez pas timide, nous sommes tout ouïe."
   }}
   <div class="spacer spacer-xs"></div>
-  <button type="submit" class="btn btn-primary btn-block">Je m'inscris</button>
+  <a href="profile-edit.html" class="btn btn-primary btn-block" role="button">Je m'inscris</a>  
 </form>
diff --git a/assets/components/molecules/uploader.hbs b/assets/components/molecules/uploader.hbs
@@ -6,5 +6,5 @@ notes: |
 ---
 <form class="uploader" action="metadata.html" method="get" enctype="multipart/form-data">
   <input type="file" name="files[]" id="filer_input" multiple="multiple" />
-  <input type="submit" class="btn btn-primary" value="Suivant" />
+  <input type="submit" class="btn btn-primary pull-right" value="Suivant" />
 </form>
diff --git a/assets/components/organisms/facet-sidebar.hbs b/assets/components/organisms/facet-sidebar.hbs
@@ -11,4 +11,6 @@ notes: |
   {{#each facets }}
     {{> facet-group facet-object=this }}
   {{/each}}
+  <a href="creation-collection-recherche.html" class="btn btn-primary btn-sm">Enregistrer la recherche</a>
+  <p><small class="text-clear text-sans"><em>Il vous est possible d'enregistrer cette recherche et d'en faire une collection.</em></small></p>
 </div>
diff --git a/assets/components/organisms/panel-left.hbs b/assets/components/organisms/panel-left.hbs
@@ -31,6 +31,10 @@ notes: |
         Contact
         <span class="pull-right">{{> chevron direction="right" thin=true }}</span>
       </a></li>
+      <li role="presentation"><a href="#">
+        Partenaires
+        <span class="pull-right">{{> chevron direction="right" thin=true }}</span>
+      </a></li>
     </ul>
     <div class="container-fluid">
       {{> separator }}

diff --git a/assets/components/organisms/panel-right.hbs b/assets/components/organisms/panel-right.hbs
@@ -37,6 +37,10 @@ notes: |
       </a></li>
     </ul>
     <div class="container-fluid">
+      {{> separator }}
+      <p>
+        <a href="creation-collection.html" class="btn btn-default btn-sm btn-block" role="button">Créer une collection</a>
+      </p>
       {{> separator }}
       <a href="#" class="text-sans text-clear">Me déconnecter</a>
     </div>

diff --git a/assets/components/organisms/profile-collection.hbs b/assets/components/organisms/profile-collection.hbs
@@ -0,0 +1,33 @@
+---
+notes: |
+  ##### Introduced : 0.5.2
+  ##### Updated : -
+  ##### Usage : `{{> profile-collection }}`
+---
+<div class="profile-collection">
+  <div class="spacer spacer-sm"></div>
+  <h1 class="h2 text-center">{{collection.title}}</h1>
+  <ul class="list-inline text-center text-sans">
+    <li><i class="glyphicon glyphicon-heart"></i> {{collection.likes}}</li>
+    <li><i class="glyphicon glyphicon-file"></i> {{collection.files}}</li>
+    &bull; Collection éditée par <a href="profile-person.html" alt="{{collection.author}}">{{collection.author}}</a>
+  </ul>
+  {{> separator }}
+  <div class="row">
+    <div class="col-sm-4">
+      <img src="{{collection.avatar}}" alt="{{collection.title}}" class="img-responsive" />
+    </div>
+    <div class="col-sm-8">
+      <p class="text-sans collection-bio" id="collection-bio">
+        {{{collection.bio}}}
+      </p>
+    </div>
+  </div>
+  <div class="spacer spacer-xs"></div>
+</div>
+
+<div class="media-features-bar bg-nobel text-center">
+  <a href="#" class="btn btn-link active"><i class="glyphicon glyphicon-heart"></i> Suivre</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-share-alt"></i> Partager</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-hourglass"></i> Activités</a>
+</div>
diff --git a/assets/components/organisms/profile-found.hbs b/assets/components/organisms/profile-found.hbs
@@ -7,24 +7,21 @@ notes: |
 <div class="profile-found">
   <img src="{{found.avatar}}" alt="{{found.name}}" class="img-responsive center-block" />
   <h1 class="h2 text-center">{{found.name}}</h1>
-  <ul class="list-inline text-clear text-center text-sans">
+  <ul class="list-inline text-center text-sans">
     <li><i class="glyphicon glyphicon-heart"></i> {{found.likes}}</li>
     <li><i class="glyphicon glyphicon-file"></i> {{found.files}}</li>
     &bull; {{found.resume}}
   </ul>
   {{> separator }}
-  <ul class="list-inline text-justify">
-    <li><a href="#" class="btn btn-link"><i class="glyphicon glyphicon-heart"></i> <b>Ajouter aux favoris</b></a></li>
-    <li><a href="#" class="btn btn-link"><i class="glyphicon glyphicon-share-alt"></i> Partager</a></li>
-    <li><a href="#" class="btn btn-link">Activités</a></li>
-    <li><a href="#" class="btn btn-link">Envoyer un message</a></li>
-  </ul>
-  <p class="text-clear text-sans person-bio" id="person-bio">
+  <p class="text-sans person-bio" id="person-bio">
     {{{found.bio}}}
   </p>
   <div class="spacer spacer-xs"></div>
-  {{> separator }}
-  <div class="text-center">
-    <button class="btn btn-link btn-readmore" id="btn-readmore">Lire la suite...</button>
-  </div>
+</div>
+
+<div class="media-features-bar bg-nobel text-center">
+  <a href="#" class="btn btn-link active"><i class="glyphicon glyphicon-heart"></i> Suivre</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-share-alt"></i> Partager</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-hourglass"></i> Activités</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-send"></i> Envoyer un message</a>
 </div>
diff --git a/assets/components/organisms/profile-person.hbs b/assets/components/organisms/profile-person.hbs
@@ -4,31 +4,29 @@ notes: |
   ##### Updated : -
   ##### Usage : `{{> profile-person }}`
 ---
+<div class="spacer spacer-sm"></div>
+<img src="{{person.avatar}}" alt="{{person.name}}" class="img-responsive img-circle center-block" />
+
 <div class="profile-person">
-  <div class="spacer spacer-sm"></div>
-  <img src="{{person.avatar}}" alt="{{person.name}}" class="img-responsive img-circle center-block" />
   <h1 class="h2 text-center">{{person.name}}</h1>
-  <ul class="list-inline text-clear text-center text-sans">
+  <ul class="list-inline text-center text-sans">
     <li><i class="glyphicon glyphicon-picture"></i> {{person.pictures}}</li>
     <li><i class="glyphicon glyphicon-film"></i> {{person.videos}}</li>
     <li><i class="glyphicon glyphicon-list-alt"></i> {{person.articles}}</li>
-    <li>Abonnés {{person.followings}}</li>
-    <li>Abonnements {{person.followers}}</li>
+    <li><strong>Abonnés</strong> {{person.followings}}</li>
+    <li><strong>Abonnements</strong> {{person.followers}}</li>
   </ul>
   {{> separator }}
-  <ul class="list-inline text-justify">
-    <li><a href="#" class="btn btn-link"><b>Envoyer un message</b></a></li>
-    <li><a href="#" class="btn btn-link">Ajouter comme contact</a></li>
-    <li><a href="#" class="btn btn-link">Activité</a></li>
-    <li><a href="#" class="chevron text-clear"></a></li>
-  </ul>
-  <p class="text-clear text-sans person-bio" id="person-bio">
+  <p class="text-sans person-bio" id="person-bio">
     {{{person.bio}}}
   </p>
   <div class="spacer spacer-xs"></div>
-  {{> separator }}
-  <div class="text-center">
-    <button class="btn btn-link btn-readmore" id="btn-readmore">Lire la suite...</button>
-  </div>
+</div>
+
+<div class="media-features-bar bg-nobel text-center">
+  <a href="#" class="btn btn-link active"><i class="glyphicon glyphicon-heart"></i> Suivre</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-share-alt"></i> Partager</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-hourglass"></i> Activités</a>
+  <a href="#" class="btn btn-link"><i class="glyphicon glyphicon-send"></i> Envoyer un message</a>
 </div>
 
diff --git a/assets/data/collection.json b/assets/data/collection.json
@@ -0,0 +1,8 @@
+{
+  "avatar": "http://notrehistoire.ch.s3-eu-west-1.amazonaws.com/photos/2010/10/41d52c14611d0821_jpg_530x530_q85.jpg",
+  "title": "Champéry",
+  "likes": "70k",
+  "files": 9506,
+  "author": "Sarah Muelheim",
+  "bio": "Vallée du district de Monthey où coule la Vièze et qui porte le nom de la commune, Val d'Illiez. De nombreux villages ou stations comme Champéry, Morgins, Troistorrents, Les Crosets, Champoussin... Tous les documents d'hier et d'aujourd'hui, en rapport avec cette vallée, sans les autres communes du district comme Monthey, Vouvry Lorem ipsum dolor sit amet, consectetur adipiscing elit. Erat enim Polemonis. Duo Reges: constructio interrete. Immo alio genere; A mene tu? Nihil opus est exemplis hoc facere longius. Potius inflammat, ut coercendi magis quam dedocendi esse videantur. Cum autem venissemus in Academiae non sine causa nobilitata spatia, solitudo erat ea, quam volueramus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Tollenda est atque extrahenda radicitus.<br><br>Nonne igitur tibi videntur, inquit, mala? Sed residamus, inquit, si placet. Sed ad illum redeo. Quo modo autem optimum, si bonum praeterea nullum est? Duo Reges: constructio interrete. Quos nisi redarguimus, omnis virtus, omne decus, omnis vera laus deserenda est. Quod cum dixissent, ille contra. Ergo adhuc, quantum equidem intellego, causa non videtur fuisse mutandi nominis. Haec para/doca illi, nos admirabilia dicamus."
+}