ajout date_invitation, corrections template

diff --git a/app/controllers/sources/piste.php b/app/controllers/sources/piste.php
index b5f1cdf..c6a26e4 100644 (file)
--- a/app/controllers/sources/piste.php
+++ b/app/controllers/sources/piste.php
@@ -61,6 +61,12 @@
                 else $env->erreur("Impossible de lire la liste des pistes");
               }
               else $env->erreur("impossible de lire la liste des morceaux");
+              $select = array("status" => $this->content_sources_mod->album_status_id);
+              if(isset($groupe)) $select["id_groupe"] = $groupe["id"];
+              if(($albums = $data->sources($select)) !== false)
+              { $env->set_out("albums", $albums);
+              }
+              else $env->erreur("impossible de lire la liste des albums");
             }
             else $env->erreur("Impossible de lire les informations du morceau");
           }

diff --git a/app/out/default/css/actions/sources.css b/app/out/default/css/actions/sources.css
index 756ef6b..d0c3113 100644 (file)
--- a/app/out/default/css/actions/sources.css
+++ b/app/out/default/css/actions/sources.css
@@ -127,6 +127,33 @@ p#play_all a
   width: 220px;
 }
 
+#colonne .logo_groupe{
+  text-align: center;
+  height: auto;
+  width: 220px;
+  padding: 0 10px 10px 10px;
+}
+
+#colonne .logo_groupe a{
+  display: block;
+  border: solid 1px #e5e5e5;
+  border-radius: 5px;
+  text-align: center;
+  background-color: #ffffff;
+  font-weight: bold;
+  color: #444444;
+}
+#colonne .logo_groupe a:hover{
+  background-color: #f1f1f1;
+}
+#colonne .logo_groupe a img{
+}
+#colonne .logo_groupe a span{
+  display: block;
+  padding: 10px;
+  text-align: center;
+}
+
 #colonne ul#album_links
 { margin: 32px 18px 0px 0px;
 }
@@ -168,28 +195,19 @@ p#play_all a
 
 /* ------------------------------- albums (page groupe) --- */
 
-ul.menu_albums{
-  margin: 32px 18px 0px 0px;
-  list-style-type: none;
-  margin-left: 0px;
-  margin: 0px 0px 10px 10px;
+ul.menu_albums
+{ margin: 32px 18px 0px 0px;
 }
 
-ul.menu_albums li{
-  list-style-type: none;
-  width: 250px;
+ul.menu_albums li
+{ list-style-type: none;
+  margin: 0px;
   padding: 0px;
 }
 
-#colonne ul.menu_albums li{
-  width: auto;
-}
-
-ul.menu_albums li a{
-  margin: 5px 0px 5px 10px;
-  display: block;
-  height: 90px;
-  padding: 5px;
+ul.menu_albums li a
+{ display: block;
+  padding: 5px 5px 0px 5px;
   border: solid 1px #d5d5d5;
   border-radius: 3px;
 }
@@ -198,13 +216,29 @@ ul.menu_albums li a:hover{
   background-color: #f5f5f5;
 }
 
-ul.menu_albums li a span{
-  display: block;
+ul.menu_albums
+{ list-style-type: none;
+  margin-left: 0px;
+  margin: 0px 0px 10px 10px;
+}
+
+ul.menu_albums li
+{ margin-left: 0px;
+  width: 220px;
+  margin: 5px 0px 5px 10px;
+}
+
+ul.menu_albums li a
+{ display: block;
+  height: 90px;
+  padding: 5px;
+}
+
+ul.menu_albums li a span
+{ display: block;
   float: right;
-  max-width: 140px;
   padding: 10px 5px 0px 5px;
-  text-align: right;
-  font-weight: bold;
+  max-width: 100px;
 }
 
 /* ------------------------ blocs source -------------------- */
@@ -498,20 +532,33 @@ ul#lien_contact li a
 
 /* ----------------------------------- bouton de derivation --------- */
 
-form.button_derive{
-  text-align: right;
+ul.button_derive:after{
+  content: "";
+  display: table;
+  clear: both;
 }
 
-form.button_derive div{
-  display: inline;
+ul.button_derive li{
+  list-style-type: none;
+  float: right;
+  position: relative;
+  padding: 2px 5px 0 1em;
 }
-form.button_derive div input[type=submit]{
-  background-color: transparent;
-  color: #333333;
-  border: solid 1px #c0c0c0;
-  padding: 1em;
-  border-radius: 5px;
+
+ul.button_derive li input[type=submit]{
+  display: block;
+  white-space : nowrap;
+  border: solid 1px #d5d5d5;
+  background-color: #ffffff;
+  background-image: url("../../icons/add.gif");
+  background-repeat: no-repeat;
+  background-position: 7px 10px;
+  padding: 0.6em 1em 0.6em 25px;
+  border-radius: 3px;
+  color: #000066;
 }
-form.button_derive div input[type=submit]:hover{
-  color: #c0c0c0;
+ul.button_derive li input[type=submit]:hover{
+  color: #000066;
+  background-color: #f5f5f5;
+  cursor: pointer;
 }

diff --git a/app/out/default/layouts/sources.xml b/app/out/default/layouts/sources.xml
index 7d319a7..54c9142 100644 (file)
--- a/app/out/default/layouts/sources.xml
+++ b/app/out/default/layouts/sources.xml
@@ -3,7 +3,7 @@
 
   <sources page="sources.php">
     <groupe>
-      <index page="simple.php" content="views/sources/groupe/list.php" />
+      <index content="views/sources/groupe/list.php" />
       <view content="views/sources/groupe/view.php" />
     </groupe>
     <album content="views/sources/album/list.php">

diff --git a/app/out/default/views/sources/logo_groupe.php b/app/out/default/views/sources/logo_groupe.php
index 769c303..c46eeb5 100644 (file)
--- a/app/out/default/views/sources/logo_groupe.php
+++ b/app/out/default/views/sources/logo_groupe.php
@@ -33,11 +33,12 @@
 ?>
 <div class="logo_groupe">
   <a href="<?php echo $this->url("sources/groupe/view", array("id" => $groupe["id"])) ?>">
-  <img src="<?php echo $this->path("web").$groupe["image_uri"]; ?>"
-       width="<?php echo $img_size["width"] ?>"
-       height="<?php echo $img_size["height"] ?>"
-       style="margin-top:<?php echo $margin_top ?>px"
-       alt="" />
+    <img src="<?php echo $this->path("web").$groupe["image_uri"]; ?>"
+         width="<?php echo $img_size["width"] ?>"
+         height="<?php echo $img_size["height"] ?>"
+         style="margin-top:<?php echo $margin_top ?>px"
+         alt="" />
+    <span><?php echo $groupe["nom"]; ?></span>
   </a>
 </div>
 <?php endif; ?>

diff --git a/app/out/default/views/sources/morceau/view.php b/app/out/default/views/sources/morceau/view.php
index 16c8991..8f3b770 100644 (file)
--- a/app/out/default/views/sources/morceau/view.php
+++ b/app/out/default/views/sources/morceau/view.php
@@ -72,11 +72,11 @@
 </ul>
 
 <?php if($this->action_allowed("users/morceaux/add")) : ?>
-<form class="button_derive" action="<?php echo $this->url("users/morceaux/add"); ?>" method="post">
+<form action="<?php echo $this->url("users/morceaux/add"); ?>" method="post">
   <input type="hidden" name="button_derive" value="<?php echo $morceau["id"];?>" />
-  <div>
-    <input type="submit" value="Publier une dérivation" />
-  </div>
+  <ul class="button_derive">
+    <li><input type="submit" value="Publier une dérivation" /></li>
+  </ul>
 </form>
 <?php endif; ?>
 

diff --git a/app/out/default/views/sources/piste/view.php b/app/out/default/views/sources/piste/view.php
index 7b474a0..7cdea46 100644 (file)
--- a/app/out/default/views/sources/piste/view.php
+++ b/app/out/default/views/sources/piste/view.php
@@ -79,11 +79,11 @@
 </ul>
 
 <?php if($this->action_allowed("users/pistes/add")) : ?>
-<form class="button_derive" action="<?php echo $this->url("users/pistes/add"); ?>" method="post">
+<form action="<?php echo $this->url("users/pistes/add"); ?>" method="post">
   <input type="hidden" name="button_derive" value="<?php echo $piste["id"];?>" />
-  <div>
-    <input type="submit" value="Publier une dérivation" />
-  </div>
+  <ul class="button_derive">
+    <li><input type="submit" value="Publier une dérivation" /></li>
+  </ul>
 </form>
 <?php endif; ?>
 

diff --git a/mw_sourceml.php b/mw_sourceml.php
index 2c7cc5b..731639f 100644 (file)
--- a/mw_sourceml.php
+++ b/mw_sourceml.php
@@ -66,7 +66,8 @@
         ||  $sgbd->table_exists("#--sml_source_cache")
         ||  $sgbd->table_exists("#--sml_source_compositions")
         ||  $sgbd->table_exists("#--sml_source_derivations")
-        ||  $sgbd->table_exists("#--sml_source_documents");
+        ||  $sgbd->table_exists("#--sml_source_documents")
+        ||  $sgbd->table_exists("#--sml_sources_invitations");
       }
       catch(Exception $e){
         return "impossible de savoir si les tables existent deja";
@@ -208,6 +209,7 @@
         ."  `id_source` INT(11) NOT NULL,"
         ."  `id_author` INT(11) NOT NULL,"
         ."  `id_sources_access` INT(11) NOT NULL,"
+        ."  `date_invitation` datetime NOT NULL,"
         ."  PRIMARY KEY (`id`)"
         .")";
         $sgbd->query($sql);