From 39104f779d37b7e4dc361e25326f5b40f011797c Mon Sep 17 00:00:00 2001
From: dj3c1t <dj3c1t@free.fr>
Date: Mon, 8 Jul 2013 22:31:26 +0200
Subject: [PATCH] modifications sur le template default

---
 app/controllers/users/morceaux.php                 |  27 +-
 app/controllers/users/pistes.php                   |  27 +-
 app/out/default/config.xml                         |   9 -
 app/out/default/css/actions/sources.css            | 262 +++++++++--------
 app/out/default/css/colorbox.css                   |   2 +-
 app/out/default/css/colors.css                     | 324 ---------------------
 app/out/default/css/sourceml_accounts.css          |   2 +-
 app/out/default/icons/item.png                     | Bin 0 -> 382 bytes
 app/out/default/icons/licences/cc.by.nc.nd.png     | Bin 0 -> 688 bytes
 app/out/default/icons/licences/cc.by.nc.png        | Bin 0 -> 672 bytes
 app/out/default/icons/licences/cc.by.nc.sa.png     | Bin 0 -> 697 bytes
 app/out/default/icons/licences/cc.by.nd.png        | Bin 0 -> 665 bytes
 app/out/default/icons/licences/cc.by.png           | Bin 0 -> 640 bytes
 app/out/default/icons/licences/cc.by.sa.png        | Bin 0 -> 672 bytes
 app/out/default/images/colorbox/controls.png       | Bin 284 -> 283 bytes
 app/out/default/js/actions/sources.js              |   6 +-
 app/out/default/js/jquery.colorbox-min.js          |   6 +-
 app/out/default/views/sources/album/list.php       |   4 +-
 app/out/default/views/sources/album/view.php       |  15 +-
 app/out/default/views/sources/groupe/list.php      |   2 +
 app/out/default/views/sources/groupe/view.php      |  26 +-
 app/out/default/views/sources/morceau/list.php     |   4 +-
 app/out/default/views/sources/morceau/view.php     |  76 +++--
 app/out/default/views/sources/piste/list.php       |   4 +-
 app/out/default/views/sources/piste/view.php       |  89 ++++--
 app/out/default/views/sources/source.php           |   3 +-
 app/out/default/views/sources/source/documents.php |  10 +-
 app/out/default/views/sources/source/header.php    |  52 ++--
 app/out/default/views/users/albums/edit.php        |   2 +-
 app/out/default/views/users/albums/list.php        |   4 +
 app/out/default/views/users/morceaux/add.php       |  11 +-
 app/out/default/views/users/morceaux/edit.php      |  17 +-
 app/out/default/views/users/morceaux/list.php      |   4 +
 app/out/default/views/users/pistes/add.php         |  11 +-
 app/out/default/views/users/pistes/edit.php        |  17 +-
 app/out/default/views/users/pistes/list.php        |   6 +-
 36 files changed, 441 insertions(+), 581 deletions(-)
 delete mode 100644 app/out/default/config.xml
 delete mode 100644 app/out/default/css/colors.css
 create mode 100644 app/out/default/icons/item.png
 create mode 100644 app/out/default/icons/licences/cc.by.nc.nd.png
 create mode 100644 app/out/default/icons/licences/cc.by.nc.png
 create mode 100644 app/out/default/icons/licences/cc.by.nc.sa.png
 create mode 100644 app/out/default/icons/licences/cc.by.nd.png
 create mode 100644 app/out/default/icons/licences/cc.by.png
 create mode 100644 app/out/default/icons/licences/cc.by.sa.png

diff --git a/app/controllers/users/morceaux.php b/app/controllers/users/morceaux.php
index 24d0c7c..8c95856 100644
--- a/app/controllers/users/morceaux.php
+++ b/app/controllers/users/morceaux.php
@@ -142,6 +142,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       $users_sources_mod = $env->get_controller("users/sources");
       if($_POST){
@@ -215,6 +216,11 @@
           }
         }
         if(!$env->messages()){
+          if(($image = $data->upload("image", $upload_dir)) === false){
+            $env->erreur("erreur lors de l'envoi de l'image. le morceau n'a pas été ajouté");
+            return;
+          }
+          if($image) $source_infos["image"] = $this->user["id"]."/".$image;
           if(
             (
               $id_source = $data->add_source(
@@ -296,6 +302,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       if(($compositions = $data->source_compositions(array("id_source" => $morceau["id"]))) === false){
         $env->erreur("Impossible de lire la liste des compositions");
@@ -310,7 +317,8 @@
         $morceau = $data->empty_source(
           array(
             "id" => $morceau["id"],
-            "groupes" => $morceau["groupes"]
+            "groupes" => $morceau["groupes"],
+            "image" => isset($morceau["image"]) ? $morceau["image"] : ""
           )
         );
         $users_sources_mod = $env->get_controller("users/sources");
@@ -380,6 +388,23 @@
           }
         }
         if(!$env->messages()){
+          if(isset($_POST["del_image"])){
+            if($morceau["image"]){
+              if(!@unlink($env->path("content")."uploads/".$morceau["image"])){
+                $env->erreur("Impossible d'effacer l'image du morceau");
+                return;
+              }
+            }
+            $morceau["image"] = "";
+          }
+          else{
+            if(($up_image = $data->upload("image", $upload_dir)) === false){
+              $env->erreur("Impossible d'uploader l'image");
+              return;
+            }
+            if($up_image) $morceau["image"] = $this->user["id"]."/".$up_image;
+          }
+          if($morceau["image"]) $source_infos["image"] = $morceau["image"];
           if(
             (
               $data->set_source(
diff --git a/app/controllers/users/pistes.php b/app/controllers/users/pistes.php
index 4fd25f6..60fc50b 100644
--- a/app/controllers/users/pistes.php
+++ b/app/controllers/users/pistes.php
@@ -147,6 +147,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       $users_sources_mod = $env->get_controller("users/sources");
       if($_POST){
@@ -220,6 +221,11 @@
           }
         }
         if(!$env->messages()){
+          if(($image = $data->upload("image", $upload_dir)) === false){
+            $env->erreur("erreur lors de l'envoi de l'image. la piste n'a pas été ajoutée");
+            return;
+          }
+          if($image) $source_infos["image"] = $this->user["id"]."/".$image;
           if(
             (
               $id_source = $data->add_source(
@@ -301,6 +307,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       if(($compositions = $data->source_compositions(array("id_source" => $piste["id"]))) === false){
         $env->erreur("Impossible de lire la liste des compositions");
@@ -315,7 +322,8 @@
         $piste = $data->empty_source(
           array(
             "id" => $piste["id"],
-            "groupes" => $piste["groupes"]
+            "groupes" => $piste["groupes"],
+            "image" => isset($piste["image"]) ? $piste["image"] : ""
           )
         );
         $users_sources_mod = $env->get_controller("users/sources");
@@ -385,6 +393,23 @@
           }
         }
         if(!$env->messages()){
+          if(isset($_POST["del_image"])){
+            if($piste["image"]){
+              if(!@unlink($env->path("content")."uploads/".$piste["image"])){
+                $env->erreur("Impossible d'effacer l'image de la piste");
+                return;
+              }
+            }
+            $piste["image"] = "";
+          }
+          else{
+            if(($up_image = $data->upload("image", $upload_dir)) === false){
+              $env->erreur("Impossible d'uploader l'image");
+              return;
+            }
+            if($up_image) $piste["image"] = $this->user["id"]."/".$up_image;
+          }
+          if($piste["image"]) $source_infos["image"] = $piste["image"];
           if(
             (
               $data->set_source(
diff --git a/app/out/default/config.xml b/app/out/default/config.xml
deleted file mode 100644
index 315e9ed..0000000
--- a/app/out/default/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-
-  <groupe_view_albums type="checkbox" default="0"><![CDATA[Lister les albums sur la page d'un groupe]]></groupe_view_albums>
-  <colonne_logo_groupe type="checkbox" default="1"><![CDATA[Afficher le logo du groupe courant dans la colonne]]></colonne_logo_groupe>
-  <albums_menu type="checkbox" default="1"><![CDATA[Afficher les albums du groupe courant dans la colonne]]></albums_menu>
-  <nom_groupe type="checkbox" default="1"><![CDATA[Afficher le nom du groupe courant dans la colonne]]></nom_groupe>
-
-</config>
diff --git a/app/out/default/css/actions/sources.css b/app/out/default/css/actions/sources.css
index 1a7239c..363fd9b 100644
--- a/app/out/default/css/actions/sources.css
+++ b/app/out/default/css/actions/sources.css
@@ -1,3 +1,43 @@
+/* ------------------------------- ariane ----------- */
+
+ul.ariane{
+  padding-bottom: 2em;
+}
+
+ul.groupes_sources li{
+  clear: both;
+  margin-bottom: 0.5em;
+}
+
+ul.groupes_sources li a{
+  display: block;
+  padding: 0 1em 0 1.8em;
+  line-height: 2em;
+  background-image: url(../../icons/item.png);
+  background-position: 5px 0.6em;
+  background-repeat: no-repeat;
+  border: solid 1px #d5d5d5;
+  border-radius: 3px;
+}
+ul.groupes_sources li a:hover{
+  color: #000066;
+  background-color: #f5f5f5;
+}
+
+ul.ariane li{
+  float: left;
+}
+ul.ariane li a{
+  display: block;
+  padding: 0 1.8em 0 0.5em;
+  background-image: url(../../icons/item.png);
+  background-position: right 3px;
+  background-repeat: no-repeat;
+}
+ul.ariane li:last-child a{
+  background-image: none;
+}
+
 /* ------------------------------- liste groupes ----------- */
 
 ul.groupes{
@@ -7,11 +47,11 @@ ul.groupes{
 ul.groupes li{
   padding: 0px;
   float: left;
-  width: 33%;
+  width: 50%;
 }
 
 ul.groupes li h4{
-  font-size: 1.2em;
+  font-size: 1.05em;
   font-weight: bold;
   margin: 0px;
   padding: 0px;
@@ -22,13 +62,15 @@ ul.groupes li h4 a{
   display: block;
   padding: 5px;
   height: 100px;
-  border: solid 1px #d9d9d9;
+  background-color: #ffffff;
   border-radius: 3px 3px 3px 3px;
   -moz-border-radius: 3px 3px 3px 3px;
+  color: #444444;
+  border: solid 1px #d5d5d5;
 }
 ul.groupes li h4 a:hover{
-  color: #000066;
-  background-color: #f1f1f1;
+  color: #444444;
+  background-color: #f5f5f5;
 }
 
 ul.groupes li h4 a img{
@@ -61,7 +103,7 @@ ul.groupes li .infos li
 
 /* ------------------------------- page album ----------- */
 
-.logo_album{
+.logo_source{
   text-align: center;
 }
 
@@ -123,103 +165,101 @@ p#play_all a
   float: right;
   padding: 10px 5px 0px 5px;
 }
-/*
-ul#lien_contact
-{ margin: 20px 18px 0px 0px;
-  padding: 0px;
-}
 
-ul#lien_contact li
-{ list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-ul#lien_contact li a
-{ display: block;
-  text-align: right;
-  padding: 5px 5px 0px 5px;
-}
-*/
 /* ------------------------------- albums (page groupe) --- */
 
-#center ul.menu_albums
-{ margin: 32px 18px 0px 0px;
+ul.menu_albums{
+  margin: 32px 18px 0px 0px;
+  list-style-type: none;
+  margin-left: 0px;
+  margin: 0px 0px 10px 10px;
 }
 
-#center ul.menu_albums li
-{ list-style-type: none;
-  margin: 0px;
+ul.menu_albums li{
+  list-style-type: none;
+  width: 250px;
   padding: 0px;
 }
 
-#center ul.menu_albums li a
-{ display: block;
-  padding: 5px 5px 0px 5px;
+#colonne ul.menu_albums li{
+  width: auto;
 }
 
-#center h3.menu_albums
-{ margin: 0px 0px 10px 10px;
-}
-
-#center ul.menu_albums
-{ list-style-type: none;
-  margin-left: 0px;
-  margin: 0px 0px 10px 10px;
-}
-
-#center ul.menu_albums li
-{ margin-left: 0px;
-  width: 220px;
+ul.menu_albums li a{
   margin: 5px 0px 5px 10px;
-/*  float: left;*/
-}
-
-#center ul.menu_albums li a
-{ display: block;
+  display: block;
   height: 90px;
   padding: 5px;
+  border: solid 1px #d5d5d5;
+  border-radius: 3px;
+}
+ul.menu_albums li a:hover{
+  color: #000066;
+  background-color: #f5f5f5;
 }
 
-#center ul.menu_albums li a span
-{ display: block;
+ul.menu_albums li a span{
+  display: block;
   float: right;
+  max-width: 140px;
   padding: 10px 5px 0px 5px;
-  max-width: 100px;
+  text-align: right;
+  font-weight: bold;
 }
 
 /* ------------------------ blocs source -------------------- */
 
-ul.sources
-{ list-style-type: none;
+ul.sources{
+  list-style-type: none;
 }
 
-ul.sources li
-{ margin: 10px 5px 0px 5px;
+ul.sources li{
+  margin: 10px 5px 0px 5px;
   padding: 5px;
 }
 
-.playing_download
-{ padding: 5px;
+.playing_download{
+  padding: 5px;
   margin-top: 10px;
 }
 
-.sources h5
-{ font-size: 1em;
-  padding: 3px 10px 3px 10px;
+.track{
+  background-color: #ffffff;
+  border: solid 1px #d5d5d5;
+  border-radius: 3px;
+  box-shadow: 0px 0px 5px #d5d5d5;
 }
 
-.sources h5 span
-{ font-weight: normal;
+.track h1{
+  font-size: 1.3em;
+  float: left;
+}
+.track h1 a{
+  color: #555555;
+}
+.track h1 a:hover{
+  text-decoration: underline;
 }
 
-.sources h5 span.small
-{ font-size: 0.9em
+.track ul.authors{
+  float: right;
+  padding: 0;
+  margin: 0;
 }
+.track ul.authors li{
+  padding: 0;
+  margin: 0;
+}
+.track ul.authors li a{
+  display: block;
+  text-align: right;
+/*  color: #855e00;*/
+  padding: 0em 1em;
+  border-radius: 3px;
+  margin-bottom: 0.3em;
+}
+.track ul.authors li a:hover{
 
-.sources h5 .auteur
-{ float: right;
-  font-weight: normal;
 }
 
 .licence
@@ -236,6 +276,7 @@ ul.documents li
 { margin: 0px;
   padding: 0px;
   clear: left;
+  font-size: 0.8em;
 }
 
 /* ------ player */
@@ -307,20 +348,24 @@ ul.documents li
   padding-left: 0px;
 }
 
-.source_arbo h3
-{ padding-left: 35px;
+.source_arbo h3{
+  font-size: 1em;
+  font-weight: bold;
+  padding-left: 35px;
+  color: #444444;
 }
 
-.derivation h3
-{ font-size: 1em;
+.derivation h3{
+  font-size: 1em;
+  font-weight: bold;
   padding-left: 35px;
-  font-weight: normal;
+  color: #444444;
 }
 
-.pistes h3
-{ font-size: 1em;
+.pistes h3{
+  font-weight: bold;
   padding-left: 35px;
-  font-weight: normal;
+  color: #444444;
 }
 
 .no_source
@@ -342,15 +387,19 @@ ul.documents li
 
 /* ------------------------------- page album ----------- */
 
-p#play_all a
-{ border: solid 1px #c0c0c0;
+p#play_all a{
   border-radius: 3px 3px 3px 3px;
   -moz-border-radius: 3px 3px 3px 3px;
   background-image: url("../../icons/ecouter.png");
   background-repeat: no-repeat;
   background-position: 6px 6px;
+  color: #333333;
+  border: solid 1px #d5d5d5;
   background-color: #ffffff;
 }
+p#play_all a:hover{
+  background-color: #f5f5f5;
+}
 
 /* ----------------------------------- sources --------- */
 
@@ -358,9 +407,7 @@ ul.albums li a
 { border: solid 1px #555555;
 }
 
-.logo_groupe
-{ /*border: solid 1px #e9e9e9;*/
-  background-color: #ffffff;
+.logo_groupe{
   border-radius: 3px 3px 3px 3px;
   -moz-border-radius: 3px 3px 3px 3px;
 }
@@ -369,49 +416,18 @@ ul#lien_contact li a
 { border-bottom: solid 1px #d9d9d9;
 }
 
-#colonne ul#album_links
-{ /*border-bottom: solid 1px #333333;*/
+.playing_track{
+  border: solid 1px #999999;
+  box-shadow: 0px 0px 5px #999999;
 }
 
-#colonne ul#album_links li
-{
-}
-
-#colonne ul.menu_albums li
-{ border: solid 1px #d9d9d9;
+.player_progress{
+  border: solid 1px #c0c0c0;
   background-color: #ffffff;
 }
 
-#center ul.menu_albums li
-{ border: solid 1px #d9d9d9;
-  float: left;
-}
-
-.track
-{ border: solid 1px #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.track h5
-{ background-color: #ffffff;
-  border-radius: 3px 3px 0px 0px;
-  -moz-border-radius: 3px 3px 0px 0px;
-}
-
-.playing_track
-{ border: solid 1px #dedede;
-  background-color: #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.player_progress
-{ background-color: #ececec;
-}
-
 .player_progress .loaded
-{ background-color: #dedede;
+{ background-color: #c0c0c0;
 }
 
 .player_progress .position
@@ -458,8 +474,12 @@ ul#lien_contact li a
 { border-left: none;
 }
 
-.loading
-{ background-image: url("../../icons/ajax-loader.gif");
+.loading{
+  background-image: url("../../icons/ajax-loader.gif");
   background-repeat: no-repeat;
   background-position: 5px 5px;
-}
\ No newline at end of file
+  height: 20px;
+}
+.loading span{
+  display: none;
+}
diff --git a/app/out/default/css/colorbox.css b/app/out/default/css/colorbox.css
index 89fea1c..8a7708a 100644
--- a/app/out/default/css/colorbox.css
+++ b/app/out/default/css/colorbox.css
@@ -20,7 +20,7 @@
     #cboxMiddleRight{width:21px;}
     #cboxTopCenter{height:21px;}
     #cboxBottomCenter{height:21px;}
-    #cboxContent{background:#ffffff; overflow:hidden; color: #555555; padding: 10px 10px 0px 10px; border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px;}
+    #cboxContent{background:#ffffff; overflow:hidden; color: #333333; padding: 10px 10px 0px 10px; border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; border: solid 1px #999999; }
         #cboxError{padding:50px; border:1px solid #ccc;}
         #cboxLoadedContent{margin-bottom:28px;}
         #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
diff --git a/app/out/default/css/colors.css b/app/out/default/css/colors.css
deleted file mode 100644
index 9b50de8..0000000
--- a/app/out/default/css/colors.css
+++ /dev/null
@@ -1,324 +0,0 @@
-body
-{ background-color: #ffffff;
-  color: #333333;
-}
-
-a
-{ text-decoration: none;
-  color: #000066;
-}
-
-a img
-{ border: none;
-}
-
-a:hover
-{ color: #c0c0c0;
-}
-
-.navig
-{ color: #333333;
-  border: solid 1px #c0c0c0;
-  background-color: #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.loading
-{ background-image: url("../icons/ajax-loader.gif");
-  background-repeat: no-repeat;
-  background-position: 5px 5px;
-}
-
-/* ------------------------- messages --------------- */
-
-.messages
-{ border: solid 1px #c0c0c0;
-}
-
-.erreur
-{ border: solid 1px #c0c0c0;
-}
-
-.redirect_message div
-{ border: solid 1px #c0c0c0;
-}
-
-/* ------------------------- blocs generaux --------- */
-
-#header
-{ padding-top: 10px;
-}
-
-#header .content
-{ border-bottom: solid 1px #d9d9d9;
-}
-
-#colonne
-{ /*border-right: dashed 1px #555555; */
-}
-
-#footer .content
-{ border-top: solid 1px #e9e9e9;
-}
-
-#footer .content p
-{ color: #777777;
-}
-
-/* ----------------------------------- menu top ----- */
-
-#menu_top ul.menu li a
-{ border: solid 1px #e9e9e9;
-  background-color: #ffffff;
-}
-
-#menu_top ul.menu li ul li a
-{ border-top: none;
-  border-right: solid 1px #333333;
-  border-bottom: none;
-  border-left: solid 1px #333333;
-  background-color: #050505;
-}
-
-#menu_top ul.menu li ul li.last a
-{ border-top: none;
-  border-right: solid 1px #333333;
-  border-bottom: solid 1px #333333;
-  border-left: solid 1px #333333;
-  background-color: #050505;
-}
-
-/* ----------------------------------- admin --------- */
-
-table.admin tr.hl td
-{ border: solid 1px #d1d1d1;
-}
-
-table.admin tr.hl:hover
-{ background-color: #f9f9f9;
-}
-
-input[type=text], input[type=file], input[type=password], textarea, select
-{ border: solid 1px #999999;
-  color: #333333;
-}
-
-input[type=submit], a.button
-{ border: solid 1px #d1d1d1;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-input[type=submit]:hover, a.button:hover
-{ border: solid 1px #d1d1d1;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-ul.admin
-{ border-bottom: dashed 1px #c0c0c0;
-}
-
-ul.admin_form_head
-{ border: solid 1px #c0c0c0;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-ul.admin_form_content ul.admin
-{ border-bottom: none;
-}
-
-ul.admin li a
-{ border: solid 1px #d1d1d1;
-}
-
-.admin_source_infos ul.admin li a
-{ border: none;
-  background-color: #101010;
-  color: #c0c0c0;
-}
-
-ul.admin li a.add
-{ background-image: url("../icons/add.gif");
-  background-repeat: no-repeat;
-  background-position: 3px 6px;
-  border: solid 1px #d1d1d1;
-}
-
-ul.admin li a:hover
-{
-}
-
-.admin_source_infos
-{ border: solid 1px #c0c0c0;
-/*  background-color: #0a0a0a;*/
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.admin_source_infos ul.admin li a:hover
-{ border: none;
-  background-color: #333333;
-  color: #c0c0c0;
-}
-
-#documents .document
-{ border: solid 1px #c0c0c0;
-}
-
-/* ------------------------------- plugins ----------- */
-
-ul.plugins li
-{ border: solid 1px #c0c0c0;
-}
-
-ul.plugins li.enabled
-{ background-color: #ffffff;
-}
-
-ul.plugins li.disabled
-{ background-color: #f7f7f7;
-}
-
-ul.plugins li.uninstalled
-{ background-color: #e5e5e5;
-}
-
-ul.plugins li ul.plugin_links li
-{ border-top: none;
-  border-right: none;
-  border-bottom: none;
-  border-left: solid 1px #c0c0c0;
-}
-
-ul.plugins li ul.plugin_links li input
-{ border: solid 1px #c0c0c0;
-}
-
-/* ------------------------------- liste groupes ----------- */
-
-ul.groupes li h4 a
-{ border: solid 1px #d9d9d9;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-/* ------------------------------- page album ----------- */
-
-p#play_all a
-{ border: solid 1px #c0c0c0;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-  background-image: url("../icons/ecouter.png");
-  background-repeat: no-repeat;
-  background-position: 6px 6px;
-  background-color: #ffffff;
-}
-
-/* ----------------------------------- sources --------- */
-
-ul.albums li a
-{ border: solid 1px #555555;
-}
-
-.logo_groupe
-{ /*border: solid 1px #e9e9e9;*/
-  background-color: #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-ul#lien_contact li a
-{ border-bottom: solid 1px #d9d9d9;
-}
-
-#colonne ul#album_links
-{ /*border-bottom: solid 1px #333333;*/
-}
-
-#colonne ul#album_links li
-{
-}
-
-#colonne ul.menu_albums li
-{ border: solid 1px #d9d9d9;
-  background-color: #ffffff;
-}
-
-#center ul.menu_albums li
-{ border: solid 1px #d9d9d9;
-  float: left;
-}
-
-.track
-{ border: solid 1px #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.track h5
-{ background-color: #ffffff;
-  border-radius: 3px 3px 0px 0px;
-  -moz-border-radius: 3px 3px 0px 0px;
-}
-
-.playing_track
-{ border: solid 1px #dedede;
-  background-color: #ffffff;
-  border-radius: 3px 3px 3px 3px;
-  -moz-border-radius: 3px 3px 3px 3px;
-}
-
-.player_progress
-{ background-color: #ececec;
-}
-
-.player_progress .loaded
-{ background-color: #dedede;
-}
-
-.player_progress .position
-{ background-color: #999999;
-}
-
-.player_controls a img
-{ border: none;
-}
-
-.source_arbo ul.menu_source
-{ float: right;
-  margin: 0px 10px 1px 0px;
-}
-
-.source_arbo ul.menu_source li
-{ float: right;
-  padding: 1px;
-}
-
-.source_arbo ul.menu_source li a
-{ display: block;
-  text-align: center;
-  background-color: #151515;
-  border-radius: 3px 3px 0px 0px;
-  -moz-border-radius: 3px 3px 0px 0px;
-  padding: 2px 5px 2px 5px;
-}
-
-.source_arbo ul.menu_source li a:hover
-{
-}
-
-.source_arbo ul.menu_source li.icon a
-{ border: none;
-  padding: 2px 2px 2px 2px;
-}
-
-.pistes
-{ border-left: none;
-}
-
-.derivation
-{ border-left: none;
-}
diff --git a/app/out/default/css/sourceml_accounts.css b/app/out/default/css/sourceml_accounts.css
index 0825116..a49fd80 100644
--- a/app/out/default/css/sourceml_accounts.css
+++ b/app/out/default/css/sourceml_accounts.css
@@ -63,6 +63,6 @@ ul.xml_infos li
 }
 
 .source_groupes .access{
-  color: #c0c0c0;
+  color: #666666;
   padding-left: 20px;
 }
\ No newline at end of file
diff --git a/app/out/default/icons/item.png b/app/out/default/icons/item.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f7ef7293a40ea70569970cc9a28d019847deeb8
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&jKx9jP7LeL$-D$|*pj^6T^Qs+
zu(2^{3Q&Zzz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YJ8XBD$h_uUe&2o#bmag8W(&d<$F
z%`0JWE=o--Nlj5G&n(GMaQE~L2yf&Q2P(Sh>EaloasKSYwSLTj0<HE@T@m4}%#K+e
z!bNcl6-8ecxSm`5fy3sYjYDi~@I{tJIoF`eA~yqe#$KGDlXmpkvM=rj3(KF?6hFJi
zUB9&Kb3$7Aq;*P3)n+;`MJ2p;P21Ad@k!<f=MILv26xX$+mv#yJq+&}c`_Jn6BJfX
z+S1eUD%?V8pUPgwyH>Ibn7=f(cg!&VyS7BMT)&ZjfmhV_mEVnYXGHS#yxML4wNk)r
zbGm}Rjj93Tvg4CxKQK37R(lusruwbOx>u$58#nIG=lfgCwV$DN_xhjLe=+9mvFrbG
SRHYK=Nd`|>KbLh*2~7b0)QS86

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.nc.nd.png b/app/out/default/icons/licences/cc.by.nc.nd.png
new file mode 100644
index 0000000000000000000000000000000000000000..072f8cda0ab220f98162dec5c705c44298d9aeee
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!LP<nHRCwBA
zU>IS55s3f)|36ZE%gD$AVXfJ;8d+k`uDvs-&g|&uC@(L^)aL5ydg|1vw(eGO32`7-
zURJ@?$@SxhkAvK|ka%Unlz92#<?_YLarqVqcJJP8W@a|Ie+q>A;p2zGg2JH^$yhwR
ze8~!7VPRapg#ci1+`Msf!`h8N_Qy{jJbXO7eY}UNhc8{cl%AdrWSl*FR#{mYnC^jT
z`2G9$KoZCXiU7rpjg4JgT&`Wc1~r9=3CKlDKM;VNoG{r~1(9{(DPJ(Ppjk?khc8{c
z{Q1*opnrhuu&^*71E?QJc6N3G{rT?QJ7CP;yLS&L3lzL_`wl!+0~0xB2>}EU>){L_
z31k!W09++pBQaXgEG5drU%z|-l7fPQz$gWJ4B~TO0tT{`l$3ztX=!Ppp`oxM9_sX;
zKYuW?Fk-p}*?SOoz`2;Qfy<#}Xdxknxp{biB+$1&zX5#+j8#an4CDg+3>2@ZsF*ct
z7Fqzavvd6aLt0=n!T_2erh2#t@mfgmu%5myFE1~|pTLOSvu6*`M4-=sY+!5)2?+s3
zAldcInKO#YiV$4_`~tv=3V#d}UsWRegcuW$6%f<{ZFnHp!+l--&!0ZOfB!xnJAff#
zVqy{<7ab7n59G>9%QZJNZ{4zWkk`Y&fWT5pN5@6IeftI&rFb-#m6fTeDnoqB&nK{B
z%Z@?rTYS|Lu>F*pnOa#{+1}ocRgaUi)Aj4u3rY&$>A8PG|7cr!khY~qT4#v?Aiw}`
W?NiqbQ>df>0000<MNUMnLSTY+yf{k$

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.nc.png b/app/out/default/icons/licences/cc.by.nc.png
new file mode 100644
index 0000000000000000000000000000000000000000..54ebdfbd8b88229b0cb6da644bde68c83181d87e
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!GD$>1RCwBA
zU>IS55s3f)|36ZE3j`1kui3O3Sz^zwy)&oI?C9tyFE7W`=IZKt>eQ*W?pARLaUfS-
zR>9TD_2Y++gWR`3Zvy?xgemdz#mnW3m*es+5bWN)+sw>ta{m+v_ru2zg$0E}C6cjt
zc=?hQ!otG1d<y}<;JA6?=7zN!f$Wc;K6v<ec>8z{RS#dfcqu(S9mqI)_N=n9GB6nc
z)A0NE?|~$c4HN;28yg$DxVT)qdJSp{6BCe&mVO`r&PA5On%*$k$R^Or!<Q~z{`~1P
z&_6(SSXda40kjfGc6N3G{rT?QJ7CP;yLS&L3lzL_`wl!+0~0xx5`vKt;$k=hl96!b
zG0ZFn*GMZ5fBo_WND2xH0;3e@F^JEB2^h#$Qc?nnr=_KZhK9n5c&O8V{`|qn!iebs
zWbZ+o4(FmJ0pviz3^*Ekn45<ONCJHe^c&EJz*vP8%RnyB&p`2tii%mYW}(FiJ3Gh!
zKmYN>F!maPkrB-^Sk==uhV}Gyd3kvu{sczso;`bjjsW@`$Ogu?kdP2i1d?6PoH?VY
ztO(I1z%Kx-sPM-y@l_?V=gBaEsD=k}J>1vT|NQCm`}gnT(FP0=6BCo@xafdje;`*@
zTCTaFdFz&~L$V%@j*EKx_6;yf@n|k9D^pQbhWM7BPhiKE9fRDr_^Ksf`zbXuwX(9Z
zy}cc)9w%p~>({RrloY_zbN__?(YEv;ZA*`|&JqJafB^uooh;+!k6K6o0000<MNUMn
GLSTaMVmieD

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.nc.sa.png b/app/out/default/icons/licences/cc.by.nc.sa.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed028fed9d6154b10bf73872ea925a9603a352ae
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!OG!jQRCwBA
zU>IS55s3f)|36ZE3j`1kui3O3Sz^zwy)&oI?C9tyFE7W`=IZKt>eQ*W?pARLaUfS-
zR>9TD_2Y++gWR`3Zvy?xgemdz#mnW3m*es+5bWN)+sw>ta{m+v_ru2zg$0E}C6cjt
zc=?hQ!otG1d<y}<;JA6?=7zN!f$Wc;K6v<ec>8z{RS#dfcqu(S9mqI)_N=n9GB6nc
z)A0NE?|~$c4HN;28yg$DxVT)qdJSp{6BCe&mVO`r&PA5On%*$k$R^-QrD(PgERUEl
ze0%xxr_VtD0NG(-VL%4Z2q4+n*$MRLyLaz^F@NvgJ)kU5@XqZ!@Kg;<<XB1wMn;GW
z;0#Dc!sU9*EC<(!D^EfIG3v2<`0JN1KvGap5E!LEk3oD6Ou#_4l9CcoJS{CPG&B@e
z#6z9_^XCsn7DlYW5BDC#DR3@Y<RAwMX24<90#T2aG)RtNZXO;W3G^+{Z$KXcV-->?
z1Gzvy1H~&UDrU`^g%&65>>U69{Kpf+*lP$_<ly%+vJcU;pjm-wAYl*d>Fe_H@<RLx
zjMzPU_5h6l`W(mx#<q}<5Ksh?UC*33qo}M1(Ivny0IaC+$1w3#C0YdH$pU0pfu$bq
z>*|00^!fe!_wi^0hKPxYNpxIvK(IfMD=RJ6+|ayr%hn-T4@bvEy?y%z7^QeLmz9;N
zs47Ez%g-mUW6O>~?pu7-60rT0nweTzS=rv+j#ZD7v(xqK*9%Gt;OV)4LjP!6dXToI
fM_Olz0U*EtDwt)|Le?|v00000NkvXXu0mjf&ay*>

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.nd.png b/app/out/default/icons/licences/cc.by.nd.png
new file mode 100644
index 0000000000000000000000000000000000000000..35eca20cc9b00faea53cbfb39cbfe34076cd3dfd
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!D@jB_RCwBA
zU>IS55s3f)|36ZE%gD$AVXfJ;8d+k`uDvs-&g|&uC@(L^)aL5ydg|1vw(eGO32`7-
zURJ@?$@SxhkAvK|ka%Unlz92#<?_YLarqVqcJJP8W@a|Ie+q>A;p2zGg2JH^$yhwR
ze8~!7VPRapg#ci1+`Msf!`h8N_Qy{jJbXO7eY}UNhc8{cl%AdrWSl*FR#{mYnC^jT
z`2G9$KoZCXiU7rpjg4JgT&`Wc1~r9=3CKlDKM;VNoG{r~1tDxS6KLh(OBXMH{`48>
zA0Rs{EDXp1S_vdOJ3E2?eE04hFy`;wy9bm73f{SW2cD{di5#<p00M}M;S3-NWaG(W
zxJ;mxhrfRL0we_m1%Xit^cckFzyu6rD=8@f#naN#LPJAgMLg8$KY#vUWMRbg0J8TW
zPKR?bBarHTBg(_vJUl=W=v$!QfIbAqDx_Eja)EvZidR%r%$hX|El$|kIsX44Eq)kb
z08NnAen$7Op1v+GFE7NOz=++mXAjU3K%WEIz}OZN5(0`qvg?^MXB3qcA-V+k1%MS5
z{um~{s-(~aq8c8^^>ANT|MREM@87?VM;kCiOiWCo<DvtC{efIrX}RWx=B-<{4)S^!
z7<O1n>FBtqw{PD7qZE(kva&K2Rb_~8`S}EPY}ql$eT%PJ0=A!0GgB)oE8E-KvFdSh
zcDjE3dO=A6JU#bM=pSuM57M^uNb4*y00bBS5>6)L^o3Ai00000NkvXXu0mjfhO#Q?

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.png b/app/out/default/icons/licences/cc.by.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecd2abc73bd3d0bd46b806eb93351c017f15ab22
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!5=lfsRCwBA
zU>IS55s3f)|36ZE%gD$AVXfJ;8d+k`uDvs-&g|&uC@(L^)aL5ydg|1vw(eGO32`7-
zURJ@?$@SxhkAvK|ka%Unlz92#<?_YLarqVqcJJP8W@a|Ie+q>A;p2zGg2JH^$yhwR
ze8~!7VPRapg#ci1+`Msf!`h8N_Qy{jJbXO7eY}UNhc8{cl%AdrWSl*FR#{mYnC^jT
z`2G9$KoZCXiU7rpjg4JgT&`Wc1~r9=3CKlDKM;VNoG{q~@8L@qFMs~@8R#D%J1i^=
z$N;(zNOpF10{!{!-8*2+-@A7YC<_$4bNdcFRRa?_W(ffV5bwbmKoZCvL>~V7<qMD$
z6chwTDbQmOp92#xkgcSo1Qbt8OA8GRg%$Bor~mx<gOP<1vyedc9>mWB>su@y=H}r6
zl0e@A{RZ?QFjgVOGLQ@OGf=#uqGHypS!juqot@+VpZ|Dbc<|<7J$+qXUS5blff2iB
z&mN$ofj$Safw3(lBm@+JWY;ri&L}D?LUal63jixB{4qSZ8Xm~?a9>yd^QX`6-@lJX
z8!$vnOiZHVq632cfm~T>x#ouEty{JZ@_HB;`dCWo=(wo2Z{Gl;6p!YzvN9D_Wr%P2
z`2==s*)hm{i?3P&wx3cnQ!6Vg+uPf*>Tz;*x_<q7K}i8TJ@-%OA8kty(zf(S>nt$<
a1Q-Bx&HUr%A;kRv0000<MNUMnLSTaKhanaK

literal 0
HcmV?d00001

diff --git a/app/out/default/icons/licences/cc.by.sa.png b/app/out/default/icons/licences/cc.by.sa.png
new file mode 100644
index 0000000000000000000000000000000000000000..c67509f1264e4b845b643e340cb39970e432c711
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq002+`000jN0ssI2{Hx#C00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!GD$>1RCwBA
zU>IS55s3f)|36ZE%gD$AVXfJ;8d+k`uDvs-&g|&uC@(L^)aL5ydg|1vw(eGO32`7-
zURJ@?$@SxhkAvK|ka%Unlz92#<?_YLarqVqcJJP8W@a|Ie+q>A;p2zGg2JH^$yhwR
ze8~!7VPRapg#ci1+`Msf!`h8N_Qy{jJbXO7eY}UNhc8{cl%AdrWSl*FR#{mYnC^jT
z`2G9$KoZCXiU7rpjg4JgT&`Wc1~r9=3CKlDKM;VNoG{t=wa}t)VZ!k3<<Fl!1N{SJ
zhlPa!89-ZsWM^k5(4X(#y#vPly?gh7vOvK*x9`AHH87E5mJmPyaWtF(B!O(KzGZ{~
zWG>bHjPBvDU%miIK|w)alma~l@i{O71KCPSN<i_nw6xIBP*@QUb^6brKNwjUvBntO
zdl1*dxoGhTkwr@g^oU_@9v&bG^exbDKpz5Q6;dn%xj;Vy#VaZ*X3d&~mN?njIsX6o
zk0*w)))4Uc#Ht=mmR26t)7RzY<%ReY7_ocy>;c*e^f{0XjBOzyA)p8(yPi37Mp0Q2
zqDz2Z09aAsk70s!21)8EZFnHp!+l--&!0ZOfB!xnZNLyQF)@jbiw+3(2XbYl<(eCs
zw{F=w$m?NXXksa)qvN99zI_9XQaqZ=%F0w!l_9?6=M&hmWyc`*Exu|A*nUdQOs%Y}
zY;SMJs>jLM>H78S1tkUW^xQw8f3z(<NZZmQt+T`c5MTgDa5dw*$@7{30000<MNUMn
GLSTaKz&eKj

literal 0
HcmV?d00001

diff --git a/app/out/default/images/colorbox/controls.png b/app/out/default/images/colorbox/controls.png
index 051b4a623e0dffe738ff60b912e7bf0a3e51cf53..dade09d5525e26517be0eb4cc85d78f3d7163492 100644
GIT binary patch
delta 197
zcmbQkG@EHcT>V{kHXaL&d;F(=FfcI8_H=O!skrs_jv-fr0}sQ&7umIw_Fp~qj3c6x
zbLL8x+1k?zSPYqf3K<&CZQIXZ;1YBG^UOKV-`YOXmE2IEDW5O4svuMNz0`(+OwskL
znbh=^-&|GC6EnGCrf^UH{SGEJkX8s-as2p;j_=)e4XxfkD>etTde5%74rH&ch!r)c
plsxF~Zcv#kEg`<%Rv)bXObN4iiq&Jumd(3Bd{0+Dmvv4FO#nO$O8x)<

delta 198
zcmbQuG>2(IT>WiUMnMUc^j_&{3=9l&JY5_^DsH{KW60HDz~gZ78uxb{+l_vDOS_#7
z72o?dbstur5|G0SRLRhA=GT3BgXeqhKR0yy|4Z&;8&AZJmi}__RRx~H@1-^rc#5uH
z%%rBT8go(oonFR<T!%gC=XWr%fwV$E$MMvXBh~gw2@i$r?!~S+r0TmT`@kX9&^>)z
sGxkh*uv~e@o^8BSy06a@2dmGjVo;SRt^C%_`~}4KboFyt=akR{056kF<p2Nx

diff --git a/app/out/default/js/actions/sources.js b/app/out/default/js/actions/sources.js
index 670a016..f8f28c8 100644
--- a/app/out/default/js/actions/sources.js
+++ b/app/out/default/js/actions/sources.js
@@ -274,14 +274,14 @@ function gui_state(state){
       $("#player_" + current_document).find(".play").css("display", "none");
       $("#player_" + current_document).find(".pause").css("display", "inline");
       $("#player_" + current_document).find(".stop").css("display", "inline");
-      $("#track_" + source_id).removeClass("track");
+//      $("#track_" + source_id).removeClass("track");
       $("#track_" + source_id).addClass("playing_track");
     }
     else if(state == "paused"){
       $("#player_" + current_document).find(".play").get(0).style.display = "inline";
       $("#player_" + current_document).find(".pause").get(0).style.display = "none";
       $("#player_" + current_document).find(".stop").get(0).style.display = "inline";
-      $("#track_" + source_id).removeClass("track");
+//      $("#track_" + source_id).removeClass("track");
       $("#track_" + source_id).addClass("playing_track");
     }
     else if(state == "stoped"){
@@ -289,7 +289,7 @@ function gui_state(state){
       $("#player_" + current_document).find(".pause").get(0).style.display = "none";
       $("#player_" + current_document).find(".stop").get(0).style.display = "none";
       $("#track_" + source_id).removeClass("playing_track");
-      $("#track_" + source_id).addClass("track");
+//      $("#track_" + source_id).addClass("track");
       $("#track_" + source_id + " .player_progress .position").not(
         "#track_" + source_id + " .pistes .player_progress .position").not(
         "#track_" + source_id + " .derivation .player_progress .position").css("width", "0%");
diff --git a/app/out/default/js/jquery.colorbox-min.js b/app/out/default/js/jquery.colorbox-min.js
index b795ee8..2096ccf 100644
--- a/app/out/default/js/jquery.colorbox-min.js
+++ b/app/out/default/js/jquery.colorbox-min.js
@@ -1,4 +1,4 @@
-// ColorBox v1.3.16 - a full featured, light-weight, customizable lightbox based on jQuery 1.3+
-// Copyright (c) 2011 Jack Moore - jack@colorpowered.com
-// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+// ColorBox v1.3.16 - a full featured, light-weight, customizable lightbox based on jQuery 1.3+
+// Copyright (c) 2011 Jack Moore - jack@colorpowered.com
+// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 (function(a,b,c){function ba(b){if(!T){O=b,Z(a.extend(J,a.data(O,e))),x=a(O),P=0,J.rel!=="nofollow"&&(x=a("."+V).filter(function(){var b=a.data(this,e).rel||this.rel;return b===J.rel}),P=x.index(O),P===-1&&(x=x.add(O),P=x.length-1));if(!R){R=S=!0,q.show();if(J.returnFocus)try{O.blur(),a(O).one(k,function(){try{this.focus()}catch(a){}})}catch(c){}p.css({opacity:+J.opacity,cursor:J.overlayClose?"pointer":"auto"}).show(),J.w=X(J.initialWidth,"x"),J.h=X(J.initialHeight,"y"),U.position(0),n&&y.bind("resize."+o+" scroll."+o,function(){p.css({width:y.width(),height:y.height(),top:y.scrollTop(),left:y.scrollLeft()})}).trigger("resize."+o),$(g,J.onOpen),I.add(C).hide(),H.html(J.close).show()}U.load(!0)}}function _(){var a,b=f+"Slideshow_",c="click."+f,d,e,g;J.slideshow&&x[1]&&(d=function(){E.text(J.slideshowStop).unbind(c).bind(i,function(){if(P<x.length-1||J.loop)a=setTimeout(U.next,J.slideshowSpeed)}).bind(h,function(){clearTimeout(a)}).one(c+" "+j,e),q.removeClass(b+"off").addClass(b+"on"),a=setTimeout(U.next,J.slideshowSpeed)},e=function(){clearTimeout(a),E.text(J.slideshowStart).unbind([i,h,j,c].join(" ")).one(c,d),q.removeClass(b+"on").addClass(b+"off")},J.slideshowAuto?d():e())}function $(b,c){c&&c.call(O),a.event.trigger(b)}function Z(b){for(var c in b)a.isFunction(b[c])&&c.substring(0,2)!=="on"&&(b[c]=b[c].call(O));b.rel=b.rel||O.rel||"nofollow",b.href=a.trim(b.href||a(O).attr("href")),b.title=b.title||O.title}function Y(a){return J.photo||/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i.test(a)}function X(a,b){b=b==="x"?y.width():y.height();return typeof a=="string"?Math.round(/%/.test(a)?b/100*parseInt(a,10):parseInt(a,10)):a}function W(c,d){var e=b.createElement("div");c&&(e.id=f+c),e.style.cssText=d||!1;return a(e)}var d={transition:"elastic",speed:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",open:!1,returnFocus:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0},e="colorbox",f="cbox",g=f+"_open",h=f+"_load",i=f+"_complete",j=f+"_cleanup",k=f+"_closed",l=f+"_purge",m=a.browser.msie&&!a.support.opacity,n=m&&a.browser.version<7,o=f+"_IE6",p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J={},K,L,M,N,O,P,Q,R,S,T=!1,U,V=f+"Element";U=a.fn[e]=a[e]=function(b,c){var f=this,g;if(!f[0]&&f.selector)return f;b=b||{},c&&(b.onComplete=c);if(!f[0]||f.selector===undefined)f=a("<a/>"),b.open=!0;f.each(function(){a.data(this,e,a.extend({},a.data(this,e)||d,b)),a(this).addClass(V)}),g=b.open,a.isFunction(g)&&(g=g.call(f)),g&&ba(f[0]);return f},U.init=function(){y=a(c),q=W().attr({id:e,"class":m?f+(n?"IE6":"IE"):""}),p=W("Overlay",n?"position:absolute":"").hide(),r=W("Wrapper"),s=W("Content").append(z=W("LoadedContent","width:0; height:0; overflow:hidden"),B=W("LoadingOverlay").add(W("LoadingGraphic")),C=W("Title"),D=W("Current"),F=W("Next"),G=W("Previous"),E=W("Slideshow").bind(g,_),H=W("Close")),r.append(W().append(W("TopLeft"),t=W("TopCenter"),W("TopRight")),W(!1,"clear:left").append(u=W("MiddleLeft"),s,v=W("MiddleRight")),W(!1,"clear:left").append(W("BottomLeft"),w=W("BottomCenter"),W("BottomRight"))).children().children().css({"float":"left"}),A=W(!1,"position:absolute; width:9999px; visibility:hidden; display:none"),a("body").prepend(p,q.append(r,A)),s.children().hover(function(){a(this).addClass("hover")},function(){a(this).removeClass("hover")}).addClass("hover"),K=t.height()+w.height()+s.outerHeight(!0)-s.height(),L=u.width()+v.width()+s.outerWidth(!0)-s.width(),M=z.outerHeight(!0),N=z.outerWidth(!0),q.css({"padding-bottom":K,"padding-right":L}).hide(),F.click(function(){U.next()}),G.click(function(){U.prev()}),H.click(function(){U.close()}),I=F.add(G).add(D).add(E),s.children().removeClass("hover"),a("."+V).live("click",function(a){a.button!==0&&typeof a.button!="undefined"||a.ctrlKey||a.shiftKey||a.altKey||(a.preventDefault(),ba(this))}),p.click(function(){J.overlayClose&&U.close()}),a(b).bind("keydown."+f,function(a){var b=a.keyCode;R&&J.escKey&&b===27&&(a.preventDefault(),U.close()),R&&J.arrowKey&&x[1]&&(b===37?(a.preventDefault(),G.click()):b===39&&(a.preventDefault(),F.click()))})},U.remove=function(){q.add(p).remove(),a("."+V).die("click").removeData(e).removeClass(V)},U.position=function(a,c){function g(a){t[0].style.width=w[0].style.width=s[0].style.width=a.style.width,B[0].style.height=B[1].style.height=s[0].style.height=u[0].style.height=v[0].style.height=a.style.height}var d,e=Math.max(b.documentElement.clientHeight-J.h-M-K,0)/2+y.scrollTop(),f=Math.max(y.width()-J.w-N-L,0)/2+y.scrollLeft();d=q.width()===J.w+N&&q.height()===J.h+M?0:a,r[0].style.width=r[0].style.height="9999px",q.dequeue().animate({width:J.w+N,height:J.h+M,top:e,left:f},{duration:d,complete:function(){g(this),S=!1,r[0].style.width=J.w+N+L+"px",r[0].style.height=J.h+M+K+"px",c&&c()},step:function(){g(this)}})},U.resize=function(a){if(R){a=a||{},a.width&&(J.w=X(a.width,"x")-N-L),a.innerWidth&&(J.w=X(a.innerWidth,"x")),z.css({width:J.w}),a.height&&(J.h=X(a.height,"y")-M-K),a.innerHeight&&(J.h=X(a.innerHeight,"y"));if(!a.innerHeight&&!a.height){var b=z.wrapInner("<div style='overflow:auto'></div>").children();J.h=b.height(),b.replaceWith(b.children())}z.css({height:J.h}),U.position(J.transition==="none"?0:J.speed)}},U.prep=function(b){function h(b){U.position(b,function(){var b,d,g,h,j=x.length,k,n;!R||(n=function(){B.hide(),$(i,J.onComplete)},m&&Q&&z.fadeIn(100),C.html(J.title).add(z).show(),j>1?(typeof J.current=="string"&&D.html(J.current.replace(/\{current\}/,P+1).replace(/\{total\}/,j)).show(),F[J.loop||P<j-1?"show":"hide"]().html(J.next),G[J.loop||P?"show":"hide"]().html(J.previous),b=P?x[P-1]:x[j-1],g=P<j-1?x[P+1]:x[0],J.slideshow&&E.show(),J.preloading&&(h=a.data(g,e).href||g.href,d=a.data(b,e).href||b.href,h=a.isFunction(h)?h.call(g):h,d=a.isFunction(d)?d.call(b):d,Y(h)&&(a("<img/>")[0].src=h),Y(d)&&(a("<img/>")[0].src=d))):I.hide(),J.iframe?(k=a("<iframe/>").addClass(f+"Iframe")[0],J.fastIframe?n():a(k).load(n),k.name=f+ +(new Date),k.src=J.href,J.scrolling||(k.scrolling="no"),m&&(k.frameBorder=0,k.allowTransparency="true"),a(k).appendTo(z).one(l,function(){k.src="//about:blank"})):n(),J.transition==="fade"?q.fadeTo(c,1,function(){q[0].style.filter=""}):q[0].style.filter="",y.bind("resize."+f,function(){U.position(0)}))})}function g(){J.h=J.h||z.height(),J.h=J.mh&&J.mh<J.h?J.mh:J.h;return J.h}function d(){J.w=J.w||z.width(),J.w=J.mw&&J.mw<J.w?J.mw:J.w;return J.w}if(!!R){var c=J.transition==="none"?0:J.speed;y.unbind("resize."+f),z.remove(),z=W("LoadedContent").html(b),z.hide().appendTo(A.show()).css({width:d(),overflow:J.scrolling?"auto":"hidden"}).css({height:g()}).prependTo(s),A.hide(),a(Q).css({"float":"none"}),n&&a("select").not(q.find("select")).filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one(j,function(){this.style.visibility="inherit"}),J.transition==="fade"?q.fadeTo(c,0,function(){h(0)}):h(c)}},U.load=function(b){var c,d,g=U.prep;S=!0,Q=!1,O=x[P],b||Z(a.extend(J,a.data(O,e))),$(l),$(h,J.onLoad),J.h=J.height?X(J.height,"y")-M-K:J.innerHeight&&X(J.innerHeight,"y"),J.w=J.width?X(J.width,"x")-N-L:J.innerWidth&&X(J.innerWidth,"x"),J.mw=J.w,J.mh=J.h,J.maxWidth&&(J.mw=X(J.maxWidth,"x")-N-L,J.mw=J.w&&J.w<J.mw?J.w:J.mw),J.maxHeight&&(J.mh=X(J.maxHeight,"y")-M-K,J.mh=J.h&&J.h<J.mh?J.h:J.mh),c=J.href,B.show(),J.inline?(W().hide().insertBefore(a(c)[0]).one(l,function(){a(this).replaceWith(z.children())}),g(a(c))):J.iframe?g(" "):J.html?g(J.html):Y(c)?(a(Q=new Image).addClass(f+"Photo").error(function(){J.title=!1,g(W("Error").text("This image could not be loaded"))}).load(function(){var a;Q.onload=null,J.scalePhotos&&(d=function(){Q.height-=Q.height*a,Q.width-=Q.width*a},J.mw&&Q.width>J.mw&&(a=(Q.width-J.mw)/Q.width,d()),J.mh&&Q.height>J.mh&&(a=(Q.height-J.mh)/Q.height,d())),J.h&&(Q.style.marginTop=Math.max(J.h-Q.height,0)/2+"px"),x[1]&&(P<x.length-1||J.loop)&&(Q.style.cursor="pointer",Q.onclick=function(){U.next()}),m&&(Q.style.msInterpolationMode="bicubic"),setTimeout(function(){g(Q)},1)}),setTimeout(function(){Q.src=c},1)):c&&A.load(c,function(b,c,d){g(c==="error"?W("Error").text("Request unsuccessful: "+d.statusText):a(this).contents())})},U.next=function(){!S&&x[1]&&(P<x.length-1||J.loop)&&(P=P<x.length-1?P+1:0,U.load())},U.prev=function(){!S&&x[1]&&(P||J.loop)&&(P=P?P-1:x.length-1,U.load())},U.close=function(){R&&!T&&(T=!0,R=!1,$(j,J.onCleanup),y.unbind("."+f+" ."+o),p.fadeTo(200,0),q.stop().fadeTo(300,0,function(){q.add(p).css({opacity:1,cursor:"auto"}).hide(),$(l),z.remove(),setTimeout(function(){T=!1,$(k,J.onClosed)},1)}))},U.element=function(){return a(O)},U.settings=d,a(U.init)})(jQuery,document,this);
\ No newline at end of file
diff --git a/app/out/default/views/sources/album/list.php b/app/out/default/views/sources/album/list.php
index a450d4c..20f47c8 100644
--- a/app/out/default/views/sources/album/list.php
+++ b/app/out/default/views/sources/album/list.php
@@ -1,4 +1,4 @@
-<h2>Albums</h2>
+<h1>Albums</h1>
 
 <?php if($this->out["groupes"]["total"] > 1) : ?>
 
@@ -48,5 +48,5 @@
 <?php $items = "albums"; $legend = "albums"; require $this->out_file("views/navig.php"); ?>
 
 <?php else : ?>
-<p>Aucun album pour le moment</p>
+<p>Aucun album</p>
 <?php endif; ?>
diff --git a/app/out/default/views/sources/album/view.php b/app/out/default/views/sources/album/view.php
index ce1561a..d6e9297 100644
--- a/app/out/default/views/sources/album/view.php
+++ b/app/out/default/views/sources/album/view.php
@@ -1,7 +1,9 @@
-<h2>
-  <?php echo $this->out["album"]["reference"] ? $this->out["album"]["reference"]["titre"] : $this->out["album"]["titre"] ?>
-</h2>
-
+<article class="album">
+  <header>
+    <h1>
+      <?php echo $this->out["album"]["reference"] ? $this->out["album"]["reference"]["titre"] : $this->out["album"]["titre"] ?>
+    </h1>
+  </header>
 <?php
 
   if
@@ -13,7 +15,7 @@
   $margin_top = 10;
   $album_image_uri = $this->path("web").$this->out["album"]["image_uri"];
 ?>
-<p class="logo_album">
+<p class="logo_source">
   <img src="<?php echo $album_image_uri ?>"
        width="<?php echo $img_size["width"] ?>"
        height="<?php echo $img_size["height"] ?>"
@@ -91,4 +93,5 @@
 
 <?php $items = "morceaux"; $legend = "morceaux"; require $this->out_file("views/navig.php"); ?>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+</article>
\ No newline at end of file
diff --git a/app/out/default/views/sources/groupe/list.php b/app/out/default/views/sources/groupe/list.php
index 85bb7cc..fe38b27 100644
--- a/app/out/default/views/sources/groupe/list.php
+++ b/app/out/default/views/sources/groupe/list.php
@@ -1,3 +1,5 @@
+<h1>Groupes</h1>
+
 <?php if($this->out["groupes"]["list"]) : ?>
 
 <?php $items = "groupes"; $legend = "groupes"; require $this->out_file("views/navig.php"); ?>
diff --git a/app/out/default/views/sources/groupe/view.php b/app/out/default/views/sources/groupe/view.php
index 88556d9..180eb2a 100644
--- a/app/out/default/views/sources/groupe/view.php
+++ b/app/out/default/views/sources/groupe/view.php
@@ -1,10 +1,18 @@
-<h2><?php echo $this->out["groupe"]["nom"]; ?></h2>
-<div class="description">
-<?php echo $this->out["groupe"]["description"] ?>
-</div>
+<article class="groupe">
+  <header>
+    <h1><?php echo $this->out["groupe"]["nom"]; ?></h1>
+  </header>
+
+  <?php if($this->out["groupe"]["description"]) : ?>
+  <div class="description">
+  <?php echo $this->out["groupe"]["description"] ?>
+  </div>
+  <?php endif; ?>
+  <ul class="groupes_sources">
+    <li><a href="<?php echo $this->url("sources/morceau", array("groupe" => $this->out["groupe"]["id"])); ?>">Morceaux</a></li>
+    <li><a href="<?php echo $this->url("sources/piste", array("groupe" => $this->out["groupe"]["id"])); ?>">Sources</a></li>
+  </ul>
 
-<div class="clear"><!-- --></div>
-<br />
 <?php
 
   if
@@ -13,8 +21,7 @@
   ) :
 
 ?>
-
-<h3 class="menu_albums">Albums</h3>
+<h2 class="menu_albums">Albums</h2>
 <ul class="menu_albums">
 <?php foreach($this->out["albums"]["list"] as $id_album => $album) : ?>
   <li><a href="<?php echo $this->url("sources/album/view", array("album" => $id_album)) ?>" title="<?php echo str_replace("\"", "&quot;", $album["titre"]) ?>">
@@ -43,8 +50,9 @@
 <?php endif; ?>
 
 <?php if($this->out["groupe"]["contact_form"]) : ?>
-<h3>Contact</h3>
+<h2>Contact</h2>
 <p>
   <a href="<?php echo $this->url("forms/sourceml/contact_author", array("id" => $this->out["groupe"]["id"])) ?>">Envoyer un message à <?php echo $this->out["groupe"]["nom"]; ?></a>.
 </p>
 <?php endif; ?>
+</article>
\ No newline at end of file
diff --git a/app/out/default/views/sources/morceau/list.php b/app/out/default/views/sources/morceau/list.php
index 452b0bf..c549520 100644
--- a/app/out/default/views/sources/morceau/list.php
+++ b/app/out/default/views/sources/morceau/list.php
@@ -1,4 +1,4 @@
-<h2>Morceaux</h2>
+<h1>Morceaux</h1>
 
 <?php
 
@@ -80,5 +80,5 @@
 <?php $items = "morceaux"; $legend = "morceaux"; require $this->out_file("views/navig.php"); ?>
 
 <?php else : ?>
-<p>Aucun morceau pour le moment</p>
+<p>Aucun morceau</p>
 <?php endif; ?>
diff --git a/app/out/default/views/sources/morceau/view.php b/app/out/default/views/sources/morceau/view.php
index 4010f48..77d3357 100644
--- a/app/out/default/views/sources/morceau/view.php
+++ b/app/out/default/views/sources/morceau/view.php
@@ -1,31 +1,56 @@
-<h2>
-<?php $ariane_params = array("morceau" => $this->out["morceau"]["id"]); ?>
-<?php if(isset($this->out["album"]) && $this->out["album"]) : $ariane_params["album"] = $this->out["album"]["id"]; ?>
-<a href="<?php echo $this->url("sources/album/view", $ariane_params) ?>">
-<?php echo $this->out["album"]["titre"] ?>
-</a>
-&raquo;
-<?php endif; ?>
+<article class="morceau">
+  <ul class="ariane">
+    <?php $ariane_params = array("morceau" => $this->out["morceau"]["id"]); ?>
+    <?php if(isset($this->out["album"]) && $this->out["album"]) : $ariane_params["album"] = $this->out["album"]["id"]; ?>
+    <li><a href="<?php echo $this->url("sources/album/view", $ariane_params) ?>">
+    <?php echo $this->out["album"]["titre"] ?>
+    </a></li>
+    <?php endif; ?>
+    <?php if($this->out["morceau"]["reference"]) : ?>
+    <li><span>r&eacute;f&eacute;rence &raquo;</span> <a href="<?php echo $this->out["morceau"]["reference"]["from"] ?>"><?php echo $this->out["morceau"]["reference"]["titre"] ?> (<?php echo $this->out["morceau"]["reference"]["auteur"] ?>)</a></li>
+    <?php else : ?>
+    <li><a href="<?php echo $this->url("sources/morceau/view", $ariane_params) ?>"><?php echo $this->out["morceau"]["titre"] ?></a></li>
+    <?php endif; ?>
+  </ul>
+  <div class="clear"><!-- --></div>
+  <header>
+    <h1>
+    <?php if($this->out["morceau"]["reference"]) : ?>
+    <span>r&eacute;f&eacute;rence &raquo;</span> <?php echo $this->out["morceau"]["reference"]["titre"] ?> (<?php echo $this->out["morceau"]["reference"]["auteur"] ?>)
+    <?php else : ?>
+    <?php echo $this->out["morceau"]["titre"] ?>
+    <?php endif; ?>    
+    </h1>
+    <?php if($this->out["morceau"]["derivations"]) : ?>
+    <span class="derivation">
+      <span>d&eacute;rive de &raquo;</span>
+      <?php $n = 0; foreach($this->out["morceau"]["derivations"] as $derivation) : ?>
+      <?php echo $n ? ", " : "" ?><a href="<?php echo $derivation["from"] ?>"><?php echo $derivation["titre"] ?> (<?php echo $derivation["auteur"] ?>)</a>
+      <?php $n++; endforeach; ?>
+    </span>
+    <?php endif; ?>
+  </header>
 
-<?php if($this->out["morceau"]["reference"]) : ?>
-<span>r&eacute;f&eacute;rence </span>&raquo; <a href="<?php echo $this->out["morceau"]["reference"]["from"] ?>"><strong><?php echo $this->out["morceau"]["reference"]["titre"] ?> (<?php echo $this->out["morceau"]["reference"]["auteur"] ?>)</strong></a>
-<?php else : ?>
-<a href="<?php echo $this->url("sources/morceau/view", $ariane_params) ?>"><?php echo $this->out["morceau"]["titre"] ?></a>
-
-<?php if($this->out["morceau"]["derivations"]) : ?>
-      <br />
-      <span class="small">
-        d&eacute;rive de &raquo;
-<?php $n = 0; foreach($this->out["morceau"]["derivations"] as $derivation) : ?>
-        <?php echo $n ? ", " : "" ?><a href="<?php echo $derivation["from"] ?>"><?php echo $derivation["titre"] ?> (<?php echo $derivation["auteur"] ?>)</a>
-<?php $n++; endforeach; ?>
-      </span>
-<?php endif; ?>
+<?php
 
+  if
+  (    $this->out["morceau"]["image_uri"]
+    && file_exists($this->out["morceau"]["image_uri"])
+    && ($img_size = $data->img_size($this->out["morceau"]["image_uri"], 450, 450)) !== false
+  ) :
+//  $margin_top = floor((450 - $img_size["height"]) / 2);
+  $margin_top = 10;
+  $morceau_image_uri = $this->path("web").$this->out["morceau"]["image_uri"];
+?>
+<p class="logo_source">
+  <img src="<?php echo $morceau_image_uri ?>"
+       width="<?php echo $img_size["width"] ?>"
+       height="<?php echo $img_size["height"] ?>"
+       style="margin-top:<?php echo $margin_top ?>px"
+       alt="" />
+</p>
 <?php endif; ?>
 
-</h2>
-
 <div class="source_arbo">
 
 <?php
@@ -46,7 +71,7 @@
 ?>
 </ul>
 
-<?php if(!$display_name) : ?>
+<?php if(isset($morceau["description"]) && !$display_name) : ?>
 <div class="description">
   <?php echo $morceau["description"] ?>
 </div>
@@ -54,3 +79,4 @@
 <div class="clear"><!-- --></div>
 
 </div>
+</article>
\ No newline at end of file
diff --git a/app/out/default/views/sources/piste/list.php b/app/out/default/views/sources/piste/list.php
index 4f6cd1b..6287e31 100644
--- a/app/out/default/views/sources/piste/list.php
+++ b/app/out/default/views/sources/piste/list.php
@@ -1,4 +1,4 @@
-<h2>Sources</h2>
+<h1>Sources</h1>
 
 <?php
 
@@ -79,5 +79,5 @@
 <?php $items = "pistes"; $legend = "sources"; require $this->out_file("views/navig.php"); ?>
 
 <?php else : ?>
-<p>Aucune source pour le moment</p>
+<p>Aucune source</p>
 <?php endif; ?>
diff --git a/app/out/default/views/sources/piste/view.php b/app/out/default/views/sources/piste/view.php
index f168843..c72fff5 100644
--- a/app/out/default/views/sources/piste/view.php
+++ b/app/out/default/views/sources/piste/view.php
@@ -1,39 +1,63 @@
-<h2>
-<?php $ariane_params = array("piste" => $this->out["piste"]["id"]); ?>
-<?php if(isset($this->out["album"]) && $this->out["album"]) : $ariane_params["album"] = $this->out["album"]["id"]; ?>
-<a href="<?php echo $this->url("sources/album/view", $ariane_params) ?>">
-<?php echo $this->out["album"]["titre"] ?>
-</a>
-&raquo;
-<?php endif; ?>
-
-<?php if(isset($this->out["morceau"]) && $this->out["morceau"]) : $ariane_params["morceau"] = $this->out["morceau"]["id"]; ?>
-<a href="<?php echo $this->url("sources/morceau/view", $ariane_params) ?>">
-<?php echo $this->out["morceau"]["reference"] ? $this->out["morceau"]["reference"]["titre"] : $this->out["morceau"]["titre"] ?>
-</a>
-&raquo;
-<?php endif; ?>
-
+<article class="piste">
+  <ul class="ariane">
+    <?php $ariane_params = array("piste" => $this->out["piste"]["id"]); ?>
+    <?php if(isset($this->out["album"]) && $this->out["album"]) : $ariane_params["album"] = $this->out["album"]["id"]; ?>
+    <li><a href="<?php echo $this->url("sources/album/view", $ariane_params) ?>">
+    <?php echo $this->out["album"]["titre"] ?>
+    </a></li>
+    <?php endif; ?>
 
-<?php if($this->out["piste"]["reference"]) : ?>
-<span>r&eacute;f&eacute;rence </span>&raquo; <a href="<?php echo $this->out["piste"]["reference"]["from"] ?>"><strong><?php echo $this->out["piste"]["reference"]["titre"] ?> (<?php echo $this->out["piste"]["reference"]["auteur"] ?>)</strong></a>
-<?php else : ?>
-<a href="<?php echo $this->url("sources/piste/view", $ariane_params) ?>"><?php echo $this->out["piste"]["titre"] ?></a>
+    <?php if(isset($this->out["morceau"]) && $this->out["morceau"]) : $ariane_params["morceau"] = $this->out["morceau"]["id"]; ?>
+    <li><a href="<?php echo $this->url("sources/morceau/view", $ariane_params) ?>">
+    <?php echo $this->out["morceau"]["reference"] ? $this->out["morceau"]["reference"]["titre"] : $this->out["morceau"]["titre"] ?>
+    </a></li>
+    <?php endif; ?>
+    
+    <?php if($this->out["piste"]["reference"]) : ?>
+    <li><span>r&eacute;f&eacute;rence &raquo;</span> <a href="<?php echo $this->out["piste"]["reference"]["from"] ?>"><?php echo $this->out["piste"]["reference"]["titre"] ?> (<?php echo $this->out["piste"]["reference"]["auteur"] ?>)</a></li>
+    <?php else : ?>
+    <li><a href="<?php echo $this->url("sources/piste/view", $ariane_params) ?>"><?php echo $this->out["piste"]["titre"] ?></a></li>
+    <?php endif; ?>
+  </ul>
+  <div class="clear"><!-- --></div>
+  <header>
+    <h1>
+      <?php if($this->out["piste"]["reference"]) : ?>
+      <span>r&eacute;f&eacute;rence &raquo;</span><?php echo $this->out["piste"]["reference"]["titre"] ?> (<?php echo $this->out["piste"]["reference"]["auteur"] ?>)
+      <?php else : ?>
+      <?php echo $this->out["piste"]["titre"] ?>
+      <?php endif; ?>
+    </h1>
+    <?php if($this->out["piste"]["derivations"]) : ?>
+    <span class="derivation">
+      <span>d&eacute;rive de &raquo;</span>
+      <?php $n = 0; foreach($this->out["piste"]["derivations"] as $derivation) : ?>
+      <?php echo $n ? ", " : "" ?><a href="<?php echo $derivation["from"] ?>"><?php echo $derivation["titre"] ?> (<?php echo $derivation["auteur"] ?>)</a>
+      <?php $n++; endforeach; ?>
+    </span>
+    <?php endif; ?>
+  </header>
 
-<?php if($this->out["piste"]["derivations"]) : ?>
-      <br />
-      <span class="small">
-        d&eacute;rive de &raquo;
-<?php $n = 0; foreach($this->out["piste"]["derivations"] as $derivation) : ?>
-        <?php echo $n ? ", " : "" ?><a href="<?php echo $derivation["from"] ?>"><?php echo $derivation["titre"] ?> (<?php echo $derivation["auteur"] ?>)</a>
-<?php $n++; endforeach; ?>
-      </span>
-<?php endif; ?>
+<?php
 
+  if
+  (    $this->out["piste"]["image_uri"]
+    && file_exists($this->out["piste"]["image_uri"])
+    && ($img_size = $data->img_size($this->out["piste"]["image_uri"], 450, 450)) !== false
+  ) :
+//  $margin_top = floor((450 - $img_size["height"]) / 2);
+  $margin_top = 10;
+  $piste_image_uri = $this->path("web").$this->out["piste"]["image_uri"];
+?>
+<p class="logo_source">
+  <img src="<?php echo $piste_image_uri ?>"
+       width="<?php echo $img_size["width"] ?>"
+       height="<?php echo $img_size["height"] ?>"
+       style="margin-top:<?php echo $margin_top ?>px"
+       alt="" />
+</p>
 <?php endif; ?>
 
-</h2>
-
 <div class="source_arbo">
 
 <?php
@@ -54,7 +78,7 @@
 ?>
 </ul>
 
-<?php if(!$display_name) : ?>
+<?php if(isset($piste["description"]) && !$display_name) : ?>
 <div class="description">
   <?php echo $piste["description"] ?>
 </div>
@@ -62,3 +86,4 @@
 <div class="clear"><!-- --></div>
 
 </div>
+</article>
\ No newline at end of file
diff --git a/app/out/default/views/sources/source.php b/app/out/default/views/sources/source.php
index 1107918..ac24110 100644
--- a/app/out/default/views/sources/source.php
+++ b/app/out/default/views/sources/source.php
@@ -1,6 +1,7 @@
 <?php if($source) : ?>
 
 <li class="track" id="track_<?php echo $source["id"] ?>">
+  <article>
 
 <?php
 
@@ -16,7 +17,7 @@
   require $this->out_file("views/sources/source/arbo.php");
 
 ?>
-
+  </article>
 </li>
 
 <?php endif; ?>
diff --git a/app/out/default/views/sources/source/documents.php b/app/out/default/views/sources/source/documents.php
index 56af9e0..df8d6a8 100644
--- a/app/out/default/views/sources/source/documents.php
+++ b/app/out/default/views/sources/source/documents.php
@@ -2,7 +2,7 @@
 
   $documents = $source["reference"] ? $source["reference"]["documents"] : $source["documents"];
   if($documents) :
-
+  $mw_out = $this->helper("mw_helper_out");
 ?>
 
 
@@ -36,7 +36,13 @@
       </div>
       <?php endif; ?>
       <div class="no_player"><!-- --></div>
-      <a href="<?php echo $document["url"] ?>"><?php echo $document["nom"]; ?></a>
+      <?php
+        $ext = explode(".", $document["url"]);
+        if(count($ext) > 1) $ext = $ext[count($ext) - 1];
+        else $ext = $document["url"];
+        if(strlen($ext) > 16) $ext = "(...) ".substr($ext, -16);
+      ?>
+      <a href="<?php echo $document["url"] ?>" title="<?php echo $mw_out->esc_attr($document["nom"]); ?>"><?php echo $ext; ?></a>
     </li>
 
   <?php endforeach; ?>
diff --git a/app/out/default/views/sources/source/header.php b/app/out/default/views/sources/source/header.php
index 7b87bd5..eb4ec84 100644
--- a/app/out/default/views/sources/source/header.php
+++ b/app/out/default/views/sources/source/header.php
@@ -4,35 +4,39 @@
   foreach($groupes as $k => $groupe) $groupes[$k]["url"] = $this->url("sources/groupe/view", array("id" => $groupe["id"]));
 
 ?>
+<header>
 
-  <h5>
-
-<?php if($groupes) : $k = 0; foreach($groupes as $groupe) : $k++; ?>
-    <a class="auteur" href="<?php echo $groupe["url"] ?>"><?php echo $groupe["nom"] ?></a><?php if($k < count($groupes)) : ?><br /><?php endif; ?>
-<?php endforeach; endif; ?>
-
-<?php if(!isset($display_name) || $display_name) : ?>
-
-<?php if($source["reference"]) : ?>
+  <?php if(!isset($display_name) || $display_name) : ?>
+  <h1>
+    <?php if($source["reference"]) : ?>
     <span>r&eacute;f&eacute;rence &raquo; <a href="<?php echo $source["reference"]["from"] ?>"><strong><?php echo $source["reference"]["titre"] ?></strong></a></span>
-<?php else : ?>
+    <?php else : ?>
     <a href="<?php echo $source["url"] ?>"><?php echo $source["titre"] ?></a>
-<?php endif; ?>
-<?php if($source["derivations"]) : ?>
+    <?php endif; ?>
+    <?php if($source["derivations"]) : ?>
     <br />
     <span class="small">
       d&eacute;rive de &raquo;
-<?php $n = 0; foreach($source["derivations"] as $derivation) : ?>
+      <?php $n = 0; foreach($source["derivations"] as $derivation) : ?>
       <?php echo $n ? ", " : "" ?><a href="<?php echo $derivation["from"] ?>"><strong><?php echo $derivation["titre"] ?> (<?php echo $derivation["auteur"] ?>)</strong></a>
-<?php $n++; endforeach; ?>
+      <?php $n++; endforeach; ?>
     </span>
-<?php endif; ?>
-
-<?php endif; ?>
-    <br class="clear" />
-  </h5>
-
-  <div class="player_progress">
-    <div class="loaded"><!-- --></div>
-    <div class="position"><!-- --></div>
-  </div>
+    <?php endif; ?>
+  </h1>
+  <?php endif; ?>
+  <?php if($groupes) : ?>
+  <ul class="authors">
+    <?php foreach($groupes as $groupe) : ?>
+    <li><a class="auteur" href="<?php echo $groupe["url"] ?>"><?php echo $groupe["nom"] ?></a></li>
+    <?php endforeach; ?>
+  </ul>
+  <?php endif; ?>
+
+  <br class="clear" />
+
+</header>
+
+<div class="player_progress">
+  <div class="loaded"><!-- --></div>
+  <div class="position"><!-- --></div>
+</div>
diff --git a/app/out/default/views/users/albums/edit.php b/app/out/default/views/users/albums/edit.php
index a88a7a4..cea233c 100644
--- a/app/out/default/views/users/albums/edit.php
+++ b/app/out/default/views/users/albums/edit.php
@@ -123,7 +123,7 @@
         <label for="description">description</label>
       </li>
       <li>
-        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo $this->out["album"]["description"] ?></textarea>
+        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo isset($this->out["album"]["description"]) ? $this->out["album"]["description"] : "" ?></textarea>
       </li>
   
     </ul>
diff --git a/app/out/default/views/users/albums/list.php b/app/out/default/views/users/albums/list.php
index d7f45a1..e7b0089 100644
--- a/app/out/default/views/users/albums/list.php
+++ b/app/out/default/views/users/albums/list.php
@@ -48,7 +48,11 @@
     <?php if($album["reference"]) : ?>
           r&eacute;f&eacute;rence &raquo; <a href="<?php echo $album["reference"]["from"] ?>"><?php echo $album["reference"]["titre"] ?> (<?php echo $album["reference"]["auteur"] ?>)</a>
     <?php else : ?>
+      <?php if($album["permissions"]["editeur"]) : ?>
           <a href="<?php echo $this->url("users/albums/edit", array("id" => $id_album)) ?>"><?php echo $album["titre"] ?></a>
+      <?php else : ?>
+          <?php echo $album["titre"] ?>
+      <?php endif; ?>
     <?php endif; ?>
     <?php if($album["derivations"]) : ?>
           <br />
diff --git a/app/out/default/views/users/morceaux/add.php b/app/out/default/views/users/morceaux/add.php
index ec9b692..e6be13d 100644
--- a/app/out/default/views/users/morceaux/add.php
+++ b/app/out/default/views/users/morceaux/add.php
@@ -32,7 +32,7 @@ var is_reference = <?php echo $this->out["morceau"]["reference"] ? "true" : "fal
 
 <?php if($this->out["groupes"]["total"] > 0) : ?>
 
-<form name="morceau_form" action="<?php echo $this->url("users/morceaux/add") ?>" method="post">
+<form name="morceau_form" action="<?php echo $this->url("users/morceaux/add") ?>" method="post" enctype="multipart/form-data">
   <fieldset>
     <ul class="form">
   
@@ -166,7 +166,14 @@ var is_reference = <?php echo $this->out["morceau"]["reference"] ? "true" : "fal
           <input type="text" class="long_text" name="titre" id="titre" value="<?php echo $this->out["morceau"]["titre"] ?>" />
         </div>
       </li>
-  
+
+      <li>
+        <label for="image">icone</label>
+        <div class="form_input">
+          <input type="file" name="image" />
+        </div>
+      </li>
+
       <li>
         <label for="licence">licence</label>
         <div class="form_input">
diff --git a/app/out/default/views/users/morceaux/edit.php b/app/out/default/views/users/morceaux/edit.php
index 160c7c2..6835a5a 100644
--- a/app/out/default/views/users/morceaux/edit.php
+++ b/app/out/default/views/users/morceaux/edit.php
@@ -25,7 +25,7 @@ var is_reference = <?php echo $this->out["morceau"]["reference"] ? "true" : "fal
 
 <?php if($this->out["groupes"]["total"] > 0) : ?>
 
-<form name="morceau_form" action="<?php echo $this->url("users/morceaux/edit", array("id" => $_GET[$this->param("id")])) ?>" method="post">
+<form name="morceau_form" action="<?php echo $this->url("users/morceaux/edit", array("id" => $_GET[$this->param("id")])) ?>" method="post" enctype="multipart/form-data">
   <fieldset>
     <input type="hidden" name="date_inscription" value="<?php echo $this->out["morceau"]["date_inscription"] ?>" />
 
@@ -159,7 +159,18 @@ var is_reference = <?php echo $this->out["morceau"]["reference"] ? "true" : "fal
           <input type="text" class="long_text" name="titre" id="titre" value="<?php echo $this->out["morceau"]["titre"] ?>" />
         </div>
       </li>
-  
+
+      <li>
+        <label for="image">icone</label>
+        <div class="form_input">
+          <?php if(isset($this->out["morceau"]["image"])) : ?>
+          <img class="logo" src="<?php echo $this->out["morceau"]["image_uri"] ?>" /><br /><br />
+          <input type="checkbox" name="del_image" /> effacer l'icone<br /><br />
+          <?php endif; ?>
+          <input type="file" name="image" />
+        </div>
+      </li>
+
       <li>
         <label for="licence">licence</label>
         <div class="form_input">
@@ -228,7 +239,7 @@ var is_reference = <?php echo $this->out["morceau"]["reference"] ? "true" : "fal
         <label for="description">description</label>
       </li>
       <li>
-        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo $this->out["morceau"]["description"] ?></textarea>
+        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo isset($this->out["morceau"]["description"]) ? $this->out["morceau"]["description"] : "" ?></textarea>
       </li>
   
     </ul>
diff --git a/app/out/default/views/users/morceaux/list.php b/app/out/default/views/users/morceaux/list.php
index 6c30f3f..4419ae6 100644
--- a/app/out/default/views/users/morceaux/list.php
+++ b/app/out/default/views/users/morceaux/list.php
@@ -72,7 +72,11 @@
     <?php if($morceau["reference"]) : ?>
           r&eacute;f&eacute;rence &raquo; <a href="<?php echo $morceau["reference"]["from"] ?>"><?php echo $morceau["reference"]["titre"] ?> (<?php echo $morceau["reference"]["auteur"] ?>)</a>
     <?php else : ?>
+      <?php if($morceau["permissions"]["editeur"]) : ?>
           <a href="<?php echo $this->url("users/morceaux/edit", array("id" => $id_morceau)) ?>"><?php echo $morceau["titre"] ?></a>
+      <?php else : ?>
+          <?php echo $morceau["titre"] ?>
+      <?php endif; ?>
     <?php endif; ?>
     <?php if($morceau["derivations"]) : ?>
           <br />
diff --git a/app/out/default/views/users/pistes/add.php b/app/out/default/views/users/pistes/add.php
index 9991ff4..d27ce37 100644
--- a/app/out/default/views/users/pistes/add.php
+++ b/app/out/default/views/users/pistes/add.php
@@ -32,7 +32,7 @@ var is_reference = <?php echo $this->out["piste"]["reference"] ? "true" : "false
 
 <?php if($this->out["groupes"]["total"] > 0) : ?>
 
-<form name="morceau_form" action="<?php echo $this->url("users/pistes/add") ?>" method="post">
+<form name="morceau_form" action="<?php echo $this->url("users/pistes/add") ?>" method="post" enctype="multipart/form-data">
   <fieldset>
     <ul class="form">
   
@@ -166,7 +166,14 @@ var is_reference = <?php echo $this->out["piste"]["reference"] ? "true" : "false
           <input type="text" class="long_text" name="titre" id="titre" value="<?php echo $this->out["piste"]["titre"] ?>" />
         </div>
       </li>
-  
+
+      <li>
+        <label for="image">icone</label>
+        <div class="form_input">
+          <input type="file" name="image" />
+        </div>
+      </li>
+
       <li>
         <label for="licence">licence</label>
         <div class="form_input">
diff --git a/app/out/default/views/users/pistes/edit.php b/app/out/default/views/users/pistes/edit.php
index 1c46820..dda8eb3 100644
--- a/app/out/default/views/users/pistes/edit.php
+++ b/app/out/default/views/users/pistes/edit.php
@@ -25,7 +25,7 @@ var is_reference = <?php echo $this->out["piste"]["reference"] ? "true" : "false
 
 <?php if($this->out["groupes"]["total"] > 0) : ?>
 
-<form name="piste_form" action="<?php echo $this->url("users/pistes/edit", array("id" => $_GET[$this->param("id")])) ?>" method="post">
+<form name="piste_form" action="<?php echo $this->url("users/pistes/edit", array("id" => $_GET[$this->param("id")])) ?>" method="post" enctype="multipart/form-data">
   <fieldset>
     <input type="hidden" name="date_inscription" value="<?php echo $this->out["piste"]["date_inscription"] ?>" />
 
@@ -159,7 +159,18 @@ var is_reference = <?php echo $this->out["piste"]["reference"] ? "true" : "false
           <input type="text" class="long_text" name="titre" id="titre" value="<?php echo $this->out["piste"]["titre"] ?>" />
         </div>
       </li>
-  
+
+      <li>
+        <label for="image">icone</label>
+        <div class="form_input">
+          <?php if(isset($this->out["piste"]["image"])) : ?>
+          <img class="logo" src="<?php echo $this->out["piste"]["image_uri"] ?>" /><br /><br />
+          <input type="checkbox" name="del_image" /> effacer l'icone<br /><br />
+          <?php endif; ?>
+          <input type="file" name="image" />
+        </div>
+      </li>
+
       <li>
         <label for="licence">licence</label>
         <div class="form_input">
@@ -228,7 +239,7 @@ var is_reference = <?php echo $this->out["piste"]["reference"] ? "true" : "false
         <label for="description">description</label>
       </li>
       <li>
-        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo $this->out["piste"]["description"] ?></textarea>
+        <textarea class="tinymce" cols="70" rows="10" name="description" id="description"><?php echo isset($this->out["piste"]["description"]) ? $this->out["piste"]["description"] : "" ?></textarea>
       </li>
   
     </ul>
diff --git a/app/out/default/views/users/pistes/list.php b/app/out/default/views/users/pistes/list.php
index 8754f53..f541d66 100644
--- a/app/out/default/views/users/pistes/list.php
+++ b/app/out/default/views/users/pistes/list.php
@@ -72,7 +72,11 @@
     <?php if($piste["reference"]) : ?>
           r&eacute;f&eacute;rence &raquo; <a href="<?php echo $piste["reference"]["from"] ?>"><?php echo $piste["reference"]["titre"] ?> (<?php echo $piste["reference"]["auteur"] ?>)</a>
     <?php else : ?>
-          <a href="<?php echo $this->url("users/pistes/edit", array("id" => $id_morceau)) ?>"><?php echo $piste["titre"] ?></a>
+      <?php if($piste["permissions"]["editeur"]) : ?>
+          <a href="<?php echo $this->url("users/pistes/edit", array("id" => $id_piste)) ?>"><?php echo $piste["titre"] ?></a>
+      <?php else : ?>
+          <?php echo $piste["titre"] ?>
+      <?php endif; ?>
     <?php endif; ?>
     <?php if($piste["derivations"]) : ?>
           <br />
-- 
2.1.4