From: dj3c1t Date: Mon, 8 Jul 2013 20:31:26 +0000 (+0200) Subject: modifications sur le template default X-Git-Tag: sourceml.0.15.3 X-Git-Url: http://git.dj3c1t.com/?p=mw_sourceml;a=commitdiff_plain;h=39104f779d37b7e4dc361e25326f5b40f011797c modifications sur le template default --- 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 @@ - - - - - - - - - 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 0000000..4f7ef72 Binary files /dev/null and b/app/out/default/icons/item.png differ 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 0000000..072f8cd Binary files /dev/null and b/app/out/default/icons/licences/cc.by.nc.nd.png differ 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 0000000..54ebdfb Binary files /dev/null and b/app/out/default/icons/licences/cc.by.nc.png differ 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 0000000..ed028fe Binary files /dev/null and b/app/out/default/icons/licences/cc.by.nc.sa.png differ 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 0000000..35eca20 Binary files /dev/null and b/app/out/default/icons/licences/cc.by.nd.png differ 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 0000000..ecd2abc Binary files /dev/null and b/app/out/default/icons/licences/cc.by.png differ 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 0000000..c67509f Binary files /dev/null and b/app/out/default/icons/licences/cc.by.sa.png differ diff --git a/app/out/default/images/colorbox/controls.png b/app/out/default/images/colorbox/controls.png index 051b4a6..dade09d 100644 Binary files a/app/out/default/images/colorbox/controls.png and b/app/out/default/images/colorbox/controls.png differ 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"),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("
").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")[0].src=h),Y(d)&&(a("")[0].src=d))):I.hide(),J.iframe?(k=a("