From d064c6c80e22edd1f2c1f449e60fc671d879b715 Mon Sep 17 00:00:00 2001 From: Garret Heaton Date: Thu, 22 Nov 2012 15:48:55 -0800 Subject: [PATCH] Switch to datatables.net table script Works better with Bootstrap. Still need to fix sorting on some columns. --- www/asc.gif | Bin 54 -> 0 bytes www/bg.gif | Bin 64 -> 0 bytes www/datatables/images/sort_asc.png | Bin 0 -> 1118 bytes www/datatables/images/sort_asc_disabled.png | Bin 0 -> 1050 bytes www/datatables/images/sort_both.png | Bin 0 -> 1136 bytes www/datatables/images/sort_desc.png | Bin 0 -> 1127 bytes www/datatables/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes www/default.css | 59 +++++--------- www/default.js | 79 +++++++++---------- www/desc.gif | Bin 54 -> 0 bytes www/index.html | 79 ++++++++++--------- www/jquery.tablesorter.min.js | 4 - 12 files changed, 96 insertions(+), 125 deletions(-) delete mode 100644 www/asc.gif delete mode 100644 www/bg.gif create mode 100644 www/datatables/images/sort_asc.png create mode 100644 www/datatables/images/sort_asc_disabled.png create mode 100644 www/datatables/images/sort_both.png create mode 100644 www/datatables/images/sort_desc.png create mode 100644 www/datatables/images/sort_desc_disabled.png delete mode 100644 www/desc.gif delete mode 100644 www/jquery.tablesorter.min.js diff --git a/www/asc.gif b/www/asc.gif deleted file mode 100644 index 74157867f25acbc146704d43399d6c3605ba7724..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A=tFW`Q0{?_dDi`go= G4AuZ#-wosd diff --git a/www/bg.gif b/www/bg.gif deleted file mode 100644 index fac668fcf42af844a3af0a239fa638ddbc08443c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZ?wbhEHb6lLIKXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFp2l{H=O3Yl~fU8)V1~= QTew|n!uOuePzDBT00piR0RR91 diff --git a/www/datatables/images/sort_asc.png b/www/datatables/images/sort_asc.png new file mode 100644 index 0000000000000000000000000000000000000000..a88d7975fe9017e4e5f2289a94bd1ed66a5f59dc GIT binary patch literal 1118 zcmbVLO=#0l98awuV{uMt6P_}u4rcI3idKFP2SpU%ZJIE?RL`X zK?Oyo=*5GG2SxDYK=7akJqV&hrl{aWJa`y*5xh+1%i2y4V}gO?edPc9{r;a9vjc}) zn|Cxb4AYwFmvVG%_ui)U^y_4!ujsO!qzYuv8YUIR!Aw%KiWp=JrG#@>(I!s4#N7H->?w+cxsH2#GA};A>g8lyFDGPKh!5)vuP_{)}*83+N zJUBU!S0_i+E{*Lu1iGsNB``2iK-CyCU7?y_mv{xb_pUh>ESZqe1Y2{eAZLMSIT%EO zFrdOH1W^=3p>Qk~I{J+k#s5zQ@j{%aIA!l^GQjJ zqA1Uc2%!{8qBKfMNh#9DCnKS_*uZ8?mnf!+8@f8xtz#prVg=E`3bCBLWsNmDAX~PG z<(4fQh=UOzE2?gKXRkc9XeI3Er?HlHECVd%SI}3`hy1_du3@$R$r(qT;k@Sft63UX zv;)2Ea_iH>^6+4jPK-lGM{Zw37Tz>~~zlHzO61x51(V4jcaKrcIVDG$-d>)z}S|7f!xxYhfUE}Kj zug_h&HZN}go22$5Ym1}P8~vYNx7-~$TWFJ;_nh!wFYSAQJF{CCo=xpK8^7?iY1^!H haOA^1D_`VC7fU=jcT literal 0 HcmV?d00001 diff --git a/www/datatables/images/sort_asc_disabled.png b/www/datatables/images/sort_asc_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..4e144cf0b1f786a9248a2998311e8109998d8a2d GIT binary patch literal 1050 zcmaJ=O-K|`93R^(@goeAz6hRU)S-61)?IaU({*Myml|8vh4x}JJM&z}b>>Yo&vx~s z*1>{0Sk$FMM28~iln?~vp$ zL+z1TilQ3g{c@7*P2Q^6L;g-8^nq-LaWstw(J;=d4x}PF%0Lh|)htXxRiC)>9(Gfd zk2X?ioL0_@8ZsHx!!QNYCTxo8?kU)+mV+2%VAin0^v_psXkh4J`eIPw6kCELM*pM( z2PX$o+GI}a)ajlxpt~Rv0TW^s6wEQp6$@dys4J4Qcg@nE2*J59y%|(mNdO5s5Cj>{ zuW=y`gm{Jzw6(Xlp9TWQb1WyYyx`~C#eg7k94LJ>@#g5mVp5Kkd=V>5k6>(zESt~g znS6jjPL}06J3BoMLGTlV-<`0qTJT$LYgs{tuI3mvHjo88MKy!QahN8NZl++`Te6m0 zDibLfTTpG5XE-mVGEhip#w2PB)JKi0I-PD8)*(7w)xTBHA4Yzu(Y*BKcijk8- zXslet#0bL39YHpb27^FRHN*1kB3@C%xaDHi(qLQ;(?o$W3|;IHBC-_Xc|nkPo{#bo zKE_Anh#c$_BEdk1ROZS^8#kea%Upe%D^%oqqhQ*^vkV>MD%4{RGC?tA(byrDwm?jZ z#$wTmdL^!2ITo%WmnFflUSt1hboq)*k9XV}TViYtKD5ZRJ7lb1H!ZJ`CviJ2M^c5A z%=*Sgk8hr8@-S*Kr`Ol~RJX(fddmmK4eR}O=#0l98WD1Hz^GK+C=e@fhgE~b#2$Ux^~T`1v5)mw1NlIe}zC z+ge9alrMQeN|SYi`>tC{zIG}!O_oO7k;UC8kBf>8sknx65F`zy2d1H-4fel=trX>@ z^-LCL<%6P%3`TJ=Ov$hao1$9VN|vJbLJV@SM>nJN{L>dS(6uOiBq(#Tm4F5Pz>p2Q zhq^NAP_G)%=(c^JwImV&17Zb~j6Ty5OHq1RS0sD)n5Dro1ouYi-$7;N6i6T&f*`~B zRW8JV5YO;|=5RQ?2M8R`v7Es2f}anI0YT(Au=3Evo2})=wA8uci&#;*fUzaAY_V8m ziU9`MJuDxIL|hF)@DqgJ88op{@|#XmML~j&YU>u(kqKNyC5HxZlqQk>PQkENWld+L zOr&6JNwHX-;oOueKw17j)G$`j4o<^A@%~fT$qZVMO+yC_*eYpUzR7iEi3uAj7}*(w z`YKgS6%a;F0a+l?9R#wX>ZWTi<7HV)nhsV>6(*%9O%xbi*F?TK!383rh#(|*p6}q} zd?z25;!?0(hzA2Li3(Rj>VN@FT;Xbexbdo7cN7eZc$T28pMYAYjSR4yvZz;&C0tc+ zg{xJMrKKvDCBd+6WB+P&<%mp=yImbyVyq56G|9BvWUP^I>ms=lb4e+lDSgg;Us`JO zKB6{wH+j~F#-A4FY3K3qm~Z6m@V6}oQ%8?p-E$dw`#0C$PJfmCV8)v}3>Ydha%`fZ zJk~G*M^A3LGk$Td;R`icF67R~`sBOHv)Hlqlc%$jy~9_oZJcNyWxkbb_O9u#|7hLF z-<-NMLzh3S0YA@8gd1Pt(Df|3@16Y-n=aSvsF@AkI`ioeFg>&H3bXU&vBnE6gIChkL+(Ey+0iB4Z$Eze7t_CX>Hq)$ literal 0 HcmV?d00001 diff --git a/www/datatables/images/sort_desc.png b/www/datatables/images/sort_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..def071ed5afd264a036f6d9e75856366fd6ad153 GIT binary patch literal 1127 zcmbVMOK8+U7*1U&zKRu5sR)h{1;yRWWV^4}ShvZpU2*HWU2!iy(qy)cZ89;Lb+`3m zMbruv!GjkO!3qksP*5)lD)k}=Dp*ht-n@8G5m8XoN!zU+ih_Y;=AZe$?|)|~*Ri8v z(dtDU$2DZy)jV65`|pB!_H}d7Cv0h=sUqzpC0fy3%q0!dg+a#Bx^W(BM*oq=xP{{a zC9_bZ#q2IgCss)FbwX9kVQ7wPX{|b%-is;d!ri7V^Y8E8=YeU+{JuyQW*r6hnC$~D z?i}bS=mWia!r)uCftISo2rNuBP__DOPpZoN6tBeg{;|M=DHYl)^V3chvpJv;7lTL$ z26Y&PAc{gL+#HL=wg3?#C_qs_Vi3iouqZ(YW*(kdbB&UeSJN}Lm?ZN(lsb|iR4SEF zB^)Adw}29fgwG+0L8cM(`faLJgSNN6#-L(PcTI+l@K3y+Xf(g*^61+0|J+O6zN2mb?UNGh6GU@A{1+eF%d@N2(^XdVmhis(y25|iAr;gV=io5OsYy0 zB}Gv|2&GUGrBPB%s*yG^841Ug8a88lRI_zlvuiTDGuXsmv6A9qjS{y&NMEf3ay^6+ zuZK85>5PD^rkl1e`{kLAR>iJ)6dP%mSYRr@k~xQcDE=$%X{_--ITM&Og5Ml}G)wJ> zb)dhUZG9%p4iC23#JFrUCcmwHz{cugMoku~ue-kg{Mj0~%`FeCcz9jAdg}QET-kSG za`+2B_+lRTaeAVz>E`F1pN7h>B=BbGqcz13d%ywZR&4OjkNNrF_U}#EcXDGa@V52B z>JnIW7#s%CHi literal 0 HcmV?d00001 diff --git a/www/datatables/images/sort_desc_disabled.png b/www/datatables/images/sort_desc_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..7824973cc60fc1841b16f2cb39323cefcdc3f942 GIT binary patch literal 1045 zcmaJ=&rj1(9IuWjVlWt@h#q(rlc~7%$2P_q>KN??ODrK{#&I!}_Kh{rzS=%m2N%F- zAW={L0VZBJnRrkSCK{q1NKA||(ZmA>6Hgw9o;Z-;>)3_|u*vIt-(X0AeGY5Bm`Mgoq{>2>Xkbiu%Ds= zw2?31f^tL9kQr8eOxQDR!ltPHq-U$zG{j&MP8pU+Z@qp?149?-TQP-IYzdZ(;duv+ z&5z`@`Drbo)5+_g-xG*{39$-1bH;K7Po%550y+EF3=OIfJT20DK^2ryARz~WSeOlI zY%dFXxiA-r#^dp8fM+?DVR?q*LtI>l@B+(%+D8*_j$RaUa;D~sSR!4**cKS3TrP*p zkuY+m7%q`W_!>MPB8ZS%v9RieEVsL^AVXJk3>zEB0=}X;iDt1#lSubcFztq{<<`nX z3dVS<&2VAXPpJ-6l>b9bvw?PT4(`W$ps<^-*pSIV7tJ~vX67YQ8ELa7v~ZoP?{i~^a{W;-ZQ@ymjxh)IjDt*2O<6Dwh=q$vY$VY; zc&J{Ds~-?cjVm3>Wk@iL-`IZ|UB4pJ;~yJiON_?gLyJtiL&kbxZhV_OiPfx}%6s1@ zcXoG^ffrPJ;LQ4(`t<(ickJ1j|E0&fC8lSh8sUh5lwUg=l~QoqsK t`nTanN|e2@a&yVMdhy b) ? 1 : 0)); + }, + + "span-sort-desc": function(a, b) { + return ((a < b) ? 1 : ((a > b) ? -1 : 0)); + } +}); diff --git a/www/desc.gif b/www/desc.gif deleted file mode 100644 index 3b30b3c58eabdb47a1c420ad03c8e30b966cc858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A>EGoD<#VNP?1QCB1* GgEatI(+xQQ diff --git a/www/index.html b/www/index.html index c62bbf28..2a99e0fd 100644 --- a/www/index.html +++ b/www/index.html @@ -43,7 +43,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- +
@@ -51,7 +51,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -59,13 +59,13 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + - + @@ -77,12 +77,11 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + - @@ -90,19 +89,19 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + - + - + @@ -114,7 +113,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -126,7 +125,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -138,7 +137,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -150,7 +149,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -162,7 +161,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -174,7 +173,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -186,7 +185,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -198,7 +197,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -210,7 +209,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -222,7 +221,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -234,7 +233,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -246,7 +245,7 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- + @@ -255,23 +254,25 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

Name Compute Units Storage PlatformI/O PerfI/O Perf Max IPs API Name Linux cost
Standard Small 1.70 GB 1 (1 core x 1 unit) 160 GB 32/64-bitModerateModerate 8 m1.small $0.065 per hour 2 (1 core x 2 units) 410 GB 32/64-bitModerateModerate 12 m1.medium $0.13 per hour $0.23 per hour
Standard Large 4 (2 cores x 2 units) 850 GB (2 x 420 GB) 64-bitHigh (EBS Optimized)High (EBS Optimized) 30 m1.large $0.26 per hour $0.46 per hour
Standard Extra Large 15.00 GB 8 (4 cores x 2 units) 1690 GB (4 x 420 GB) 64-bitHigh (EBS Optimized)High (EBS Optimized) 60 m1.xlarge $0.52 per hour 2 (only for short bursts) 0 GB (EBS only) 32/64-bitLowLow 1 t1.micro $0.02 per hour 6.5 (2 cores x 3.25 units) 420 GB 64-bitModerateModerate 60 m2.xlarge $0.45 per hour 13 (4 cores x 3.25 units) 850 GB 64-bitHighHigh 120 m2.2xlarge $0.90 per hour 26 (8 cores x 3.25 units) 1690 GB (2 x 840 GB) 64-bitHigh (EBS Optimized)High (EBS Optimized) 240 m2.4xlarge $1.80 per hour 13 (4 cores x 3.25 units) 0 GB (EBS only) 64-bitModerateModerate 60 m3.xlarge $0.58 per hour 26 (8 cores x 3.25 units) 0 GB (EBS only) 64-bitHighHigh 120 m3.2xlarge $1.16 per hour 5 (2 cores x 2.5 units) 350 GB 32/64-bitModerateModerate 12 c1.medium $0.165 per hour 20 (8 cores x 2.5 units) 1690 GB (4 x 420 GB) 64-bitHighHigh 60 c1.xlarge $0.66 per hour 33.5 (2 x Intel Xeon X5570) 1690 GB (2 x 840 GB) 64-bitVery HighVery High 1 cc1.4xlarge $1.30 per hour 88 (2 x Intel Xeon E5-2670) 3370 GB (4 x 840 GB) 64-bitVery HighVery High 240 cc2.8xlarge $2.40 per hour 33.5 (2 x Intel Xeon X5570) 1690 GB (2 x 840 GB) 64-bitVery HighVery High 1 cg1.4xlarge $2.10 per hour 35 (2 x Intel Xeon X5570) 2048 GB (2 x 1024 GB SSD) 64-bitVery HighVery High 1 hi1.4xlarge $3.10 per hour
- - - - - - + + + + + + + + diff --git a/www/jquery.tablesorter.min.js b/www/jquery.tablesorter.min.js deleted file mode 100644 index b8605df1..00000000 --- a/www/jquery.tablesorter.min.js +++ /dev/null @@ -1,4 +0,0 @@ - -(function($){$.extend({tablesorter:new -function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i