From fbcd08efdf70536dd92305f7bc23fe492d42d64f Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:02:23 +0100 Subject: [PATCH 1/9] Init --- .../WindowsInstallerLink/_restart.jelly | 6 +-- .../WindowsInstallerLink/_restart.properties | 2 + .../hudson/util/HudsonIsLoading/index.jelly | 8 ++-- .../util/HudsonIsLoading/index.properties | 4 ++ .../util/HudsonIsLoading/index_bg.properties | 2 +- .../util/HudsonIsLoading/index_cs.properties | 2 +- .../util/HudsonIsLoading/index_da.properties | 2 +- .../util/HudsonIsLoading/index_de.properties | 2 +- .../util/HudsonIsLoading/index_es.properties | 2 +- .../util/HudsonIsLoading/index_fr.properties | 2 +- .../util/HudsonIsLoading/index_it.properties | 2 +- .../util/HudsonIsLoading/index_ja.properties | 2 +- .../util/HudsonIsLoading/index_ko.properties | 2 +- .../util/HudsonIsLoading/index_lt.properties | 2 +- .../util/HudsonIsLoading/index_lv.properties | 2 +- .../util/HudsonIsLoading/index_nl.properties | 2 +- .../util/HudsonIsLoading/index_pl.properties | 2 +- .../HudsonIsLoading/index_pt_BR.properties | 2 +- .../util/HudsonIsLoading/index_ru.properties | 2 +- .../util/HudsonIsLoading/index_sr.properties | 2 +- .../HudsonIsLoading/index_sv_SE.properties | 2 +- .../util/HudsonIsLoading/index_tr.properties | 2 +- .../HudsonIsLoading/index_zh_TW.properties | 2 +- .../util/HudsonIsRestarting/index.jelly | 8 ++-- .../util/HudsonIsRestarting/index.properties | 2 + .../HudsonIsRestarting/index_bg.properties | 2 +- .../HudsonIsRestarting/index_da.properties | 2 +- .../HudsonIsRestarting/index_de.properties | 2 +- .../HudsonIsRestarting/index_es.properties | 2 +- .../HudsonIsRestarting/index_fr.properties | 2 +- .../HudsonIsRestarting/index_it.properties | 2 +- .../HudsonIsRestarting/index_ja.properties | 2 +- .../HudsonIsRestarting/index_nb_NO.properties | 2 +- .../HudsonIsRestarting/index_nl.properties | 2 +- .../HudsonIsRestarting/index_pt_BR.properties | 2 +- .../HudsonIsRestarting/index_ru.properties | 2 +- .../HudsonIsRestarting/index_sr.properties | 2 +- .../HudsonIsRestarting/index_sv_SE.properties | 2 +- .../HudsonIsRestarting/index_uk.properties | 2 +- .../HudsonIsRestarting/index_zh_TW.properties | 2 +- war/src/main/scss/components/_spinner.scss | 12 +++--- war/src/main/scss/simple-page.scss | 41 +++++++++++++++++-- 42 files changed, 93 insertions(+), 58 deletions(-) create mode 100644 core/src/main/resources/hudson/util/HudsonIsLoading/index.properties create mode 100644 core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly index 6f04bbd02baf..b6746ee1abac 100644 --- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> - + @@ -40,7 +40,6 @@ THE SOFTWARE. -
@@ -48,8 +47,7 @@ THE SOFTWARE.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties new file mode 100644 index 000000000000..aa8045ec46d1 --- /dev/null +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties @@ -0,0 +1,4 @@ +Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\ + Jenkins is getting ready to work +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\ + Your browser will reload automatically when Jenkins is ready diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties index c4dbafc096d3..cf7a5415160a 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\ Браузърът ви ще се презареди автоматично, когато Jenkins е готов. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\ Изчакайте докато Jenkins стане готов за работа diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties index a6178e681dfb..0761811a1b6e 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Počkejte prosím, než aplikace Jenkins zcela naběhne -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jakmile bude Jenkins připraven, stránka se automaticky obnoví. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jakmile bude Jenkins připraven, stránka se automaticky obnoví. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties index e21aea6cced6..e6aa4d23e035 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Vent venligst imens Jenkins gør klar til at arbejde diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties index 5c8ce353b0a1..9ece73ccef71 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins wird gestartet. Bitte warten -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties index af8a8155bcd7..f78d460a63f1 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor espera hasta que Jenkins esté listo. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Su navegador recargará automáticamente esta página cuando Jenkins esté listo. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Su navegador recargará automáticamente esta página cuando Jenkins esté listo. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties index 1700e54e1d59..d71fa265cba9 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Merci d''attendre que Jenkins soit prêt -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties index d51ce8d127b6..8e12a9c9cd85 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties @@ -24,6 +24,6 @@ Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendere finché \ Jenkins si prepara a funzionare Starting\ Jenkins=Avvio di Jenkins in corso -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Quando \ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Quando \ Jenkins sarà pronto per funzionare, la finestra del browser si aggiornerà \ automaticamente. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties index ea257511d10f..0a936dbee9eb 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties @@ -22,5 +22,5 @@ Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\ Jenkinsの準備ができるまで、お待ちください。 -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\ Jenkinsの準備が完了すると、ブラウザは自動的にリロードされます。 diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties index 9cd2f2882b1b..81a6d940127c 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins가 준비 될 때까지 기다려주세요. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins가 준비 되면 자동 리로딩 합니다. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins가 준비 되면 자동 리로딩 합니다. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties index e58dc1096e11..558a943e51a5 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties @@ -3,4 +3,4 @@ # /jenkins-core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins ruošiamas darbui, prašome palaukti -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties index 5d2407f80bd1..0bfd3719f38e 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Lūdzu uzgaidiet, kamēr Jenkins sagatavojās darbam... -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties index 9020673e1798..eb3b8533cea2 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins is aan het opstarten. Gelieve even te wachten. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Uw browser zal zich vernieuwen wanneer Jenkins gereed is. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Uw browser zal zich vernieuwen wanneer Jenkins gereed is. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties index 0b15e437ed76..7db3190ae6fa 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Poczekaj proszę, aż Jenkins będzie gotowy do pracy -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy. Starting\ Jenkins=Uruchamianie Jenkinsa diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties index 1577f6d6549e..df7aaa90b4a5 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor aguarde enquanto o Jenkins se prepara para trabalhar -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto. Starting\ Jenkins=Iniciando\ o\ Jenkins diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties index 0b0c44865cf2..9c805a274e2d 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Пожалуйста, подождите. Jenkins готовится к работе -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Эта страница будет перезагружена, когда Jenkins будет готов. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Эта страница будет перезагружена, когда Jenkins будет готов. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties index ef611a407eff..94bcbab19fc6 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Молимо вас, сачекајте док се Jenkins припрема. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties index e8e233a4a78d..adda7b34729d 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Var god vänta medan Jenkins förbereds -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din webbläsare laddas om automatiskt när Jenkins är redo. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din webbläsare laddas om automatiskt när Jenkins är redo. Starting\ Jenkins=Jenkins startar upp \ No newline at end of file diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties index 75ceabc3dd0e..10eb48ee7efc 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins kullanıma hazır oluncaya kadar lütfen bekleyiniz -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir. diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties index e1c348f32d51..114bd9495e08 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins 就緒後，您的瀏覽器會自動重載頁面。 +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins 就緒後，您的瀏覽器會自動重載頁面。 Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins 準備要上工了，請耐心等候 diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly index c51e37e67687..f9e80ef85036 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> - + @@ -40,7 +40,6 @@ THE SOFTWARE. -
@@ -50,11 +49,10 @@ THE SOFTWARE. Jenkins logo

- ${%Please wait while Jenkins is restarting} - ... +

- ${%Your browser will reload automatically when Jenkins is ready.} + ${%Your browser will reload automatically when Jenkins is ready}

diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties new file mode 100644 index 000000000000..6ad13259188f --- /dev/null +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties @@ -0,0 +1,2 @@ +Please\ wait\ while\ Jenkins\ is\ restarting=\ + Jenkins is restarting diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties index 5008885a291a..95b4f88a2970 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties @@ -22,5 +22,5 @@ Please\ wait\ while\ Jenkins\ is\ restarting=\ Изчакайте докато Jenkins рестартира -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\ Браузър ви автоматично ще презареди страницата, когато Jenkins е готов. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties index 16914e8d8254..1f7882730cf4 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar. Please\ wait\ while\ Jenkins\ is\ restarting=Vent venligst imens Jenkins genstarter diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties index 1750883d183d..a16e4576f8b6 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties @@ -1,5 +1,5 @@ Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet. Bitte warten. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist. Safe\ Restart=Sicherer Neustart Builds\ on\ agents\ can\ usually\ continue.=Builds auf Agenten laufen in der Regel weiter. Restart=Neustarten diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties index 7c6125c37624..8d1fab12d96b 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ restarting=Por favor espera hasta que Jenkins acabe de reiniciarse. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Su navegador recargará esta página cuando Jenkins esté listo. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Su navegador recargará esta página cuando Jenkins esté listo. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties index efce31db91aa..4a5d1cb95b98 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties @@ -22,6 +22,6 @@ Restarting\ Jenkins=Redémarrage de Jenkins Please\ wait\ while\ Jenkins\ is\ restarting=Veuillez attendre pendant que Jenkins redémarre -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur se rafraîchira automatiquement quand Jenkins sera prêt. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Votre navigateur se rafraîchira automatiquement quand Jenkins sera prêt. Safe\ Restart=Redémarrage sans danger Builds\ on\ agents\ can\ usually\ continue.=Les builds sur les agents peuvent généralement se poursuivre. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties index 4f54ef52a89f..aa4e68436fc0 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties @@ -24,6 +24,6 @@ Please\ wait\ while\ Jenkins\ is\ restarting=Attendere finché Jenkins si sta \ riavviando Restarting\ Jenkins=Riavvio di Jenkins in corso -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Quando \ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Quando \ Jenkins sarà pronto per funzionare, la finestra del browser si aggiornerà \ automaticamente. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties index 76b280e6da63..745c7e62e47f 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties @@ -22,5 +22,5 @@ Please\ wait\ while\ Jenkins\ is\ restarting=\ Jenkinsが再起動するまでしばらくお待ちください -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\ +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\ Jenkinsの準備が完了すると、ブラウザは自動的にリロードされます。 diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties index a20538adecdb..f4c4fba9ba12 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ restarting=Vennligst vent mens Jenkins restartes -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Nettleseren vil automatisk lastes på nytt når Jenkins er klar +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Nettleseren vil automatisk lastes på nytt når Jenkins er klar diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties index 343d92136586..44f29d65aaad 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wordt herstart. Gelieve even te wachten. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Uw browser zal zich vernieuwen wanneer Jenkins gereed is. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Uw browser zal zich vernieuwen wanneer Jenkins gereed is. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties index 3e6f01596eb9..00302f959e8f 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. Please\ wait\ while\ Jenkins\ is\ restarting=Por favor aguarde enquanto o Jenkins está reiniciando -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto. Restarting\ Jenkins=Reiniciando\ o\ Jenkins diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties index 896b441f7fb9..1a4391795481 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ restarting=Пожалуйста, подождите, Jenkins перезагружается -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Когда перезагрузка будет завершена, страница должна автоматически обновиться +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Когда перезагрузка будет завершена, страница должна автоматически обновиться diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties index 028e5be0ff2b..107c867059be 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ restarting=Молимо вас, сачекајте док се поново покреће Jenkins. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман. diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties index f174baeca3eb..da4ee69d1100 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties @@ -1,7 +1,7 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ restarting=Vänta medan Jenkins startar om -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din webbläsare laddas om automatiskt när Jenkins är redo. +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din webbläsare laddas om automatiskt när Jenkins är redo. Restarting\ Jenkins=Jenkins startar om Safe\ Restart=Säker omstart diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties index b67d35e570a1..55deae8f544e 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors Please\ wait\ while\ Jenkins\ is\ restarting=Зачекайте, будь ласка, поки Jenkins перегрузиться -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш браузер буде прегружено після того як Jenkins буде готовий +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш браузер буде прегружено після того як Jenkins буде готовий diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties index 7e5a5f204148..90e408d30050 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins 就緒後，您的瀏覽器會自動重載頁面。 +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins 就緒後，您的瀏覽器會自動重載頁面。 Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins 重新啟動中，請耐心等候 diff --git a/war/src/main/scss/components/_spinner.scss b/war/src/main/scss/components/_spinner.scss index af5732ca8320..c1a3fde2dd9c 100644 --- a/war/src/main/scss/components/_spinner.scss +++ b/war/src/main/scss/components/_spinner.scss @@ -10,23 +10,23 @@ &::after { content: ""; display: inline-block; - width: 1.3rem; - height: 1.3rem; + width: 0.9lh; + height: 0.9lh; border-radius: 100%; - border: 0.175rem solid currentColor; + border: 0.125lh solid currentColor; } &::before { position: relative; - margin-right: 0.75rem; + margin-right: 0.5lh; opacity: 0.2; - align-self: flex-start; } &::after { position: absolute; - top: 0; + top: 50%; left: 0; + translate: 0 -0.45lh; clip-path: inset(0 0 50% 50%); animation: loading-spinner 1s infinite linear; diff --git a/war/src/main/scss/simple-page.scss b/war/src/main/scss/simple-page.scss index 08bb4f1493e2..881bbdf8d227 100644 --- a/war/src/main/scss/simple-page.scss +++ b/war/src/main/scss/simple-page.scss @@ -22,6 +22,7 @@ * THE SOFTWARE. */ @use "./base/core"; +@use "./components/spinner"; @use "./pages/sign-in-register"; .simple-page h1 { @@ -36,11 +37,10 @@ } .simple-page .safe-restarting { - font-size: var(--font-size-sm); - padding: 15px; + padding: 10px 30px; border-radius: 10px; text-align: center; - margin: 5% auto auto; + margin-top: 2rem; background-color: var(--alert-success-bg-color); border: 1px solid var(--alert-success-border-color); @@ -90,7 +90,7 @@ } .simple-page .logo > img { - height: 130px; + height: 140px; } .simple-page form .submit input { @@ -108,3 +108,36 @@ .simple-page .jenkins-alert { color: var(--danger-color, #c4000a); } + +@keyframes dotheroar { + from { + scale: 97.5%; + opacity: 0; + filter: blur(1px); + } +} + +.signupIntroDefault { + display: flex; + flex-direction: column; + gap: 1rem; + animation: dotheroar 0.4s both 0.2s; + + * { + font-size: 1rem; + margin: 0; + } +} + +.loading { + margin: 1rem 0 0; + + p { + font-weight: 500; + font-size: 1.125rem; + } +} + +.restarting { + color: var(--text-color-secondary); +} From eea8cc9cb127b4f65c1db6343abe1b38c74cb85c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 2 Sep 2024 21:14:44 +0100 Subject: [PATCH 2/9] Update simple-page.scss --- war/src/main/scss/simple-page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/src/main/scss/simple-page.scss b/war/src/main/scss/simple-page.scss index 881bbdf8d227..c856a2d699bd 100644 --- a/war/src/main/scss/simple-page.scss +++ b/war/src/main/scss/simple-page.scss @@ -74,7 +74,7 @@ display: flex; align-items: center; justify-content: center; - min-height: 90vh; + min-height: 100vh; } .simple-page .jenkins-button { From 29eec13ac381833f5e6ac8fb971e4054af94e000 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:36:14 +0100 Subject: [PATCH 3/9] Simplify --- .../WindowsInstallerLink/_restart.jelly | 18 ++++---- .../hudson/util/HudsonIsLoading/index.jelly | 20 ++++----- .../util/HudsonIsRestarting/index.jelly | 41 +++++++++---------- war/src/main/scss/simple-page.scss | 8 ++-- 4 files changed, 41 insertions(+), 46 deletions(-) diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly index b6746ee1abac..5423852829c6 100644 --- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly @@ -43,16 +43,14 @@ THE SOFTWARE.
-