@@ -99,6 +98,9 @@
this.$boxRecovery = this.$panel.find('#box-recovery');
this.$boxRecent = this.$panel.find('#box-recent');
+ this.$panelContainer = this.$panel.find('.recent-panel-container');
+ this.$tableBoxRecovery = this.$boxRecovery.find('.table-box').get(0);
+ this.$tableBoxRecent = this.$boxRecent.find('.table-box').get(0);
},
listitemtemplate: function(info) {
let id = !!info.uid ? (` id="${info.uid}"`) : '';
@@ -159,30 +161,12 @@
});
},
- updatelistsize: function() {
- // set fixed height for scrollbar appearing.
- var _available_height = this.$panel.height();
- var _box_recent_height = _available_height;
+ updateListSize: function() {
+ const hasRecoveryScroll = this.$tableBoxRecovery.scrollHeight > this.$tableBoxRecovery.clientHeight;
+ const hasRecentScroll = this.$tableBoxRecent.scrollHeight > this.$tableBoxRecent.clientHeight;
- if (!this.$boxRecovery.find('tr').size()) {
- // $boxRecent.height($boxRecent.parent().height());
- } else {
- _available_height -= /*separatorHeight*/40;
- _box_recent_height *= 0.5;
-
- this.$boxRecovery.height(_available_height * 0.5);
-
- var $table_box = this.$boxRecovery.find('.table-box');
- if ( !$table_box.hasScrollBar() ) {
- let _new_recovery_height = $table_box.find('.table-files.list').height() + /*$headerRecovery.height()*/46;
- this.$boxRecovery.height(_new_recovery_height);
-
- _box_recent_height = _available_height - _new_recovery_height;
- }
- }
-
- /*$boxRecent.height() != _box_recent_height &&*/ this.$boxRecent.height(_box_recent_height);
- }
+ this.$panelContainer.css('grid-template-rows', hasRecoveryScroll || hasRecentScroll ? '' : 'auto 1fr');
+ },
});
window.ControllerRecent = ControllerRecent;
@@ -240,6 +224,8 @@
} else {
this.rawRecents = undefined;
}
+
+ this.view.updateListSize();
};
var _on_recents = function(params) {
@@ -263,13 +249,12 @@
}
this.view.$boxRecovery[collectionRecovers.size() > 0 ? 'show' : 'hide']();
- this.view.$panel.find('#recovery-sep')[collectionRecovers.size() > 0 ? 'show' : 'hide']();
- this.view.updatelistsize();
+ this.view.updateListSize();
};
function _init_collections() {
- let _cl_rcbox = this.view.$panel.find('#box-recent'),
- _cl_rvbox = this.view.$panel.find('#box-recovery');
+ let _cl_rcbox = this.view.$boxRecent,
+ _cl_rvbox = this.view.$boxRecovery;
collectionRecents = new Collection({
view: _cl_rcbox,
@@ -441,7 +426,7 @@
});
$(window).resize(()=>{
- this.view.updatelistsize();
+ this.view.updateListSize();
});
CommonEvents.on("icons:svg", this.view.onscale);
CommonEvents.on('portal:authorized', (data)=>{
diff --git a/common/loginpage/src/panels.js b/common/loginpage/src/panels.js
index c0fa8359d..22a595900 100644
--- a/common/loginpage/src/panels.js
+++ b/common/loginpage/src/panels.js
@@ -131,9 +131,9 @@ function onActionClick(e) {
$('.action-panel').hide();
$('.action-panel.' + action).show(0,()=>{
// bug: recent panel has the wrong height if 'wellcome' panel is showed firstly
- if (action == 'recent') {
- app.controller.recent.view.updatelistsize();
- }
+ // if (action == 'recent') {
+ // app.controller.recent.view.updateListSize();
+ // }
});
CommonEvents.fire('panel:show', [action]);
diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js
index 2fcbfd1b1..271935f2c 100644
--- a/common/loginpage/src/panelsettings.js
+++ b/common/loginpage/src/panelsettings.js
@@ -45,25 +45,29 @@
const themes_map = {
'theme-system': {
- text: 'Same as system',
+ text: utils.Lang.settOptThemeSystem,
type: THEME_TYPE_SYSTEM,
},
'theme-light': {
- text: 'Light',
+ text: utils.Lang.settOptThemeLight,
type: 'light',
},
'theme-classic-light': {
- text: 'Classic Light',
+ text: utils.Lang.settOptThemeClassicLight,
type: 'light',
},
'theme-dark': {
- text: 'Dark',
+ text: utils.Lang.settOptThemeDark,
type: 'dark',
},
'theme-contrast-dark': {
- text: 'Dark Contrast',
+ text: utils.Lang.settOptThemeContrastDark,
type: 'dark',
},
+ 'theme-gray': {
+ text: 'Gray',
+ type: 'light',
+ },
}
const nativevars = window.RendererProcessVariable;
@@ -174,7 +178,7 @@