From 1f8c88845076b4df151b4d193532d17f0ffa4956 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Garc=C3=ADa?= Date: Fri, 1 Aug 2014 12:32:22 +0200 Subject: [PATCH] Fixed bootstrap style to SLA dataTable --- portal/templates/base.html | 3 ++- portal/templates/fed4fire/fed4fire_base.html | 3 ++- sla/slaclient/restclient.py | 4 ++-- sla/static/images/sort_asc.png | Bin 0 -> 1118 bytes sla/static/images/sort_both.png | Bin 0 -> 361 bytes sla/static/images/sort_desc.png | Bin 0 -> 1127 bytes sla/templates/slice-tab-sla.html | 4 ++-- 7 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sla/static/images/sort_asc.png create mode 100644 sla/static/images/sort_both.png create mode 100644 sla/static/images/sort_desc.png diff --git a/portal/templates/base.html b/portal/templates/base.html index af81a0ed..f4e4762e 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -8,7 +8,7 @@ {% include 'messages-transient-header.html' %} - + @@ -30,6 +30,7 @@ {% insert_str prelude "css/bootstrap.css" %} {% insert_str prelude "css/topmenu.css" %} {% insert_str prelude "js/logout.js" %} + - + @@ -28,6 +28,7 @@ {% insert_str prelude "css/bootstrap.css" %} {% insert_str prelude "css/topmenu.css" %} {% insert_str prelude "js/logout.js" %} + diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index 29fcae82..ab38cc4d 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -120,8 +120,8 @@ class Client(object): kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER, settings.SLA_MANAGER_PASSWORD) - for key, values in kwargs.iteritems(): - print key, values + # for key, values in kwargs.iteritems(): + # print key, values result = requests.get(url, **kwargs) print "GET {} {} {}".format( diff --git a/sla/static/images/sort_asc.png b/sla/static/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/sla/static/images/sort_both.png b/sla/static/images/sort_both.png new file mode 100644 index 0000000000000000000000000000000000000000..8222cdbaf37098cafc614a534f8582c3f9ef8a2b GIT binary patch literal 361 zcmV-v0ha!WP)41m-bpck3pf)KUQ?HwJMuH1L8+;gAjoaqK{xR z2&ZAd*!l%Ds1hmAVJ`d&q;pA5XJFfbu0V^;S>z{Lh%5d=d0&9ImF&C;cE$hyv!L8o zApa@Jv5Dro8lZv3jEszZ1l5Al86jLzUd~C3I;tjGfB*vk_+Ovd8get+00000NkvXX Hu0mjfGBA$_ literal 0 HcmV?d00001 diff --git a/sla/static/images/sort_desc.png b/sla/static/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/sla/templates/slice-tab-sla.html b/sla/templates/slice-tab-sla.html index e0b36ecf..2742078f 100755 --- a/sla/templates/slice-tab-sla.html +++ b/sla/templates/slice-tab-sla.html @@ -3,7 +3,7 @@

{% for row in ag_info %} @@ -47,7 +47,7 @@ {% endfor %} - +

-- 2.43.0