From 98288ec0c60463ec9cf265a5dc379c1601a34c7d Mon Sep 17 00:00:00 2001 From: agibert Date: Sun, 2 Dec 2012 09:04:06 +0000 Subject: [PATCH] - New Track Page Info layout, - Improve Play Page Link layout. --- html/default.css | 415 +++++++++++++++++++++++++++++++++++++++------- html/lmbrowse.php | 378 ++++++++++++++++++++++++++++------------- 2 files changed, 618 insertions(+), 175 deletions(-) diff --git a/html/default.css b/html/default.css index 9522b44..4697839 100644 --- a/html/default.css +++ b/html/default.css @@ -5,6 +5,12 @@ html, body background-color: black; } + + +/*--------------------------------------------*/ +/* TABLE */ +/*--------------------------------------------*/ + table { vertical-align: top; @@ -16,61 +22,25 @@ table margin-right: auto; } -td -{ - vertical-align: top; - text-align: center; -} - -td.border -{ - vertical-align: top; - text-align: left; - width: 70px; - height: 70px -} - -td.menu-bg -{ - vertical-align: top; - text-align: center; - height: 20px; - background-color: transparent; - background-image: url(/images/menu-bg.png); - background-repeat: repeat-x; - background-attachment: scroll; -} - -td.menu-item -{ - vertical-align: top; - text-align: center; - height: 20px; -} - -td.body -{ - vertical-align: middle; - text-align: left; -} - -td.line-bg -{ - vertical-align: top; - text-align: center; - height: 20px; - background-color: transparent; - background-image: url(/images/line-m.png); - background-repeat: repeat-x; - background-attachment: scroll; -} - table.list { vertical-align: top; text-align: left; width: 100%; height: auto; +/* height: 100%; */ + margin-left: auto; + margin-right: auto; + table-layout: auto; +/* border: 10px solid #888888;*/ +} + +table.tab +{ + vertical-align: top; + text-align: left; + width: 100%; + height: 100%; margin-left: auto; margin-right: auto; table-layout: auto; @@ -79,6 +49,10 @@ table.list +/*--------------------------------------------*/ +/* TR */ +/*--------------------------------------------*/ + tr.row0 { height: 10px; @@ -239,6 +213,48 @@ tr.play2 +tr.intro0 +{ + height: 24px; + color: white; + background-color: #222222; +} + +tr.intro1 +{ + height: auto; + background-color: #111111; +} + +tr.intro2 +{ + height: auto; + background-color: #111111; +} + + + +tr.hardware0 +{ + height: 24px; + color: white; + background-color: #222222; +} + +tr.hardware1 +{ + height: auto; + background-color: #111111; +} + +tr.hardware2 +{ + height: auto; + background-color: #111111; +} + + + tr.tracks0 { height: auto; @@ -325,20 +341,41 @@ tr.extras2 tr.links0 { - height: auto; + height: 24px; color: white; background-color: #222222; } tr.links1 { - height: 32px; + height: auto; background-color: #111111; } tr.links2 { - height: 32px; + height: auto; + background-color: #111111; +} + + + +tr.thanks0 +{ + height: 24px; + color: white; + background-color: #222222; +} + +tr.thanks1 +{ + height: auto; + background-color: #111111; +} + +tr.thanks2 +{ + height: auto; background-color: #111111; } @@ -346,9 +383,9 @@ tr.links2 tr.info0 { - height: auto; - color: black; - background-color: #EEEEEE; + height: 24px; + color: white; + background-color: #222222; } tr.info1 @@ -365,7 +402,14 @@ tr.info2 -tr.lyric1 +tr.lyrics0 +{ + height: 24px; + color: white; + background-color: #222222; +} + +tr.lyrics1 { height: auto; background-color: #333333; @@ -377,6 +421,55 @@ tr.lyric1 /* TD */ /*--------------------------------------------*/ +td +{ + vertical-align: top; + text-align: center; +} + +td.border +{ + vertical-align: top; + text-align: left; + width: 70px; + height: 70px +} + +td.menu-bg +{ + vertical-align: top; + text-align: center; + height: 20px; + background-color: transparent; + background-image: url(/images/menu-bg.png); + background-repeat: repeat-x; + background-attachment: scroll; +} + +td.menu-item +{ + vertical-align: top; + text-align: center; + height: 20px; +} + +td.body +{ + vertical-align: middle; + text-align: left; +} + +td.line-bg +{ + vertical-align: top; + text-align: center; + height: 20px; + background-color: transparent; + background-image: url(/images/line-m.png); + background-repeat: repeat-x; + background-attachment: scroll; +} + td.col1 { vertical-align: middle; @@ -642,12 +735,18 @@ td.text_l { vertical-align: middle; text-align: left; + background-color: #111111; + font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; + font-size: 16px; } td.text_r { vertical-align: middle; text-align: right; + background-color: #111111; + font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; + font-size: 16px; } td.title_l @@ -696,6 +795,105 @@ td.logo-r +td.intro0, +td.intro00, +td.intro01, +td.intro1, +td.intro2 +{ + vertical-align: middle; + text-align: left; + font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; + font-size: 14px; +} + +td.intro0 +{ + text-align: right; + width: 96px; + background-color: #222222; + font-size: 24px; + font-weight: bold; + padding-right: 10px; + padding-left: 10px; +} + +td.intro00 +{ + width: 10px; + background-color: #000000; +} + +td.intro01 +{ + width: 20px; +} + +td.intro1 +{ + text-align: right; + padding-right: 10px; + padding-left: 10px; +} + +td.intro2 +{ + text-align: center; + width: 24px; + font-size: 1px; +} + + + +td.hardware0, +td.hardware00, +td.hardware01, +td.hardware1, +td.hardware2 +{ + vertical-align: middle; + text-align: left; + font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; + font-size: 14px; +} + +td.hardware0 +{ + text-align: left; + width: 96px; + background-color: #222222; + font-size: 24px; + font-weight: bold; + padding-right: 10px; + padding-left: 10px; +} + +td.hardware00 +{ + width: 10px; + background-color: #000000; +} + +td.hardware01 +{ + width: 20px; +} + +td.hardware1 +{ + padding-right: 10px; + padding-left: 10px; +} + +td.hardware2 +{ + text-align: center; + width: 24px; + font-size: 1px; +} + + + td.tracks0, td.tracks00, td.tracks1, @@ -988,6 +1186,8 @@ td.links0 background-color: #222222; font-size: 24px; font-weight: bold; + padding-right: 10px; + padding-left: 10px; } td.links00 @@ -1004,14 +1204,64 @@ td.links01 td.links1 { text-align: right; + padding-right: 5px; + padding-left: 5px; } td.links2 { text-align: center; - width: 32px; - font-size: 16px; + width: 24px; + font-size: 1px; +} + + + +td.thanks0, +td.thanks00, +td.thanks01, +td.thanks1, +td.thanks2 +{ + vertical-align: middle; + text-align: left; + font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; + font-size: 14px; +} + +td.thanks0 +{ + text-align: left; + width: 96px; + background-color: #222222; + font-size: 24px; font-weight: bold; + padding-right: 10px; + padding-left: 10px; +} + +td.thanks00 +{ + width: 10px; + background-color: #000000; +} + +td.thanks01 +{ + width: 20px; +} + +td.thanks1 +{ + padding-right: 10px; + padding-left: 10px; +} + +td.thanks2 +{ + text-align: center; + width: 24px; + font-size: 1px; } @@ -1028,8 +1278,13 @@ td.info2 td.info0 { + text-align: right; width: 96px; background-color: #222222; + font-size: 24px; + font-weight: bold; + padding-right: 10px; + padding-left: 10px; } td.info00 @@ -1043,11 +1298,15 @@ td.info1 width: 130px; font-size: 16px; font-weight: bold; + padding-right: 10px; + padding-left: 10px; } td.info2 { text-align: right; + padding-right: 10px; + padding-left: 10px; } td.info3 @@ -1082,30 +1341,36 @@ td.info9 -td.lyric0, -td.lyric00, -td.lyric1 +td.lyrics0, +td.lyrics00, +td.lyrics1 { vertical-align: middle; text-align: center; font-family: verdana, geneva, lucida, 'lucida grande', arial, helvetica, sans-serif; } -td.lyric0 +td.lyrics0 { + text-align: left; width: 96px; background-color: #222222; + font-size: 24px; + font-weight: bold; + padding-right: 10px; + padding-left: 10px; } -td.lyric00 +td.lyrics00 { width: 10px; background-color: #000000; } -td.lyric1 +td.lyrics1 { font-size: 14px; + background-color: #111111; } @@ -1153,6 +1418,28 @@ img.menu-item /* A */ /*--------------------------------------------*/ +a:link +{ + color:#6644FF; +} + +a:visited +{ + color:#FF00FF; +} + +a:hover +{ + color:#FF2222; +} + +a:active +{ + color:#0066FF; +} + + + a.menu-home_page, a.menu-about, a.menu-discography, diff --git a/html/lmbrowse.php b/html/lmbrowse.php index 75b411f..54c795e 100644 --- a/html/lmbrowse.php +++ b/html/lmbrowse.php @@ -1,8 +1,8 @@ "; - lmb_menu($id); + lmb_menu($page_id); // include "$lmb_body_2"; @@ -945,14 +945,20 @@ function lmb_play_intro( $play_type, $play_id, $play_priority) - - + + - - + @@ -984,16 +990,21 @@ function lmb_play_intro( $play_type, $play_id, $play_priority) "; - echo "{$file_tag} + echo "{$file_tag} "; } @@ -1592,10 +1603,8 @@ function lmb_links_tab( $play_type, $play_id, $play_priority) exec( $cmd, $line); - echo "
Introduction 
Introduction
-
+
"; - include "{$play_path}/.intro"; + + $intro_file = "{$play_path}/.intro"; + $intro_string = file_get_contents( "{$intro_file}"); + + echo " ".lmb_html_text_format( "{$intro_string}")."
+"; + + echo "
- - + + + $hardware_file = "{$play_path}/.hardware"; + $hardware_string = file_get_contents( "{$hardware_file}"); + + echo " ".lmb_html_text_format( "{$hardware_string}")."
+"; + + echo " - - + +
+

"; - include "{$play_path}/.hardware"; - echo "
-
 Hardware
Hardware & Software
@@ -1022,7 +1033,7 @@ function lmb_track_info_get( $play_type, $play_id, $play_priority, $track_id) $track_info = array(); $cmd="eval \$( metaflac --export-tags-to=- \"${track_file}\" | grep -v -e \".* .*=\" -e \".*-.*=\" | sed -e 's/=/=\\\"/' -e 's/$/\"/') - echo -e \"\${TRACKNUMBER}\t\$(basename ${track_file} .flac)\t\${ARTIST}\t\${ALBUM}\t\$(echo \${TITLE} | sed 's/ (.*//')\t\$(echo \${TITLE} | sed -e 's/.* (//' -e 's/)$//')\t\${COMPOSER}\t\${COMMENT}\t\$(metaflac --show-sample-rate \"${track_file}\")\t\$(metaflac --show-total-samples \"${track_file}\")\t \t\${SAFECREATIVE}\""; + echo -e \"\${TRACKNUMBER}\t\$(basename ${track_file} .flac)\t\${ARTIST}\t\${ALBUM}\t\$(echo \${TITLE} | sed 's/ (.*//')\t\$(echo \${TITLE} | sed -e 's/.* (//' -e 's/)$//')\t\${COMPOSER}\t\${COMMENT}\t\$(metaflac --show-sample-rate \"${track_file}\")\t\$(metaflac --show-total-samples \"${track_file}\")\t\${SAFECREATIVE}\""; exec($cmd, $line); @@ -1149,7 +1160,7 @@ function lmb_tracklist( $play_type, $play_id, $play_priority) echo "
 {$track_info["id"]}  {$track_info["title"]}  {$track_info["mix"]}  {$track_info["length"]}  {$track_info["composer"]}  {$track_info["comment"]} 
 {$track_info["id"]}  {$track_info["title"]}  {$track_info["mix"]}  {$track_info["length"]}  {$track_info["composer"]}  {$track_info["comment"]} 
+ echo "
- - + + + "; } - echo " - - - + echo " +
"; for( $i = 0; $i < count($line); $i++) @@ -1607,14 +1616,19 @@ function lmb_links_tab( $play_type, $play_id, $play_priority) $link = htmlentities( "{$tab[1]}"); $image = "{$tab[2]}"; - echo " {$text}   \"\"
+ echo "
+ {$text} + + \"\" +
Links 
Links
@@ -1629,27 +1643,33 @@ function lmb_links_tab( $play_type, $play_id, $play_priority) function lmb_play_last( $play_type, $play_id, $play_priority) { - $play_path="discography/{$play_type}/{$play_priority}-{$play_id}"; + $play_path = "discography/{$play_type}/{$play_priority}-{$play_id}"; echo " - +
- +
- - + + - - + + + $thanks_file = "{$play_path}/.thanks"; + $thanks_string = file_get_contents( "{$thanks_file}"); + + echo " ".lmb_html_text_format( "{$thanks_string}")."
+"; + + + + echo "
 Thanks
Thanks
-
+
"; - include "{$play_path}/.thanks"; - echo "
-
@@ -1808,47 +1828,123 @@ function lmb_track_info( $play_type, $play_id, $play_priority, $track_id) echo " - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + "; if ($track_info["safe_creative"] != "") { echo " - - + + + +"; + } + + echo " +
 Group Name{$track_info["artist"]}  \"\"
 Album{$track_info["album"]} 
Informations
 Track Number{$track_info["id"]} Group Name{$track_info["artist"]}
 Track Name{$track_info["title"]} Album{$track_info["album"]}
 Mix Name{$track_info["mix"]} Track Number{$track_info["id"]}
 Composer{$track_info["composer"]} Track Name{$track_info["title"]}
 Comment{$track_info["comment"]} Mix Name{$track_info["mix"]}
 Length{$track_info["length"]} Composer{$track_info["composer"]}
Comment{$track_info["comment"]}
Length{$track_info["length"]}
 Safe CreativeLink Safe CreativeLink
+"; +} + + + +/*--------------------------------------------------------------------------------------------------------------------*/ +/* Track Info */ +/*--------------------------------------------------------------------------------------------------------------------*/ + +function lmb_track_info_old( $play_type, $play_id, $play_priority, $track_id) +{ + global $lmb_url; + + + $track_info = lmb_track_info_get( $play_type, $play_id, $play_priority, $track_id); + $height=220/8; + + if ($track_info["safe_creative"] != "") + { + $rowspan = 9; + } + else + { + $rowspan = 8; + } + + echo " + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"; + + if ($track_info["safe_creative"] != "") + { + echo " + + "; } @@ -1873,6 +1969,51 @@ function lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $tra $lyrics_file = "tracks/{$track_name}/{$track_mix}/lyrics.txt"; + echo "
Group Name{$track_info["artist"]}\"\"
Album{$track_info["album"]}
Track Number{$track_info["id"]}
Track Name{$track_info["title"]}
Mix Name{$track_info["mix"]}
Composer{$track_info["composer"]}
Comment{$track_info["comment"]}
Length{$track_info["length"]}
Safe CreativeLink
+ + + + + + + + +
+
+ "; + + + if( file_exists( "{$lyrics_file}")) + { + $lyrics_string = file_get_contents( "{$lyrics_file}"); + } + else + { + $lyrics_string = "No lyrics found...\n"; + } + + echo str_replace( "\n", "
\n ", "{$lyrics_string}"); + + echo "
+
Lyrics
+"; +} + + + +/*--------------------------------------------------------------------------------------------------------------------*/ +/* Track Lyrics */ +/*--------------------------------------------------------------------------------------------------------------------*/ + +function lmb_track_lyrics_old( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix) +{ + $play_path = "discography/{$play_type}/{$play_priority}-{$play_id}"; + $cover_path = "{$play_path}/covers/{$play_id}-cover"; + $logo_path = "{$play_path}/logos/{$play_id}-logo"; + $track_path = "{$play_path}/tracks"; + $lyrics_file = "tracks/{$track_name}/{$track_mix}/lyrics.txt"; + + echo " @@ -2039,80 +2180,95 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac $border1_size= $cover_size + 30; $border2_size= $cover_size + 10; + echo "

-
- + - - - - - -
+ - - - -
\"\"
- 		- - - - + - -
+ + + + + + + +
\"\"
+ 		+ + + + + echo " + + +
"; lmb_track_info( $play_type, $play_id, $play_priority, $track_id); // echo "
"; - echo "
+
-
- - -
+ + + + + echo " + + +
"; lmb_jplayer_insert( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); - echo "
+
- + @@ -2208,7 +2364,7 @@ echo " @@ -2292,10 +2448,10 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t $css_row = ( $k + 1 + count( $mix_tab)) % 2 + 3; echo " - - - - + + + + "; } @@ -2330,7 +2486,7 @@ function lmb_track_body( $play_type, $play_id, $play_priority, $track_id) $track_mix = $tab[2]; /* --- Introduction --- */ - lmb_track_intro_old( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); + lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); /* --- Download --- */ lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); @@ -2350,8 +2506,8 @@ function lmb_track_page( $play_type, $play_id, $play_priority, $track_id) $track_info = lmb_track_info_get( $play_type, $play_id, $play_priority, $track_id); $track_title = "Track - {$track_info["title"]} ({$track_info["mix"]})"; -// lmb_header( 4, "Langueur Monotone - Track Page", "/images/title-track.png", "Track", 962); - lmb_header( 4, "Langueur Monotone - {$track_title} Page", "/images/title-track.png", "Track", "track,{$track_info["title"]},{$track_info["title"]} {$track_info["mix"]}", 1234); + lmb_header( 4, "Langueur Monotone - Track Page", "/images/title-track.png", "Track", 962); +// lmb_header( 4, "Langueur Monotone - {$track_title} Page", "/images/title-track.png", "Track", "track,{$track_info["title"]},{$track_info["title"]} {$track_info["mix"]}", 1234); lmb_track_body( $play_type, $play_id, $play_priority, $track_id); lmb_footer(); }
+ - - - - - + - +
-
+
+ + + + + + + - - -
+
"; lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); -echo "
- 		- - - - +echo " + + +
\"\"
+ 		+ + + + + + +
\"\"
+
@@ -2166,7 +2322,7 @@ function lmb_track_intro_old( $play_type, $play_id, $play_priority, $track_id, $ 		"; - lmb_track_info( $play_type, $play_id, $play_priority, $track_id); + lmb_track_info_old( $play_type, $play_id, $play_priority, $track_id); echo "
"; - lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); + lmb_track_lyrics_old( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); echo "
{$mix_tab[$k]["track_name"]}{$mix_tab[$k]["mix_name"]}{$mix_tab[$k]["play_type_name"]}{$mix_tab[$k]["play_name"]}{$mix_tab[$k]["track_name"]}{$mix_tab[$k]["mix_name"]}{$mix_tab[$k]["play_type_name"]}{$mix_tab[$k]["play_name"]}