diff --git a/common/changes/8.0.0/changes.html b/common/changes/8.0.0/changes.html new file mode 100644 index 000000000..886142dba --- /dev/null +++ b/common/changes/8.0.0/changes.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 8.0.0 - {{DATE}}

+ +

New Features

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ + +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ diff --git a/common/changes/8.0.0/changes_ru.html b/common/changes/8.0.0/changes_ru.html new file mode 100644 index 000000000..5318021ed --- /dev/null +++ b/common/changes/8.0.0/changes_ru.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 8.0.0 - {{DATE}}

+ +

Новые функции

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ + +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ diff --git a/common/loginpage/locale/be.js b/common/loginpage/locale/be.js index af37189f2..7647a24ae 100644 --- a/common/loginpage/locale/be.js +++ b/common/loginpage/locale/be.js @@ -56,6 +56,7 @@ l10n.be = { actActivate: 'Актываваць', actAbout: 'Пра праграму', actSettings: 'Налады', + actTemplates: 'Шаблоны', licKeyHolder: 'ключ актывацыі ўводу', btnActivate: 'Актываваць', licGetLicense: 'Атрымаць ключ актывацыі', @@ -92,9 +93,19 @@ l10n.be = { settOptLaunchInWindow: 'У акне', settSpellcheckDetection: 'Выяўленне мовы правапісу', settOptDisabled: 'Адключана', + settOptEnabled: 'Уключана', aboutChangelog: 'Спіс зменаў', updateNoUpdates: 'Праграма абноўленая', updateAvialable: 'Даступна версія $1. Пстрыкніце, каб спампаваць.', settOptThemeSystem: 'Сістэмная', settOptThemeContrastDark: 'Кантрасная цёмная', + settAUpdateMode: 'Рэжым аўтаабнаўлення', + settOptAUpdateSilent: 'Ціхі рэжым', + settOptAUpdateAsk: 'Папрасіць спампаваць', + updateDownloadFinished: 'Спампоўка скончана. Націсніце, каб усталяваць', + updateDownloadCanceled: 'Спампоўка скасавана', + updateDownloadProgress: 'Спампоўка $1%. Націсніце, каб спыніць', + settOptDescDisabled: "Аўтаматычная праверка абнаўленняў будзе адключана", + settOptDescAUpdateSilent: "Спампоўваць абнаўленні і пытацца перад уста-ноўкай", + settOptDescAUpdateAsk: "Вы будзеце ведаць пра ўсе этапы абнаўлення", } diff --git a/common/loginpage/locale/de.js b/common/loginpage/locale/de.js index 19c65bd20..6000d0232 100644 --- a/common/loginpage/locale/de.js +++ b/common/loginpage/locale/de.js @@ -99,7 +99,7 @@ l10n.de = { updateAvialable: 'Version $1 ist verfügbar. Klicken Sie hier zum Herunterladen.', settOptThemeSystem: 'Wie im System', settOptThemeContrastDark: 'Dunkler Kontrast', - settAUpdateMode: 'utomatische Aktualisierung', + settAUpdateMode: 'Automatische Aktualisierung', settOptAUpdateSilent: 'Lautlos', settOptAUpdateAsk: 'Anfrage zum Herunterladen', updateDownloadFinished: 'Herunterladen abgeschlossen. Für Installation hier klicken', diff --git a/common/loginpage/locale/ga.js b/common/loginpage/locale/ga.js index b66491445..505fc4e9b 100644 --- a/common/loginpage/locale/ga.js +++ b/common/loginpage/locale/ga.js @@ -56,6 +56,7 @@ l10n.ga = { actActivate: 'Gníomhachtaigh', actAbout: 'Faoi', actSettings: 'Socruithe', + actTemplates: 'Teimpléid', licKeyHolder: 'eochair gníomhachtaithe ionchuir', btnActivate: 'Gníomhachtaigh', licGetLicense: 'Faigh ceadúnas anois', @@ -90,4 +91,21 @@ l10n.ga = { settOptLaunchMode: 'Oscail comhad', settOptLaunchInTab: 'Sa chluaisín', settOptLaunchInWindow: 'I bhfuinneog', + settSpellcheckDetection: 'Brath teanga litrithe', + settOptDisabled: 'Díchumasaithe', + settOptEnabled: 'Cumasaithe', + aboutChangelog: 'Changelog', + updateNoUpdates: 'Aip suas chun dáta', + updateAvialable: 'Tá leagan $1 ar fáil. Cliceáil le híoslódáil.', + settOptThemeSystem: 'Córas mar in gcéanna', + settOptThemeContrastDark: 'Codarsnacht dorcha', + settAUpdateMode: 'Mód uath-nuashonraithe', + settOptAUpdateSilent: 'Mód chiúin', + settOptAUpdateAsk: 'Iarr chun íoslódáil', + updateDownloadFinished: 'Críochnaithe ag íoslódáil. Cliceáil chun suiteáil', + updateDownloadCanceled: 'Cealaíodh an íoslódáil', + updateDownloadProgress: '$1% á íoslódáil. Cliceáil chun stop a chur leis', + settOptDescDisabled: "Díchumasófar nuashonruithe atá le uathsheiceáil", + settOptDescAUpdateSilent: "Íoslódáil na nuashonruithe agus fiafraigh roimh iad a shuiteáil", + settOptDescAUpdateAsk: "Cuirfear ar an eolas thú faoi gach céim nuashonruithe", } diff --git a/common/loginpage/locale/lt.js b/common/loginpage/locale/lt.js index 667596b48..78c36da0d 100644 --- a/common/loginpage/locale/lt.js +++ b/common/loginpage/locale/lt.js @@ -91,4 +91,21 @@ l10n.lt = { settOptLaunchMode: 'Atidayti failą', settOptLaunchInTab: 'Skirtuke', settOptLaunchInWindow: 'Lange', + settSpellcheckDetection: 'Rašymo kalbos aptikimas', + settOptDisabled: 'Išjungtas', + settOptEnabled: 'Įjungtas', + aboutChangelog: 'Pakeitimų sąrašas', + updateNoUpdates: 'Programa atnaujinta', + updateAvialable: 'Galima versija už 1 JAV dolerį. Spustelėkite norėdami atsisiųsti.', + settOptThemeSystem: 'Tokia pati kaip sistema', + settOptThemeContrastDark: 'Tamsus kontrastas', + settAUpdateMode: 'Automatinio atnaujinimo režimas', + settOptAUpdateSilent: 'Tylusis režimas', + settOptAUpdateAsk: 'Prašyti atsisiųsti', + updateDownloadFinished: 'Atsisiuntimas baigtas. Spustelėkite kad įdiegtumėte', + updateDownloadCanceled: 'DAtsisiuntimas atšauktas', + updateDownloadProgress: 'Atsisiunčiama 1%. Spustelėkite, jei norite sustabdyti', + settOptDescDisabled: "Automatinis naujinimų tikrinimas bus išjungtas", + settOptDescAUpdateSilent: "Atsisiųsti naujinimus ir klausti prieš įdiegiant", + settOptDescAUpdateAsk: "Jums bus pranešta apie visus atnaujinimo žingsnius", } diff --git a/common/loginpage/noconnect/code.js b/common/loginpage/noconnect/code.js index 7a584e29e..c50761a29 100644 --- a/common/loginpage/noconnect/code.js +++ b/common/loginpage/noconnect/code.js @@ -1,4 +1,4 @@ -{ +{ !window.l10n && (window.l10n = {boxNoConnect:{}}); !window.l10n.boxNoConnect && (window.l10n.boxNoConnect = {}); @@ -7,8 +7,12 @@ const langs = { en: { msgNoConn: 'Internet connection failed...', msgNoConnDesc: 'Check connection', + msgFileNoConn: 'Check your internet connection', msgFileNoConnDesc: "You are unable to edit the document because the Internet connection is lost or restricted. Please check your connection and re-open the document to continue.", + msgTemplatesNoConn: 'Check your internet connection', msgTemplatesNoConnDesc: "Couldn't load this section because you are experiencing possible network issues. Please check your internet connection and try again.", + msgFileError: 'Oops! Something went wrong', + msgFileErrorDesc: "We lost access to your file due to a lack of memory or some other reason. Please don't worry and try reopening the file. Close this tab to continue", } } @@ -18,6 +22,13 @@ const error_box = function() { return (l10n.boxNoConnect[l] && l10n.boxNoConnect[l][n]) || langs.en[n]; } + const page_t10s = { + "def": ["msgNoConn", "msgNoConnDesc"], + "cloudfile": ["msgFileNoConn", "msgFileNoConnDesc"], + "templates": ["msgTemplatesNoConn", "msgTemplatesNoConnDesc"], + "fileerr": ["msgFileError", "msgFileErrorDesc"], + }; + const _fix_lang = l => { if ( l && l10n && l10n.boxNoConnect ) { if ( l10n.boxNoConnect[l]) @@ -45,23 +56,26 @@ const error_box = function() { if ( !args.parent ) args.parent = document.body; args.parent.insertAdjacentHTML('beforeend', html_); - _page = args.page; + _page = args.page || 'def'; this.translate(args.lang); }, translate: function(lang) { + const page = !page_t10s[_page] ? 'def' : _page; lang = _fix_lang(lang); const ms = document.getElementById("idx-msg-short"); - if ( ms ) ms.innerText = _tr("msgNoConn", lang); + if ( ms ) ms.innerText = _tr(page_t10s[page][0], lang); const ml = document.getElementById("idx-msg-long"); if ( ml ) { - if ( _page == 'file' ) - ml.innerText = _tr("msgFileNoConnDesc", lang); - else - if ( _page == 'templates') - ml.innerText = _tr("msgTemplatesNoConnDesc", lang); - else ml.innerText = _tr("msgNoConnDesc", lang); + ml.innerText = _tr(page_t10s[page][1], lang); + + // if ( _page == 'file' ) { + // ml.innerText = _tr("msgFileNoConnDesc", lang); + // } else + // if ( _page == 'templates') { + // ml.innerText = _tr("msgTemplatesNoConnDesc", lang); + // } else ml.innerText = _tr("msgNoConnDesc", lang); } }, } diff --git a/common/loginpage/noconnect/connection_error.svg b/common/loginpage/noconnect/connection_error.svg index d9bafd9c8..40febfeba 100644 --- a/common/loginpage/noconnect/connection_error.svg +++ b/common/loginpage/noconnect/connection_error.svg @@ -1,5 +1,14 @@ - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/common/loginpage/noconnect/index.html.deploy b/common/loginpage/noconnect/index.html.deploy index de1500023..f6450b9c2 100644 --- a/common/loginpage/noconnect/index.html.deploy +++ b/common/loginpage/noconnect/index.html.deploy @@ -37,9 +37,9 @@ } svg.icon { - width: 170px; - height: 170px; - margin-bottom: 20px; + width: 300px; + height: 300px; + /* margin-bottom: 20px; */ } .description { diff --git a/common/loginpage/noconnect/l10n/ru.js b/common/loginpage/noconnect/l10n/ru.js index 2ea72411a..c00cb43b4 100644 --- a/common/loginpage/noconnect/l10n/ru.js +++ b/common/loginpage/noconnect/l10n/ru.js @@ -1,4 +1,10 @@ l10n.boxNoConnect.ru = { msgNoConn: 'Страница не доступна...', msgNoConnDesc: 'Проверьте соединение', + msgFileNoConn: 'Check your internet connection', + msgFileNoConnDesc: "You are unable to edit the document because the Internet connection is lost or restricted. Please check your connection and re-open the document to continue.", + msgTemplatesNoConn: 'Check your internet connection', + msgTemplatesNoConnDesc: "Couldn't load this section because you are experiencing possible network issues. Please check your internet connection and try again.", + msgFileError: 'Oops! Something went wrong', + msgFileErrorDesc: "We lost access to your file due to a lack of memory or some other reason. Please don't worry and try reopening the file. Close this tab to continue", } diff --git a/common/loginpage/noconnect/styles.css b/common/loginpage/noconnect/styles.css index 435b9cbb5..9cef8b99b 100644 --- a/common/loginpage/noconnect/styles.css +++ b/common/loginpage/noconnect/styles.css @@ -12,9 +12,9 @@ } .box-connection-error svg.icon { - width: 170px; - height: 170px; - margin-bottom: 20px; + width: 300px; + height: 300px; + /* margin-bottom: 20px; */ } .box-connection-error .description { diff --git a/common/loginpage/providers/moodle/assets/buttonlogo.svg b/common/loginpage/providers/moodle/assets/buttonlogo.svg index 3659ac5b7..3165b538b 100644 --- a/common/loginpage/providers/moodle/assets/buttonlogo.svg +++ b/common/loginpage/providers/moodle/assets/buttonlogo.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/common/loginpage/providers/moodle/assets/buttonlogo_dark.svg b/common/loginpage/providers/moodle/assets/buttonlogo_dark.svg index 34bdcd139..d48a7164f 100644 --- a/common/loginpage/providers/moodle/assets/buttonlogo_dark.svg +++ b/common/loginpage/providers/moodle/assets/buttonlogo_dark.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/common/loginpage/res/img/connect1-dark.svg b/common/loginpage/res/img/connect1-dark.svg index 3a081c21c..b651408bc 100644 --- a/common/loginpage/res/img/connect1-dark.svg +++ b/common/loginpage/res/img/connect1-dark.svg @@ -1 +1,79 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/connect1-light.svg b/common/loginpage/res/img/connect1-light.svg index ca9f4ac30..918f8a1a8 100644 --- a/common/loginpage/res/img/connect1-light.svg +++ b/common/loginpage/res/img/connect1-light.svg @@ -1 +1,79 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/connect2-dark.svg b/common/loginpage/res/img/connect2-dark.svg index b60047ec7..546b02e9b 100644 --- a/common/loginpage/res/img/connect2-dark.svg +++ b/common/loginpage/res/img/connect2-dark.svg @@ -1 +1,33 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/connect2-light.svg b/common/loginpage/res/img/connect2-light.svg index 709312859..6406dc302 100644 --- a/common/loginpage/res/img/connect2-light.svg +++ b/common/loginpage/res/img/connect2-light.svg @@ -1 +1,33 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/docm.svg b/common/loginpage/res/img/formats-svg/docm.svg new file mode 100644 index 000000000..1d13a41b9 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/docm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/dotm.svg b/common/loginpage/res/img/formats-svg/dotm.svg new file mode 100644 index 000000000..c6abf07c2 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/dotm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/fodp.svg b/common/loginpage/res/img/formats-svg/fodp.svg new file mode 100644 index 000000000..66ded0b19 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/fodp.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/fods.svg b/common/loginpage/res/img/formats-svg/fods.svg new file mode 100644 index 000000000..0923aa015 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/fods.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/fodt.svg b/common/loginpage/res/img/formats-svg/fodt.svg new file mode 100644 index 000000000..b214921be --- /dev/null +++ b/common/loginpage/res/img/formats-svg/fodt.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/md.svg b/common/loginpage/res/img/formats-svg/md.svg new file mode 100644 index 000000000..ae8d22266 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/md.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/neutral.svg b/common/loginpage/res/img/formats-svg/neutral.svg new file mode 100644 index 000000000..8fc7a69de --- /dev/null +++ b/common/loginpage/res/img/formats-svg/neutral.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/potm.svg b/common/loginpage/res/img/formats-svg/potm.svg new file mode 100644 index 000000000..2273a016b --- /dev/null +++ b/common/loginpage/res/img/formats-svg/potm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/ppsm.svg b/common/loginpage/res/img/formats-svg/ppsm.svg new file mode 100644 index 000000000..06973c9a0 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/ppsm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/pptm.svg b/common/loginpage/res/img/formats-svg/pptm.svg new file mode 100644 index 000000000..a0c51fa42 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/pptm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/xlsb.svg b/common/loginpage/res/img/formats-svg/xlsb.svg new file mode 100644 index 000000000..b5df27922 --- /dev/null +++ b/common/loginpage/res/img/formats-svg/xlsb.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/formats-svg/xlsm.svg b/common/loginpage/res/img/formats-svg/xlsm.svg new file mode 100644 index 000000000..e9b1f95dc --- /dev/null +++ b/common/loginpage/res/img/formats-svg/xlsm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/common/loginpage/res/img/update_status/error.svg b/common/loginpage/res/img/update_status/error.svg index 17f8df147..b9b8d5512 100644 --- a/common/loginpage/res/img/update_status/error.svg +++ b/common/loginpage/res/img/update_status/error.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/common/loginpage/res/img/update_status/lastcheck.svg b/common/loginpage/res/img/update_status/lastcheck.svg index 3fe5e1cc7..0df668c4e 100644 --- a/common/loginpage/res/img/update_status/lastcheck.svg +++ b/common/loginpage/res/img/update_status/lastcheck.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/common/loginpage/res/img/update_status/load.svg b/common/loginpage/res/img/update_status/load.svg index 2e1ae93b2..1bbab9067 100644 --- a/common/loginpage/res/img/update_status/load.svg +++ b/common/loginpage/res/img/update_status/load.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/common/loginpage/res/img/welcome-dark.svg b/common/loginpage/res/img/welcome-dark.svg index 569a5fe7a..cd8921871 100644 --- a/common/loginpage/res/img/welcome-dark.svg +++ b/common/loginpage/res/img/welcome-dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/common/loginpage/res/img/welcome-light.svg b/common/loginpage/res/img/welcome-light.svg index 29e9d3f41..8b7787840 100644 --- a/common/loginpage/res/img/welcome-light.svg +++ b/common/loginpage/res/img/welcome-light.svg @@ -1 +1,56 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/loginpage/src/css/rtl.less b/common/loginpage/src/css/rtl.less new file mode 100644 index 000000000..752b3098d --- /dev/null +++ b/common/loginpage/src/css/rtl.less @@ -0,0 +1,115 @@ +.rtl { + .tool-quick-menu { + padding: 0 27px 28px 0; + + > li { + &.menu-item { + padding: 5px 0 5px 20px; + } + + a { + .icon { + margin-right: 0; + margin-left: 19px; + } + } + } + } + + .table-caption { + text-align: right; + } + + .table-files { + caption { + text-align: right; + } + + td, th { + text-align: right; + } + + .cicon { + // padding: 0 16px 0 0; + } + } + + .lst-tools { + text-align: right; + } + + .logout { + &[tooltip]:before { + left: 120%; + right: inherit; + } + } + + #box-portals { + .logout { + .icon { + transform: rotate(180deg); + } + } + } + + .settings-field { + text-align: right; + } + + #caption-restart { + text-align: right; + } + + #sett-box-user { + input { + margin-left: 20px; + margin-right: 0; + } + } + + .checkbox { + margin-right: initial; + margin-left: 16px; + + &::before { + right: 0; + left: initial; + } + + &::after { + right: 7px; + left: initial; + } + } + + .box-ver { + text-align: right; + } + + #idx-about-cut-logo { + margin-right: 0; + margin-left: 15px; + } + + .box-cmp-select { + .btn { + padding-left: 35px; + padding-right: 15px; + } + } + + .bootstrap-select .dropdown-toggle .caret { + left: 12px; + right: inherit; + } + + .bs3.bootstrap-select .dropdown-toggle .filter-option { + padding-right: initial; + } + + #idx-update-cnt #idx-update-status-icon { + margin-left: 8px; + margin-right: initial; + } +} diff --git a/common/loginpage/src/formats.png b/common/loginpage/src/formats.png index c6e450c10..dec3812b0 100644 Binary files a/common/loginpage/src/formats.png and b/common/loginpage/src/formats.png differ diff --git a/common/loginpage/src/formats@1.25x.png b/common/loginpage/src/formats@1.25x.png index 60a29013a..f46cc0d2e 100644 Binary files a/common/loginpage/src/formats@1.25x.png and b/common/loginpage/src/formats@1.25x.png differ diff --git a/common/loginpage/src/formats@1.5x.png b/common/loginpage/src/formats@1.5x.png index 352cb5eb0..9c113f72a 100644 Binary files a/common/loginpage/src/formats@1.5x.png and b/common/loginpage/src/formats@1.5x.png differ diff --git a/common/loginpage/src/formats@1.75x.png b/common/loginpage/src/formats@1.75x.png index 9bb4bfabe..1dc51251b 100644 Binary files a/common/loginpage/src/formats@1.75x.png and b/common/loginpage/src/formats@1.75x.png differ diff --git a/common/loginpage/src/formats@2x.png b/common/loginpage/src/formats@2x.png index 91182920f..7fa409c9e 100644 Binary files a/common/loginpage/src/formats@2x.png and b/common/loginpage/src/formats@2x.png differ diff --git a/common/loginpage/src/locale.js b/common/loginpage/src/locale.js index 09e4c8307..0a4f4a41e 100644 --- a/common/loginpage/src/locale.js +++ b/common/loginpage/src/locale.js @@ -142,6 +142,7 @@ l10n.en = { settOptDescDisabled: "Auto checking updates will be disabled", settOptDescAUpdateSilent: "Download updates and ask before install", settOptDescAUpdateAsk: "You will be notified about all updates steps", + settRtlMode: "RTL Interface", } diff --git a/common/loginpage/src/panels.js b/common/loginpage/src/panels.js index 4bfa3debf..69aa274a1 100644 --- a/common/loginpage/src/panels.js +++ b/common/loginpage/src/panels.js @@ -35,6 +35,16 @@ $(document).ready(function() { $('.tool-menu').on('click', '> .menu-item > a', onActionClick); $('.tool-quick-menu .menu-item a').click(onNewFileClick); + if ( window.utils.isWinXp ) { + $('a[action] use').each((i, e) => { + const _attr_href = e.getAttribute('href'); + if ( !!_attr_href ) { + const $el = $(e), $parent = $el.parent(); + $el.remove(); + $parent.html(``); + } + }); + } !window.app && (window.app = {controller:{}}); !window.app.controller && (window.app.controller = {}); @@ -60,8 +70,11 @@ $(document).ready(function() { selectAction('welcome'); localStorage.setItem('welcome', 'have been'); - } else - selectAction('recent'); + } else { + if ( !!utils.inParams.panel && $(`.action-panel.${utils.inParams.panel}`).length ) + selectAction(utils.inParams.panel); + else selectAction('recent'); + } $('#placeholder').on('click', '.newportal', function(){ CommonEvents.fire("portal:create"); @@ -128,6 +141,8 @@ function onActionClick(e) { }; function selectAction(action) { + if ( !$(`.action-panel.${action}`).length ) return; + $('.tool-menu > .menu-item').removeClass('selected'); $('.tool-menu a[action='+action+']').parent().addClass('selected'); $('.action-panel').hide(); diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js index c93a701e3..e7210d037 100644 --- a/common/loginpage/src/panelsettings.js +++ b/common/loginpage/src/panelsettings.js @@ -80,11 +80,13 @@ } } - const write_theme_css = function (css) { + const write_theme_css = function (css, id) { if ( !!css ) { + let style = document.createElement('style'); style.type = 'text/css'; style.innerHTML = css; + style.setAttribute('data-theme-id', id); document.getElementsByTagName('head')[0].appendChild(style); } } @@ -93,7 +95,7 @@ for ( const t of nativevars.localthemes ) { const _css = create_colors_css(t.id, t.colors); if ( _css ) { - write_theme_css(_css); + write_theme_css(_css, t.id); themes_map[t.id] = {text: t.name, type: t.type, l10n: t.l10n}; } } @@ -179,7 +181,7 @@