diff --git a/common/loginpage/src/css/colors_contrast_dark.less b/common/loginpage/src/css/colors_contrast_dark.less index 4e8e2af47..13641b694 100644 --- a/common/loginpage/src/css/colors_contrast_dark.less +++ b/common/loginpage/src/css/colors_contrast_dark.less @@ -42,6 +42,7 @@ --text-link: #acbfff; --text-inverse: #121212; --text-contrast-background: #fff; + --text-negative: #f62211; --icon-normal: #e8e8e8; diff --git a/common/loginpage/src/css/colors_dark.less b/common/loginpage/src/css/colors_dark.less index 1cce096de..a002fc2c8 100644 --- a/common/loginpage/src/css/colors_dark.less +++ b/common/loginpage/src/css/colors_dark.less @@ -42,6 +42,7 @@ --text-link: #acbfff; --text-inverse: #333; --text-contrast-background: #fff; + --text-negative: #f62211; --icon-normal: fade(#fff, 80%); diff --git a/common/loginpage/src/css/styles.less b/common/loginpage/src/css/styles.less index 301c783c0..a579c115d 100644 --- a/common/loginpage/src/css/styles.less +++ b/common/loginpage/src/css/styles.less @@ -821,7 +821,12 @@ li.menu-item { } #box-recent { + display: flex; padding-bottom: 32px; + + &.empty { + display: none; + } } #box-recovery { @@ -2091,9 +2096,40 @@ li.menu-item { } } + .status-field.hbox { + padding-bottom: 10px; + } + #idx-update-status-text { font-size: 14px; } + + #idx-update-status-icon { + min-width: 28px; + width: 28px; + height: 28px; + margin-right: 8px; + + &[data-icon=success] { + fill: #95C038; + } + &[data-icon=error] { + fill: #FF6F3D; + } + &[data-icon=load], &[data-icon=lastcheck] { + fill: #5DC0E8; + } + + &[data-icon=load] { + animation: rotate 1.5s linear infinite; + } + + @keyframes rotate { + to { + transform: rotate(360deg); + } + } + } } #idx-update-btnaction { diff --git a/common/loginpage/src/dnd-file-zone.js b/common/loginpage/src/dnd-file-zone.js index 416e80b96..81bc25f1c 100644 --- a/common/loginpage/src/dnd-file-zone.js +++ b/common/loginpage/src/dnd-file-zone.js @@ -18,7 +18,7 @@ window.DnDFileZone = function () { $parent = parentElement; $el = $parent.append(_template).find('.dnd-zone'); - $el.find('a').bind('click', function () { + $el.find('button').bind('click', function () { openFile(OPEN_FILE_FOLDER, ''); }); }, diff --git a/common/loginpage/src/panelabout.js b/common/loginpage/src/panelabout.js index 302a1e57f..4f70217de 100644 --- a/common/loginpage/src/panelabout.js +++ b/common/loginpage/src/panelabout.js @@ -72,13 +72,16 @@ var _lang = utils.Lang; const _updates_status = `
-
- -
-
- -
-
`; +
+ + + + +
+
+ +
+ `; let _html = `
diff --git a/common/loginpage/src/panelrecent.js b/common/loginpage/src/panelrecent.js index c87870b41..33b294c07 100644 --- a/common/loginpage/src/panelrecent.js +++ b/common/loginpage/src/panelrecent.js @@ -141,13 +141,13 @@
- - + + ${info.crypted ? ` ` : ''} - ${!isSvgIcons ? `` :''} + ${!isSvgIcons ? `` :''}

${info.name}

${info.ext} @@ -290,7 +290,7 @@ this.rawRecents = undefined; } - this.view.$boxRecent.css('display', collectionRecents.size() > 0 ? 'flex' : 'none'); + // this.view.$boxRecent.css('display', collectionRecents.size() > 0 ? 'flex' : 'none'); // requestAnimationFrame(() => this.view.updateListSize()); if (collectionRecents.size() > 0 || collectionRecovers.size() > 0) { @@ -421,19 +421,33 @@ menu.actionlist == 'recent' ? openFile(OPEN_FILE_RECENT, data) : openFile(OPEN_FILE_RECOVERY, data); - } else - if (/\:clear/.test(action)) { - menu.actionlist == 'recent' ? - window.sdk.LocalFileRemoveAllRecents() : + } else if (/\:clear/.test(action)) { + if (menu.actionlist === 'recent') { + window.sdk.LocalFileRemoveAllRecents(); + if (collectionRecovers.size() === 0) { + this.dndZone.show(); + } + } else { window.sdk.LocalFileRemoveAllRecovers(); + if (collectionRecents.size() === 0) { + this.dndZone.show(); + } + } } else if (/\:forget/.test(action)) { $('#' + data.uid, this.view.$panel).addClass('lost'); - setTimeout(e => { - menu.actionlist == 'recent' ? - window.sdk.LocalFileRemoveRecent(parseInt(data.fileid)) : - window.sdk.LocalFileRemoveRecover(parseInt(data.fileid));} - , 300); // 300ms - duration of item's 'collapse' transition + + if (menu.actionlist === 'recent') { + window.sdk.LocalFileRemoveRecent(parseInt(data.fileid)); + if (collectionRecovers.size() === 0) { + this.dndZone.show(); + } + } else { + window.sdk.LocalFileRemoveRecover(parseInt(data.fileid)); + if (collectionRecents.size() === 0) { + this.dndZone.show(); + } + } } else if (/\:explore/.test(action)) { if (menu.actionlist == 'recent') { @@ -518,11 +532,6 @@ console.log('portal authorized'); }); - $('#box-recent .table-box').scroll(e => { - if ( Menu.opened ) - Menu.closeAll(); - }); - this.dndZone = new DnDFileZone(); this.dndZone.render(this.view.$panel.find("#area-dnd-file")); diff --git a/common/loginpage/src/paneltemplates.js b/common/loginpage/src/paneltemplates.js index c82ff2e74..3b71d2c47 100644 --- a/common/loginpage/src/paneltemplates.js +++ b/common/loginpage/src/paneltemplates.js @@ -275,7 +275,7 @@ isLoading = true; const _domain = localStorage.templatesdomain ? localStorage.templatesdomain : 'https://oforms.onlyoffice.com'; // https://oforms.teamlab.info - const _url = `{_domain}/dashboard/api/oforms?populate=*&locale=en&pagination[page]=${_page_num}`; + const _url = `${_domain}/dashboard/api/oforms?populate=*&locale=en&pagination[page]=${_page_num}`; fetch(_url) .then(r => r.json()) .then(d => { diff --git a/win-linux/package/windows/dictionary.ail b/win-linux/package/windows/dictionary.ail index ca5988344..81f4d916f 100644 --- a/win-linux/package/windows/dictionary.ail +++ b/win-linux/package/windows/dictionary.ail @@ -294,7 +294,7 @@ -