From d2799590420dbe7124d4955c71c2036936129373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Mon, 27 Oct 2014 18:07:30 +0100 Subject: [PATCH] Remove the 'All Metrics' tab --- app/node_controllers/resultsController.js | 5 ---- app/node_views/results.html | 31 ---------------------- app/public/fonts/icons.woff | Bin 2312 -> 2136 bytes app/public/fonts/svg-icons/drawer3.svg | 1 - app/public/scripts/resultsCtrl.js | 14 ---------- app/public/styles/less/icons.less | 31 ++++++++++------------ app/public/styles/less/main.less | 3 --- app/public/styles/main.css | 15 +---------- 8 files changed, 15 insertions(+), 85 deletions(-) delete mode 100755 app/public/fonts/svg-icons/drawer3.svg diff --git a/app/node_controllers/resultsController.js b/app/node_controllers/resultsController.js index 4da4c1c..d1cdb97 100644 --- a/app/node_controllers/resultsController.js +++ b/app/node_controllers/resultsController.js @@ -21,10 +21,6 @@ var resultsController = function(req, res, googleAnalyticsId) { fs.readFile('./app/node_views/results.html', {encoding: 'utf8'}, callback); }, - phantomasMetadata: function(callback) { - fs.readFile('./node_modules/phantomas/lib/metadata/metadata.json', {encoding: 'utf8'}, callback); - }, - phantomasResults: function(callback) { fs.readFile(phantomasResultsPath, {encoding: 'utf8'}, callback); } @@ -40,7 +36,6 @@ var resultsController = function(req, res, googleAnalyticsId) { phantomasResults = phantomasResults.replace(/<\/script>/g, '\\u003c/script>'); var html = results.htmlTemplate; - html = strReplace(html, '%%METADATA%%', results.phantomasMetadata); html = strReplace(html, '%%RESULTS%%', phantomasResults); html = strReplace(html, '%%GA_ID%%', googleAnalyticsId); diff --git a/app/node_views/results.html b/app/node_views/results.html index 3113b2c..65bde25 100644 --- a/app/node_views/results.html +++ b/app/node_views/results.html @@ -23,7 +23,6 @@
New test
Summary
JS Timeline
-
All Metrics
@@ -854,34 +853,6 @@
- -
-

Metrics from Phantomas report

-

Phantomas is a web performance metrics collector. You can find here the (almost) entire list of metrics from Phantomas.

- -
-

{{moduleName}}

-
-
- {{metricName}}: {{phantomasResults.metrics[metricName] | number: 0}} - {{metric.unit}} -
-
- {{metric.desc}} - (unreliable) -
-
-
Show offenders
-
Hide offenders
-
    -
  • - {{offender}} -
    • -
-
-
-
-
@@ -892,8 +863,6 @@ var _phantomas_results = %%RESULTS%%; - var _phantomas_metadata = %%METADATA%%; - var GA_ID = '%%GA_ID%%'; if (GA_ID.length > 0 && window.location.host === 'yellowlab.tools') { (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ diff --git a/app/public/fonts/icons.woff b/app/public/fonts/icons.woff index 51197d55953a75a0738db290f0a3d7040f5d52e8..832a8a8809b188082bbe7d8602d50a98e77f7f37 100644 GIT binary patch delta 1958 zcmXAqc{JNu6vuy&NP;31H5pYgGD<8}vF}?fp~P0pFtJBQjJ0ywYG}(Snv$rNQBy5Z zMNw)hN;(>?PD`tHL4s1!c4{kQnVMf`-Z|fQ&i8ZQyZ4><$Gv%q<0z#JZvw&F-`^Vm zkU@Y904`azVx{jG1|V=r4mrys5d6IW0B#OO(4f?4*fo}`vkL)a{-8e$N&_$jVBUU) z$3d0`dLk&Y;nb9U6fGhNWRF2_0{{?Tk?LAMB_<*o01zMoz#4$51fqyR0U^kafnFVy z77WGMe@mgI(Lv|~0tHa2FmR_u(7}WVFaZGnPf|WWVgxM)WC@@bfkiF}Sot|gKc|8Z zL3)Dh04NOr3IOzq^nkDg{{U2F>$F{IdiMRFJaj@|kD|w_iJkVvaDntur5%ktxXZU1 z-}_WEBykwjO(o5~Dm!@r46+>J@LKVpJqd;T!T>zWgV#lWy<6S=TSW!XXCd+7Z&R6gX|xteNHYYFRtbU)mXW68_yjoEc>m{ zxBR@IrPY(>gQLZ-^ycBSisN6K>dH>VGjWXPqB)z2V-o5)$wd%IUv`}j@QT+;-EJTs zb9>>LT6V|KVuw|4h{-IgHe_F(RK!Z;eT@8t?)^c@_k*IzEtTA4g3Lpg>>B=k+ht`z zhyb!HRIdvRLG)0^XGuLr#daYgC-eJr2joV(PQeiJHUU^#xdT>WSNYm7iquGSVfbsl zLwzcIpP?ChZ<=`_^(2GpwAXbkpPo7SGqQ4-jbhjY<*$q%G^;t-+v0@#*q~PGS?TB& ztTdYyjGPbgYokq))SAL5^ZkOpWp1c9l9_)!JgYU~G0}y&6P>k`69~nRw9Ou7HD9T* z^~=obFZ^tV+sn>e_eLd0Ga=Osjv1`GM7C@AB1y`aK3-tXbFK4#)ICQTRtV6|T$Swg zxbsr|XlV>-g19d)FTLkB;$26qQMt&;ETpF-Uf7xe7mpBhs(B4*L)P zMcZ9UZ}`@ITR3yBGl&&G#w|8IP1F?*u065fm$Ywv*FJScBYG^{W$$%h{&;W;zX)BM zCe|C}oh2O~xSG(F=X2-GQ&jlat!;mNU7L+-oX(SX8~4aV!!~)0{xX}i97NcVf-|Iu zFBiFXfTj09OY#~f$YSt_;SHDOis~XO$;Ofoo87jjPiqtJX|x~CWMK+MUU2kfB6Qu4 zy{DA^W=r9}iMCO<7A~$=UPfM7nMb#kp!S-7e0BN4yNSg~&!k-OcE?s2KlH}NYzuX* zpuc8whCAuTU$(u-7%cP3#mCN5Z%FboY+UtR`aY-<*wxySn530M{7!tNX!(;JyAX#B zJ%gIkXOFXUUH%+*Iw5E0wF}o?DSd`yzDq$<^La~(wMq6uM7$NXN+lo zu)J}USE%LOn%NQ%Ros}C{8wU&@%WPC#+uPXvuW)vv6{(!>HN9y^4QHdGt8HCPI>r= z6=2Suk)c2&zJ*$66_w2NRO)lB9-6%~wsvaU>KJ?!g?m4Ar&n83fQn6(d=}EpdfGM& zuaPU?5lVT)yuzJzKv%&`jfu8#I%0h5TluS}dCyBPy=tJQpB`>LxwFX)+xXQQt>^f% zwv4+7wR~2N{S2q*La)QD0XCiN#1=Jg%qA0>92v~neZUJAy79GjMv=+nXyCkYd%?hk zB^j((J^~LAdl5?i$D+w(5j0W?jv_~rVUBVdv5<9D0Co$oVq*}AkOX!S;v19K*2p%n z6@N_y9tY-R>vnDV>w>c}qS#0v`)f*tjeUgYfkOGLALQW8cp$(}W|TdH&}UQufDljt z?*afg45a?++?m%ywTDVQBVPcrY z(6`7A=W}CY)kz{F;odrL%T839Aw5tl$~`lm{r7WvU!mE&?@sM%o{sQo)G{wcWx@H+ zFk$*)_TPi_KAD+w4@b(gQs^_r~FqGR8rM7}6*h)eJmJRnc( zGXJ@;kY|pj)>x?A-Cs8dc~X(D;f>wA6({SlJAZt^l*`#noYe~+epxT7e~Re1*Z8|{ l(&Ej1qUX{{vhsS>P?67WeHWvq&ho_9Pl|mEPUB1f_Ae3MXC(jt delta 2143 zcmXw*c{JNu8^?c|NMbE*`XcR&wCKo0Xzg2DN@8s-Ni8i#L?YHwRMe8%B2}TJw%W#0 zN|jP2Q_Lu_bfIW!EseeuLu=GhMVVjco%f#e`Q!U}&U4Q__mBJBQ5p6DWP}}oU`Ha^ z0e~0+kO06Xt(JjQVorj>`Bs#l7J)!I2LP~nuz~_P63}7r*1{Z5001}?%s+sj0X+a} zN7T>+oidnhKs+_xzBQo)l7m490-OQ>5l5lI=RP`>>9Y6)78eMh7M6gkb&= zL>Vf>+?$~XhA{vD0cHRRf`T3bfIu<>+zjzO!~Q|s9ta`_QbBhF%;2F#SoSlkE5VmT z!$7wKI!O>T0096-LAXfNLDoyqaxz-XD9O6S`W{T{r;#{(@9^xx zFriPUMmJj_oo#p@srqI=1LDEGuu*EiIvZfrF-Vm=L247KvQQq_9LW^4iTDz?kC_?I zj{DQad@Mq2WpMtq?BH+L4zsQ}$5KspC=H4${rq>bHLkwwKYma%VSLTn&SZDoV9gR} z(l#~5H)XiXl;kQzSw7|Vi3h3$HFqdNAs6C%}CjC-2aW)#9frDKHX-ReNkA%K&l%}V^xmg5$-yr$OTkZ$sHmFuA=VGynXLTeRZ2- ziC0~&bSYBQx%YJD=7ZSOG3zqz;U$fRs2S-$eA^F)O%%Vl=)n6JhJM+aYcXlr%Yd&W z8*Wv#@MHP@Emb(5-$zw$Je4l9uK%Es7?Sig;3K}*&5{V;J`hymIgUK1qhYj&s ziN1ytwL|>!C$jverW3iAOxX-~PR=CZ+$UPH?$z*QQ?gRSrY3(JBTBOB{&0z{)xWi* z>ayKTbSS<&Wj0Yylb_vVOqivcmlpc76zDnojLW)`iI&8H@#N7pe)26+_`#LyB|v?f zcS!Dd@l>r}{f9RH1C(0+kUxTZ;YCm)K1FZuXYmUIcS`**ogU@Ha94EN9 zAPMaaaR@-CGHgt&HoZLUR5Hq57Y*5Rs_N))d$$7$Ji>J=N;^9$9|dxLe{ z#yr;qX?v<@{#OYp_X7{M64qO6(|%K&#(UJ>Qco9F#`pzEx|8!FAx}lC=SGSiu=kHI zyq`SeJyK}%F(x>ac?Q$Jek?V3IH@XQ(W&}k@aS+u&jF~h}1_#@g1TE#@{viS=nf`ueJ|0sOw4J-NFRVX1i(i@W3)nfRh-v?B4EhvVh;fvNh} zGC}UAX&RYroQhvZR*laNM=d?)5tY9s6tbBuP3T>&2ObhTe|mDmqQ{SqUzLzj>!bQY zy!M6@A2L+}MR1g22Um@19`l7elwy&Gg770lv*asfr3G`?lRvu}ra$Vl$3-qGI|OZv z9!_XF#(h)w1=_l%{<1<&FuQzGXGlTqZiGNE-vAGc9izS1GZ>xDG1~mE`8O2hN7eG= zmMfA{ME9T2YRckH;RF+M@lj&x1-(9JZkLjJ470d`H_?2fX>Ns}lo0o6wDS?&buV%A zvyJw-*;@x22f0B7jYUtcl*9+!c1zbE$m zc{ELARUUvo0F3|brEw!+G?68)5T>9rNJc#VSA%W9`?S5~<(}1vXsVFr1;l;d8nLwp zIS%WFo2bJfE-2s?2KO-p3)EZ(cgMX*YWvjlocGKmB zXmzd$X;-crT)(+wMrXw-OBF(mZ(!4fLlg#(ET#h4ZW6+%^5nA>SO#D)i`Ijv-eJ~ z)1k4aytD~<(K;wBEx;v1z?$Z{ift_!%@{qC4Q>=zhpLhGz7*=%S!CVMdbL`r6B02` zLB;zocH;_WQ=*;2FHA7<)V~E*3HTn%bCSiYuB=AI$DJd6U1Mj&V+ \ No newline at end of file diff --git a/app/public/scripts/resultsCtrl.js b/app/public/scripts/resultsCtrl.js index 26248a2..ae27f8a 100644 --- a/app/public/scripts/resultsCtrl.js +++ b/app/public/scripts/resultsCtrl.js @@ -3,7 +3,6 @@ var app = angular.module('Results', []); app.controller('ResultsCtrl', function ($scope) { // Grab results from nodeJS served page $scope.phantomasResults = window._phantomas_results; - $scope.phantomasMetadata = window._phantomas_metadata.metrics; $scope.view = 'summary'; @@ -20,7 +19,6 @@ app.controller('ResultsCtrl', function ($scope) { initSummaryView(); initJSTimelineView(); - initMetricsView(); } @@ -173,18 +171,6 @@ app.controller('ResultsCtrl', function ($scope) { $scope.timelineMax = Math.max.apply(Math, $scope.timeline); } - function initMetricsView() { - // Get the Phantomas modules from metadata - $scope.metricsModule = {}; - for (var metricName in $scope.phantomasMetadata) { - var metric = $scope.phantomasMetadata[metricName]; - if (!$scope.metricsModule[metric.module]) { - $scope.metricsModule[metric.module] = {}; - } - $scope.metricsModule[metric.module][metricName] = metric; - } - } - function getDomComplexityScore() { var note = 'A'; diff --git a/app/public/styles/less/icons.less b/app/public/styles/less/icons.less index 3bc4d60..dbdc9f3 100644 --- a/app/public/styles/less/icons.less +++ b/app/public/styles/less/icons.less @@ -1,27 +1,24 @@ -@arrow-left3-font-family: "fontsmith-icons"; -@arrow-left3-value: "\e007"; -@arrow-left3: '"fontsmith-icons"' '"\\e007"'; -@list-font-family: "fontsmith-icons"; -@list-value: "\e002"; -@list: '"fontsmith-icons"' '"\\e002"'; -@warning-font-family: "fontsmith-icons"; -@warning-value: "\e000"; -@warning: '"fontsmith-icons"' '"\\e000"'; @eye-font-family: "fontsmith-icons"; @eye-value: "\e004"; @eye: '"fontsmith-icons"' '"\\e004"'; -@question-font-family: "fontsmith-icons"; -@question-value: "\e001"; -@question: '"fontsmith-icons"' '"\\e001"'; @lab-font-family: "fontsmith-icons"; @lab-value: "\e003"; @lab: '"fontsmith-icons"' '"\\e003"'; @bars-font-family: "fontsmith-icons"; -@bars-value: "\e006"; -@bars: '"fontsmith-icons"' '"\\e006"'; -@drawer3-font-family: "fontsmith-icons"; -@drawer3-value: "\e005"; -@drawer3: '"fontsmith-icons"' '"\\e005"'; +@bars-value: "\e005"; +@bars: '"fontsmith-icons"' '"\\e005"'; +@warning-font-family: "fontsmith-icons"; +@warning-value: "\e000"; +@warning: '"fontsmith-icons"' '"\\e000"'; +@arrow-left3-font-family: "fontsmith-icons"; +@arrow-left3-value: "\e006"; +@arrow-left3: '"fontsmith-icons"' '"\\e006"'; +@question-font-family: "fontsmith-icons"; +@question-value: "\e001"; +@question: '"fontsmith-icons"' '"\\e001"'; +@list-font-family: "fontsmith-icons"; +@list-value: "\e002"; +@list: '"fontsmith-icons"' '"\\e002"'; .icon-font-family(@char) { font-family: ~`@{char}[0]`; diff --git a/app/public/styles/less/main.less b/app/public/styles/less/main.less index 571064a..ef48683 100644 --- a/app/public/styles/less/main.less +++ b/app/public/styles/less/main.less @@ -65,9 +65,6 @@ h1 span { .icon-spaghetti { .icon(@bars); } -.icon-metrics { - .icon(@drawer3); -} .icon-eye { .icon(@eye); } \ No newline at end of file diff --git a/app/public/styles/main.css b/app/public/styles/main.css index e92c2e7..ca72257 100644 --- a/app/public/styles/main.css +++ b/app/public/styles/main.css @@ -95,7 +95,7 @@ h1 span { -webkit-font-smoothing: antialiased; } .icon-back:before { - content: "\e007"; + content: "\e006"; } .icon-summary { font-family: "fontsmith-icons"; @@ -121,19 +121,6 @@ h1 span { -webkit-font-smoothing: antialiased; } .icon-spaghetti:before { - content: "\e006"; -} -.icon-metrics { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-metrics:before { content: "\e005"; } .icon-eye {