diff --git a/data/interfaces/lossless/album.html b/data/interfaces/lossless/album.html index fc6643e5..6dac1ad8 100644 --- a/data/interfaces/lossless/album.html +++ b/data/interfaces/lossless/album.html @@ -26,7 +26,7 @@
- albumart + albumart

${album['AlbumTitle']}

@@ -129,16 +129,18 @@ diff --git a/data/interfaces/lossless/artist.html b/data/interfaces/lossless/artist.html index ce1b4aa8..bf1e689d 100644 --- a/data/interfaces/lossless/artist.html +++ b/data/interfaces/lossless/artist.html @@ -176,7 +176,7 @@ } $(document).ready(function() { - getArtistInfo("${artist['ArtistName']}","#artistImg img",3); + getArtistInfo("${artist['ArtistName']}","#artistImg img",3,"${artist['ArtistID']}"); initActions(); initThisPage(); }); diff --git a/data/interfaces/lossless/base.html b/data/interfaces/lossless/base.html index e958dca2..a1742071 100644 --- a/data/interfaces/lossless/base.html +++ b/data/interfaces/lossless/base.html @@ -76,13 +76,22 @@
Back to top diff --git a/data/interfaces/lossless/css/data_table.css b/data/interfaces/lossless/css/data_table.css index a2642d13..c05488be 100644 --- a/data/interfaces/lossless/css/data_table.css +++ b/data/interfaces/lossless/css/data_table.css @@ -108,8 +108,6 @@ table.display thead th { background-color: white; font-weight: bold; font-size: 16px; - cursor: pointer; - * cursor: hand; } table.display tfoot th { @@ -139,14 +137,20 @@ table.display td.center { .sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; + cursor: pointer; + * cursor: hand; } .sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; + cursor: pointer; + * cursor: hand; } .sorting { background: url('../images/sort_both.png') no-repeat center right; + cursor: pointer; + * cursor: hand; } .sorting_asc_disabled { diff --git a/data/interfaces/lossless/css/style.css b/data/interfaces/lossless/css/style.css index d046c750..86caec5b 100644 --- a/data/interfaces/lossless/css/style.css +++ b/data/interfaces/lossless/css/style.css @@ -178,11 +178,30 @@ table th { background-image: -webkit-linear-gradient(#fafafa, #eaeaea) !important; filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa, endColorstr=#eaeaea) !important; -ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa, endColorstr=#eaeaea) !important; + border-left: 1px solid #E0E0E0; + -moz-box-shadow: 1px 0 0 #fafafa; + -webkit-box-shadow: 1px 0 0 #fafafa; + box-shadow: 1px 0 0 #fafafa; text-shadow: 1px 1px 0 #FFFFFF ; } table th input[type="checkbox"] { vertical-align: middle; } +table th:first-child { + border-left: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +table th.sorting_desc, +table th.sorting_asc { + background-image: -moz-linear-gradient(#fafbfd, #dce6ef) !important; + background-image: linear-gradient(#fafbfd, #dce6ef) !important; + background-image: -webkit-linear-gradient(#fafbfd, #dce6ef) !important; + filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa, endColorstr=#eaeaea) !important; + -ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa, endColorstr=#eaeaea) !important; + color: #4183c4; +} table td { vertical-align: top; } @@ -468,8 +487,10 @@ header #logo { } footer { display: table; - margin: 20px auto; + margin: 60px auto 20px auto; width: 960px; + padding-top: 10px; + border-top: 1px solid #EEE; } #main { line-height: 24px; @@ -1017,7 +1038,7 @@ div#artistheader h2 a { } #searchresults_table th#artistname { min-width: 325px; - text-align: center; + text-align: left; } #searchresults_table #artistImg { background: url("../images/loader_black.gif") no-repeat scroll center center #ffffff; @@ -1039,6 +1060,9 @@ div#artistheader h2 a { text-align: left; vertical-align: middle; } +#searchresults_table td#add { + vertical-align: middle; +} #searchresults_table td#score .bar { width: 100px; margin: 0 auto; @@ -1088,13 +1112,25 @@ div#artistheader h2 a { font-size: 10px; position: relative; z-index: 999; - margin: 20px auto; + margin: 0px auto; text-align: center; - width: 390px; + width: 400px; } #donate { - margin: 20px auto; - text-align: center; + float: left; + text-align: left; +} +#actions { + float: right; + text-align: right; + margin-right: 10px; + margin-top: -5px; + color: #cccccc; +} +#actions .ui-icon { + position: relative; + top: 4px; + background-image: url("../images/ui-icons_70b2e1_256x240.png"); } #toTop { background: url("../images/toTop.gif") no-repeat scroll 10px center #f7f7f7; @@ -1115,7 +1151,6 @@ div#artistheader h2 a { } .cloudtag { font-size: 16px; - padding-top: 30px; } .cloudtag #cloud { line-height: 1.5em; @@ -1167,7 +1202,8 @@ div#artistheader h2 a { font-weight: 900; } .cloudtag #cloud li { - display: inline; + display: inline-block; + margin: 5px 10px; } .floatright { float: right; diff --git a/data/interfaces/lossless/css/style.less b/data/interfaces/lossless/css/style.less index bf2a5e62..4649e0c3 100644 --- a/data/interfaces/lossless/css/style.less +++ b/data/interfaces/lossless/css/style.less @@ -104,8 +104,15 @@ table { border-spacing: 0; th { .gradient(#FAFAFA, #EAEAEA); + border-left: 1px solid #E0E0E0; + .shadow(1px 0 0 #FAFAFA); text-shadow:1px 1px 0 #FFFFFF ; input[type="checkbox"]{ vertical-align: middle;} + &:first-child { border-left:0;.shadow(none)} + &.sorting_desc,&.sorting_asc { + .gradient(#FAFBFD, #DCE6EF); + color: @link-color; + } } td { vertical-align: top; @@ -332,8 +339,10 @@ header { } footer { display: table; - margin: 20px auto; + margin: 60px auto 20px auto; width: 960px; + padding-top: 10px; + border-top: 1px solid #EEE; } #main { line-height: 24px; @@ -819,7 +828,7 @@ div#artistheader { } th#artistname { min-width: 325px; - text-align: center; + text-align: left; } #artistImg { background: url("../images/loader_black.gif") no-repeat scroll center center #FFFFFF; @@ -841,6 +850,7 @@ div#artistheader { text-align: left; vertical-align: middle; } + td#add {vertical-align: middle;} td#score { .bar { width: 100px; @@ -887,13 +897,25 @@ div#artistheader { font-size: 10px; position: relative; z-index: 999; - margin: 20px auto; + margin: 0px auto; text-align: center; - width: 390px; + width: 400px; } #donate { - margin: 20px auto; - text-align: center; + float: left; + text-align: left; +} +#actions { + float: right; + text-align: right; + margin-right: 10px; + margin-top: -5px; + color: @border-color; + .ui-icon { + position: relative; + top: 4px; + background-image: url("../images/ui-icons_70b2e1_256x240.png"); + } } #toTop { background: url("../images/toTop.gif") no-repeat scroll 10px center #f7f7f7; @@ -916,7 +938,6 @@ div#artistheader { } .cloudtag { font-size: 16px; - padding-top: 30px; #cloud { line-height: 1.5em; margin: 0; @@ -965,7 +986,10 @@ div#artistheader { font-weight: 900; } } - li { display: inline; } + li { + display: inline-block; + margin: 5px 10px; + } } } diff --git a/data/interfaces/lossless/images/icon_like.png b/data/interfaces/lossless/images/icon_like.png new file mode 100644 index 00000000..e3f638d1 Binary files /dev/null and b/data/interfaces/lossless/images/icon_like.png differ diff --git a/data/interfaces/lossless/index.html b/data/interfaces/lossless/index.html index 503ccf9c..bf437622 100644 --- a/data/interfaces/lossless/index.html +++ b/data/interfaces/lossless/index.html @@ -1,4 +1,4 @@ -lossless<%inherit file="base.html"/> +<%inherit file="base.html"/> <%! from headphones import helpers %> @@ -54,7 +54,7 @@ lossless<%inherit file="base.html"/> %>
- ${artist['ArtistName']} + ${artist['ArtistName']} ${artist['Status']} ${albumdisplay}
${havetracks}/${totaltracks}
@@ -73,12 +73,16 @@ lossless<%inherit file="base.html"/> +