Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ggNFH-0001or-7i for pgadmin-hackers@arkaria.postgresql.org; Mon, 07 Jan 2019 05:14:39 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1ggNFF-0002Ip-LM for pgadmin-hackers@arkaria.postgresql.org; Mon, 07 Jan 2019 05:14:37 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ggNFF-0002Ii-1k for pgadmin-hackers@lists.postgresql.org; Mon, 07 Jan 2019 05:14:37 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ggNFA-0000sX-Sb for pgadmin-hackers@lists.postgresql.org; Mon, 07 Jan 2019 05:14:35 +0000 Received: by mail-lj1-x242.google.com with SMTP id n18-v6so37024173lji.7 for ; Sun, 06 Jan 2019 21:14:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SRCTeoIezMC+hp/2/UvURdbUO4Q9q86hQfl6yKU0v18=; b=HqCbjPUiHm/NJV+5wN9Cj5wVnGGjQHdlc2TZlTKqYJXpxkTP3sDzk3LLqfmUZsL8rj BZ1nDg8JWWZQ95QsIgjCMhdbIZv7y1aK3iZh4JnDmt1ta3+5mtRZk0voitE5/DURxrhm OGy1JPla/wa/Az1Hd/rb5ncVDJa+fxICkzgAFpmn9Pw07SbasfhxAFUSRw/tvXlDfr/W CbVdMPICH8bZhhMyC8cYAq8tqOZqyaDncTbTaN982DUWUnPo8O3ApGsn6/kW60yEj8JZ shHWIoyX8DRt8wOGSCqq5Bnng+LUAngYVdSicrxoGSgmJPj6Am2dwAWaTjMWKZCyN1Zx YEqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SRCTeoIezMC+hp/2/UvURdbUO4Q9q86hQfl6yKU0v18=; b=X8H2rblXXcwaTeZMjy1cqQyNTvcMKKjqNyRQRAE8TAQmPipb4rY5haJmCTcxJ1UDAR tCBHCEUhAX71M+zYmupHB3mFGz7r+a5U5Q6I1v/aUwFdbHhJkGw21RXDtfbtdcE6UiCV 07eETKVkToqdcr5AAhpM9+Y8WkYr1EoJbzmqEtiIk2DYX469wOVo5EfMZOk6NvaAPEY/ L+c+/ER8apb01yG+3mPvjkVr1Vo0TPl+oGdGXZ1t9skPP6ZIXdPWHF+F74LmTg1UKOKi dm213bI3HFsJG2GSlKwrG4eLS08v+UXRicuQW6ns4fwvDEmXpJReU3G/dwJWBMTC1ZAK LXBg== X-Gm-Message-State: AA+aEWb4iJEROa9kEdoPNmZ7wsDC5xH3YeSibgUdMM5docjW/ss9aFgh cdkn83IxeNcHRomH8tv9I6Ri2fud8Eejt8uJcscA2w== X-Google-Smtp-Source: ALg8bN7vtdw6nYa9qBk3EJAtG9vVlI+DNfcyiR6lNLqQlUy6Nec8LUk+dYK/eIM8sLobp7a3KnQrLEB2ZiNpBkAIl/0= X-Received: by 2002:a2e:9f0b:: with SMTP id u11-v6mr28257496ljk.99.1546838070336; Sun, 06 Jan 2019 21:14:30 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Mon, 7 Jan 2019 10:44:18 +0530 Message-ID: Subject: Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica To: Dave Page Cc: Akshay Joshi , pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000b54b4b057ed74ddd" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000b54b4b057ed74ddd Content-Type: multipart/alternative; boundary="000000000000b54b47057ed74ddb" --000000000000b54b47057ed74ddb Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached is the patch to incorporate the changes discussed in trailing mail(s). Kindly review. On Fri, Jan 4, 2019 at 3:31 PM Dave Page wrote: > On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal > wrote: > > > > Hi, > > > > On Fri, Jan 4, 2019 at 2:53 PM Dave Page wrote: > >> > >> Hi > >> > >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal < > aditya.toshniwal@enterprisedb.com> wrote: > >>> > >>> Hi Dave, > >>> > >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page wrote: > >>>> > >>>> > >>>> A few other things that I noticed (or have been bugging me): > >>>> > >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to > 40px and setting the font-weight to normal on the menu options (but not the > product name) seems much better to me (and adjusting everything else as > required of course). > >>> > >>> Giving too much space for the navbar will reduce the usable space for > other things. It is good enough(32) to be used easily, and is equal to all > the other headers in app (including tabs) giving a feel of native desktop > application. You'll find even smaller menu heights in native desktop > application. We can make font weight to normal and may be slightly increase > horizontal spacing between the menu links. > >> > >> > >> 8 pixels isn't going to make a noticeable difference to the workspace > for users, and would leave the bar smaller than the 50px it's been for the > last couple of years (iirc). I think it needs it to avoid looking cramped - > please make the change. > > > > Will do. > > One more doubt regarding bold headers, should I remove bold headers in > dashboard graph header, subnode headers (eg.table->columns), properties tab > accrordian headers ? > > No, please don't. I left them bold and the styling seemed like it > worked. We can tweak again if others disagree later. > > Thanks! > > BTW - Chrome 71 shows the offset headers in the file dialogue as well. > > >>>> > >>>> - In the file dialogue, the column headers don't line up with the > columns in the rows. > >>> > >>> I could not see this on my machine (screenshot attached). Could you > please share the screenshot. > >> > >> > >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS. > >> > >> -- > >> Dave Page > >> Blog: http://pgsnake.blogspot.com > >> Twitter: @pgsnake > >> > >> EnterpriseDB UK: http://www.enterprisedb.com > >> The Enterprise PostgreSQL Company > > > > > > > > -- > > Thanks and Regards, > > Aditya Toshniwal > > Software Engineer | EnterpriseDB Software Solutions | Pune > > "Don't Complain about Heat, Plant a tree" > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > -- Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB Software Solutions | Pune "Don't Complain about Heat, Plant a tree" --000000000000b54b47057ed74ddb Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the patch to inco= rporate the changes discussed in trailing mail(s).

Kindly review.

On Fri, Jan 4, 2019 = at 3:31 PM Dave Page <dpage@pgadmin= .org> wrote:
On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
<= aditya.toshniwal@enterprisedb.com> wrote:
>
> Hi,
>
> On Fri, Jan 4, 2019 at 2:53 PM Dave Page <dpage@pgadmin.org> wrote:
>>
>> Hi
>>
>> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <aditya.toshniwal@e= nterprisedb.com> wrote:
>>>
>>> Hi Dave,
>>>
>>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <dpage@pgadmin.org> wrote:
>>>>
>>>>
>>>> A few other things that I noticed (or have been bugging me= ):
>>>>
>>>> - The menu bar seems a little cramped. Taking pg-navbar fr= om 32 to 40px and setting the font-weight to normal on the menu options (bu= t not the product name) seems much better to me (and adjusting everything e= lse as required of course).
>>>
>>> Giving too much space for the navbar will reduce the usable sp= ace for other things. It is good enough(32) to be used easily, and is equal= to all the other headers in app (including tabs) giving a feel of native d= esktop application. You'll find even smaller menu heights in native des= ktop application. We can make font weight to normal and may be slightly inc= rease horizontal spacing between the menu links.
>>
>>
>> 8 pixels isn't going to make a noticeable difference to the wo= rkspace for users, and would leave the bar smaller than the 50px it's b= een for the last couple of years (iirc). I think it needs it to avoid looki= ng cramped - please make the change.
>
> Will do.
> One more doubt regarding bold headers, should I remove bold headers in= dashboard graph header, subnode headers (eg.table->columns), properties= tab accrordian headers ?

No, please don't. I left them bold and the styling seemed like it
worked. We can tweak again if others disagree later.

Thanks!

BTW - Chrome 71 shows the offset headers in the file dialogue as well.

>>>>
>>>> - In the file dialogue, the column headers don't line = up with the columns in the rows.
>>>
>>> I could not see this on my machine (screenshot attached). Coul= d you please share the screenshot.
>>
>>
>> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"



--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


--
Thanks and Rega= rds,
Aditya Toshniwa= l
Softw= are Engineer |=C2=A0EnterpriseDB Software Solutions |=C2=A0Pune
&q= uot;Don't Complain about Heat, Plant a tree"
--000000000000b54b47057ed74ddb-- --000000000000b54b4b057ed74ddd Content-Type: application/octet-stream; name="RM3692.part4.patch" Content-Disposition: attachment; filename="RM3692.part4.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jqlvf8hz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9jc3MvZmls ZV9tYW5hZ2VyLmNzcyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9jc3Mv ZmlsZV9tYW5hZ2VyLmNzcwppbmRleCBkZDc1OTZiNC4uNTcxZTkwZTggMTAwNjQ0Ci0tLSBhL3dl Yi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9jc3MvZmlsZV9tYW5hZ2VyLmNzcwor KysgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvY3NzL2ZpbGVfbWFuYWdl ci5jc3MKQEAgLTIwLDIwICsyMCw2IEBACiAgIGhlaWdodDogMTdweDsKIH0KIAotLmZpbGVpbmZv ICNjb250ZW50cyBsaSBwID4gc3Bhbi5sZXNzX3RleHQsCi0uZmlsZWluZm8gdGFibGUjY29udGVu dHMgdHIgdGQ6Zmlyc3QtY2hpbGQgcCBzcGFuLmxlc3NfdGV4dCB7Ci0gIHdpZHRoOiAxMDAlOwot ICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKLSAgb3ZlcmZsb3c6IGhpZGRlbjsKLSAgdGV4dC1h bGlnbjogY2VudGVyOwotICB3aGl0ZS1zcGFjZTogbm93cmFwOwotfQotCi0uZmlsZWluZm8gdGFi bGUjY29udGVudHMgdHIgdGQgcCB7Ci0gIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgbWFyZ2lu LWJvdHRvbTogMDsKLX0KLQogLmZpbGVpbmZvID4gaDEgewogICBmb250LXNpemU6IDE2cHg7CiAg IG1hcmdpbjogMTAwcHggYXV0bzsKQEAgLTg2LDcgKzcyLDYgQEAgeDotby1wcmVmb2N1cywgLmZp bGUtaW5wdXQtY29udGFpbmVyIHt0b3A6MTZweDt3aWR0aDoxOThweDt9CiB9CiAKIGRpdi5jbGlw IHsKLSAgd2lkdGg6IDMwcHg7CiAgIGhlaWdodDogMzBweDsKICAgbWFyZ2luOiAxMHB4IGF1dG87 CiAgIG92ZXJmbG93OiBoaWRkZW47CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVf bWFuYWdlci9zdGF0aWMvanMvdXRpbGl0eS5qcyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5h Z2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzCmluZGV4IGFlNmI4YjM0Li41ZTllYjJmMCAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMK KysrIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMK QEAgLTUzMyw3ICs1MzMsNyBAQCBkZWZpbmUoWwogCiAgICAgICAgICAgICB2YXIgY2xhc3NfdHlw ZTsKICAgICAgICAgICAgIGlmICgoZGF0YVtrZXldKS5maWxlX3R5cGUgPT0gJ2RpcicpIHsKLSAg ICAgICAgICAgICAgY2xhc3NfdHlwZSA9ICdmYSBmYS1mb2xkZXItb3BlbiBmbV9mb2xkZXInOwor ICAgICAgICAgICAgICBjbGFzc190eXBlID0gJ2ZhIGZhLWZvbGRlci1vcGVuIGZtX2ZvbGRlcl9n cmlkJzsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoKGRhdGFba2V5XSkuZmlsZV90eXBlID09ICdk cml2ZScpIHsKICAgICAgICAgICAgICAgY2xhc3NfdHlwZSA9ICdmYSBmYS1oZGQtbyBmbV9kcml2 ZSc7CiAgICAgICAgICAgICB9IGVsc2UgewpAQCAtNTYwLDkgKzU2MCw5IEBAIGRlZmluZShbCiAg ICAgICAgICAgICAgIHJlc3VsdCArPSAnPHNwYW4+JyArIGZtX2ZpbGVuYW1lICsgJzwvc3Bhbj4n OwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgcmVzdWx0ICs9Ci0gICAgICAg ICAgICAgICAgJzxwPjxpbnB1dCB0eXBlPSJ0ZXh0IiBjbGFzcz0iZm1fZmlsZV9yZW5hbWUiIC8+ JyArCisgICAgICAgICAgICAgICAgJzxkaXY+PGlucHV0IHR5cGU9InRleHQiIGNsYXNzPSJmbV9m aWxlX3JlbmFtZSIgLz4nICsKICAgICAgICAgICAgICAgICAnPHNwYW4gY2xhc3M9Imxlc3NfdGV4 dCIgdGl0bGU9IicgKyBmbV9maWxlbmFtZSArICciPicgKyBmbV9maWxlbmFtZSArCi0gICAgICAg ICAgICAgICAgJzwvc3Bhbj48L3A+JzsKKyAgICAgICAgICAgICAgICAnPC9zcGFuPjwvZGl2Pic7 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAocHJvcHMuV2lkdGggJiYgcHJvcHMuV2lk dGggIT0gJycpIHsKICAgICAgICAgICAgICAgcmVzdWx0ICs9ICc8c3BhbiBjbGFzcz0ibWV0YSBk aW1lbnNpb25zIj4nICsKQEAgLTYxMSw3ICs2MTEsNyBAQCBkZWZpbmUoWwogCiAgICAgICAgICAg ICBpZiAoKGRhdGFba2V5XSkuZmlsZV90eXBlID09ICdkaXInKSB7CiAgICAgICAgICAgICAgIGNs YXNzX3R5cGUgPSAndGJsX2ZvbGRlcic7Ci0gICAgICAgICAgICAgIGljb25fdHlwZSA9ICdmYSBm YS1mb2xkZXItb3Blbic7CisgICAgICAgICAgICAgIGljb25fdHlwZSA9ICdmYSBmYS1mb2xkZXIt b3BlbiBmbV9mb2xkZXJfbGlzdCc7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKChkYXRhW2tleV0p LmZpbGVfdHlwZSA9PSAnZHJpdmUnKSB7CiAgICAgICAgICAgICAgIGNsYXNzX3R5cGUgPSAndGJs X2RyaXZlJzsKICAgICAgICAgICAgICAgaWNvbl90eXBlID0gJ2ZhIGZhLWhkZC1vJzsKQEAgLTYz OSwxMSArNjM5LDEzIEBAIGRlZmluZShbCiAgICAgICAgICAgICAgIHJlc3VsdCArPSAnPHNwYW4g dGl0bGU9IicgKyAoZGF0YVtrZXldKS5GaWxlbmFtZSArICciPicgKwogICAgICAgICAgICAgICAg IGZtX2ZpbGVuYW1lICsgJzwvc3Bhbj48L3RkPic7CiAgICAgICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgICByZXN1bHQgKz0gJzxwPjxpbnB1dCB0eXBlPSJ0ZXh0IiBjbGFzcz0iZm1fZmls ZV9yZW5hbWUiLz4nKworICAgICAgICAgICAgICByZXN1bHQgKz0gJzxkaXY+PGlucHV0IHR5cGU9 InRleHQiIGNsYXNzPSJmbV9maWxlX3JlbmFtZSIvPicrCisgICAgICAgICAgICAgICAgICAgICAg ICAnPGRpdiBjbGFzcz0iZC1mbGV4Ij4nICsKICAgICAgICAgICAgICAgICAgICAgICAgICc8c3Bh biBjbGFzcz0iJytpY29uX3R5cGUrJyI+PC9zcGFuPicgKwogICAgICAgICAgICAgICAgICAgICAg ICAgZGF0YV9wcm90ZWN0ZWQgKwogICAgICAgICAgICAgICAgICAgICAgICAgJzxzcGFuIGNsYXNz PSJsZXNzX3RleHQgbWwtMiIgdGl0bGU9IicgKyBmbV9maWxlbmFtZSArICciPicgKyBmbV9maWxl bmFtZSArICc8L3NwYW4+JyArCi0gICAgICAgICAgICAgICAgICAgICAgICAnPC9wPjwvdGQ+JzsK KyAgICAgICAgICAgICAgICAgICAgICAgICc8L2Rpdj4nICsKKyAgICAgICAgICAgICAgICAgICAg ICAgICc8L2Rpdj48L3RkPic7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAocHJvcHMu U2l6ZSAmJiBwcm9wcy5TaXplICE9ICcnKSB7CiAgICAgICAgICAgICAgIHJlc3VsdCArPSAnPHRk PjxzcGFuIHRpdGxlPSInICsgcHJvcHMuU2l6ZSArICciPicgKwpAQCAtNjk4LDcgKzcwMCw3IEBA IGRlZmluZShbCiAKICAgICAgICAgaWYgKCQoJy5maWxlaW5mbycpLmRhdGEoJ3ZpZXcnKSA9PSAn Z3JpZCcpIHsKICAgICAgICAgICBlLnN0b3BQcm9wYWdhdGlvbigpOwotICAgICAgICAgICR0aGlz ID0gJCgnLmZpbGVfbWFuYWdlcicpLmZpbmQoJyNjb250ZW50cyBsaS5zZWxlY3RlZCBwJyk7Cisg ICAgICAgICAgJHRoaXMgPSAkKCcuZmlsZV9tYW5hZ2VyJykuZmluZCgnI2NvbnRlbnRzIGxpLnNl bGVjdGVkIGRpdicpOwogICAgICAgICAgIG9yaWdfdmFsdWUgPSBkZWNvZGVVUkkoJHRoaXMuZmlu ZCgnc3Bhbi5sZXNzX3RleHQnKS5hdHRyKCd0aXRsZScpKTsKICAgICAgICAgICBuZXd2YWx1ZSA9 IG9yaWdfdmFsdWUuc3Vic3RyaW5nKDAsIG9yaWdfdmFsdWUuaW5kZXhPZignLicpKTsKIApAQCAt NzEzLDcgKzcxNSw3IEBAIGRlZmluZShbCiAgICAgICAgICAgJCgnLmZpbGVfbWFuYWdlcicpLm9m ZigpLm9uKCdrZXl1cCcsIGZ1bmN0aW9uKGUpIHsKICAgICAgICAgICAgIGlmIChlLmtleUNvZGUg PT0gMTMpIHsKICAgICAgICAgICAgICAgZS5zdG9wUHJvcGFnYXRpb24oKTsKLSAgICAgICAgICAg ICAgJCgnLmZpbGVpbmZvICNjb250ZW50cyBsaS5zZWxlY3RlZCBwJykuZmluZCgKKyAgICAgICAg ICAgICAgJCgnLmZpbGVpbmZvICNjb250ZW50cyBsaS5zZWxlY3RlZCBkaXYnKS5maW5kKAogICAg ICAgICAgICAgICAgICdpbnB1dCcKICAgICAgICAgICAgICAgKS50cmlnZ2VyKCdibHVyJyk7CiAg ICAgICAgICAgICB9CkBAIC03MjEsNyArNzIzLDcgQEAgZGVmaW5lKFsKICAgICAgICAgfSBlbHNl IGlmICgkKCcuZmlsZWluZm8nKS5kYXRhKCd2aWV3JykgPT0gJ2xpc3QnKSB7CiAgICAgICAgICAg ZS5zdG9wUHJvcGFnYXRpb24oKTsKICAgICAgICAgICAkdGhpcyA9ICQoJy5maWxlaW5mbycpLmZp bmQoCi0gICAgICAgICAgICAndGFibGUjY29udGVudHMgdGJvZHkgdHIuc2VsZWN0ZWQgdGQ6Zmly c3QtY2hpbGQgcCcKKyAgICAgICAgICAgICd0YWJsZSNjb250ZW50cyB0Ym9keSB0ci5zZWxlY3Rl ZCB0ZDpmaXJzdC1jaGlsZCBkaXYnCiAgICAgICAgICAgKTsKICAgICAgICAgICBvcmlnX3ZhbHVl ID0gZGVjb2RlVVJJKCR0aGlzLmZpbmQoJ3NwYW4ubGVzc190ZXh0JykuaHRtbCgpKSwKICAgICAg ICAgICAgIG5ld3ZhbHVlID0gb3JpZ192YWx1ZS5zdWJzdHJpbmcoMCwgb3JpZ192YWx1ZS5sYXN0 SW5kZXhPZignLicpKTsKQEAgLTczNyw3ICs3MzksNyBAQCBkZWZpbmUoWwogICAgICAgICAgICQo Jy5maWxlX21hbmFnZXInKS5vZmYoKS5vbigna2V5dXAnLCBmdW5jdGlvbihlKSB7CiAgICAgICAg ICAgICBpZiAoZS5rZXlDb2RlID09IDEzKSB7CiAgICAgICAgICAgICAgIGUuc3RvcFByb3BhZ2F0 aW9uKCk7Ci0gICAgICAgICAgICAgICQoJy5maWxlaW5mbyB0YWJsZSNjb250ZW50cyB0ci5zZWxl Y3RlZCB0ZCBwJykuZmluZCgKKyAgICAgICAgICAgICAgJCgnLmZpbGVpbmZvIHRhYmxlI2NvbnRl bnRzIHRyLnNlbGVjdGVkIHRkIGRpdicpLmZpbmQoCiAgICAgICAgICAgICAgICAgJ2lucHV0Jwog ICAgICAgICAgICAgICApLnRyaWdnZXIoJ2JsdXInKTsKICAgICAgICAgICAgIH0KQEAgLTc0Niw3 ICs3NDgsNyBAQCBkZWZpbmUoWwogICAgICAgfSk7CiAKICAgICAgIC8vIFJlbmFtZSBVSSBoYW5k bGluZwotICAgICAgJCgnLmZpbGVpbmZvICNjb250ZW50cyBsaSBwJykub24oJ2JsdXIgZGJsY2xp Y2snLCAnaW5wdXQnLCBmdW5jdGlvbihlKSB7CisgICAgICAkKCcuZmlsZWluZm8gI2NvbnRlbnRz IGxpIGRpdicpLm9uKCdibHVyIGRibGNsaWNrJywgJ2lucHV0JywgZnVuY3Rpb24oZSkgewogICAg ICAgICBlLnN0b3BQcm9wYWdhdGlvbigpOwogCiAgICAgICAgIHZhciBvbGRfbmFtZSA9IGRlY29k ZVVSSSgkKHRoaXMpLnNpYmxpbmdzKCdzcGFuJykuYXR0cigndGl0bGUnKSk7CkBAIC04MjQsNyAr ODI2LDcgQEAgZGVmaW5lKFsKICAgICAgICAgfQogICAgICAgfSk7CiAKLSAgICAgICQoJy5maWxl aW5mbyB0YWJsZSNjb250ZW50cyB0ciB0ZCBwJykub24oCisgICAgICAkKCcuZmlsZWluZm8gdGFi bGUjY29udGVudHMgdHIgdGQgZGl2Jykub24oCiAgICAgICAgICdibHVyIGRibGNsaWNrJywgJ2lu cHV0JywKICAgICAgICAgZnVuY3Rpb24oZSkgewogICAgICAgICAgIHZhciBvbGRfbmFtZSA9IGRl Y29kZVVSSSgkKHRoaXMpLnNpYmxpbmdzKCdzcGFuJykuYXR0cigndGl0bGUnKSksCkBAIC0xMTQx LDcgKzExNDMsNyBAQCBkZWZpbmUoWwogCiAgICAgICAgICAgc2VsZWN0X2JveCA9IGA8ZGl2IGNs YXNzPSdjaGFuZ2VfZmlsZV90eXBlcyBkLWZsZXggYWxpZ24taXRlbXMtY2VudGVyIHAtMSc+CiAg ICAgICAgICAgPGRpdj4KLSAgICAgICAgICAgICR7Z2V0dGV4dCgnU2hvdyBoaWRkZW4gZmlsZXMg YW5kIGZvbGRlcnMnKX0gPworICAgICAgICAgICAgJHtnZXR0ZXh0KCdTaG93IGhpZGRlbiBmaWxl cyBhbmQgZm9sZGVycycpfT8KICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSdjaGVja2JveCcgaWQ9 J3Nob3dfaGlkZGVuJyBvbmNsaWNrPSdwZ0FkbWluLkZpbGVVdGlscy5oYW5kbGVDbGljayh0aGlz KScgdGFiaW5kZXg9JzExJz4KICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICA8ZGl2IGNsYXNz PSJtbC1hdXRvIj4KQEAgLTE0MTUsNyArMTQxNyw3IEBAIGRlZmluZShbCiAgICAgICAgIC8vIHdl IHJlbW92ZSBzaW1wbGUgZmlsZSB1cGxvYWQgZWxlbWVudAogICAgICAgICAkKCcuZmlsZS1pbnB1 dC1jb250YWluZXInKS5yZW1vdmUoKTsKICAgICAgICAgJCgnLnVwbG9hZCcpLnJlbW92ZSgpOwot ICAgICAgICAkKCcuY3JlYXRlJykuYmVmb3JlKCc8YnV0dG9uIHZhbHVlPSJVcGxvYWQiIHR5cGU9 ImJ1dHRvbiIgdGl0bGU9IlVwbG9hZCBGaWxlIiBuYW1lPSJ1cGxvYWQiIGlkPSJ1cGxvYWQiIGNs YXNzPSJidG4gZmEgZmEtdXBsb2FkIHVwbG9hZCIgdGFiaW5kZXg9IjYiPjxzcGFuPjwvc3Bhbj48 L2J1dHRvbj4gJyk7CisgICAgICAgICQoJy5jcmVhdGUnKS5iZWZvcmUoJzxidXR0b24gdmFsdWU9 IlVwbG9hZCIgdHlwZT0iYnV0dG9uIiB0aXRsZT0iVXBsb2FkIEZpbGUiIG5hbWU9InVwbG9hZCIg aWQ9InVwbG9hZCIgY2xhc3M9ImJ0biBidG4tc20gYnRuLXNlY29uZGFyeSB1cGxvYWQiIHRhYmlu ZGV4PSI2Ij48c3BhbiBjbGFzcz0iZmEgZmEtdXBsb2FkIHNxbC1pY29uLWxnIj48L3NwYW4+PC9i dXR0b24+ICcpOwogCiAgICAgICAgICQoJyN1cGxvYWRlciAudXBsb2FkJykub2ZmKCkub24oJ2Ns aWNrJywgZnVuY3Rpb24oKSB7CiAgICAgICAgICAgLy8gd2UgY3JlYXRlIHByb21wdApAQCAtMTU3 OSw4ICsxNTgxLDggQEAgZGVmaW5lKFsKICAgICAgICAgICAvLyB0ZW1wbGF0ZSBmb3IgY3JlYXRp bmcgbmV3IGZvbGRlcgogICAgICAgICAgIGZvbGRlcl9kaXYgPQogICAgICAgICAgICAgJzxsaSBj bGFzcz1cJ2NhcF9kb3dubG9hZCBjYXBfZGVsZXRlIGNhcF9zZWxlY3RfZmlsZSBjYXBfc2VsZWN0 X2ZvbGRlciBjYXBfcmVuYW1lIGNhcF9jcmVhdGUgY2FwX3VwbG9hZFwnPicgKwotICAgICAgICAg ICAgJzxkaXYgY2xhc3M9XCdjbGlwXCc+PHNwYW4gZGF0YS1hbHQ9XCdcJyBjbGFzcz1cJ2ZhIGZh LWZvbGRlci1vcGVuIGZtX2ZvbGRlclwnPjwvc3Bhbj48L2Rpdj4nICsKLSAgICAgICAgICAgICc8 cD48aW5wdXQgdHlwZT1cJ3RleHRcJyBjbGFzcz1cJ2ZtX2ZpbGVfcmVuYW1lXCc+PHNwYW4gdGl0 bGU9XCdcJz5OZXdfRm9sZGVyPC9zcGFuPjwvcD4nICsKKyAgICAgICAgICAgICc8ZGl2IGNsYXNz PVwnY2xpcFwnPjxzcGFuIGRhdGEtYWx0PVwnXCcgY2xhc3M9XCdmYSBmYS1mb2xkZXItb3BlbiBm bV9mb2xkZXJfZ3JpZFwnPjwvc3Bhbj48L2Rpdj4nICsKKyAgICAgICAgICAgICc8ZGl2PjxpbnB1 dCB0eXBlPVwndGV4dFwnIGNsYXNzPVwnZm1fZmlsZV9yZW5hbWVcJz48c3BhbiB0aXRsZT1cJ1wn Pk5ld19Gb2xkZXI8L3NwYW4+PC9kaXY+JyArCiAgICAgICAgICAgICAnPHNwYW4gY2xhc3M9XCdt ZXRhIHNpemVcJz48L3NwYW4+PHNwYW4gY2xhc3M9XCdtZXRhIGNyZWF0ZWRcJz48L3NwYW4+PHNw YW4gY2xhc3M9XCdtZXRhIG1vZGlmaWVkXCc+PC9zcGFuPjwvbGk+JzsKIAogICAgICAgICAgIHBh dGggPSAkKCcuY3VycmVudHBhdGgnKS52YWwoKTsKQEAgLTE2MTksNyArMTYyMSw3IEBAIGRlZmlu ZShbCiAgICAgICAgICAgICAnPHRyIGNsYXNzPVwnY2FwX2Rvd25sb2FkIGNhcF9kZWxldGUgY2Fw X3NlbGVjdF9maWxlIGNhcF9zZWxlY3RfZm9sZGVyIGNhcF9yZW5hbWUgY2FwX2NyZWF0ZSBjYXBf dXBsb2FkXCc+JyArCiAgICAgICAgICAgICAnPHRkIHRpdGxlPVwnXCcgY2xhc3M9XCcgdGJsX2Zv bGRlclwnPicgKwogICAgICAgICAgICAgJzxpbnB1dCB0eXBlPVwndGV4dFwnIGNsYXNzPVwnZm1f ZmlsZV9yZW5hbWVcJz4nKwotICAgICAgICAgICAgJzxzcGFuIGNsYXNzPSJmYSBmYS1mb2xkZXIt b3BlbiI+PC9zcGFuPicgKworICAgICAgICAgICAgJzxzcGFuIGNsYXNzPSJmYSBmYS1mb2xkZXIt b3BlbiBmbV9mb2xkZXJfbGlzdCI+PC9zcGFuPicgKwogICAgICAgICAgICAgJzxzcGFuPicgKyBs Zy5uZXdfZm9sZGVyICsgJzwvc3Bhbj4nICsKICAgICAgICAgICAgICc8L3RkPicrCiAgICAgICAg ICAgICAnPHRkPjxzcGFuIHRpdGxlPVwnXCc+PC9zcGFuPjwvdGQ+JyArCmRpZmYgLS1naXQgYS93 ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvc2Nzcy9fZmlsZV9tYW5hZ2VyLnNj c3MgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvc2Nzcy9fZmlsZV9tYW5h Z2VyLnNjc3MKaW5kZXggNDA0YmY2ZDEuLjQ1YmNmZWJiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvc2Nzcy9fZmlsZV9tYW5hZ2VyLnNjc3MKKysrIGIv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL3Njc3MvX2ZpbGVfbWFuYWdlci5z Y3NzCkBAIC00MCw4ICs0MCw4IEBACiAKICAgLmZpbGVfbGlzdGluZ190YWJsZSB0Ym9keSB0ciB0 ZDpudGgtY2hpbGQoMSksCiAgIC5maWxlX2xpc3RpbmdfdGFibGUgdGhlYWQgdHIgdGg6bnRoLWNo aWxkKDEpIHsKLSAgICB3aWR0aDogMTAwJTsKLSAgICBtaW4td2lkdGg6IDEwMCU7CisgICAgd2lk dGg6IDQwMHB4OworICAgIG1pbi13aWR0aDogNDAwcHg7CiAgIH0KIAogICAuZmlsZV9saXN0aW5n X3RhYmxlIHRib2R5IHRyIHRkOm50aC1jaGlsZCgyKSwKQEAgLTUzLDkgKzUzLDkgQEAKIAogICAu ZmlsZV9saXN0aW5nX3RhYmxlIHRib2R5IHRyIHRkOm50aC1jaGlsZCgzKSwKICAgLmZpbGVfbGlz dGluZ190YWJsZSB0aGVhZCB0ciB0aDpudGgtY2hpbGQoMykgewotICAgIHdpZHRoOiAyMDBweDsK LSAgICBtaW4td2lkdGg6IDIwMHB4OwotICAgIG1heC13aWR0aDogMjAwcHg7CisgICAgd2lkdGg6 IDEwMCU7CisgICAgbWluLXdpZHRoOiAxMDAlOworICAgIG1heC13aWR0aDogMTAwJTsKICAgfQog fQogCkBAIC02NiwxMiArNjYsMzkgQEAKICAgYmFja2dyb3VuZDogJHRhYmxlLWhvdmVyLWJnLWNv bG9yOwogfQogCi0uZmlsZWluZm8gdGFibGUjY29udGVudHMgdHIgdGQgcCB7CisuZmlsZWluZm8g dGFibGUjY29udGVudHMgdHIgdGQgewogICBmb250LWZhbWlseTogJGZvbnQtZmFtaWx5LXByaW1h cnk7CiB9CiAKLS5mbV9mb2xkZXIgeworLmZpbGVpbmZvICNjb250ZW50cyBsaSBzcGFuLmxlc3Nf dGV4dCB7CisgIHdpZHRoOiAxMDAlOworICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKKyAgb3Zl cmZsb3c6IGhpZGRlbjsKKyAgdGV4dC1hbGlnbjogY2VudGVyOworICB3aGl0ZS1zcGFjZTogbm93 cmFwOworICBkaXNwbGF5OiBibG9jazsKK30KKworLmZpbGVpbmZvIHRhYmxlI2NvbnRlbnRzIHRy IHRkOmZpcnN0LWNoaWxkIHsKKyAgJiBzcGFuLmxlc3NfdGV4dCB7CisgICAgd2lkdGg6IDEwMCU7 CisgICAgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAg ICB3aGl0ZS1zcGFjZTogbm93cmFwOworICAgIG1heC13aWR0aDogY2FsYyg0MDBweCAtIDMwcHgp OworICB9CisKKyAgJiAuZmEgeworICAgIGxpbmUtaGVpZ2h0OiBpbmhlcml0OworICB9Cit9CisK Ky5mbV9mb2xkZXJfZ3JpZCB7CiAgIGZvbnQtc2l6ZTogeHgtbGFyZ2UgIWltcG9ydGFudDsKK30K KworLmZtX2ZvbGRlcl9saXN0LAorLmZtX2ZvbGRlcl9ncmlkIHsKICAgY29sb3I6ICRjb2xvci13 YXJuaW5nOwogfQogCkBAIC0xMTgsNyArMTQ1LDcgQEAKICAgaGVpZ2h0OiA4MHB4OwogICB0ZXh0 LWFsaWduOiBjZW50ZXI7CiAgIG92ZXJmbG93OiBoaWRkZW47Ci0gIG1hcmdpbi1ib3R0b206IDEw cHg7CisgIG1hcmdpbjogMC41cmVtOwogICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDJweDsKICAg LW1vei1ib3JkZXItcmFkaXVzOiAycHg7CiAgIGJvcmRlci1yYWRpdXM6IDJweDsKQEAgLTMzOCw0 ICszNjUsNCBAQAogCiAuY2FwX3NlbGVjdF9maWxlIHsKICAgY3Vyc29yOiBwb2ludGVyOwotfQor fQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21p c2MvZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvaW5kZXguaHRtbCBiL3dlYi9w Z2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvaW5kZXguaHRt bAppbmRleCBmODU0NTQ1ZS4uODZjZjZmZDYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mv ZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvaW5kZXguaHRtbAorKysgYi93ZWIv cGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci90ZW1wbGF0ZXMvZmlsZV9tYW5hZ2VyL2luZGV4Lmh0 bWwKQEAgLTgsMTIgKzgsMTMgQEAKICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImZsZXgtZ3Jvdy0x IG1yLTEiPgogICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdyb3VwIiByb2xlPSJn cm91cCI+CiAgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdyb3VwLXByZXBl bmQiPgotICAgICAgICAgICAgICAgICAgICAgICAgPGJ1dHRvbiBuYW1lPSJob21lIiB0eXBlPSJi dXR0b24iIHZhbHVlPSJIb21lIiB0aXRsZT0ie3sgXygnSG9tZScpIH19IiBjbGFzcz0iYnRuIGJ0 bi1zZWNvbmRhcnkgYmctZ3JheS1saWdodGVyIGhvbWUiCisgICAgICAgICAgICAgICAgICAgICAg ICA8YnV0dG9uIG5hbWU9ImhvbWUiIHR5cGU9ImJ1dHRvbiIgdmFsdWU9IkhvbWUiIHRpdGxlPSJ7 eyBfKCdIb21lJykgfX0iIGNsYXNzPSJidG4gYnRuLXNlY29uZGFyeSBob21lIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0YWJpbmRleD0iMSI+Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLWhvbWUgZmEtbGciPjwvc3Bhbj4KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iZmEgZmEtaG9tZSBzcWwtaWNvbi1sZyI+ PC9zcGFuPgogICAgICAgICAgICAgICAgICAgICAgICAgPC9idXR0b24+Ci0gICAgICAgICAgICAg ICAgICAgICAgICA8YnV0dG9uIG5hbWU9ImxldmVsLXVwIiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7 eyBfKCdCYWNrJykgfX0iIHZhbHVlPSJMZXZlbFVwIiBjbGFzcz0iYnRuIGJ0bi1zZWNvbmRhcnkg YmctZ3JheS1saWdodGVyIGZhIGZhLWxldmVsLXVwIGxldmVsLXVwIgorICAgICAgICAgICAgICAg ICAgICAgICAgPGJ1dHRvbiBuYW1lPSJsZXZlbC11cCIgdHlwZT0iYnV0dG9uIiB0aXRsZT0ie3sg XygnQmFjaycpIH19IiB2YWx1ZT0iTGV2ZWxVcCIgY2xhc3M9ImJ0biBidG4tc2Vjb25kYXJ5IGxl dmVsLXVwIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNhYmxlZCB0YWJpbmRl eD0iMiI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLWxl dmVsLXVwIHNxbC1pY29uLWxnIj48L3NwYW4+CiAgICAgICAgICAgICAgICAgICAgICAgICA8L2J1 dHRvbj4KICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgICAgIDxp bnB1dCBpZD0iZmlsZS1pbnB1dC1wYXRoIiBjbGFzcz0iZm9ybS1jb250cm9sIGlucHV0LXBhdGgg dGV4dC10cnVuY2F0ZSIgdGl0bGU9IiIgdHlwZT0idGV4dCIgdGFiaW5kZXg9IjMiIGF1dG9mb2N1 cy8+CkBAIC0yMywzMiArMjQsMzIgQEAKICAgICAgICAgICAgIDxkaXY+CiAgICAgICAgICAgICAg ICAgPGlucHV0IGNsYXNzPSJtb2RlIiBuYW1lPSJtb2RlIiB0eXBlPSJoaWRkZW4iIHZhbHVlPSJh ZGQiLz4KICAgICAgICAgICAgICAgICA8aW5wdXQgY2xhc3M9ImN1cnJlbnRwYXRoIiBuYW1lPSJj dXJyZW50cGF0aCIgdHlwZT0iaGlkZGVuIi8+Ci0gICAgICAgICAgICAgICAgPGJ1dHRvbiB0eXBl PSJidXR0b24iIHRpdGxlPSJ7eyBfKCdSZWZyZXNoJykgfX0iIGNsYXNzPSJidG4gYnRuLXNtIHJl ZnJlc2giCisgICAgICAgICAgICAgICAgPGJ1dHRvbiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBf KCdSZWZyZXNoJykgfX0iIGNsYXNzPSJidG4gYnRuLXNtIGJ0bi1zZWNvbmRhcnkgcmVmcmVzaCIK ICAgICAgICAgICAgICAgICAgICAgICAgIHRhYmluZGV4PSI0Ij4KLSAgICAgICAgICAgICAgICAg ICAgPHNwYW4gY2xhc3M9ImZhIGZhLXJlZnJlc2ggZmEtbGciPjwvc3Bhbj4KKyAgICAgICAgICAg ICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLXJlZnJlc2ggc3FsLWljb24tbGciPjwvc3Bhbj4K ICAgICAgICAgICAgICAgICA8L2J1dHRvbj4KLSAgICAgICAgICAgICAgICA8YnV0dG9uIHR5cGU9 ImJ1dHRvbiIgdGl0bGU9Int7IF8oJ0Rvd25sb2FkIEZpbGUnKSB9fSIgY2xhc3M9ImJ0biBidG4t c20gZG93bmxvYWQiCisgICAgICAgICAgICAgICAgPGJ1dHRvbiB0eXBlPSJidXR0b24iIHRpdGxl PSJ7eyBfKCdEb3dubG9hZCBGaWxlJykgfX0iIGNsYXNzPSJidG4gYnRuLXNtIGJ0bi1zZWNvbmRh cnkgZG93bmxvYWQiCiAgICAgICAgICAgICAgICAgICAgICAgICBkaXNhYmxlZD4KLSAgICAgICAg ICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLWRvd25sb2FkIGZhLWxnIj48L3NwYW4+Cisg ICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJmYSBmYS1kb3dubG9hZCBzcWwtaWNvbi1s ZyI+PC9zcGFuPgogICAgICAgICAgICAgICAgIDwvYnV0dG9uPgotICAgICAgICAgICAgICAgIDxi dXR0b24gbmFtZT0iZGVsZXRlIiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBfKCdEZWxldGUgRmls ZS9Gb2xkZXInKSB9fSIgY2xhc3M9ImJ0biBidG4tc20gZGVsZXRlIgorICAgICAgICAgICAgICAg IDxidXR0b24gbmFtZT0iZGVsZXRlIiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBfKCdEZWxldGUg RmlsZS9Gb2xkZXInKSB9fSIgY2xhc3M9ImJ0biBidG4tc20gYnRuLXNlY29uZGFyeSBkZWxldGUi CiAgICAgICAgICAgICAgICAgICAgICAgICBkaXNhYmxlZD4KLSAgICAgICAgICAgICAgICAgICAg PHNwYW4gY2xhc3M9ImZhIGZhLXRyYXNoIGZhLWxnIj48L3NwYW4+CisgICAgICAgICAgICAgICAg ICAgIDxzcGFuIGNsYXNzPSJmYSBmYS10cmFzaCBzcWwtaWNvbi1sZyI+PC9zcGFuPgogICAgICAg ICAgICAgICAgIDwvYnV0dG9uPgotICAgICAgICAgICAgICAgIDxidXR0b24gbmFtZT0icmVuYW1l IiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBfKCdSZW5hbWUgRmlsZS9Gb2xkZXInKSB9fSIgY2xh c3M9ImJ0biBidG4tc20gcmVuYW1lIgorICAgICAgICAgICAgICAgIDxidXR0b24gbmFtZT0icmVu YW1lIiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBfKCdSZW5hbWUgRmlsZS9Gb2xkZXInKSB9fSIg Y2xhc3M9ImJ0biBidG4tc20gYnRuLXNlY29uZGFyeSByZW5hbWUiCiAgICAgICAgICAgICAgICAg ICAgICAgICB0YWJpbmRleD0iNSI+Ci0gICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJm YSBmYS1wZW5jaWwtc3F1YXJlLW8gZmEtbGciPjwvc3Bhbj4KKyAgICAgICAgICAgICAgICAgICAg PHNwYW4gY2xhc3M9ImZhIGZhLXBlbmNpbC1zcXVhcmUtbyBzcWwtaWNvbi1sZyI+PC9zcGFuPgog ICAgICAgICAgICAgICAgIDwvYnV0dG9uPgogICAgICAgICAgICAgICAgIDxidXR0b24gbmFtZT0i bmV3Zm9sZGVyIiB0eXBlPSJidXR0b24iIHRpdGxlPSJ7eyBfKCdDcmVhdGUgbmV3IGZvbGRlcicp IH19IiB2YWx1ZT0iTmV3IEZvbGRlciIKLSAgICAgICAgICAgICAgICAgICAgICAgIGNsYXNzPSJi dG4gYnRuLXNtIGNyZWF0ZSIgdGFiaW5kZXg9IjgiPgotICAgICAgICAgICAgICAgICAgICA8c3Bh biBjbGFzcz0iZmEgZmEtZm9sZGVyLW9wZW4gZmEtbGciPjwvc3Bhbj4KKyAgICAgICAgICAgICAg ICAgICAgICAgIGNsYXNzPSJidG4gYnRuLXNtIGJ0bi1zZWNvbmRhcnkgY3JlYXRlIiB0YWJpbmRl eD0iOCI+CisgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJmYSBmYS1mb2xkZXItb3Bl biBzcWwtaWNvbi1sZyI+PC9zcGFuPgogICAgICAgICAgICAgICAgIDwvYnV0dG9uPgogICAgICAg ICAgICAgICAgIDxkaXYgY2xhc3M9ImJ0bi1ncm91cCIgcm9sZT0iZ3JvdXAiPgogICAgICAgICAg ICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJPTiBidG4gYnRuLXNlY29uZGFyeSBidG4tc20gZ3Jp ZCIgdHlwZT0iYnV0dG9uIiB0aXRsZT0ie3sgXygnVmlldyBhcyBncmlkJykgfX0iIHRhYmluZGV4 PSI5Ij4KLSAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJmYSBmYS10aCBmYS1s ZyI+PC9zcGFuPgorICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLXRo IHNxbC1pY29uLWxnIj48L3NwYW4+CiAgICAgICAgICAgICAgICAgICAgIDwvYnV0dG9uPgogICAg ICAgICAgICAgICAgICAgICA8YnV0dG9uIHR5cGU9ImJ1dHRvbiIgY2xhc3M9ImJ0biBidG4tc2Vj b25kYXJ5IGJ0bi1zbSBsaXN0IiB0aXRsZT0ie3sgXygnVmlldyBhcyB0YWJsZScpIH19IiB0YWJp bmRleD0iMTAiPgotICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLWxp c3QgZmEtbGciPjwvc3Bhbj4KKyAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJm YSBmYS1saXN0IHNxbC1pY29uLWxnIj48L3NwYW4+CiAgICAgICAgICAgICAgICAgICAgIDwvYnV0 dG9uPgogICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgPC9kaXY+CmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYm9vdHN0cmFwLm92ZXJyaWRlcy5zY3NzIGIv d2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJhcC5vdmVycmlkZXMuc2NzcwppbmRleCA4 YWIxNWFkNS4uZmViZTdhZDcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19i b290c3RyYXAub3ZlcnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Jv b3RzdHJhcC5vdmVycmlkZXMuc2NzcwpAQCAtMjY2LDcgKzI2Niw2IEBAIHRkLnN3aXRjaC1jZWxs ID4gZGl2LmJvb3RzdHJhcC1zd2l0Y2ggewogCQkJYm9yZGVyOiBub25lICFpbXBvcnRhbnQ7CiAJ CQlwYWRkaW5nOiAkdGFicy1wYWRkaW5nOwogCQkJY29sb3I6ICRjb2xvci1mZy10aGVtZTsKLQkJ CWZvbnQtd2VpZ2h0OiBib2xkOwogCQkJJi5hY3RpdmUgewogCQkJCWJvcmRlci1ib3R0b206ICRh Y3RpdmUtYm9yZGVyICFpbXBvcnRhbnQ7CiAJCQkJY29sb3I6ICRjb2xvci1wcmltYXJ5OwpAQCAt MjkwLDEwICsyODksMTEgQEAgdGQuc3dpdGNoLWNlbGwgPiBkaXYuYm9vdHN0cmFwLXN3aXRjaCB7 CiAJbWFyZ2luLXJpZ2h0OiAwcmVtOwogCXBhZGRpbmctbGVmdDogMC41cmVtICFpbXBvcnRhbnQ7 CiAJcGFkZGluZy1yaWdodDogMXJlbSAhaW1wb3J0YW50OwotCW1pbi1oZWlnaHQ6ICR0aXRsZS1o ZWlnaHQ7CisJbWluLWhlaWdodDogJG5hdmJhci1oZWlnaHQ7CiAJcGFkZGluZzogMHJlbTsKIAlk aXNwbGF5OiBmbGV4OwogCWFsaWduLWl0ZW1zOiBjZW50ZXIgIWltcG9ydGFudDsKKwlmb250LXdl aWdodDogYm9sZDsKIH0KIAogLm5hdmJhci1icmFuZDpob3ZlciB7CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9zdGF0aWMvc2Nzcy9fY29kZW1pcnJvci5vdmVycmlkZXMuc2NzcyBiL3dlYi9wZ2Fk bWluL3N0YXRpYy9zY3NzL19jb2RlbWlycm9yLm92ZXJyaWRlcy5zY3NzCmluZGV4IDcwNzQ3Y2Vk Li5mMjIyMjAxNyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2NvZGVtaXJy b3Iub3ZlcnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2NvZGVtaXJy b3Iub3ZlcnJpZGVzLnNjc3MKQEAgLTksNiArOSw3IEBACiAKIC5Db2RlTWlycm9yIHsKICAgZm9u dC1zaXplOiAxZW07CisgIGZvbnQtZmFtaWx5OiBtb25vc3BhY2UsIG1vbm9zcGFjZTsKIH0KIAog LyogRW5zdXJlIHRoZSBjb2RlbWlycm9yIGVkaXRvciBkaXNwbGF5cyBmdWxsIGhlaWdodCBndXR0 ZXJzIHdoZW4gcmVzaXplZCAqLwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3Mv X3BnYWRtaW4uc3R5bGUuc2NzcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19wZ2FkbWluLnN0 eWxlLnNjc3MKaW5kZXggM2UxMzE4NDguLjFhZDRiOTFmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9zdGF0aWMvc2Nzcy9fcGdhZG1pbi5zdHlsZS5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRp Yy9zY3NzL19wZ2FkbWluLnN0eWxlLnNjc3MKQEAgLTE0NSwxNyArMTQ1LDE2IEBACiAKIEBtZWRp YSAobWluLXdpZHRoOiA3NjhweCkgewogICAucGctbmF2YmFyIHsKLSAgICBoZWlnaHQ6ICR0aXRs ZS1oZWlnaHQ7CisgICAgaGVpZ2h0OiAkbmF2YmFyLWhlaWdodDsKICAgfQogCiAgIC5wZy1kb2Nr ZXIgewotICAgIHRvcDogJHRpdGxlLWhlaWdodCAhaW1wb3J0YW50OworICAgIHRvcDogJG5hdmJh ci1oZWlnaHQgIWltcG9ydGFudDsKICAgfQogfQogCiAucGctbmF2YmFyIHsKICAgZm9udC1zaXpl OiAkbmF2YmFyLWZvbnQtc2l6ZTsKLSAgZm9udC13ZWlnaHQ6IGJvbGQ7CiAgIHBhZGRpbmctbGVm dDogMHJlbTsKICAgcGFkZGluZy1yaWdodDogMC41cmVtOwogICAmIC5uYXYtaXRlbSAubmF2LWxp bmt7CkBAIC0xNjMsNyArMTYyLDcgQEAKICAgfQogCiAgIC5wZy1uYXZiYXItYnJhbmQtYXJyb3cg ewotICAgIGJvcmRlcjogJHRpdGxlLWhlaWdodC8yIHNvbGlkICRjb2xvci1mZzsKKyAgICBib3Jk ZXI6ICRuYXZiYXItaGVpZ2h0LzIgc29saWQgJGNvbG9yLWZnOwogICAgIGJvcmRlci1yaWdodC1j b2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogdHJhbnNwYXJlbnQ7 CiAgICAgYm9yZGVyLXRvcC1jb2xvcjogdHJhbnNwYXJlbnQ7CmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9zdGF0aWMvc2Nzcy9fd2ViY2FiaW4ucGdhZG1pbi5zY3NzIGIvd2ViL3BnYWRtaW4vc3Rh dGljL3Njc3MvX3dlYmNhYmluLnBnYWRtaW4uc2NzcwppbmRleCA3OWY2OGVjYy4uNTVlMzU2Mjgg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL193ZWJjYWJpbi5wZ2FkbWluLnNj c3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3dlYmNhYmluLnBnYWRtaW4uc2NzcwpA QCAtNzksNyArNzksNiBAQAogICBjb2xvcjogJGNvbG9yLWZnLXRoZW1lOwogICBwYWRkaW5nOiAk dGFicy1wYWRkaW5nOwogICBtYXJnaW46IDBweDsKLSAgZm9udC13ZWlnaHQ6IGJvbGQ7CiB9CiAK IC53Y0Zsb2F0aW5nIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jlc291 cmNlcy9fZGVmYXVsdC52YXJpYWJsZXMuc2NzcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jl c291cmNlcy9fZGVmYXVsdC52YXJpYWJsZXMuc2NzcwppbmRleCAwNjBlOTE1Zi4uMWEyNjM3ODQg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jlc291cmNlcy9fZGVmYXVsdC52 YXJpYWJsZXMuc2NzcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9yZXNvdXJjZXMvX2Rl ZmF1bHQudmFyaWFibGVzLnNjc3MKQEAgLTE1NSw3ICsxNTUsOCBAQCAkZm9vdGVyLWhlaWdodC1j YWxjOiAkZm9vdGVyLW1pbi1oZWlnaHQrJGZvb3Rlci1wYWRkaW5nKjI7CiAkbmF2YmFyLWZvbnQt c2l6ZTogMC45MjVyZW07CiAkbmF2YmFyLXVzZXItZm9udC1zaXplOiAwLjg3NXJlbTsKIAotJG5h dmJhci1kcm9wZG93bi10b3A6IDEwMCU7CiskbmF2YmFyLWhlaWdodDogNDBweDsKKyRuYXZiYXIt ZHJvcGRvd24tdG9wOiAxMTAlOwogJGRyb3Bkb3duLXN1Ym1lbnUtdG9wOiAtJGRyb3Bkb3duLXNw YWNlcjsKIAogJHRhYmxlLWJnOiAkY29sb3ItYmctdGhlbWU7Cg== --000000000000b54b4b057ed74ddd--