diff --git a/data/css/data_table.css b/data/css/data_table.css index a1c74dce..352d8c8b 100644 --- a/data/css/data_table.css +++ b/data/css/data_table.css @@ -4,10 +4,10 @@ -moz-border-radius: 20px; width: 88%; margin: 20px auto 0 auto; - padding: 25px; + padding: 20px; background-color: white; position: relative; - min-height: 302px; + min-height: 125px; clear: both; _height: 302px; zoom: 1; /* Feeling sorry for IE */ @@ -198,7 +198,7 @@ table.display tr.even.gradeU { tr.odd { - background-color: white; + background-color: #eeeeee; } tr.even { @@ -238,7 +238,8 @@ tr.even { font-size: 24px; text-align: center; vertical-align: middle; - height: 200px; + background-color: white; + height: 50px; width: 90%; } diff --git a/data/css/style.css b/data/css/style.css index 481c171f..03d74326 100755 --- a/data/css/style.css +++ b/data/css/style.css @@ -105,14 +105,14 @@ a:active {/*colour in NN4.xx is red*/ container { } -body { background-color: #EBF4FB; min-width: 906px; } -header { height: 68px; width: 100%; min-width: 906px; padding: 0 10px 0 10px; background-color: #CDC9C9; position: fixed; top: 0; z-index: 999; } +body { background-color: #EBF4FB; min-width: 907px; } +header { height: 68px; width: 100%; min-width: 907px; padding: 0 10px 0 10px; background-color: #CDC9C9; position: fixed; top: 0; z-index: 999; } div#logo { float: left; } ul#nav { margin-top: 25px; float: left; list-style-type: none; } -ul#nav li { margin: 40px 5px auto 15px; display: inline; } +ul#nav li { margin: 40px 5px auto 12px; display: inline; } ul#nav li a { font-size: 16px; font-weight: bold; color: #330000; text-decoration: none; } -ul#nav li a:hover { background-color: #EE0000; } +ul#nav li a:hover { background-color: #E133A5; } div#searchbar { margin: 24px auto auto 30px; float: left; } @@ -120,9 +120,9 @@ div#main { margin: 0; padding: 68px 0 0 0; } table#artist_table { background-color: white; } -table#artist_table th#name { text-align: center; } -table#artist_table th#album { text-align: center; } -table#artist_table th#reldate { width: 125px; text-align: center; } +table#artist_table th#name { text-align: center; min-width: 225px; } +table#artist_table th#album { text-align: center; min-width: 200px; } +table#artist_table th#reldate { width: 175px; text-align: center; min-width: 100px; } table#artist_table th#center { text-align: center; } table#artist_table td#name { text-align: left; } table#artist_table td#album { text-align: center; } diff --git a/data/js/libs/jquery.dataTables.min.js b/data/js/libs/jquery.dataTables.min.js index fe738fc9..bbcf701f 100644 --- a/data/js/libs/jquery.dataTables.min.js +++ b/data/js/libs/jquery.dataTables.min.js @@ -32,7 +32,7 @@ l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal= function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance= -this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ artists",sZeroRecords:"No matching records found",sEmptyTable:"Add some artists to the database!", +this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ artists",sZeroRecords:"No matching records found",sEmptyTable:"", sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ artists",sInfoEmpty:"Showing 0 to 0 of 0 artists",sInfoFiltered:"(filtered from _MAX_ total artists)",sInfoPostFix:"",sSearch:"Filter:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false, bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button"; this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};