From 23594cd3f595923b4bdb4dc9142b86c259bbc402 Mon Sep 17 00:00:00 2001 From: Neha Gupta Date: Wed, 12 Sep 2018 13:51:08 +0900 Subject: [PATCH] Added branding changes Bugzilla: 1627988 tendrl-github-id: https://github.com/Tendrl/ui/issues/1067 --- gulpfile.js | 5 +- package.json | 1 + src/commons/js/index.js | 2 +- src/commons/scss/_base.scss | 35 +++++++++ src/config.json | 3 +- src/images/bg-modal-about-pf.png | Bin 0 -> 10987 bytes src/index.html | 2 +- src/modules/base/header/header.html | 47 +++++++++--- src/modules/base/header/header.js | 6 +- src/modules/base/header/header.scss | 4 + src/modules/login/login.html | 97 ++++++++++++------------ src/modules/login/login.scss | 113 +--------------------------- 12 files changed, 140 insertions(+), 175 deletions(-) create mode 100644 src/images/bg-modal-about-pf.png diff --git a/gulpfile.js b/gulpfile.js index 9ce0a8f0..1feac7a2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -110,7 +110,10 @@ gulp.task("jsLibraries", function() { "node_modules/angular-patternfly/node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js", "node_modules/datatables/media/js/jquery.dataTables.js", "node_modules/angular-patternfly/node_modules/angularjs-datatables/dist/angular-datatables.js", - "node_modules/bootstrap-select/dist/js/bootstrap-select.js" + "node_modules/bootstrap-select/dist/js/bootstrap-select.js", + "node_modules/re-tree/re-tree.min.js", + "node_modules/ua-device-detector/ua-device-detector.min.js", + "node_modules/ng-device-detector/ng-device-detector.min.js" ]) .pipe(uglify()) .pipe(concat("libraries.js")) diff --git a/package.json b/package.json index ba6e0394..b1821a31 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "font-awesome": "^4.7.0", "idb-wrapper": "~1.7.1", "jquery": "~3.1.1", + "ng-device-detector": "^5.1.2", "numeral": "~1.5.3", "patternfly": "~3.51.1" }, diff --git a/src/commons/js/index.js b/src/commons/js/index.js index 6be67184..2459ea18 100755 --- a/src/commons/js/index.js +++ b/src/commons/js/index.js @@ -1,7 +1,7 @@ //# sourceURL=storage-management-plugin.js (function() { - var storageModule = angular.module("TendrlModule", ["ui.router", "ui.bootstrap", "frapontillo.bootstrap-switch", "patternfly.charts", "patternfly.card", "patternfly.form", "patternfly.notification", "patternfly.table", "patternfly.filters", "patternfly.modals"]); + var storageModule = angular.module("TendrlModule", ["ui.router", "ui.bootstrap", "frapontillo.bootstrap-switch", "patternfly.charts", "patternfly.card", "patternfly.form", "patternfly.notification", "patternfly.table", "patternfly.filters", "patternfly.modals", "ng.deviceDetector"]); /* Setting up provider for getting config data */ storageModule.provider("config", function() { diff --git a/src/commons/scss/_base.scss b/src/commons/scss/_base.scss index 5bb5879f..29700582 100644 --- a/src/commons/scss/_base.scss +++ b/src/commons/scss/_base.scss @@ -208,4 +208,39 @@ .toolbar-pf-actions .toolbar-pf-filter { width: 25%; } +} + + +/* About modal styles */ + +.about-modal-pf { + background-image: url(/images/bg-modal-about-pf.png) !important; + + .about-modal-footer-logo { + height: 35px; + } +} + +@media screen and (max-width: 768px) { + #aboutModal .modal-dialog { + width: 460px; + + .modal-body { + padding: 0 40px; + } + + .about-modal-footer-logo { + height: 27px; + } + } +} + +@media screen and (max-width: 480px) { + #aboutModal .modal-dialog { + width: 444px; + } + + .about-modal-footer-logo { + height: 25px; + } } \ No newline at end of file diff --git a/src/config.json b/src/config.json index b2d4c1ac..c593a256 100644 --- a/src/config.json +++ b/src/config.json @@ -5,5 +5,6 @@ "msgRefreshIntervalTime": 5, "statusRefreshIntervalTime": 30, "eventsRefreshIntervalTime": 20, - "volumeRefreshInterval": 10 + "volumeRefreshInterval": 10, + "releaseVersion": "1.6.3" } diff --git a/src/images/bg-modal-about-pf.png b/src/images/bg-modal-about-pf.png new file mode 100644 index 0000000000000000000000000000000000000000..7309fa85ffe39760b49b46fb13e0a333dfdea065 GIT binary patch literal 10987 zcmX9^byyVd_a&sILAp^;N|0DOB#l+N7d}cZA+a<9(jXxXvWrqK-JQ}d2uODk<14>+?--uE0h zFu~M}V7eb{U|#>ZS>q^MeRyZhspa&at+kHze^x%OC~G+!oF}nbs>*uav%82H&lOGD zQe3UyCvrZU1Mco+Ls#v;+6`)*)_t;+;hN|i(MLQ4#9Yd|6ATm9qyt9ZxW%5mi#WNv zUb@@hOwc4msd3;&sj4Pus?z=Mz{?%2+7v%N7#_);aKEeY^hgmnA$A|xrN&e_Ka{o8jNz$K+H5 zGm$s#V82FkQ-ha4T2=7Dc1ZY`l^kn)ID2{8zq5g^Pg=sbE6EmZ8_mQWtZhQq5`p;8 zr?Ir0t{qne+ds4~+++~4%u)QKW2?O8akK>s1%p3U?c}!HM8DdV$E%KPxxp_H2JLe? zbY4&C7H-I?)qI6(w=obT_T%}$iyw!+qTtn$?+YcJ9Ki_%CH$&%TU+!693AP z_qjz5f@JjBN^+o2J0o(>bFL(HeJmgnZa4R>7|<)4&qDv z?5=X17~pkni5H9J?Dy}aSYtUdxPhgSCj;Z?)E#<~gU3(}#sbQ-^;Z_PWrXlLZt=+H%k?| z3ofVU0zkI9R@a8xTLui5??ERA#!#DwAA-@pv{dbFgHM-17|3lS4HD8Uz3CBP$)lAW zqH7L3P8IZc3N6llHdi`3VnK+<<$aP=jx32kO$QOEpkM7{`ZsIRhdGz#*mu=I;tbJG z+im}4iWi(Mpp96!y#2V)ETIUW(!sq8H!*7m#RNxe#4#rv8c&@vdsYg@Igx;Z~uZg z2f1(Nph;pBf8vcR4Taa&*L<b2sC7#|DU)+Tt9ho!yvuKjp|1qW&! zlrQGv&%w%Bm~tCtB@)wQ>N)p1^4Tx4FE|oR_BWe@_#zQUeRsiIYUcJPbDwWQXjD}w3u<-_PIg~a??6QN>@z@bhO z=OcCOOMQJKYjm!|<$~wI&xuH+CGWPv(}rtTp8<^Xm_J|IBOq|?e^7dcAuDv`O8pa} zOX5PRu^OfKzz1U`=ji?-mLlxicAUlyqIB0wJjt4mTCGX}?2@Shi;nKCqa2jeEH0bET_9PWc`IvhUFT)#>l#_;B7PWF=IsLGtq`Dx-qD5JF=LQcV)EmbMtSx{fthtktK7HO zr)E)o8ync|&MPHN*tJ||BG-<)41n^xYzW^yn`ZsFq9^l%g^nY`g^qu(RtOY#I{$Up-_jeWj&jUYJy-WZRRs`|J6OB zYa`j49unfvYpR*~kkb-lAt45`n>4!nYTn2u6M=CO4F*1*=y!CecOzPqU_lv)c3BZP z7+Eo1U|jyH_xVlQy%9pPw;{JEgco75s%W%T`DV>R-B*3$w^!|&HpiMHi01+l%%`)q z<|)G*r&m3tZ`-Bk_g?++p+nJtFwqB{o3Kz_-qfEvi9c4gi?yZCJJa!>4KKTitstyL z2SoQQ03=_E75<)Ew(rsD8QsZJi*)lkS#2aQmL4Oa{2IP1x_{Yv9w91iO?U+}`KJ zMBj0$JzsJ_s$(nmR1()--O_(oxzn;%$jtI{q7q7Y{Su;_Ct!=Lo<4M5W3{;t^#vvSnDsCqT+V_wz2|e&@57u@sndBA+k@ps@ehA$`_+ z1H%JS@&K$%&Zni|wRbQ64z}OZrG@f@N<3+2Nj)WFG9|{{Ud!wHriv2oztptRKnCL= zC5ov;Zpu2|=c`{=27iYjfx;u)1~!^HdXZsN?%Xc0i~EVVmMAfjJA)cgWjC}w9h)E= zI26E^t#bNP-n6&tw#{Yo5J%$MYiwv+SG5fg!3!A8>ZxcZd)jY;V6>jW8dOi@n<*4l zqw*Y&bM0GEoKzZxFD+09$z6jTpM*$?aDf`-7hz=$OV6)_1}8QXb#k9qLd^H4JA1sx zr%oP41E0Hdye>b@z?y|?ducmraqZkhF)6U)Wi0bVIT-*M7+7QH=Cq1@gV-HUv^MYO zWj%qw-+}10KbOQG14_mVCg@C4cSzp0a4%qeCB_Z=*I-TjJ3LGxmi9}rL?G*va`1?y z*zqHVVNVB;|u&R2V8fajb=aV z#}1&O{J*^{Cw)DzWq+)Uf!*Ik0-l{dV=WOl+|(1gk#1Zuq>~bmNPIeQOjs>w0STO` z@INMMY;CFt9zEEtua@P@(Ii~GS7;)Z)MwG2K3tR^_-5r^{KYHw((e5u0YHXd2QJ z(`-WX7W!?&m`hx0YBez)nU44E2Dd>qduxVV<}u&%)pM20i|4A$Sig6Q_6#acu$>P3 z*7I19a!11!W*=vOqjSb!CFt%gGtzMGzp_fqlTbaZh@(p*FUibT4oadOtdAPw=o>#6 za6K2e!aGtKMzbQ`;WC@T%;gtSu?f{{_ikJvI3`koEKaNFhb14Bc)7E~4rsLV99-P; zt5&qKK;Yl0jfedL#qPU;0}lB&Ry#WcZ*V0I)2i(i*w2Pk}Pk$}aNQKk1m z9oxo-0HsK`o8Mf3G`16+~FK~62iTESXFL>De@TAXqJ=5 zKGA;p<0Rz*Unz715dQp`FN1L^8HO?(h`XqX$=po%*R0n=V8e@p2Te5eU<~&)XbY?_ z{AKJX1k_WQ*+@v#=O1hQ9)w| zda04z@PJ2tYSdtp#2a1{zlIfYSGI-Oq^XDTYirZ7(o7@GWV zQM@UM|IU<4eZqa0qT8CNI{u7QsmM^_9MmzZB}$Am=iqAFqi{f)CNr~{tJ7r^%d!uZ z?~{dpP!^2_6rCy(A+#e5lrSgB%=L1uEV-UUraYyN>=b5?*nOUBq4=qTRrq!l#Qd*u znedQ{j5#0Q5ta6vSY2?;SQF&-S{`+hr;@-3fdY&g7u@FrfHHyJiGl0M*4o#oR=>uY zu>#t_H&RS$d{(9T9RH+~`W3OEzD4?ZOE=-3IqPf8O?4P#_sg4Ze@GUhjdr7a;F?GGDNN>kSIQ`2))N|q>ONILEWkMqk>+kQiG9`VER^6)^nEc z;h>zLrai(FHBmK}hjMjNJJ{(4dG$qGO;vdoa5)I<_|zHWE;(YFz!r;q7bSiiYznZ2 z$W$=j`cFA#!Pu9w=DrrzXzI&QXLOjy|)9`s|#YKmG&jPvtU2ufv-Z)&17;S8Z@jZAP1OmIxlG!jVgyRgd1!KdIaTz0Qh5~O zgMG%ZzS~n(m1hP=!6-yLo)5+E*&jX|50>67wb^(;X3)`;U|jF zZ^MrUO;9!eh)ZRdrhs0#`{!b}Mz9x9x`xAO1^j4T6R6!}{}4C2I&jJ_5i_0BfN!t?CJ zfIIS9^5~(K3Ta#vzu#)|5Iv9R(ezpG1uE-oU8F_r4!o!CWf& zr6#(K>+04xI>W87y32y>pCa(=KGKs61uw9{=A>!`8Svtrzn;f#PsrECC4PD4%)Oo9 z8vGln-<}uzDTO&ZgSSN6WN_Qulcx<|57aNq8e%86>E(Q0YHp`{pBh^MQpRa?gnn1# zRh@&C;QVDge&|zU&N+cUu^WB0txf^ zh^vS+^cwK>@RO>&r}vkD_Ar?%$C2~b0;i9=9mZmtjRhd!viVXZM*BKAD)xn{F@%cBb3*>`^X~^sH#u5af-<;Z2Dv;0AgqT^ z?5DRN`RWmP%lOx}q-Kk+4ZY-=-J`W7yP`a@8J0ppSee&GvgT*4D^cQEufzu2M$+HX z=EVxFoo$1AyI2AP`P>+5xpH=C5jaSy+e^=C&m%UD`x-|&JPn2-a~n_PR#i;0r>8qv z4$^++l0R0~dAw8o2BzXV>pXW!xa#)c@)kxhH*Z>QFt|NsQ{8seM-$!cji4(rJm0Pi zllhX05Z))MH3k%lg9cv@Vz7NX8l1Lrult9)$SWLD*xK`dTENfy~Qc&6(1&gPP zMDg#eBnz~y%2yk%+gTiyLY2!RpV8VJek^jgJSJRM zM2dnOMEiU~+i`!@#y`nPgurZ^`VMWEM?6JDB6i`3*CMBo56MxR$Uy3#Q zZ953HcPJ~S?hlNaB9+LDBWE%#aAymXTU}PJz8kY!YACe z&{!8~q8(F31+D=9YHe911I$y*Nxv?G=GmbR&xz0gK_+f=aJp7Zcx$Y&{^2i83ZaVf z&CsbAAo?(n6LU(rfNM0es=->?Y*?b1t)6Plucd+fzyHRiC<9swD1R>MOnQk_D%YnB zo4>q}0+Y50H3MI=A$wyex9I$`wG31JHl{g^nJtVUFU4DYGqZ7;*7;PrKye%LKSq~X z3JAVX6g!|wZe%kd6M3A162Yd`#sW_JQyShnx0dN%IONKH-UE<@C7pSr^6Vm}o-fGV zR@W!Dx%kLFvotvVcWgJab0h< zOT3s)RL6_hs!vol#)~`RL<@BUilWzgQ`Z_eG;8|5lqJp|a&J?B2$;Yhf;$?DALjix zwMrMum+M+GZYRfF!y-Wz@D3nZr0(auuVg1C8sld1v}b9OBb)HS#t#rr;g<6FBU_hh zDx8d98`5AM9vkB_lf&m^M{hg~2g0ON))l8<;F2kq;{D4$JKIhe{5aTZm>(|3F2eHt z5kOP2esOlcgXB2r)jolU1XQZnt45H) zyq!$cJ;MJ$*!h#7x|Y#TB%?Ju;NB6sboSMWaLx$a7z^KTFr-l#IEEmX?2XTIPl$pQ z0)y&t{~UPiyXku?Ubn$QBE<-huh;|Stt@77i*Z4?FGW9DH)4P#BV+H@B?b=7cdnGL<|n!b5CNrr5MMc(%^5s)~&l;>+n?jl|KCIXtWwz%k zMHZNrArkHXg9S%wD+UgoYVEy<{eqxus8g@4F%d4k#^tuwphD~$O>^-pU&_9Tj1<$s z(ZTLe=8e0&*{$R59zk)!&4dl>4!6&iKZd64#K(N_n|k7Wt#=+bLJvTdaZl(ARi^lV zJP>IwrW=|4gTGguZ%=mJ)l_k?s^$IBFcrXt{jqVGNhKWYTN3jn`YDsz^&KQRNzQPE zm`;)vE`a+npO#n}3!7a=5m0_P}V9-w}PEBYjwyT_9JtIQ5e!))4 zfpBsDR*CALGF&e;@o_-wO$VOoG^HABu1R^-IwoGVF~4_~ z=WaB-5-yD!Aav05%rjLbfnNl#0q8f}JEUV+9HmPK~I&zoz2)?)GxVK>^Y&6K>wxreoYtbGQJ4h-8MapOZq!4m3Uz+VsKn4CO^VyRcdlFv5%qT|?b`{FqrJ#4Gk9shZzl?n zoX!!(gNU!Mdnb*_Ule$yT%No~p77s*T9*j;{!Y$xvM7{P84DQ?Rhjj@51uOCvAq3{ zZKvCmiH)=3Kq8MZp8;?ghaT+HBH&;{8N+U&0n^y+ZamxX8_`T=FXk)5QlDh$SS1$> zevOpD=Sy{^Up(}?R0m0m8}j(aw@o=Ou3Rl%7sh98ixJrfu)TRtK|5F4^e6|mx`w@| z4)a>Owmr{SBu3iFF}?hez@TKeT?6&J4h_jB9!9vgntVO@DY(M16JbHCeVI#Jf}k=r z*u!7I0f(@FeqG>aTgiyHNjxc(d@OO9(BEX1zzBGy)Af2%44HJ%>F8@Vl(OnpG#C#q zndyt&c|fUGI$p4;GOV35{zP@*+(Q%L31CP&O1`$ZF zjwDn?vMhJ|eyUdUx2PO*p8nVJD4`{_58E~#D%E<2f6we!2-Ys`Tjb>@T~5aE&CvMa z26LF()3M+8-_=(%k3*XOTZ;c0ORVJUQEJP_uNp_GSM1r$o~rA4pDaj=-6LX&Pc0jOiH9fip?^`t0ChBh;IcuD=iVuVRg-gsmL*ol_@z|GvwaZ;#gIuR#Bz99ilVc4=PLtXj}x%Le+v#c83I-$CpDv)NtLkn zQzgsisyFnZKM=O`Yg{ER6ddvmX5$0jq&n?^Y9cT&?Q9xbB*B5cq>t|Q(a5i0W-{K@ z^SUceIK;(k&%!%STBVEbu36@c1Y(Rclxn$CMNuW{CyYE z5E3S>3;rEhN+jl;cKQ5MnG1Yn;7 z&}(RZ{KR0QpN%oZTmP*^k4>xNOvJfywCd_SWMRu2iso{yT2bGpHB!4#U`hT)j?@%P z7TS)B$dkB4-4ApabX^Jj!6nhVaB)? zp8_uXt{3~dVbJ+DSjfM~?=Mw1+oP;tewWED zuvRqMX9MI+>03v~?AK7`?$&T*q?x9AdB>3CcjWe?ad+H#T+sT^>5scA#fdE~ z<&}9eypC(EgbnFS&cUm`=NfEbC1Xf8lwkv!_z;)$e6F@n#O9AvS1pJg40r%uMP$Ps zEc60T`kC_!2!NQ{68YCKf8J2ALQ-P8Nv7`iQF?-E57W`ycIaPBEINZN}} zN*0KA4NlQTF1XCI|LaCQSY)55GV^BPMmD{dg>SRpGbPzswAPfT(pJo&UFKz;TXfbN zw2#ASslG6jT0%2%^P0uH78>a3VEWg0={Hz^mMHlCp{7#uCBH1~#zQ|BB0%;m-y2@H z`ms!A`7zYxVOPM^(RWg{24vIcp5KstJ0&`?0Iyc(c2D>Ow>&BPyLY_e>JW zG9bkep9(;9hs_l3Z|&K57CC5zyp;Q-(bi;K?)YY08%9IXyO$mb(5*Mwi}b}4RoX(v zEf&~*54kFP=Um-|F2*o_di$5PMA|qs%lF=HX`SimJ59d$A!GhU|k1ocYl|W$Lbc>o%WloT_LAJkq}{X!u~G$5xh*-zg|4X34&e7aIS+ zCa70#lH6e5W15%UwDxNRNk3)7-rwhqM&(>O8cr3M2!^_xE^0#Z?W1KQ}}>$kMo@+hl9q3mJ`n> zj$ABvn5h{|#v}S5GbX@1RK`5n=oaQr%Na|`o1}#p`g+-$KE^9n1+) zBVpQ^+=RTp(Xw@wcTA#CC@nBirA6~k4?7&6#7n1QAcwQ_p4Ct?Lyg?f)9uc#p-G{X z-u$X;F4D|QRn%1sz0e0lbr*8fXZQ;EK3S}dmgCt`6? z@^3sS-zSr49n5T%J&c-NrF)rYBu!cLFJFUIav3P}V}TPxU%;&5@QTUdY;8JpsJ&W@ zp{?@o-uG`^EHWJcD!VRoP7)5Xr^Vn_oP)2vFH^l<%LuEB-C+WpaQgddJ`$~?$V#^uAuT3fKTcKYUrXg21ZLfu8-K4jOMVJl{~NM%fIh83Qe(L#mH4j*d;zr^)!884Xg zwHk0kkK#!+_@_tv`3K?1?S#FyI4*S!wha_R&_41D(me?PCWs2{L1`?mOxWe6DiEpQvETu8!x{ zosos<&&QcO1adgVJKSILfkT{|Ckp1t_=t}(uF1rHGUoUf8w5B4BIgUW!WimrhXQNI z(SAQHXQ;Dq%D!$prTO7AuijSQ@DwSc!02BVt_2TVC=~z@ILFwd6-Kbgg z+NcZ!yFA{uQ*mk}Mynz;aJ67?E^QV|6?XBSY-0?yTiN>!@=WQccaA5>-e+83bonAy zx0wXBDE}eZj@3&7n9|y_*+aPo`-8fdk}O-B;`L=$U`>Yx6!Iz9sszyE7iE9R literal 0 HcmV?d00001 diff --git a/src/index.html b/src/index.html index ef9b5cce..40bf0d2d 100755 --- a/src/index.html +++ b/src/index.html @@ -15,7 +15,7 @@ -
+
diff --git a/src/modules/base/header/header.html b/src/modules/base/header/header.html index f98ea542..9cd3f30d 100644 --- a/src/modules/base/header/header.html +++ b/src/modules/base/header/header.html @@ -22,6 +22,11 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/src/modules/base/header/header.js b/src/modules/base/header/header.js index 8841aaa3..96b6a2fb 100644 --- a/src/modules/base/header/header.js +++ b/src/modules/base/header/header.js @@ -3,7 +3,7 @@ angular .module("TendrlModule") - .component("header", { + .component("tendrlHeader", { templateUrl: "/modules/base/header/header.html", controller: headerController, @@ -11,7 +11,7 @@ }); /*@ngInject*/ - function headerController($rootScope, $state, $scope, $uibModal, AuthManager, utils, Notifications, userStore) { + function headerController($rootScope, $state, $scope, $uibModal, AuthManager, utils, Notifications, userStore, deviceDetector, config) { var vm = this, currentUser; @@ -20,6 +20,7 @@ vm.searchBy = {}; vm.filterBy = ""; vm.severity = ""; + vm.releaseVersion = config.releaseVersion; vm.notificationClose = notificationClose; vm.logout = logout; @@ -35,6 +36,7 @@ vm.toggleNav = toggleNav; vm.getUserRole = getUserRole; vm.updateViewing = updateViewing; + vm.device = deviceDetector; $rootScope.notification = Notifications.data; vm.htmlContent = true; diff --git a/src/modules/base/header/header.scss b/src/modules/base/header/header.scss index 503a62dc..0f7750d8 100644 --- a/src/modules/base/header/header.scss +++ b/src/modules/base/header/header.scss @@ -90,6 +90,10 @@ visibility: hidden; } + .dropdown-title { + line-height: 1.2 !important; + } + @media screen and (max-width: 992px) { .navbar-brand { display: none; diff --git a/src/modules/login/login.html b/src/modules/login/login.html index 80108fba..b119abcb 100644 --- a/src/modules/login/login.html +++ b/src/modules/login/login.html @@ -1,59 +1,56 @@