Changed all the html into go using go-elem #2161
Conversation
|
@nblock if you have some time, can you do a quick skim of the content for windows and apple? |
|
@amha-mersha can you delete the HTML templates so we are sure noone will update them in error? |
amha-mersha
force-pushed
the
amha.refactoring_html_codes_using_goelem
branch
from
ca8521a
to
1e8fc3e
Compare
Sure, but I got this on I manually fixed the checksum in |
| elem.Body(attrs.Props{ | ||
| attrs.Style : bodyStyle.ToInline(), | ||
| }, | ||
| headerOne("headscale: Windows configuration"), |
hscontrol/templates/apple.go
Outdated
| headerTwo("GUI"), | ||
| elem.Ol(nil, | ||
| elem.Li(nil, | ||
| elem.Text("Install the official Tailscale iOS client from the"), |
There was a problem hiding this comment.
The space between from the and the appstore link is missing:
hscontrol/templates/apple.go
Outdated
| ), | ||
| elem.Li(nil, | ||
| elem.Text("Open Tailscale and make sure you are"), | ||
| elem.I(nil, elem.Text("not")), |
There was a problem hiding this comment.
When rendered, there is no space between those elements:
| ), | ||
| elem.Li(nil, | ||
| elem.Text("Restart the app by closing it from the iOS app switcher, open the app and select the regular sign in option"), | ||
| elem.I(nil, elem.Text("(non-SSO)")), |
hscontrol/templates/apple.go
Outdated
| ), | ||
| ), | ||
| elem.Li(nil, | ||
| elem.Text(fmt.Sprintf(`Enter "%s" under "Alternate Coordination Server URL`,url)), |
There was a problem hiding this comment.
The closing " is missing after Coordination Server URL
amha-mersha
force-pushed
the
amha.refactoring_html_codes_using_goelem
branch
from
1e8fc3e
to
94043af
Compare
|
@nblock I think it is now fixed |
That was quick, thx! Found one additional location where the space is lost:
|
amha-mersha
force-pushed
the
amha.refactoring_html_codes_using_goelem
branch
from
94043af
to
5201cdf
Compare
|
how about now @nblock . sorry to take your time for this things |
|
Linter and |
|
A rebase should also fix the failing integration tests. |
|
So should I first rebase and commit |
|
yep that sounds best |
Created templates package in ./hscontrol/templates.
Moved the registerWebAPITemplate into the templates package as a function to be called.
Replaced the apple and windows html files with go-elem.
amha-mersha
force-pushed
the
amha.refactoring_html_codes_using_goelem
branch
from
5201cdf
to
5c226e1
Compare
|
I have rebased and pushed again |
|
Think the nix flake needs to be update again, haha, we are very close! |
|
do I update that and how |
|
In the failing build there is a new hash that needs to replace the old one one flake.nix, so a search replace should be good.
Sent from Proton Mail for iOS
On Thu, Oct 3, 2024 at 13:44, Amha Mersha ***@***.***> wrote: do I update that and how —
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because your review was requested.Message ID: ***@***.***>
|
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
|
I fixed it up and will merge it when the test runs :) Thanks @amha-mersha, if you feel like more challenges there is one linked in the issue for OIDC page that is trickier because it has more CSS. |
|
Thank you @kradalby for taking the time and guiding me. And for the other one, sure I look into it and get back to you |
|
Could you share me the issue, I couldn't find it. |
Created templates package in ./hscontrol/templates. Moved the registerWebAPITemplate into the templates package as a function to be called.
Replaced the apple and windows html files with go-elem.