mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Drop bootstrap modal.less by using <dialog> <header> and <footer>
https://snappymail.eu/demo/ updated for testing
This commit is contained in:
parent
880d4a05e9
commit
6170de5aee
70 changed files with 1521 additions and 1709 deletions
|
|
@ -1,19 +1,14 @@
|
|||
import ko from 'ko';
|
||||
|
||||
import { Settings } from 'Common/Globals';
|
||||
import { getNotification } from 'Common/Translator';
|
||||
|
||||
import Remote from 'Remote/Admin/Fetch';
|
||||
|
||||
import { decorateKoCommands } from 'Knoin/Knoin';
|
||||
import { AbstractViewCenter } from 'Knoin/AbstractViews';
|
||||
import { AbstractViewLogin } from 'Knoin/AbstractViews';
|
||||
|
||||
class LoginAdminView extends AbstractViewCenter {
|
||||
class LoginAdminView extends AbstractViewLogin {
|
||||
constructor() {
|
||||
super('AdminLogin');
|
||||
|
||||
this.hideSubmitButton = Settings.app('hideSubmitButton');
|
||||
|
||||
this.addObservables({
|
||||
login: '',
|
||||
password: '',
|
||||
|
|
@ -26,8 +21,6 @@ class LoginAdminView extends AbstractViewCenter {
|
|||
submitError: ''
|
||||
});
|
||||
|
||||
this.formError = ko.observable(false).extend({ falseTimeout: 500 });
|
||||
|
||||
this.addSubscribables({
|
||||
login: () => this.loginError(false),
|
||||
password: () => this.passwordError(false)
|
||||
|
|
@ -67,14 +60,6 @@ class LoginAdminView extends AbstractViewCenter {
|
|||
|
||||
return valid;
|
||||
}
|
||||
|
||||
onShow() {
|
||||
rl.route.off();
|
||||
}
|
||||
|
||||
submitForm() {
|
||||
// return false;
|
||||
}
|
||||
}
|
||||
|
||||
export { LoginAdminView };
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class AccountPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('Account');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
isNew: true,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class AddOpenPgpKeyPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('AddOpenPgpKey');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
key: '',
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import { FolderUserStore } from 'Stores/User/Folder';
|
|||
class AdvancedSearchPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('AdvancedSearch');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
from: '',
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class AskPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('Ask');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
askDesc: '',
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ const KEY_NAME_SUBSTR = -8,
|
|||
class ComposeOpenPgpPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('ComposeOpenPgp');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.publicKeysOptionsCaption = i18nPGP('ADD_A_PUBLICK_KEY');
|
||||
this.privateKeysOptionsCaption = i18nPGP('SELECT_A_PRIVATE_KEY');
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import { DomainAdminStore } from 'Stores/Admin/Domain';
|
|||
class DomainPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('Domain');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables(this.getDefaults());
|
||||
this.addObservables({
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import { folderListOptionsBuilder } from 'Common/UtilsUser';
|
|||
class FilterPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('Filter');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
isNew: true,
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class FolderClearPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('FolderClear');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
selectedFolder: null,
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class FolderCreatePopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('FolderCreate');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
folderName: '',
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class FolderSystemPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('FolderSystem');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.sChooseOnText = '';
|
||||
this.sUnuseText = '';
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class LanguagesPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('Languages');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.fLang = null;
|
||||
this.userLanguage = ko.observable('');
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class MessageOpenPgpPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('MessageOpenPgp');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
notification: '',
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
|||
class NewOpenPgpKeyPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('NewOpenPgpKey');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
this.addObservables({
|
||||
email: '',
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import { FilterPopupView } from 'View/Popup/Filter';
|
|||
class SieveScriptPopupView extends AbstractViewPopup {
|
||||
constructor() {
|
||||
super('SieveScript');
|
||||
this.viewNoUserSelect = true;
|
||||
|
||||
addObservablesTo(this, {
|
||||
saveError: false,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
import ko from 'ko';
|
||||
|
||||
import { Notification } from 'Common/Enums';
|
||||
import { ClientSideKeyName } from 'Common/EnumsUser';
|
||||
import { Settings, SettingsGet } from 'Common/Globals';
|
||||
import { SettingsGet } from 'Common/Globals';
|
||||
import { getNotification, translatorReload, convertLangName } from 'Common/Translator';
|
||||
|
||||
import { LanguageStore } from 'Stores/Language';
|
||||
|
|
@ -12,7 +10,7 @@ import * as Local from 'Storage/Client';
|
|||
import Remote from 'Remote/User/Fetch';
|
||||
|
||||
import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin';
|
||||
import { AbstractViewCenter } from 'Knoin/AbstractViews';
|
||||
import { AbstractViewLogin } from 'Knoin/AbstractViews';
|
||||
|
||||
import { LanguagesPopupView } from 'View/Popup/Languages';
|
||||
|
||||
|
|
@ -21,12 +19,10 @@ const SignMeOff = 0,
|
|||
SignMeUnused = 2;
|
||||
|
||||
|
||||
class LoginUserView extends AbstractViewCenter {
|
||||
class LoginUserView extends AbstractViewLogin {
|
||||
constructor() {
|
||||
super('Login');
|
||||
|
||||
this.hideSubmitButton = Settings.app('hideSubmitButton');
|
||||
|
||||
this.addObservables({
|
||||
loadingDesc: SettingsGet('LoadingDescription'),
|
||||
|
||||
|
|
@ -46,8 +42,6 @@ class LoginUserView extends AbstractViewCenter {
|
|||
signMeType: SignMeUnused
|
||||
});
|
||||
|
||||
this.formError = ko.observable(false).extend({ falseTimeout: 500 });
|
||||
|
||||
this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin');
|
||||
|
||||
this.language = LanguageStore.language;
|
||||
|
|
@ -129,11 +123,9 @@ class LoginUserView extends AbstractViewCenter {
|
|||
return valid;
|
||||
}
|
||||
|
||||
onShow() {
|
||||
rl.route.off();
|
||||
}
|
||||
onBuild(dom) {
|
||||
super.onBuild(dom);
|
||||
|
||||
onBuild() {
|
||||
const signMeLocal = Local.get(ClientSideKeyName.LastSignMe),
|
||||
signMe = (SettingsGet('SignMe') || '').toLowerCase();
|
||||
|
||||
|
|
@ -161,10 +153,6 @@ class LoginUserView extends AbstractViewCenter {
|
|||
}
|
||||
}
|
||||
|
||||
submitForm() {
|
||||
// return false;
|
||||
}
|
||||
|
||||
selectLanguage() {
|
||||
showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue