# HG changeset patch # User duong tam kien # Date 1500302229 -7200 # Node ID b5d11572f1ede90d2410b671fe0fc407a21d4d71 # Parent ec72869a5a20b1426cc241911c74181f401ab246 scaffolding diff -r ec72869a5a20 -r b5d11572f1ed design/_data/members.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_data/members.json Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,38 @@ +[ + { + "shared_sessions": 23, + "last_seen": "Thu Sep 20 1990 11:25:08 GMT+0000 (UTC)", + "name": "Valentine Shannon", + "_id": "595e548aa877e8e92b5880f1" + }, + { + "shared_sessions": 39, + "last_seen": "Mon Sep 02 2002 14:33:45 GMT+0000 (UTC)", + "name": "Laurie Garcia", + "_id": "595e548a8cc0ef3cec03bef4" + }, + { + "shared_sessions": 21, + "last_seen": "Thu Sep 12 2002 16:02:44 GMT+0000 (UTC)", + "name": "Alyson Franklin", + "_id": "595e548a53dd6a5d6c94a23e" + }, + { + "shared_sessions": 22, + "last_seen": "Fri Jan 05 1996 03:45:17 GMT+0000 (UTC)", + "name": "Tracey Robinson", + "_id": "595e548a8bda07ef152497fd" + }, + { + "shared_sessions": 40, + "last_seen": "Sat Mar 29 1980 13:09:47 GMT+0000 (UTC)", + "name": "Paula Harris", + "_id": "595e548afbda66e4a11cd078" + }, + { + "shared_sessions": 36, + "last_seen": "Wed Nov 03 1971 05:38:45 GMT+0000 (UTC)", + "name": "Conley Davidson", + "_id": "595e548ad8ad8a882b4f6a5d" + } +] diff -r ec72869a5a20 -r b5d11572f1ed design/_data/metacategories-extra.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_data/metacategories-extra.json Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,20 @@ +[ + { + "_id": "595e48cd8f18f8746b2809fc", + "label": "magna in", + "color": "(31, 108, 47)", + "description": "Dolor est elit voluptate voluptate velit cillum laborum eiusmod nisi." + }, + { + "_id": "595e48cd29bda1c999b31230", + "label": "incididunt duis", + "color": "(131, 198, 76)", + "description": "In irure do excepteur anim nulla minim deserunt aute eiusmod." + }, + { + "_id": "595e48cd4bb9bb5e1158cf47", + "label": "cillum laborum", + "color": "(119, 69, 77)", + "description": "Nostrud esse amet deserunt exercitation proident in cupidatat ipsum reprehenderit adipisicing do ipsum aute." + } +] diff -r ec72869a5a20 -r b5d11572f1ed design/_data/metacategories.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_data/metacategories.json Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,20 @@ +[ + { + "_id": "595e48cd8f18f8746b2809fc", + "label": "mot-clé", + "color": "(255,170,213)", + "description": "Les mots surlignés avec cette méta-catégorie seront considérés comme des mots-clés et seront ainsi regroupés comme tel dans une exploitation ultérieur." + }, + { + "_id": "595e48cd29bda1c999b31230", + "label": "important", + "color": "(255,255,102)", + "description": "Question. In irure do excepteur anim nulla minim deserunt aute eiusmod." + }, + { + "_id": "595e48cd4bb9bb5e1158cf47", + "label": "commentaire", + "color": "(51,153,255)", + "description": "Contexte. Nostrud esse amet deserunt exercitation proident in cupidatat ipsum reprehenderit adipisicing do ipsum aute." + } +] diff -r ec72869a5a20 -r b5d11572f1ed design/_includes/annotation-commentaire.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_includes/annotation-commentaire.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,17 @@ +
+
+
+

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

+
+
+
+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.

+
+ +
+
+
+ diff -r ec72869a5a20 -r b5d11572f1ed design/_includes/filter.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_includes/filter.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,11 @@ +
+
+ +
+ +
+ + + +
+
diff -r ec72869a5a20 -r b5d11572f1ed design/_includes/nav.html --- a/design/_includes/nav.html Mon Jul 10 16:22:59 2017 +0200 +++ b/design/_includes/nav.html Mon Jul 17 16:37:09 2017 +0200 @@ -15,7 +15,7 @@ {% endif %}
  • Paul-Émile
    • -
  • CRC
    • +
  • CRC
  • {{ session.title }}
    - {{ session.first | date: "%d/%m/%Y %H:%M" }} → {{ session.last | date: "%d/%m/%Y %H:%M" }} +
    + {{ session.title }} + + + + + + +
    -
    {{ session.annotations }} notes
    + + {% if include.show_author %} + {{ site.data.members | map: 'name' | sample }} • + {% endif %} + + {{ session.first | date: "%d/%m/%Y %H:%M" }} → {{ session.last | date: "%d/%m/%Y %H:%M" }} + + +
    + {{ session.annotations }} notes / comparer avec une autre session +
    {{ session.description }}
    - + mots-clés : {% for keyword in session.keywords %} {{ keyword }} diff -r ec72869a5a20 -r b5d11572f1ed design/_layouts/default.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/_layouts/default.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + {{ content }} + + + + + + + diff -r ec72869a5a20 -r b5d11572f1ed design/annotations-sample.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/annotations-sample.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,13 @@ +--- +layout: default +--- + +
    +
    +
    + + {% include annotation-commentaire.html %} + +
    +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/compare-1.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/compare-1.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,83 @@ +--- +layout: default +--- + +{% include nav.html search=true %} + +{% assign session1 = site.data.sessions | sample %} + +
    +
    +
    + +
    +

    comparaison de sessions

    + +
    +
    {{ session1.title }}
    + +
    + {{ session1.first | date: "%d/%m/%Y %H:%M" }} → {{ session1.last | date: "%d/%m/%Y %H:%M" }} +
    +
    + +
      + {% assign sessions_random = site.data.sessions | sample: 3 %} + {% for session in sessions_random %} +
    • +
      + +
      +
      +
      + {{ session.title }} +
      + +
      + {{ session.first | date: "%d/%m/%Y %H:%M" }} → {{ session.last | date: "%d/%m/%Y %H:%M" }} +
      +
      +
      • + {% endfor %} +
    + +
    + comparer +
    + +
    +
    +
    +
    + +
    +
    + +
    + {% include sessions.list.html show_author=true compare=true %} +
    +
    + +

    Lorem ipsum

    + +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras nisi tortor, viverra id porta id, porttitor at justo. Curabitur pharetra, sapien sit amet ornare finibus, diam tortor varius sapien, non laoreet tellus ante a justo. Donec id lacus sit amet metus gravida tempus vel vitae justo.

    + +

    Protocole d'annotations

    + +

    Membres

    + +
    + {% for member in site.data.members %} +
    +
    {{ member.name }} {{ member.shared_sessions }}
    +
    {{ member.last_seen }}
    +
    + {% endfor %} +
    + +
    +
    +
    + diff -r ec72869a5a20 -r b5d11572f1ed design/compare.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/compare.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,38 @@ +--- +--- + + + + + + + + + + + + + + + + + + + {% include nav.html %} + +
    +
    + {% include notes.compare.html margins="bottom" %} +
    + +
    + {% include notes.compare.html margins="bottom" %} +
    +
    + + + + + + + diff -r ec72869a5a20 -r b5d11572f1ed design/dashboard.html diff -r ec72869a5a20 -r b5d11572f1ed design/group-info.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/group-info.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,35 @@ +--- +layout: default +--- + +{% include nav.html search=true %} + +
    +
    +
    + +

    Lorem ipsum

    + +

    Nostrud esse amet deserunt exercitation proident in cupidatat ipsum reprehenderit adipisicing do ipsum aute. Dolor est elit voluptate voluptate velit cillum laborum eiusmod nisi.

    + +

    + Protocole d'annotations +

    + +

    Le procole d'annotation est ensemble de méta-catégories définies par le groupe afin d'avoir un langage commun d'intentions.

    + + {% for metacategory in site.data.metacategories %} +

    {{ metacategory.label }}

    + +

    {{ metacategory.description }}

    + {% endfor %} + + {% for metacategory in site.data.metacategories-extra %} +

    {{ metacategory.label }}

    + +

    {{ metacategory.description }}

    + {% endfor %} + +
    +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/group-protocol-edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/group-protocol-edit.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,50 @@ +--- +layout: default +--- + +{% include nav.html search=true %} + +
    +
    +
    + +

    Lorem ipsum

    + +

    Nostrud esse amet deserunt exercitation proident in cupidatat ipsum reprehenderit adipisicing do ipsum aute. Dolor est elit voluptate voluptate velit cillum laborum eiusmod nisi.

    + +
    +
    + + +
    +
    + + +
    + + +
    + +

    + Protocole d'annotations +

    + +

    Le procole d'annotation est ensemble de méta-catégories définies par le groupe afin d'avoir un langage commun d'intentions.

    + + {% for metacategory in site.data.metacategories %} +

    {{ metacategory.label }}

    + +

    {{ metacategory.description }}

    + {% endfor %} + + {% for metacategory in site.data.metacategories-extra %} +

    {{ metacategory.label }}

    + +

    {{ metacategory.description }}

    + {% endfor %} + + voir l'historique + +
    +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/group.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/group.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,33 @@ +--- +layout: default +--- + +{% include nav.html search=true %} +
    +
    +
    + {% include sessions.list.html show_author=true %} +
    +
    + +

    Lorem ipsum

    + +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras nisi tortor, viverra id porta id, porttitor at justo. Curabitur pharetra, sapien sit amet ornare finibus, diam tortor varius sapien, non laoreet tellus ante a justo. Donec id lacus sit amet metus gravida tempus vel vitae justo.

    + +

    Protocole d'annotations

    + +

    Membres

    + +
    + {% for member in site.data.members %} +
    +
    {{ member.name }} {{ member.shared_sessions }}
    +
    {{ member.last_seen }}
    +
    + {% endfor %} +
    + +
    +
    +
    + diff -r ec72869a5a20 -r b5d11572f1ed design/groups.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/groups.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,5 @@ +--- +layout: default +--- + +{% include nav.html search=true %} diff -r ec72869a5a20 -r b5d11572f1ed design/login.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/login.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,26 @@ +--- +layout: default +--- + +
    +
    + +

    Bienvenue sur la prise de note IRI

    + +
    + +
    + + +
    + +
    + + +
    + + Se connecter créer un compte +
    + +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/metacategory-extract-samples.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/metacategory-extract-samples.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,11 @@ +--- +--- + +
    +
    + + {% include annotation-commentaire.html %} + + +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/sequences/protocole.edit.diag --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/sequences/protocole.edit.diag Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,33 @@ +seqdiag { + + === show === + + browser -> client [label="open group info"] + client -> server [label="get last protocol for that group"] + server -> server [label="collect ids + info of metacategories in current protocol"] + client <- server [label="list of indexed metacategories"] + browser <- client [label="render list of metacategories in current protocol"] + + === edit === + + browser -> client [label="edit existing metacategory"] + client -> client [label="stack changes"] + browser <- client [label="activate submit button"] + + browser -> client [label="add new metacategory"] + client -> client [label="add new line to list of metacategories"] + browser <- client [label="(if not) activate submit button"] + + === submit === + + browser -> client [label="submit new list of metacategories"]; + client --> browser [label="set form as not editable and notify loading"]; + + client -> server [label="write new protocol"] + server -> server [label="generate new protocol id"] + server --> server [label="create new metacategories"] + server -> server [label="create new version of updated metacategories"] + client <- server [label="return new protocol id and list of indexed metacategories"] + browser <-- client [label="set form as editable but not submitable (no change)"] + +} diff -r ec72869a5a20 -r b5d11572f1ed design/sequences/protocole.edit.png Binary file design/sequences/protocole.edit.png has changed diff -r ec72869a5a20 -r b5d11572f1ed design/sessions.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/sessions.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,29 @@ +--- +layout: default +--- + +{% include nav.html %} + +
    + +
    +
    + +{% include filter.html %} + +{% include sessions.list.html %} + +
    +
    + + +
    + dernière synchro : 01/01/2018 +
    + +

    Mes mots-clés

    + +
    + +
    +
    diff -r ec72869a5a20 -r b5d11572f1ed design/signup.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/signup.html Mon Jul 17 16:37:09 2017 +0200 @@ -0,0 +1,31 @@ +--- +layout: default +--- + +
    +
    + +

    Bienvenue sur la prise de note IRI

    + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + + Créer un compte +
    + +
    +