diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html index fd4d99fe..7dde799d 100644 --- a/data/interfaces/default/album.html +++ b/data/interfaces/default/album.html @@ -26,7 +26,7 @@
- albumart +

${album['AlbumTitle']}

@@ -130,7 +130,7 @@ function getAlbumArt() { var id = "${album['AlbumID']}"; var name = "${album['AlbumTitle']}"; - var image = $("div#albumImg img#albumImg"); + var image = $("div#albumImg img"); if ( !image.hasClass('done') ) { image.addClass('done'); getArtwork(image,id,name,'album'); diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index 71165052..2c1349fc 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -27,7 +27,7 @@ <%def name="body()">
- ${artist['ArtistName']} +

%if artist['Status'] == 'Loading': @@ -214,7 +214,7 @@ resetFilters("albums"); setTimeout(function(){ initFancybox(); - },1000); + },1500) } $(document).ready(function() { diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index ab6e2ac0..8bfb9acf 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -158,6 +158,8 @@ img.albumArt { float: left; min-height: 100%; min-width: 100%; + max-width: 300px; + max-height: 300px; position: relative; } .title { @@ -750,12 +752,6 @@ div#searchbar .mini-icon { margin-left: 6px; margin-top: 6px; } -a#vipserver { - margin-left: 100px; - color: blue; - size: 95%; - font-weight: bold; -} .configtable legend { font-size: 16px; font-weight: bold; @@ -1363,6 +1359,12 @@ div#artistheader h3 span { text-align: center; vertical-align: middle; } +#upcoming_table td#albumart img, +#wanted_table td#albumart img { + background: #FFF; + border: 1px solid #ccc; + padding: 3px; +} #upcoming_table th#albumart, #wanted_table th#albumart { min-width: 50px; diff --git a/data/interfaces/default/css/style.less b/data/interfaces/default/css/style.less index 86a91c0b..2c8c67a6 100644 --- a/data/interfaces/default/css/style.less +++ b/data/interfaces/default/css/style.less @@ -84,6 +84,8 @@ img { float: left; min-height: 100%; min-width: 100%; + max-width: 250px; + max-height: 300px; position: relative; } } @@ -1083,6 +1085,15 @@ div#albumheader .albuminfo li span, div#artistheader h3 span { text-align: center; vertical-align: middle; } +#upcoming_table, #wanted_table { + td#albumart { + img { + background: #FFF; + border: 1px solid #ccc; + padding: 3px; + } + } +} #upcoming_table th#albumart, #wanted_table th#albumart { min-width: 50px; text-align: center; diff --git a/data/interfaces/default/css/style_bu.css b/data/interfaces/default/css/style_bu.css deleted file mode 100644 index e72d2e11..00000000 --- a/data/interfaces/default/css/style_bu.css +++ /dev/null @@ -1 +0,0 @@ -html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,abbr,address,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,var,b,i,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary,time,mark,audio,video{border:0;font:inherit;font-size:100%;margin:0;padding:0;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}html{color:#343434;font-size:12px;line-height:1.5}body{background:#fff;color:#343434;font-family:"Helvetica Neue",Helvetica,Arial,Geneva,sans-serif;margin:0;overflow-y:scroll;padding:0}a{color:#4183c4;text-decoration:none;outline:0}a:hover{color:#8b8b8b}a.blue{color:blue}a .ui-icon{display:inline-block;position:relative;top:2px}.links a{color:#666;clear:both;display:inline-block;float:left}.links a:hover{color:#4183c4}.links a .ui-icon{float:left;margin-right:5px;margin-top:3px}h1{font-size:24px}h2{font-size:20px}h3{font-size:16px}p.center{text-align:center}hr{border:0;border-top:1px solid #ccc;display:block;height:1px;margin:1em 0;padding:0}small{font-size:85%}img.albumArt{float:left;min-height:100%;min-width:100%;position:relative}.title{margin-bottom:20px;margin-top:10px}.title h1 img{float:left;margin-right:5px}table{border-collapse:collapse;border-spacing:0}table th{background-image:-moz-linear-gradient(#fafafa,#eaeaea)!important;background-image:linear-gradient(#fafafa,#eaeaea)!important;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;text-shadow:1px 1px 0 #fff}table th input[type="checkbox"]{vertical-align:middle}table td{vertical-align:top}table td a{color:#666}select,input,textarea,button{font:99%}textarea{overflow:auto}input{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}input:invalid,textarea:invalid{-moz-box-shadow:0 0 5px #f00;-webkit-box-shadow:0 0 5px #f00;box-shadow:0 0 5px #f00;-moz-border-radius:1px;-webkit-border-radius:1px;border-radius:1px}.no-boxshadow input:invalid,.no-boxshadow textarea:invalid{background-color:#f0dddd}input[type="checkbox"]{vertical-align:bottom}label,input[type="button"],input[type="submit"],input[type="image"],button{cursor:pointer}button,input,select,textarea{margin:0}button{overflow:visible;width:auto}input,select,form .checkbox input,.configtable td#middle,#artist_table td#have,#album_table td#have{vertical-align:middle}input[type="radio"]{vertical-align:text-bottom}::-moz-selection,::selection{background:grey;color:#fff;text-shadow:none}input[type=submit],input[type=button]{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background:#222 url("../images/button.png") repeat-x;border:0;border-bottom:1px solid rgba(0,0,0,0.25);color:#fff;cursor:pointer;display:inline-block;margin-right:3px;padding:4px 10px;position:relative;text-decoration:none;text-shadow:0 -1px 1px rgba(0,0,0,0.25)}form legend,form h2{font-size:16px;font-weight:bold;margin-bottom:10px}form table{width:100%}form fieldset{margin-bottom:20px}form fieldset small.heading{color:#666;display:block;font-style:italic;margin-bottom:10px;margin-top:-15px}form .row{font-family:Helvetica,Arial;margin-bottom:10px}form .row label{display:block;float:left;font-size:12px;line-height:normal;padding-top:7px;width:175px}form .row input{margin-right:5px}form .row input[type=text],form .row input[type=password]{border:1px solid #DDD;border-top:1px solid #cdcdcd;-moz-box-shadow:0 1px 0 #f1f1f1;-webkit-box-shadow:0 1px 0 #f1f1f1;box-shadow:0 1px 0 #f1f1f1;-moz-box-shadow:inset 0 1px 1px #e0e0e0;-webkit-box-shadow:inset 0 1px 1px #e0e0e0;box-shadow:inset 0 1px 1px #e0e0e0;color:#343434;font-size:14px;height:auto;line-height:normal;max-width:230px;margin-right:5px;padding:3px 5px}form .row small{color:#999;display:block;font-size:9px;line-height:12px;margin-left:175px;margin-top:3px}form .left label{float:none;line-height:normal;margin-bottom:10px;padding-top:1px;width:auto}form .left input{float:left;margin-bottom:10px}form .radio label{float:none;line-height:normal;margin-bottom:10px;padding-top:1px;width:auto}form .radio input{float:left;margin-bottom:10px}form .radio small{display:inline!important;line-height:normal!important;margin:0!important;width:auto}form .checkbox small{display:inline!important;line-height:normal!important;margin:0!important;width:auto}ul,ol{margin-left:2em}ol{list-style-type:decimal}nav ul,nav li{list-style:none;list-style-image:none;margin:0}ul#nav{float:right;margin:0;padding:0 0 0 10px;border-left:1px solid #fafafa;-moz-box-shadow:-1px 0 0 #e0e0e0;-webkit-box-shadow:-1px 0 0 #e0e0e0;box-shadow:-1px 0 0 #e0e0e0;height:58px}ul#nav li{display:block;float:left;font-size:18px;font-weight:bold;margin:8px 0 0 0;text-align:center}ul#nav li a{color:#343434;display:block;padding:7px 15px;text-shadow:1px 1px 0 #FFF;text-transform:capitalize;border:1px solid transparent;font-family:"Trebuchet MS",Helvetica,Arial,sans-serif}ul#nav li a:hover{background-image:-moz-linear-gradient(#f1f1f1,#e0e0e0)!important;background-image:linear-gradient(#f1f1f1,#e0e0e0)!important;background-image:-webkit-linear-gradient(#f1f1f1,#e0e0e0)!important;filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;-ms-filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;border:1px solid #ddd;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 #fafafa;-webkit-box-shadow:0 1px 0 #fafafa;box-shadow:0 1px 0 #fafafa;-moz-box-shadow:0 1px 0 #fafafa inset;-webkit-box-shadow:0 1px 0 #fafafa inset;box-shadow:0 1px 0 #fafafa inset;-webkit-transition:color .2s ease-in;-moz-transition:color .2s ease-in;-o-transition:color .2s ease-in;transition:color .2s ease-in}ul#nav li a.config{height:28px;width:10px}ul#nav li a.config img{position:relative;top:-7px;left:-7px}ul#nav li a.log{font-size:13px;padding:10px 15px 11px}header{background-image:-moz-linear-gradient(#fafafa,#eaeaea)!important;background-image:linear-gradient(#fafafa,#eaeaea)!important;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-bottom:1px solid #cacaca;-moz-box-shadow:0 0 10px rgba(0,0,0,0.1);-webkit-box-shadow:0 0 10px rgba(0,0,0,0.1);box-shadow:0 0 10px rgba(0,0,0,0.1);height:58px;position:fixed;width:100%;z-index:999}header .wrapper{margin:0 auto;overflow:hidden;position:relative;width:960px}header #logo{float:left;margin-right:20px;position:relative;top:-3px;margin-left:10px}footer{display:table;margin:20px auto;width:960px}#main{line-height:24px;margin:0 auto;padding:75px 0 0;width:960px}.message{-moz-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;background-color:#fff6a9;display:inline-block;padding:5px 10px;margin-top:10px}.message .ui-icon{float:left;margin-right:5px;position:relative;top:4px}#ajaxMsg{background-color:#fdfff2;border:1px solid #ccc;-moz-border-radius-bottomleft:10px;-moz-border-radius-bottomright:10px;-webkit-border-bottom-right-radius:10px;-webkit-border-bottom-left-radius:10px;border-bottom-left-radius:10px;border-bottom-right-radius:10px;display:none;font-size:14px;left:50%;margin-left:-125px;min-height:16px;padding:0 10px;position:fixed;text-align:center;top:-1px;width:250px;z-index:9999}#ajaxMsg .msg{font-family:"Trebuchet MS",Helvetica,Arial,sans-serif;line-height:normal;padding-left:20px}#ajaxMsg.success{background-color:#d3ffd7;padding:10px 10px 10px}#ajaxMsg.error{background-color:#ffd3d3;padding:10px 10px 10px}#ajaxMsg .ui-icon{display:inline-block;margin-left:-20px;top:2px;position:relative;margin-right:3px}#updatebar{-moz-border-radius-bottomleft:10px;-moz-border-radius-bottomright:10px;-webkit-border-bottom-right-radius:10px;-webkit-border-bottom-left-radius:10px;border-bottom-left-radius:10px;border-bottom-right-radius:10px;background-color:#fff6a9;border:1px solid #ccc;font-size:11px;left:35%;margin:0 auto;padding:1px 10px;position:absolute;text-align:center;text-transform:lowercase;top:0}#subhead .back{float:left;margin-top:-25px}#subhead #subhead_container{float:right;height:30px;list-style-type:none;width:100%;z-index:998}#subhead #subhead_container #subhead_menu{float:right;margin-top:5px;position:relative;z-index:99}#subhead #subhead_container #subhead_menu a{background-image:-moz-linear-gradient(#f4f4f4,#e7e7e7)!important;background-image:linear-gradient(#f4f4f4,#e7e7e7)!important;background-image:-webkit-linear-gradient(#f4f4f4,#e7e7e7)!important;filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;-ms-filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;font-family:"Helvetica Neue",Helvetica,Arial,Geneva,sans-serif;font-size:12px;font-weight:normal}#subhead #subhead_container #subhead_menu a:hover{background-image:-moz-linear-gradient(#599bdc,#3072b3)!important;background-image:linear-gradient(#599bdc,#3072b3)!important;background-image:-webkit-linear-gradient(#599bdc,#3072b3)!important;filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;-ms-filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;color:#FFF;border-color:#518cc6 #518cc6 #2a65a0}div#searchbar{border-left:1px solid #fafafa;-moz-box-shadow:-1px 0 0 #e0e0e0;-webkit-box-shadow:-1px 0 0 #e0e0e0;box-shadow:-1px 0 0 #e0e0e0;padding:15px 0 15px 20px;position:absolute;left:90px;top:2px}div#searchbar input[type=text]{border:1px solid #DDD;border-top:1px solid #cdcdcd;-moz-box-shadow:0 1px 0 #f1f1f1;-webkit-box-shadow:0 1px 0 #f1f1f1;box-shadow:0 1px 0 #f1f1f1;-moz-box-shadow:inset 0 1px 1px #e0e0e0;-webkit-box-shadow:inset 0 1px 1px #e0e0e0;box-shadow:inset 0 1px 1px #e0e0e0;color:#999;float:left;font-size:14px;height:auto;line-height:normal;margin-right:5px;padding:4px 5px 4px 25px;width:150px}div#searchbar .mini-icon{height:20px;width:20px;background:url("../images/icon_search.gif") left top no-repeat;position:absolute;display:block;margin-left:6px;margin-top:6px}.configtable legend{font-size:16px;font-weight:bold;margin-bottom:10px;text-shadow:1px 1px 0 #fff}.configtable tr td:last-child{border-left:1px dotted #ddd;padding-left:20px}.configtable td{padding-right:15px;width:50%}.table_wrapper{_height:302px;background-color:#FFF;clear:both;margin:30px auto 0;min-height:100px;position:relative;width:100%;zoom:1px}.manage_wrapper{_height:302px;clear:both;margin:20px auto 0;min-height:150px;padding:25px;width:88%;zoom:1px}#paddingheader{position:relative;top:-25px}#paddingheader h1{line-height:33px;width:450px}#paddingheader h1 img{float:left;margin-right:5px}div#nopaddingheader{font-size:24px;font-weight:bold;text-align:center}div#artistheader{margin-top:50px;min-height:200px}div#artistheader #artistImg{background:#fff url("../images/loader_black.gif") center no-repeat;border:5px solid #FFF;-moz-box-shadow:1px 1px 2px 0 #555;-webkit-box-shadow:1px 1px 2px 0 #555;box-shadow:1px 1px 2px 0 #555;float:left;height:200px;margin-bottom:30px;margin-right:25px;overflow:hidden;text-indent:-3000px;width:200px}div#artistheader #artistBio{font-size:16px;line-height:24px;margin-top:10px}div#artistheader h1 a{font-size:32px;margin-bottom:5px;font-family:"Trebuchet MS",Helvetica,Arial,sans-serif}div#artistheader h2 a{font-style:italic;font-weight:bold;font-family:"Trebuchet MS",Helvetica,Arial,sans-serif}#artist_table{background-color:#FFF;padding:20px;width:100%}#artist_table th#select{text-align:left}#artist_table th#select input{vertical-align:middle}#artist_table th#name{min-width:200px;text-align:left}#artist_table th#album{min-width:300px;text-align:left}#artist_table th#status,#artist_table th#albumart{min-width:50px;text-align:left}#artist_table th#have{text-align:center}#artist_table td#name{min-width:200px;text-align:left;vertical-align:middle}#artist_table td#status{min-width:50px;text-align:left;vertical-align:middle}#artist_table td#album{min-width:300px;text-align:left;vertical-align:middle}#markalbum{position:relative;top:25px;display:inline-block}#albumheader{margin-top:50px;min-height:200px}#albumheader #albumImg{background:#fff url("../images/loader_black.gif") center no-repeat;border:5px solid #FFF;-moz-box-shadow:1px 1px 2px 0 #555;-webkit-box-shadow:1px 1px 2px 0 #555;box-shadow:1px 1px 2px 0 #555;float:left;height:200px;margin-bottom:30px;margin-right:25px;overflow:hidden;text-indent:-3000px;width:200px}#albumheader p{font-size:16px;line-height:24px;margin-bottom:10px}#albumheader h1 a{display:inline-block;font-size:32px;line-height:35px;margin-bottom:3px;font-family:"Trebuchet MS",Helvetica,Arial,sans-serif}#albumheader h2 a{display:inline-block;font-style:italic;font-weight:400;margin-bottom:5px;font-family:"Trebuchet MS",Helvetica,Arial,sans-serif}#albumheader .albuminfo{margin-left:210px}#albumheader .albuminfo li{border-right:1px dotted #ccc;float:left;font-size:16px;font-weight:bold;list-style:none;margin-right:10px;padding-right:10px}#albumheader .albuminfo li:last-child{border:0}#album_table{background-color:#FFF}#album_table th#select{min-width:10px;text-align:left;vertical-align:middle}#album_table th#select input{vertical-align:middle}#album_table th#reldate{min-width:70px;text-align:center;width:175px}#album_table th#status,#album_table th#albumart{min-width:50px;text-align:left}#album_table th#status{min-width:80px;text-align:center;width:175px}#album_table th#wantlossless{min-width:80px;text-align:center;width:80px}#album_table td#albumart img{background:#FFF;border:1px solid #ccc;padding:3px}#album_table td#status a#wantlossless{white-space:nowrap}#manageheader{margin-top:45px;margin-bottom:0}#track_wrapper{font-size:16px;padding-top:20px;width:100%}#track_table th#number{min-width:10px;text-align:right}#track_table th#name{min-width:350px;text-align:center}#track_table th#location{text-align:center;width:250px}#track_table td{border-bottom:1px solid #fff}#track_table td#number{text-align:right;vertical-align:middle}#track_table td#name{font-size:15px;text-align:left;vertical-align:middle}#track_table td#location{font-size:11px;line-height:normal;text-align:center;vertical-align:middle}#history_table{background-color:#FFF;font-size:13px;width:100%}#history_table td#dateadded{font-size:14px;min-width:150px;text-align:center;vertical-align:middle}#history_table td#filename{font-size:15px;min-width:100px;text-align:center;vertical-align:middle}#history_table td#size{font-size:14px;min-width:75px;text-align:center;vertical-align:middle}#log_table{background-color:#FFF}#log_table th#timestamp{min-width:150px;text-align:left}#log_table th#level{min-width:60px;text-align:left}#log_table th#message{min-width:500px;text-align:left}#log_table td{font-size:12px;padding:2px 10px}#searchresults_table th#albumname{min-width:225px;text-align:left}#searchresults_table th#artistname{min-width:325px;text-align:center}#searchresults_table td#albumname{min-width:200px;text-align:left;vertical-align:middle}#searchresults_table td#artistname{min-width:300px;text-align:left;vertical-align:middle}#searchresults_table td#score .bar{width:100px;margin:0 auto;border:1px solid #ccc;padding:1px;background-color:#FFF}#searchresults_table td#score .bar .score{height:14px;color:#343434;color:#FFF;font-size:11px;vertical-align:middle;line-height:normal;background-image:-moz-linear-gradient(#a3e532,#90cc2a)!important;background-image:linear-gradient(#a3e532,#90cc2a)!important;background-image:-webkit-linear-gradient(#a3e532,#90cc2a)!important;filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;-ms-filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important}.progress-container{background:#FFF;border:1px solid #ccc;float:left;height:14px;margin:2px 5px 2px 0;padding:1px;width:100px}.progress-container>div{background-image:-moz-linear-gradient(#a3e532,#90cc2a)!important;background-image:linear-gradient(#a3e532,#90cc2a)!important;background-image:-webkit-linear-gradient(#a3e532,#90cc2a)!important;filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;-ms-filter:progid:dximagetransform.microsoft.gradient(startColorstr=#fafafa,endColorstr=#eaeaea)!important;height:14px}.havetracks{font-size:11px;line-height:normal;margin-left:36px;padding-bottom:3px;vertical-align:middle}#version{color:#999;font-size:10px;position:relative;z-index:999;margin:20px auto;text-align:center;width:390px}#donate{margin:20px auto;text-align:center}#toTop{background:url("../images/toTop.gif") no-repeat scroll 10px center #f7f7f7;border-radius:5px 0 0 0;bottom:0;display:none;padding:10px 10px 10px 40px;position:fixed;right:0}#shutdown{text-align:center;vertical-align:middle}#shutdown h1 img{position:relative;top:7px}.cloudtag{font-size:16px;padding-top:30px}.cloudtag #cloud{line-height:1.5em;margin:0;padding:2px;text-align:center}.cloudtag #cloud a{padding:0}.cloudtag #cloud a.tag1{font-size:.7em;font-weight:100}.cloudtag #cloud a.tag2{font-size:.8em;font-weight:200}.cloudtag #cloud a.tag3{font-size:.9em;font-weight:300}.cloudtag #cloud a.tag4{font-size:1em;font-weight:400}.cloudtag #cloud a.tag5{font-size:1.2em;font-weight:500}.cloudtag #cloud a.tag6{font-size:1.4em;font-weight:600}.cloudtag #cloud a.tag7{font-size:1.6em;font-weight:bold}.cloudtag #cloud a.tag8{font-size:1.8em;font-weight:800}.cloudtag #cloud a.tag9{font-size:2.2em;font-weight:900}.cloudtag #cloud a.tag10{font-size:2.5em;font-weight:900}.cloudtag #cloud li{display:inline}.floatright{float:right}.floatleft{float:left}.ir{background-repeat:no-repeat;direction:ltr;display:block;overflow:hidden;text-align:left;text-indent:-999em}.hidden{display:none;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:"\0020";display:block;height:0;overflow:hidden}.clearfix{zoom:1px}.clearfix:after{clear:both}#album_table th#albumname,#upcoming_table th#artistname,#wanted_table th#artistname{min-width:150px;text-align:center}#album_table th#type,#track_table th#duration{min-width:100px;text-align:center;width:175px}#album_table th#bitrate,#album_table th#albumformat{min-width:60px;text-align:center}#album_table td#select,#album_table td#albumart{text-align:left;vertical-align:middle}#album_table td#albumname,#album_table td#reldate,#album_table td#type,#track_table td#duration,#upcoming_table td#select,#upcoming_table td#status,#wanted_table td#select,#wanted_table td#status{text-align:center;vertical-align:middle}#album_table td#status,#album_table td#bitrate,#album_table td#albumformat,#album_table td#wantlossless{font-size:13px;text-align:center;vertical-align:middle}div#albumheader .albuminfo li span,div#artistheader h3 span{font-weight:400}#track_table th#bitrate,#track_table th#format,#upcoming_table th#type,#wanted_table th#type,#searchresults_table th#score{min-width:75px;text-align:center}#track_table td#bitrate,#track_table td#format{font-size:12px;text-align:center;vertical-align:middle}#history_table td#status,#history_table td#action{font-size:14px;text-align:center;vertical-align:middle}#upcoming_table th#albumart,#wanted_table th#albumart{min-width:50px;text-align:center}#upcoming_table th#albumname,#wanted_table th#albumname{min-width:200px;text-align:center}#upcoming_table th#reldate,#wanted_table th#reldate{min-width:100px;text-align:center}#upcoming_table td#albumart,#wanted_table td#albumart{min-width:50px;text-align:center;vertical-align:middle}#upcoming_table td#albumname,#wanted_table td#albumname{min-width:200px;text-align:center;vertical-align:middle}#upcoming_table td#artistname,#wanted_table td#artistname{min-width:150px;text-align:center;vertical-align:middle}#upcoming_table td#reldate,#wanted_table td#reldate{min-width:100px;text-align:center;vertical-align:middle}#upcoming_table td#type,#wanted_table td#type,#searchresults_table td#score{min-width:75px;text-align:center;vertical-align:middle}table tr td#status a{color:#4183c4}.ie7 input[type="checkbox"]{vertical-align:baseline}.ie7 img{-ms-interpolation-mode:bicubic}.ie7 legend{margin-left:-7px} \ No newline at end of file diff --git a/data/interfaces/default/images/no-cover-artist.png b/data/interfaces/default/images/no-cover-artist.png index 2a716ae2..40fe7903 100644 Binary files a/data/interfaces/default/images/no-cover-artist.png and b/data/interfaces/default/images/no-cover-artist.png differ diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 16a97a30..68fb3492 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -53,7 +53,7 @@ %> -
+
${artist['ArtistName']} ${artist['Status']} ${albumdisplay} diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index a89bb618..85ad59d2 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -2,8 +2,10 @@ function getThumb(imgElem,id,type) { if ( type == 'artist' ) { var thumbURL = "getThumb?ArtistID=" + id; + // var imgURL = "getArtwork?ArtistID=" + id; } else { var thumbURL = "getThumb?AlbumID=" + id; + // var imgURL = "getArtwork?AlbumID=" + id; } // Get Data from the cache by Artist ID $.ajax({ @@ -15,9 +17,9 @@ function getThumb(imgElem,id,type) { } else { var imageUrl = data; - } + } $(imgElem).attr("src",imageUrl).hide().fadeIn(); - // $(imgElem).wrap(''); + // $(imgElem).wrap(''); } }); } @@ -34,12 +36,12 @@ function getArtwork(imgElem,id,name,type) { url: artworkURL, cache: true, success: function(data){ - if ( data == "" ) { + if ( data == "" || data == undefined ) { var imageUrl = "interfaces/default/images/no-cover-artist.png"; } else { var imageUrl = data; - } + } $(imgElem).attr("src",imageUrl).hide().fadeIn(); $(imgElem).wrap(''); } @@ -78,20 +80,23 @@ function getImageLinks(elem,id,type) { cache: true, dataType: "json", success: function(data){ - var thumbnail = data.thumbnail; - var artwork = data.artwork; - + if ( data.thumbnail == "" || data.thumbnail == undefined ) { + var thumbnail = "interfaces/default/images/no-cover-artist.png"; + } + else { + var thumbnail = data.thumbnail; + } + if ( data.artwork == "" || data.artwork == undefined ) { + var artwork = "interfaces/default/images/no-cover-artist.png"; + } + else { + var artwork = data.artwork; + } $(elem).attr("src", thumbnail); } }); } -function getOriginalWidthOfImg(img_element) { - var t = new Image(); - t.src = (img_element.getAttribute ? img_element.getAttribute("src") : false) || img_element.src; - return t.width; -} - function initHeader() { //settings var header = $("#container header"); @@ -339,7 +344,7 @@ function initFancybox() { if ( $("a[rel=dialog]").length > 0 ) { $.getScript('interfaces/default/js/fancybox/jquery.fancybox-1.3.4.js', function() { $("head").append(""); - $("a[rel=dialog]").fancybox(); + $("a[rel=dialog]").fancybox({}); }); } } diff --git a/data/interfaces/default/upcoming.html b/data/interfaces/default/upcoming.html index bbe3e312..69f75c4c 100644 --- a/data/interfaces/default/upcoming.html +++ b/data/interfaces/default/upcoming.html @@ -40,7 +40,7 @@ %for album in wanted: - + ${album['ArtistName']} ${album['AlbumTitle']} ${album['ReleaseDate']} @@ -70,7 +70,7 @@ %for album in upcoming: - + ${album['ArtistName']} ${album['AlbumTitle']} ${album['ReleaseDate']}