From f1830c36cf4cf97bccadbd9a9afa99f12a67d115 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Mon, 4 Apr 2016 16:12:28 -0700 Subject: [PATCH] A better welcome page --- caravel/assets/images/favicon.png | Bin 5811 -> 2862 bytes caravel/assets/javascripts/welcome.js | 22 +++++++--- caravel/assets/package.json | 2 +- caravel/assets/stylesheets/welcome.css | 32 +++++++------- caravel/assets/visualizations/pivot_table.js | 2 +- caravel/assets/visualizations/table.js | 2 +- caravel/templates/caravel/base.html | 2 +- caravel/templates/caravel/basic.html | 2 +- caravel/templates/caravel/welcome.html | 42 +++++++++++++++---- caravel/views.py | 7 ++++ 10 files changed, 77 insertions(+), 36 deletions(-) diff --git a/caravel/assets/images/favicon.png b/caravel/assets/images/favicon.png index 77fd477def7936cbf2e977ea9ac29c8133e5572d..264be6930de3152db83c2f8705730ae6266ebdc2 100644 GIT binary patch literal 2862 zcmeHJ`#02k7yitAXU2?STynpwgdChyIHhKkYt)#GP#q=`QjJ^D&3vbnltf9GmQ*jQ zBO&FI%Qu%IiYUsZnNV_Tl*Y^$GxIvXp7s6#?+@o$Yp=bZz4i}#J$voFcB;<~cV$IA zMF4=Zr-#c<08mRI3gDq77gZ8KUvf~~7Ed}Jk01O@i@;R3jBX6 zfVJIzcd0XO{LUS|0ELDySeyc$ph#3wCaI{ZsV~#e)Y8_`)zddHG%_|ZUB1H1+;X+m zZ`L-pzpt@dx8B~t@sEv8o5&RBEn8h&-95H>@1W9l`qKS&`3LUV8x+jg7ZSQZ>_9~1 z!Kg!rk1(TSV&meECL|s|aq4su3ud1=n|$tk%7xTRX_wP8GOu2{o_!-HH;;2Ozu@+r zyM;yf9+W(MR90S5`LwFKrnauWp%HoB)ZEhg;$>U=tB%gsZ@S+0zI)%-|Ka1n;Lz|V zF7NZm=-8L91AV^Jjnjockr17mCCSl0~U(Od>B^T4GI47iW6nz|63O^(M^V z2u-lWK^^rEwFS&z%D51qe! z@)$o!ZYAv=rClM#@g>rrl&#f_9COTlT z*iidA_v4thRdG%}xvb2n8il+qXcw?Oxu|MW5Zn2h`Qsat;th`$HDJ_@{=lq*z!gp| zxj`es2uaPx&8sY^Mc9D+bv9(nMl~C-!%VM_{8T9#f{W8$@#_fD1fRZFHy4w2*GDVE z;b{|Hi+Zyldewfnq`wLUvlw_h?VE9o&Me;N2;yZ@xmmFbWx zmaHT$14LWqda>lh3>562`-|(R{0F$<8}LizA$ujLdvlv53iE)fd)P_xw%u(IqCX~) z)Jla33O* zST6Lnz&>h*c^XrTx+9H8mz+5UG$N;shdcm~J`tE3VX*MS0g%nc0NlYzem@1n;N;7A zR1-Apyc=l2N(jkNx~cRn3Q<)C9A`YEctIwi5I{3ssIV;(rSTUohp-#yls+XF=IJ3v zo`5KdGFU;M7hdj$KHOF3#dSkS{p7-9XEmNxnDim_Dh94dVcMX#!%R&<@q0BaB0UKD z*sGBsGwDQsJDTUL3CvW>kx4uF=v!WS&2N?s#xHoh`{?Qw(J@KG4-@% z%NS_5Jr>wkphSMJ>VMN!vj>UZIAp^t%5nK;vu?{yJn(IWN`N^W+Qbiw3~p8gy{=Fv zWDDL3D=JGEIM}=ez5lE};#n@NIQ4=A*1F6KFZ_fYt$&)887zX?%4!({>kh9SDgCOe zkPZ@e=^&(h5biqM(Nmvk4)V1zWlG+t)h$CE>W&?nATAlCVfVn>OobJPMu~6@df}P9 z9nR657nI$~P=b%kxaf`m=q7Vqo1qi{G1$Q{H3y=L>+;O4n+$-h1PZ`^2k#q7zedJf z+yu15C>??fXiJAWt}+4076He@XryqDlTam@00O@1GHP_ejZML?=Pv1j#MhxLst%eb z2+9^00meB8SUnURWD0t?W(SqPt`n#nLL6`!?x^T60VT2ATSE+WrAW|UP*5Wctu$~mM5J{?mi>v4n^N=w1T%Mh~LA82<%_Y&f4z5H_& z;Do(ENkpIM;VfP{wQ`pFaZ++^%Rf%tsC`V*Ugn)^CG#6^x9qw(?Z_Sy&2&lUYV>`Z zf8-j=rta&X?HDa@JT=SZC*MCg`iR9RZ{BdkPn9Xf%4M6T0y7g|UFlrlv+!(>P>cyUBN5B{W``lY>I92wX&a!)LN+v;!vJyC5{Bn(ddp)s=gW#@NtpLyRz z_jEHYW^K}yrm<$)kvXFc5tE-ShNj&~q%}XI>EA~#zIdlTx8Su`I#hBzQvR6}lTgqsu1kEb3VI!5Ykra8L5GjDTJasPtm7mp`8uJ$~N zv8iP5k)O|4ajcHy9z-IS+t=n%S%L`nCXqpUol#PVbtLhM%-S>kKjn@F;*EBl(LNm1lJ2x>uu3)Ii*+pI3n3Q)nVyl(KyuZ@XEbGI@^|I5E z=}qSp?+dig8$97`os8DV9kmD!xzMd{_>XBV(Psx{RP5AdNBYr~@qd3Qo~}DwO1Ci1 F{1<$M?9BiG literal 5811 zcmeAS@N?(olHy`uVBq!ia0y~yV0;Y19Be=lf%0+-AjOjI=O*T#nOummuzXWO+%GK1Om&t-Pq3n5b!0v%PfH>H0&RsLt&-e(?*f4{sf zzrX(XNqZ(14gm#+1m6eGw@$b9X<%Rk3jEPu&{N9+k%)AV)MtNC304LaWgZn3P#6t| z(eyByFQ`@$JV^dod%nK?!1eq8e)au-x*u2`H8`wlh(EUSMjFq+3T zOC88$WO8OqwP7*w1CJyuV>(r#l`#)IsKCQI<)gp_3()w2zzi;p$14{=I*|q<0mqyj z9z%K)S_^uXH$4MYdkqHy97Zh|4I*HA8E&b_uI=+NND}84{qg7de)}))<9|G^lZ^K` z$Op;>AGS0Y)mhaY2j#5;tcZM(Ou9pzwiD>kf8;R4x<)~1`#ktQI?7x*l$zkxt#e>A`>_Y O&EVdiv { - padding: 3px; - overflow: auto; - max-height: 500px; -} - .table i { padding-top: 6px; } + +img.loading { + width: 25px; +} + +.welcome table { + display: none; + width: 100%; +} + +input { + margin-left: 5px; + margin-top: 8px; +} diff --git a/caravel/assets/visualizations/pivot_table.js b/caravel/assets/visualizations/pivot_table.js index 795adbb29..655895c8e 100644 --- a/caravel/assets/visualizations/pivot_table.js +++ b/caravel/assets/visualizations/pivot_table.js @@ -1,7 +1,7 @@ var $ = window.$ = require('jquery'); var jQuery = window.jQuery = $; -require('datatables'); +require('datatables.net-bs'); require('./pivot_table.css'); require('../node_modules/datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css'); diff --git a/caravel/assets/visualizations/table.js b/caravel/assets/visualizations/table.js index d819fc3f5..ea3e9a0ed 100644 --- a/caravel/assets/visualizations/table.js +++ b/caravel/assets/visualizations/table.js @@ -3,7 +3,7 @@ var jQuery = window.jQuery = $; var d3 = require('d3'); require('./table.css'); -require('datatables'); +require('datatables.net-bs'); require('../node_modules/datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css'); function tableVis(slice) { diff --git a/caravel/templates/caravel/base.html b/caravel/templates/caravel/base.html index bab571bbc..2dacdffce 100644 --- a/caravel/templates/caravel/base.html +++ b/caravel/templates/caravel/base.html @@ -1,7 +1,7 @@ {% extends "appbuilder/baselayout.html" %} {% block head_css %} - + {{super()}} {% endblock %} diff --git a/caravel/templates/caravel/basic.html b/caravel/templates/caravel/basic.html index 39e6734c0..d210298cf 100644 --- a/caravel/templates/caravel/basic.html +++ b/caravel/templates/caravel/basic.html @@ -8,7 +8,7 @@ {% block head_meta %}{% endblock %} {% block head_css %} - + {% endblock %} {% block head_js %} diff --git a/caravel/templates/caravel/welcome.html b/caravel/templates/caravel/welcome.html index 42bb6556c..4d614a2c0 100644 --- a/caravel/templates/caravel/welcome.html +++ b/caravel/templates/caravel/welcome.html @@ -17,18 +17,44 @@
-
-

Dashboards

-
-
+
+
+
+
+ +
Dashboards
+ + + +
+ +
+
+
+
+ +
-
-

Slices

-
-
+
+
+
+
+ +
Slices
+ + + +
+ +
+
+
+
+ +
diff --git a/caravel/views.py b/caravel/views.py index d58473921..34b8284aa 100644 --- a/caravel/views.py +++ b/caravel/views.py @@ -248,6 +248,9 @@ class SliceAsync(SliceModelView): # noqa 'created_by_', 'modified', 'icons'] label_columns = { 'icons': ' ', + 'created_by_': 'Creator', + 'viz_type': 'Type', + 'slice_link': 'Slice', } appbuilder.add_view_no_menu(SliceAsync) @@ -298,6 +301,10 @@ appbuilder.add_view( class DashboardModelViewAsync(DashboardModelView): # noqa list_columns = ['dashboard_link', 'created_by_', 'modified'] + label_columns = { + 'created_by_': 'Creator', + 'dashboard_link': 'Dashboard', + } appbuilder.add_view_no_menu(DashboardModelViewAsync)