diff --git a/common/loginpage/src/css/colors.less b/common/loginpage/src/css/colors.less
index 29344aef1..c4860be82 100644
--- a/common/loginpage/src/css/colors.less
+++ b/common/loginpage/src/css/colors.less
@@ -7,7 +7,6 @@
/*--background-button: #fff;*/
--background-accent-button: #3483db;
--background-primary-button: #444;
- --background-scrim: fade(#000, 20%);
--background-scroll-thumb: #e0e0e0;
--background-action-panel: #fff;
--background-icon-normal: #fff;
@@ -30,7 +29,6 @@
--border-divider: #dfdfdf;
--border-regular-control: #c0c0c0;
--border-control-focus: #848484;
- --border-error: #f62211;
--border-sidebar: #f7f7f7;
--border-sidebar-item: transparent;
--border-sidebar-icon: #cbcbcb;
@@ -48,7 +46,6 @@
--text-negative: var(--text-normal);
--icon-normal: fade(#000, 80%);
- --icon-success: #090;
--disabled-element-opacity: .4;
--theme-inverted-image-filter: none;
@@ -72,7 +69,6 @@
@background-button: var(--background-button,#fff);
@background-accent-button: var(--background-accent-button);
@background-primary-button: var(--background-primary-button);
-@background-scrim: var(--background-scrim);
@background-scroll-thumb: var(--background-scroll-thumb);
@background-action-panel: var(--background-action-panel);
@background-icon-normal: var(--background-icon-normal);
@@ -95,7 +91,6 @@
@border-divider: var(--border-divider);
@border-regular-control: var(--border-regular-control);
@border-control-focus: var(--border-control-focus);
-@border-error: var(--border-error);
@border-sidebar: var(--border-sidebar);
@border-sidebar-item: var(--border-sidebar-item);
@border-sidebar-icon: var(--border-sidebar-icon, transparent);
@@ -115,7 +110,6 @@
@text-negative: var(--text-negative);
@icon-normal: var(--icon-normal);
-@icon-success: var(--icon-success);
@disabled-element-opacity: var(--disabled-element-opacity);
@theme-inverted-image-filter: var(--theme-inverted-image-filter);
diff --git a/common/loginpage/src/css/colors_classic.less b/common/loginpage/src/css/colors_classic.less
index 103aeffdc..0bb814e1e 100644
--- a/common/loginpage/src/css/colors_classic.less
+++ b/common/loginpage/src/css/colors_classic.less
@@ -6,7 +6,6 @@
/*--background-button: #fff;*/
/*--background-accent-button: #3483db;*/
--background-primary-button: #a5a5a5;
- /*--background-scrim: fade(#000, 20%);*/
/*--background-scroll-thumb: #e0e0e0;*/
--highlight-button-hover: #ebebeb;
@@ -25,7 +24,6 @@
--border-divider: #cbcbcb;
--border-regular-control: #cfcfcf;
--border-control-focus: #848484;
- --border-error: #d9534f;
--text-normal: #444;
--text-normal-pressed: #444;
diff --git a/common/loginpage/src/css/colors_contrast_dark.less b/common/loginpage/src/css/colors_contrast_dark.less
index 4e9dddbdb..e81368ad8 100644
--- a/common/loginpage/src/css/colors_contrast_dark.less
+++ b/common/loginpage/src/css/colors_contrast_dark.less
@@ -6,7 +6,6 @@
--background-button: #1e1e1e;
--background-primary-button: #e6e6e6;
--background-accent-button: #3483db;
- --background-scrim: fade(#000, 60%);
--background-scroll-thumb: #424242;
--background-action-panel: #212121;
--background-icon-normal: #2a2a2a;
@@ -31,7 +30,6 @@
--border-divider: #414141;
--border-regular-control: #696969;
--border-control-focus: #b8b8b8;
- --border-error: #f62211;
--border-sidebar: 0 none;
--border-sidebar-icon: #616161;
diff --git a/common/loginpage/src/css/colors_dark.less b/common/loginpage/src/css/colors_dark.less
index 52adeac0b..eb458d626 100644
--- a/common/loginpage/src/css/colors_dark.less
+++ b/common/loginpage/src/css/colors_dark.less
@@ -6,7 +6,6 @@
--background-button: #333;
--background-primary-button: #ddd;
--background-accent-button: #3483db;
- --background-scrim: fade(#000, 60%);
--background-scroll-thumb: #555;
--background-action-panel: #333;
--background-icon-normal: #333;
@@ -31,7 +30,6 @@
--border-divider: #505050;
--border-regular-control: #666666;
--border-control-focus: #ccc;
- --border-error: #f62211;
--border-sidebar: #2a2a2a;
--border-sidebar-icon: #616161;
diff --git a/common/loginpage/src/css/colors_gray.less b/common/loginpage/src/css/colors_gray.less
index 6c578c014..ad1aca113 100644
--- a/common/loginpage/src/css/colors_gray.less
+++ b/common/loginpage/src/css/colors_gray.less
@@ -7,7 +7,6 @@
/*--background-button: #fff;*/
--background-accent-button: #3483db;
--background-primary-button: #444;
- --background-scrim: fade(#000, 20%);
--background-scroll-thumb: #e0e0e0;
--background-action-panel: #fff;
@@ -29,7 +28,6 @@
--border-divider: #dfdfdf;
--border-regular-control: #c0c0c0;
--border-control-focus: #848484;
- --border-error: #f62211;
--border-sidebar: #f7f7f7;
--border-sidebar-item: transparent;
--border-radius-sidebar-item: 8px;
@@ -44,7 +42,6 @@
--text-contrast-background: #fff;
--icon-normal: fade(#000, 80%);
- --icon-success: #090;
--disabled-element-opacity: .4;
--theme-inverted-image-filter: none;
diff --git a/common/loginpage/src/css/colors_night.less b/common/loginpage/src/css/colors_night.less
index 8792c9d41..57d76128e 100644
--- a/common/loginpage/src/css/colors_night.less
+++ b/common/loginpage/src/css/colors_night.less
@@ -6,7 +6,6 @@
--background-button: #333;
--background-primary-button: #ddd;
--background-accent-button: #3483db;
- --background-scrim: fade(#000, 60%);
--background-scroll-thumb: #555;
--background-action-panel: #404040;
--background-icon-normal: #404040;
@@ -30,7 +29,6 @@
--border-divider: #505050;
--border-regular-control: #585858;
--border-control-focus: #ccc;
- --border-error: #f62211;
--border-sidebar: var(--border-tabbar);
--border-sidebar-icon: #585858;
diff --git a/common/loginpage/src/css/colors_white.less b/common/loginpage/src/css/colors_white.less
index fa34a92e7..194743732 100644
--- a/common/loginpage/src/css/colors_white.less
+++ b/common/loginpage/src/css/colors_white.less
@@ -8,7 +8,6 @@
/*--background-button: #fff;*/
--background-accent-button: #3483db;
--background-primary-button: #3483db;
- --background-scrim: fade(#000, 20%);
--background-scroll-thumb: #e0e0e0;
--background-action-panel: #fff;
--background-icon-normal: #fff;
@@ -31,7 +30,6 @@
--border-divider: #dfdfdf;
--border-regular-control: #c0c0c0;
--border-control-focus: #848484;
- --border-error: #f62211;
--border-sidebar: var(--background-normal);
--border-sidebar-item: transparent;
--border-sidebar-icon: var(--border-divider);
@@ -49,7 +47,6 @@
--text-negative: #991B1B;
--icon-normal: fade(#000, 80%);
- --icon-success: #090;
--disabled-element-opacity: .4;
--theme-inverted-image-filter: none;
diff --git a/common/loginpage/src/css/styles.less b/common/loginpage/src/css/styles.less
index 3c7366f52..6d6648b06 100644
--- a/common/loginpage/src/css/styles.less
+++ b/common/loginpage/src/css/styles.less
@@ -1155,6 +1155,7 @@ li.menu-item {
}
tr:not(.lost) {
+ position: relative;
.cportal, .cuser, .cemail {
/*width: 25%;*/
padding: 0;
@@ -1173,10 +1174,33 @@ li.menu-item {
}
}
+ .info {
+ width: 100%;
+ }
+
+ &:hover .info-content {
+ padding-right: 40px;
+ .rtl & {
+ padding-right: 0;
+ padding-left: 40px;
+ }
+ }
+
.cell-tools {
width: 38px;
padding: 0 8px 0 0;
overflow: visible;
+ position: absolute;
+ top: 50%;
+ right: 0;
+ transform: translateY(-50%);
+ display: flex;
+ align-items: center;
+ .rtl & {
+ padding: 0 0 0 8px;
+ right: auto;
+ left: 0;
+ }
.hlayout {
justify-content: flex-end;
@@ -1184,9 +1208,12 @@ li.menu-item {
.btn-quick.more {
margin: 0 5px 0 0px;
+ .rtl & {
+ margin: 0 0 0 5px;
+ }
}
}
- }
+}
.sidebar-block-title {
.btn-quick {
diff --git a/common/loginpage/src/css/window.less b/common/loginpage/src/css/window.less
index 50da531d3..8288df5fd 100644
--- a/common/loginpage/src/css/window.less
+++ b/common/loginpage/src/css/window.less
@@ -64,6 +64,7 @@ dialog {
justify-content: space-between;
padding: 30px 16px 16px 32px;
background: none;
+ user-select: none;
.rtl &{
padding: 30px 32px 16px 16px;
}
@@ -364,3 +365,7 @@ dialog {
}
}
+.win_xp .dlg.dlg-about .body {
+ -webkit-user-select: text;
+}
+
diff --git a/common/loginpage/src/dialogconnect.js b/common/loginpage/src/dialogconnect.js
index 3f89631fb..1b0d4159b 100644
--- a/common/loginpage/src/dialogconnect.js
+++ b/common/loginpage/src/dialogconnect.js
@@ -244,7 +244,6 @@ window.DialogConnect = function(params) {
resolve({status:'skipped', response: {statusText: _url}});
else {
- const matches = (e) => (provider === 'onlyoffice' ? ['onlyoffice', 'teamlab'] : [provider]).some(p => (e.responseText || '').toLowerCase().includes(p) || portal.toLowerCase().includes(p));
let fetchFuntion = $.ajax;
if (window.AscSimpleRequest && window.AscSimpleRequest.createRequest)
fetchFuntion = window.AscSimpleRequest.createRequest;
@@ -261,11 +260,6 @@ window.DialogConnect = function(params) {
// skip checking response for tests
// if ( !_model.entryPage )
// JSON.parse(e.responseText)
-
- if (!matches(e)) {
- reject({status:'invalid portal', response:e});
- return;
- }
resolve({status:status, response:e});
} catch (err) {
diff --git a/common/loginpage/src/panelabout.js b/common/loginpage/src/panelabout.js
index b67f1f995..c5e519e0f 100644
--- a/common/loginpage/src/panelabout.js
+++ b/common/loginpage/src/panelabout.js
@@ -58,16 +58,20 @@
baseView.prototype.constructor.call(this, args);
};
+ const version = function(commercial) {
+ return commercial === true ? utils.Lang.strVersionCommercial : utils.Lang.strVersionCommunity;
+ };
+
ViewAbout.prototype = Object.create(baseView.prototype);
ViewAbout.prototype.constructor = ViewAbout;
ViewAbout.prototype.paneltemplate = function(args) {
var _opts = args.opts;
!!_opts.active && (_opts.edition = !!_opts.edition ? _opts.edition + ' ' + _opts.active : _opts.active);
_opts.edition = !!_opts.edition ? `${_opts.edition}
` : '';
- const strVersion = args.opts.commercial === true ? utils.Lang.strVersionCommercial : utils.Lang.strVersionCommunity;
+ const strVersion = version(args.opts.commercial);
let _ext_ver = '';
- if ( !!_opts.arch ) _ext_ver += `${_opts.arch == 'x64' ? 'x64' : 'x86'}`;
+ if ( !!_opts.arch ) _ext_ver += _opts.arch;
if ( !!_opts.pkg ) _ext_ver += ` ${_opts.pkg}`;
if ( !!_ext_ver ) _opts.version += ` (${_ext_ver.trim()})`;
@@ -124,6 +128,7 @@
utils.fn.extend(ControllerAbout.prototype, (function() {
let features = undefined;
+ let action = null;
let _on_features_avalable = function (params) {
if ( !!this.view ) {
@@ -153,6 +158,7 @@
if (!this.view) {
this.view = new ViewAbout(args);
+ this.view.args = args;
this.view.$menuitem && this.view.$menuitem.removeClass('extra');
this.view.$body = $(this.view.paneltemplate(args));
this.view.$dialog = new AboutDialog();
@@ -186,7 +192,6 @@
if ( this.updates ) {
$('body').on('click', '.btn-update-action', e=>{
- const action = $(e.target).data('action');
sdk.execCommand('updates:action', action);
});
}
@@ -258,7 +263,7 @@
const $button = $('#idx-update-btnaction', this.view.$body);
if ( info.button.text ) {
$button.text(info.button.text);
- $button.data("action", info.button.action);
+ action = info.button.action;
}
if ( info.button.lock ) {
@@ -300,7 +305,7 @@
CommonEvents.on('lang:changed', () => {
if (this.view) {
this.view.$dialog.titleText = utils.Lang.actAbout;
- $('#idx-about-version span', this.view.$body).text(utils.Lang.strVersion);
+ $('#idx-about-version span', this.view.$body).text(version(this.view.args.opts.commercial));
}
});
diff --git a/common/loginpage/src/panelconnect.js b/common/loginpage/src/panelconnect.js
index a5ce581cf..1eb071426 100644
--- a/common/loginpage/src/panelconnect.js
+++ b/common/loginpage/src/panelconnect.js
@@ -111,9 +111,11 @@
-
- ${utils.skipUrlProtocol(info.portal)}
- ${info.user}${info.email.length && (' (' + info.email + ')') || ''}
+ |
+
+ ${utils.skipUrlProtocol(info.portal)}
+ ${info.user}${info.email.length && (' (' + info.email + ')') || ''}
+
|
diff --git a/common/templates/DE/Forms/[32]IFZGEZLJORZXMZLSORZGCZY=.pdf b/common/templates/DE/Forms/[32]IFZGEZLJORZXMZLSORZGCZY=.pdf
new file mode 100644
index 000000000..172e4ccbc
Binary files /dev/null and b/common/templates/DE/Forms/[32]IFZGEZLJORZXMZLSORZGCZY=.pdf differ
diff --git a/common/templates/DE/Forms/[32]INUGKY3LNRUXG5DF.pdf b/common/templates/DE/Forms/[32]INUGKY3LNRUXG5DF.pdf
new file mode 100644
index 000000000..2b9522c29
Binary files /dev/null and b/common/templates/DE/Forms/[32]INUGKY3LNRUXG5DF.pdf differ
diff --git a/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4======.pdf b/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4======.pdf
new file mode 100644
index 000000000..6ced3fd58
Binary files /dev/null and b/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4======.pdf differ
diff --git a/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4QCQQLVORXSS===.pdf b/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4QCQQLVORXSS===.pdf
new file mode 100644
index 000000000..e351dd22b
Binary files /dev/null and b/common/templates/DE/Forms/[32]JNQXKZTWMVZHI4TBM4QCQQLVORXSS===.pdf differ
diff --git a/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMU======.pdf b/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMU======.pdf
new file mode 100644
index 000000000..5af8fd6b1
Binary files /dev/null and b/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMU======.pdf differ
diff --git a/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMUQCQZDVNZVWK3DCNRQXKKI=.pdf b/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMUQCQZDVNZVWK3DCNRQXKKI=.pdf
new file mode 100644
index 000000000..0304e53ab
Binary files /dev/null and b/common/templates/DE/Forms/[32]JRSWS43UOVXGO43VOJVXK3TEMUQCQZDVNZVWK3DCNRQXKKI=.pdf differ
diff --git a/common/templates/DE/Forms/[32]K5XWG2DFNZYGYYLO.pdf b/common/templates/DE/Forms/[32]K5XWG2DFNZYGYYLO.pdf
new file mode 100644
index 000000000..772d3c109
Binary files /dev/null and b/common/templates/DE/Forms/[32]K5XWG2DFNZYGYYLO.pdf differ
diff --git a/common/templates/DE/Forms/[32]KJSWS43FOBWGC3TFOI======.pdf b/common/templates/DE/Forms/[32]KJSWS43FOBWGC3TFOI======.pdf
new file mode 100644
index 000000000..48ce65294
Binary files /dev/null and b/common/templates/DE/Forms/[32]KJSWS43FOBWGC3TFOI======.pdf differ
diff --git a/common/templates/EN/Forms/[32]I5SW4ZLSMFWCA2LOOZXWSY3F.pdf b/common/templates/EN/Forms/[32]I5SW4ZLSMFWCA2LOOZXWSY3F.pdf
new file mode 100644
index 000000000..36468ed06
Binary files /dev/null and b/common/templates/EN/Forms/[32]I5SW4ZLSMFWCA2LOOZXWSY3F.pdf differ
diff --git a/common/templates/EN/Forms/[32]IFYHA3DJMNQXI2LPNYQGM33SEBZXK4TWNF3G64RAMJSW4ZLGNF2HG===.pdf b/common/templates/EN/Forms/[32]IFYHA3DJMNQXI2LPNYQGM33SEBZXK4TWNF3G64RAMJSW4ZLGNF2HG===.pdf
new file mode 100644
index 000000000..68a12a380
Binary files /dev/null and b/common/templates/EN/Forms/[32]IFYHA3DJMNQXI2LPNYQGM33SEBZXK4TWNF3G64RAMJSW4ZLGNF2HG===.pdf differ
diff --git a/common/templates/EN/Forms/[32]INQXEZLHNF3GK4RAMRQWS3DZEBRWQZLDNNWGS43U.pdf b/common/templates/EN/Forms/[32]INQXEZLHNF3GK4RAMRQWS3DZEBRWQZLDNNWGS43U.pdf
new file mode 100644
index 000000000..e22ebbc69
Binary files /dev/null and b/common/templates/EN/Forms/[32]INQXEZLHNF3GK4RAMRQWS3DZEBRWQZLDNNWGS43U.pdf differ
diff --git a/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQ======.pdf b/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQ======.pdf
new file mode 100644
index 000000000..f37e832c0
Binary files /dev/null and b/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQ======.pdf differ
diff --git a/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQQCQRTMN53WK4TTFE======.pdf b/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQQCQRTMN53WK4TTFE======.pdf
new file mode 100644
index 000000000..80c6d481a
Binary files /dev/null and b/common/templates/EN/Forms/[32]INSXE5DJMZUWGYLUMUQG6ZRAMFRWQ2LFOZSW2ZLOOQQCQRTMN53WK4TTFE======.pdf differ
diff --git a/common/templates/EN/Forms/[32]JJXWEIDQOJXXA33TMFWA====.pdf b/common/templates/EN/Forms/[32]JJXWEIDQOJXXA33TMFWA====.pdf
new file mode 100644
index 000000000..c35422e42
Binary files /dev/null and b/common/templates/EN/Forms/[32]JJXWEIDQOJXXA33TMFWA====.pdf differ
diff --git a/common/templates/EN/Forms/[32]JRUWGZLOONSSAYLHOJSWK3LFNZ2A====.pdf b/common/templates/EN/Forms/[32]JRUWGZLOONSSAYLHOJSWK3LFNZ2A====.pdf
new file mode 100644
index 000000000..540e04afb
Binary files /dev/null and b/common/templates/EN/Forms/[32]JRUWGZLOONSSAYLHOJSWK3LFNZ2A====.pdf differ
diff --git a/common/templates/EN/Forms/[32]K5SWK23MPEQHA3DBNZXGK4Q=.pdf b/common/templates/EN/Forms/[32]K5SWK23MPEQHA3DBNZXGK4Q=.pdf
new file mode 100644
index 000000000..3e30b5afe
Binary files /dev/null and b/common/templates/EN/Forms/[32]K5SWK23MPEQHA3DBNZXGK4Q=.pdf differ
diff --git a/common/templates/EN/Forms/[32]KRZGC5TFNQQHA3DBNZXGK4Q=.pdf b/common/templates/EN/Forms/[32]KRZGC5TFNQQHA3DBNZXGK4Q=.pdf
new file mode 100644
index 000000000..3426bb21a
Binary files /dev/null and b/common/templates/EN/Forms/[32]KRZGC5TFNQQHA3DBNZXGK4Q=.pdf differ
diff --git a/common/templates/EN/Forms/[32]KZQWYZLOORUW4ZJHOMQEIYLZEBTWSZTUEBRWK4TUNFTGSY3BORSQ====.pdf b/common/templates/EN/Forms/[32]KZQWYZLOORUW4ZJHOMQEIYLZEBTWSZTUEBRWK4TUNFTGSY3BORSQ====.pdf
new file mode 100644
index 000000000..047f86714
Binary files /dev/null and b/common/templates/EN/Forms/[32]KZQWYZLOORUW4ZJHOMQEIYLZEBTWSZTUEBRWK4TUNFTGSY3BORSQ====.pdf differ
diff --git a/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4======.pdf b/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4======.pdf
new file mode 100644
index 000000000..c73ccd4f4
Binary files /dev/null and b/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4======.pdf differ
diff --git a/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4QGIYLSNMQGE3DVMU======.pdf b/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4QGIYLSNMQGE3DVMU======.pdf
new file mode 100644
index 000000000..691630a62
Binary files /dev/null and b/common/templates/ES/Forms/[32]INSXE5DJMZUWGYLEN4QGIYLSNMQGE3DVMU======.pdf differ
diff --git a/common/templates/ES/Forms/[32]JRUXG5DBEBSGKIDDN5WXA4TPMJQWG2ODWNXA====.pdf b/common/templates/ES/Forms/[32]JRUXG5DBEBSGKIDDN5WXA4TPMJQWG2ODWNXA====.pdf
new file mode 100644
index 000000000..ac10c10db
Binary files /dev/null and b/common/templates/ES/Forms/[32]JRUXG5DBEBSGKIDDN5WXA4TPMJQWG2ODWNXA====.pdf differ
diff --git a/common/templates/ES/Forms/[32]KBQWG5DPEBSGKIDTN5RWS33T.pdf b/common/templates/ES/Forms/[32]KBQWG5DPEBSGKIDTN5RWS33T.pdf
new file mode 100644
index 000000000..a7c574ac7
Binary files /dev/null and b/common/templates/ES/Forms/[32]KBQWG5DPEBSGKIDTN5RWS33T.pdf differ
diff --git a/common/templates/ES/Forms/[32]KBWGC3RAONSW2YLOMFWA====.pdf b/common/templates/ES/Forms/[32]KBWGC3RAONSW2YLOMFWA====.pdf
new file mode 100644
index 000000000..bffe5113e
Binary files /dev/null and b/common/templates/ES/Forms/[32]KBWGC3RAONSW2YLOMFWA====.pdf differ
diff --git a/common/templates/ES/Forms/[32]KBWGC3TJMZUWGYLEN5ZCAZDFEB3GSYLKMVZQ====.pdf b/common/templates/ES/Forms/[32]KBWGC3TJMZUWGYLEN5ZCAZDFEB3GSYLKMVZQ====.pdf
new file mode 100644
index 000000000..e8138e990
Binary files /dev/null and b/common/templates/ES/Forms/[32]KBWGC3TJMZUWGYLEN5ZCAZDFEB3GSYLKMVZQ====.pdf differ
diff --git a/common/templates/ES/Forms/[32]KBZGK43UMFWW6IDFNZ2HEZJAOBQXE5DJMN2WYYLSMVZQ====.pdf b/common/templates/ES/Forms/[32]KBZGK43UMFWW6IDFNZ2HEZJAOBQXE5DJMN2WYYLSMVZQ====.pdf
new file mode 100644
index 000000000..34fd28765
Binary files /dev/null and b/common/templates/ES/Forms/[32]KBZGK43UMFWW6IDFNZ2HEZJAOBQXE5DJMN2WYYLSMVZQ====.pdf differ
diff --git a/common/templates/ES/Forms/[32]KBZMHM3SOJXWOYJAMRSSAY3PNZ2HEYLUN4QGIZJAMFWHC5LJNRSXE===.pdf b/common/templates/ES/Forms/[32]KBZMHM3SOJXWOYJAMRSSAY3PNZ2HEYLUN4QGIZJAMFWHC5LJNRSXE===.pdf
new file mode 100644
index 000000000..dbc18fea8
Binary files /dev/null and b/common/templates/ES/Forms/[32]KBZMHM3SOJXWOYJAMRSSAY3PNZ2HEYLUN4QGIZJAMFWHC5LJNRSXE===.pdf differ
diff --git a/common/templates/FR/Forms/[32]IZQWG5DVOJSQ====.pdf b/common/templates/FR/Forms/[32]IZQWG5DVOJSQ====.pdf
new file mode 100644
index 000000000..9d6fc353e
Binary files /dev/null and b/common/templates/FR/Forms/[32]IZQWG5DVOJSQ====.pdf differ
diff --git a/common/templates/FR/Forms/[32]JRSXI5DSMUQGIZJAMTB2S4DBOJ2CA4TFORZGC2LUMU======.pdf b/common/templates/FR/Forms/[32]JRSXI5DSMUQGIZJAMTB2S4DBOJ2CA4TFORZGC2LUMU======.pdf
new file mode 100644
index 000000000..1d793dadd
Binary files /dev/null and b/common/templates/FR/Forms/[32]JRSXI5DSMUQGIZJAMTB2S4DBOJ2CA4TFORZGC2LUMU======.pdf differ
diff --git a/common/templates/FR/Forms/[32]JRUXG5DFEBSGKIDDN5XHI4TPNRSQ====.pdf b/common/templates/FR/Forms/[32]JRUXG5DFEBSGKIDDN5XHI4TPNRSQ====.pdf
new file mode 100644
index 000000000..a13e9ed00
Binary files /dev/null and b/common/templates/FR/Forms/[32]JRUXG5DFEBSGKIDDN5XHI4TPNRSQ====.pdf differ
diff --git a/common/templates/FR/Forms/[32]KBWGC3TJMZUWGYLUMV2XEIDEMUQHM33ZMFTWK===.pdf b/common/templates/FR/Forms/[32]KBWGC3TJMZUWGYLUMV2XEIDEMUQHM33ZMFTWK===.pdf
new file mode 100644
index 000000000..98d682bc6
Binary files /dev/null and b/common/templates/FR/Forms/[32]KBWGC3TJMZUWGYLUMV2XEIDEMUQHM33ZMFTWK===.pdf differ
diff --git a/common/templates/FR/Forms/[32]KBWGC3TONFXGOIDEMUQHGZLNMFUW4ZI=.pdf b/common/templates/FR/Forms/[32]KBWGC3TONFXGOIDEMUQHGZLNMFUW4ZI=.pdf
new file mode 100644
index 000000000..83a395e4f
Binary files /dev/null and b/common/templates/FR/Forms/[32]KBWGC3TONFXGOIDEMUQHGZLNMFUW4ZI=.pdf differ
diff --git a/common/templates/IT/Forms/[32]IFTWK3TEMEQHGZLUORUW2YLOMFWGK===.pdf b/common/templates/IT/Forms/[32]IFTWK3TEMEQHGZLUORUW2YLOMFWGK===.pdf
new file mode 100644
index 000000000..5a3120d15
Binary files /dev/null and b/common/templates/IT/Forms/[32]IFTWK3TEMEQHGZLUORUW2YLOMFWGK===.pdf differ
diff --git a/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAMRUSA4DSMVZXIYL2NFXW4ZJAMRUSA43FOJ3GS6TJ.pdf b/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAMRUSA4DSMVZXIYL2NFXW4ZJAMRUSA43FOJ3GS6TJ.pdf
new file mode 100644
index 000000000..1262d6560
Binary files /dev/null and b/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAMRUSA4DSMVZXIYL2NFXW4ZJAMRUSA43FOJ3GS6TJ.pdf differ
diff --git a/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAOBZGK3DJNVUW4YLSMUQGI2JANRXWGYL2NFXW4ZI=.pdf b/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAOBZGK3DJNVUW4YLSMUQGI2JANRXWGYL2NFXW4ZI=.pdf
new file mode 100644
index 000000000..6ff572982
Binary files /dev/null and b/common/templates/IT/Forms/[32]INXW45DSMF2HI3ZAOBZGK3DJNVUW4YLSMUQGI2JANRXWGYL2NFXW4ZI=.pdf differ
diff --git a/common/templates/IT/Forms/[32]JRUXG5DBEBSGSIDDN5XHI4TPNRWG6===.pdf b/common/templates/IT/Forms/[32]JRUXG5DBEBSGSIDDN5XHI4TPNRWG6===.pdf
new file mode 100644
index 000000000..f2109dc9b
Binary files /dev/null and b/common/templates/IT/Forms/[32]JRUXG5DBEBSGSIDDN5XHI4TPNRWG6===.pdf differ
diff --git a/common/templates/IT/Forms/[32]JVXWIZLMNRXSAY3BNE======.pdf b/common/templates/IT/Forms/[32]JVXWIZLMNRXSAY3BNE======.pdf
new file mode 100644
index 000000000..c07ff32ed
Binary files /dev/null and b/common/templates/IT/Forms/[32]JVXWIZLMNRXSAY3BNE======.pdf differ
diff --git a/common/templates/IT/Forms/[32]JVXWIZLMNRXSAZDFNRSWOYJAOJUXI2LSN4QGI33DOVWWK3TUNE======.pdf b/common/templates/IT/Forms/[32]JVXWIZLMNRXSAZDFNRSWOYJAOJUXI2LSN4QGI33DOVWWK3TUNE======.pdf
new file mode 100644
index 000000000..1ea577e60
Binary files /dev/null and b/common/templates/IT/Forms/[32]JVXWIZLMNRXSAZDFNRSWOYJAOJUXI2LSN4QGI33DOVWWK3TUNE======.pdf differ
diff --git a/common/templates/IT/Forms/[32]KBZG6Z3SMFWW2YJAMRUSA5TJMFTWO2LP.pdf b/common/templates/IT/Forms/[32]KBZG6Z3SMFWW2YJAMRUSA5TJMFTWO2LP.pdf
new file mode 100644
index 000000000..85ea38f96
Binary files /dev/null and b/common/templates/IT/Forms/[32]KBZG6Z3SMFWW2YJAMRUSA5TJMFTWO2LP.pdf differ
diff --git a/common/templates/JA/Forms/[32]42LYL2FBRTRYHF7DQOU6HA5T4OBYVY4DXQ======.pdf b/common/templates/JA/Forms/[32]42LYL2FBRTRYHF7DQOU6HA5T4OBYVY4DXQ======.pdf
new file mode 100644
index 000000000..ca3323560
Binary files /dev/null and b/common/templates/JA/Forms/[32]42LYL2FBRTRYHF7DQOU6HA5T4OBYVY4DXQ======.pdf differ
diff --git a/common/templates/JA/Forms/[32]42S23Z5YX3UKRPHGTCHONG5YEDRYHFPDQKU6HA544OB2BY4DQDRYHPHDQKX6HA4W4OB2XY4DXQ======.pdf b/common/templates/JA/Forms/[32]42S23Z5YX3UKRPHGTCHONG5YEDRYHFPDQKU6HA544OB2BY4DQDRYHPHDQKX6HA4W4OB2XY4DXQ======.pdf
new file mode 100644
index 000000000..e43f32319
Binary files /dev/null and b/common/templates/JA/Forms/[32]42S23Z5YX3UKRPHGTCHONG5YEDRYHFPDQKU6HA544OB2BY4DQDRYHPHDQKX6HA4W4OB2XY4DXQ======.pdf differ
diff --git a/common/templates/JA/Forms/[32]46TZ7Z5IR3TJ3IPHWSCOHANL5GLKFY4BTHRYFC7HSSZ6RK4L42N3Q===.pdf b/common/templates/JA/Forms/[32]46TZ7Z5IR3TJ3IPHWSCOHANL5GLKFY4BTHRYFC7HSSZ6RK4L42N3Q===.pdf
new file mode 100644
index 000000000..96921327d
Binary files /dev/null and b/common/templates/JA/Forms/[32]46TZ7Z5IR3TJ3IPHWSCOHANL5GLKFY4BTHRYFC7HSSZ6RK4L42N3Q===.pdf differ
diff --git a/common/templates/JA/Forms/[32]4OBYDY4CU7RYHA7DQKX6HA5K4OBLTY4DRA======.pdf b/common/templates/JA/Forms/[32]4OBYDY4CU7RYHA7DQKX6HA5K4OBLTY4DRA======.pdf
new file mode 100644
index 000000000..d05f62b7a
Binary files /dev/null and b/common/templates/JA/Forms/[32]4OBYDY4CU7RYHA7DQKX6HA5K4OBLTY4DRA======.pdf differ
diff --git a/common/templates/JA/Forms/[32]4WOKQIHIQG3SB2FIXQQONGEOEDTJXOA=.pdf b/common/templates/JA/Forms/[32]4WOKQIHIQG3SB2FIXQQONGEOEDTJXOA=.pdf
new file mode 100644
index 000000000..5a86a23a3
Binary files /dev/null and b/common/templates/JA/Forms/[32]4WOKQIHIQG3SB2FIXQQONGEOEDTJXOA=.pdf differ
diff --git a/common/templates/JA/Forms/[32]4WTZJZF3XPTYVNQ=.pdf b/common/templates/JA/Forms/[32]4WTZJZF3XPTYVNQ=.pdf
new file mode 100644
index 000000000..6ffdf84ca
Binary files /dev/null and b/common/templates/JA/Forms/[32]4WTZJZF3XPTYVNQ=.pdf differ
diff --git a/common/templates/JA/Forms/[32]4WXJ7Z5YX3UKRPHGTCHONG5Y.pdf b/common/templates/JA/Forms/[32]4WXJ7Z5YX3UKRPHGTCHONG5Y.pdf
new file mode 100644
index 000000000..e14934d6f
Binary files /dev/null and b/common/templates/JA/Forms/[32]4WXJ7Z5YX3UKRPHGTCHONG5Y.pdf differ
diff --git a/common/templates/JA/Forms/[32]5GALDY4DS7RYHKPDQOZ6HA4K4OB3Y===.pdf b/common/templates/JA/Forms/[32]5GALDY4DS7RYHKPDQOZ6HA4K4OB3Y===.pdf
new file mode 100644
index 000000000..c11910993
Binary files /dev/null and b/common/templates/JA/Forms/[32]5GALDY4DS7RYHKPDQOZ6HA4K4OB3Y===.pdf differ
diff --git a/common/templates/JA/Forms/[32]5GDZD2MKVXTLNCHIWK56RMVY4WAJ7ZNFSHT3JBHGTO4A====.pdf b/common/templates/JA/Forms/[32]5GDZD2MKVXTLNCHIWK56RMVY4WAJ7ZNFSHT3JBHGTO4A====.pdf
new file mode 100644
index 000000000..8bf02abbc
Binary files /dev/null and b/common/templates/JA/Forms/[32]5GDZD2MKVXTLNCHIWK56RMVY4WAJ7ZNFSHT3JBHGTO4A====.pdf differ
diff --git a/common/templates/PT/Forms/[32]I5QXG5DPOMQGIZJAOZUWCZ3FNU======.pdf b/common/templates/PT/Forms/[32]I5QXG5DPOMQGIZJAOZUWCZ3FNU======.pdf
new file mode 100644
index 000000000..776dda7ed
Binary files /dev/null and b/common/templates/PT/Forms/[32]I5QXG5DPOMQGIZJAOZUWCZ3FNU======.pdf differ
diff --git a/common/templates/PT/Forms/[32]JFXGM33SNVSSA43FNVQW4YLM.pdf b/common/templates/PT/Forms/[32]JFXGM33SNVSSA43FNVQW4YLM.pdf
new file mode 100644
index 000000000..72e5f2918
Binary files /dev/null and b/common/templates/PT/Forms/[32]JFXGM33SNVSSA43FNVQW4YLM.pdf differ
diff --git a/common/templates/PT/Forms/[32]JRUXG5DBEBSGKIDDN5XHI4TPNRSQ====.pdf b/common/templates/PT/Forms/[32]JRUXG5DBEBSGKIDDN5XHI4TPNRSQ====.pdf
new file mode 100644
index 000000000..5120fba7c
Binary files /dev/null and b/common/templates/PT/Forms/[32]JRUXG5DBEBSGKIDDN5XHI4TPNRSQ====.pdf differ
diff --git a/common/templates/PT/Forms/[32]JRUXM4TPEBSGKIDSMVTWS43UOJXSAZDPEBWW65DPOJUXG5DB.pdf b/common/templates/PT/Forms/[32]JRUXM4TPEBSGKIDSMVTWS43UOJXSAZDPEBWW65DPOJUXG5DB.pdf
new file mode 100644
index 000000000..2ee6829c8
Binary files /dev/null and b/common/templates/PT/Forms/[32]JRUXM4TPEBSGKIDSMVTWS43UOJXSAZDPEBWW65DPOJUXG5DB.pdf differ
diff --git a/common/templates/PT/Forms/[32]KBWGC3TFNJQWI33SEBSGKIDWNFQWOZLOOM======.pdf b/common/templates/PT/Forms/[32]KBWGC3TFNJQWI33SEBSGKIDWNFQWOZLOOM======.pdf
new file mode 100644
index 000000000..d8986f164
Binary files /dev/null and b/common/templates/PT/Forms/[32]KBWGC3TFNJQWI33SEBSGKIDWNFQWOZLOOM======.pdf differ
diff --git a/common/templates/PT/Forms/[32]KBWGC3TPEBZWK3LBNZQWY===.pdf b/common/templates/PT/Forms/[32]KBWGC3TPEBZWK3LBNZQWY===.pdf
new file mode 100644
index 000000000..f0e5bd6ab
Binary files /dev/null and b/common/templates/PT/Forms/[32]KBWGC3TPEBZWK3LBNZQWY===.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CP5BO6QWDIL2IGQXXILAIGQXLILBUFW2C2NDC6QXEQNBNGQWXIL3UMM.pdf b/common/templates/RU/Forms/[32]2CP5BO6QWDIL2IGQXXILAIGQXLILBUFW2C2NDC6QXEQNBNGQWXIL3UMM.pdf
new file mode 100644
index 000000000..2292ae587
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CP5BO6QWDIL2IGQXXILAIGQXLILBUFW2C2NDC6QXEQNBNGQWXIL3UMM.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CP5BO6QWDIL3UFY2GANBPWQWLIYTUFY2C5CBUF72GB5DAWQWXIYRUFV2GA5DAWQWLILRUFZ.pdf b/common/templates/RU/Forms/[32]2CP5BO6QWDIL3UFY2GANBPWQWLIYTUFY2C5CBUF72GB5DAWQWXIYRUFV2GA5DAWQWLILRUFZ.pdf
new file mode 100644
index 000000000..0d400f1d2
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CP5BO6QWDIL3UFY2GANBPWQWLIYTUFY2C5CBUF72GB5DAWQWXIYRUFV2GA5DAWQWLILRUFZ.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CP5BPWQWTILBUMA2C7NDB6QXXIYXUFZEBB5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIJJUFV2C65DDBA2CQ5BMWRR7IYFUF62CZ5BPRA2CJNBMGQXPILLUF52GBNBOGQXXILA===.pdf b/common/templates/RU/Forms/[32]2CP5BPWQWTILBUMA2C7NDB6QXXIYXUFZEBB5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIJJUFV2C65DDBA2CQ5BMWRR7IYFUF62CZ5BPRA2CJNBMGQXPILLUF52GBNBOGQXXILA===.pdf
new file mode 100644
index 000000000..31978d446
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CP5BPWQWTILBUMA2C7NDB6QXXIYXUFZEBB5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIJJUFV2C65DDBA2CQ5BMWRR7IYFUF62CZ5BPRA2CJNBMGQXPILLUF52GBNBOGQXXILA===.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CP5DAGQWXILJUF32C7NBNWQWXIL3UFY2C2SBUF6EDIYBUFQ2CY5BPWRQLILK===.pdf b/common/templates/RU/Forms/[32]2CP5DAGQWXILJUF32C7NBNWQWXIL3UFY2C2SBUF6EDIYBUFQ2CY5BPWRQLILK===.pdf
new file mode 100644
index 000000000..6ab67bd57
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CP5DAGQWXILJUF32C7NBNWQWXIL3UFY2C2SBUF6EDIYBUFQ2CY5BPWRQLILK===.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQU======.pdf b/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQU======.pdf
new file mode 100644
index 000000000..4b3606806
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQU======.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQUQNBJWQWLILLUMC2C7NDB6QXXIYXUFZEDIL7UMA2C4NBPORQI======.pdf b/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQUQNBJWQWLILLUMC2C7NDB6QXXIYXUFZEDIL7UMA2C4NBPORQI======.pdf
new file mode 100644
index 000000000..0c39a14fb
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CQ5BNORQDIYFUFY2GCNBOGQXLILBUMCEDIL4IGQWTIL5UMB2GBNBOGQW3ILLUF52C4NDD6RQUQNBJWQWLILLUMC2C7NDB6QXXIYXUFZEDIL7UMA2C4NBPORQI======.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CR5BPOQXDILFUFV2GANDAOQWDILXUMM2C65DC6QXEQNDAORQ7ILLUMC.pdf b/common/templates/RU/Forms/[32]2CR5BPOQXDILFUFV2GANDAOQWDILXUMM2C65DC6QXEQNDAORQ7ILLUMC.pdf
new file mode 100644
index 000000000..991421731
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CR5BPOQXDILFUFV2GANDAOQWDILXUMM2C65DC6QXEQNDAORQ7ILLUMC.pdf differ
diff --git a/common/templates/RU/Forms/[32]2CT5BNOQXIW5BO6QXDIYDUMCEDILJUF32GHSBUF72C7NBPGQX3IYTUF52C4NBOWQWAQNBP6QXYQNDA6RQXIL5UFU2GBQ====.pdf b/common/templates/RU/Forms/[32]2CT5BNOQXIW5BO6QXDIYDUMCEDILJUF32GHSBUF72C7NBPGQX3IYTUF52C4NBOWQWAQNBP6QXYQNDA6RQXIL5UFU2GBQ====.pdf
new file mode 100644
index 000000000..140fdf3d1
Binary files /dev/null and b/common/templates/RU/Forms/[32]2CT5BNOQXIW5BO6QXDIYDUMCEDILJUF32GHSBUF72C7NBPGQX3IYTUF52C4NBOWQWAQNBP6QXYQNDA6RQXIL5UFU2GBQ====.pdf differ
diff --git a/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORCVR42OLK===.pdf b/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORCVR42OLK===.pdf
new file mode 100644
index 000000000..c134d3f1e
Binary files /dev/null and b/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORCVR42OLK===.pdf differ
diff --git a/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORINI4WGZK===.pdf b/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORINI4WGZK===.pdf
new file mode 100644
index 000000000..146f4378a
Binary files /dev/null and b/common/templates/ZH/Forms/[32]42EJBZ53VHUK7APEXGTORINI4WGZK===.pdf differ
diff --git a/common/templates/ZH/Forms/[32]42EL7ZF2U7TIVNPGRK6OLAE742WL5ZMQRDSZBDA=.pdf b/common/templates/ZH/Forms/[32]42EL7ZF2U7TIVNPGRK6OLAE742WL5ZMQRDSZBDA=.pdf
new file mode 100644
index 000000000..b500176c5
Binary files /dev/null and b/common/templates/ZH/Forms/[32]42EL7ZF2U7TIVNPGRK6OLAE742WL5ZMQRDSZBDA=.pdf differ
diff --git a/common/templates/ZH/Forms/[32]42EL7ZNRRPT2PH7IWWA6LEEI4WIIY===.pdf b/common/templates/ZH/Forms/[32]42EL7ZNRRPT2PH7IWWA6LEEI4WIIY===.pdf
new file mode 100644
index 000000000..0f1021448
Binary files /dev/null and b/common/templates/ZH/Forms/[32]42EL7ZNRRPT2PH7IWWA6LEEI4WIIY===.pdf differ
diff --git a/common/templates/ZH/Forms/[32]42LYL2FBRTUKDDHHVCF6LLUJ42HJF2FBVDSY3FI=.pdf b/common/templates/ZH/Forms/[32]42LYL2FBRTUKDDHHVCF6LLUJ42HJF2FBVDSY3FI=.pdf
new file mode 100644
index 000000000..b86ddbe87
Binary files /dev/null and b/common/templates/ZH/Forms/[32]42LYL2FBRTUKDDHHVCF6LLUJ42HJF2FBVDSY3FI=.pdf differ
diff --git a/common/templates/ZH/Forms/[32]4S5IXZUDQXTLRBPFRWKQ====.pdf b/common/templates/ZH/Forms/[32]4S5IXZUDQXTLRBPFRWKQ====.pdf
new file mode 100644
index 000000000..7a0a79318
Binary files /dev/null and b/common/templates/ZH/Forms/[32]4S5IXZUDQXTLRBPFRWKQ====.pdf differ
diff --git a/common/templates/ZH/Forms/[32]4W5JJZNRRLTZJH7GWGBORAMM4S4KVZF2XLT25AHFR2DA====.pdf b/common/templates/ZH/Forms/[32]4W5JJZNRRLTZJH7GWGBORAMM4S4KVZF2XLT25AHFR2DA====.pdf
new file mode 100644
index 000000000..c87ccd5d0
Binary files /dev/null and b/common/templates/ZH/Forms/[32]4W5JJZNRRLTZJH7GWGBORAMM4S4KVZF2XLT25AHFR2DA====.pdf differ
diff --git a/common/templates/ZH/Forms/[32]4WXJV2MHSHSZBCHFSCGA====.pdf b/common/templates/ZH/Forms/[32]4WXJV2MHSHSZBCHFSCGA====.pdf
new file mode 100644
index 000000000..cd7b962ed
Binary files /dev/null and b/common/templates/ZH/Forms/[32]4WXJV2MHSHSZBCHFSCGA====.pdf differ
diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
index 4e3b22f36..326b9b6ed 100644
--- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
+++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
@@ -1872,6 +1872,9 @@
@"type": [ASCThemesController isCurrentThemeDark] ? @"dark" : @"light",
@"system": mode}];
[[ASCEditorJSVariables instance] apply];
+
+ json = [[NSMutableDictionary alloc] initWithDictionary: @{@"theme": [ASCThemesController actualThemeId]}];
+ appManager->UpdatePlugins([[json jsonString] stdwstring]);
}
}
@@ -2022,6 +2025,7 @@
case AscEditorType::etPresentation:
docName = [NSString stringWithFormat:NSLocalizedString(@"Presentation %ld.pptx", nil), ++presentationNameCounter];
break;
+ case AscEditorType::etPdf:
case AscEditorType::etDocumentMasterOForm:
case AscEditorType::etDocumentMasterForm:
docName = [NSString stringWithFormat:NSLocalizedString(@"Document %ld.pdf", nil), ++pdfNameCounter];
diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCEventsController.mm b/macos/ONLYOFFICE/Code/Controllers/Common/ASCEventsController.mm
index a32ae9c90..c49695767 100644
--- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCEventsController.mm
+++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCEventsController.mm
@@ -756,7 +756,8 @@ public:
int tplType = [json[@"type"] intValue];
// if ( tplType > AVS_OFFICESTUDIO_FILE_DOCUMENT and tplType < AVS_OFFICESTUDIO_FILE_PRESENTATION ) docType = AscEditorType::etDocument; else
if ( tplType > AVS_OFFICESTUDIO_FILE_PRESENTATION and tplType < AVS_OFFICESTUDIO_FILE_SPREADSHEET ) docType = AscEditorType::etPresentation; else
- if ( tplType > AVS_OFFICESTUDIO_FILE_SPREADSHEET and tplType < AVS_OFFICESTUDIO_FILE_CROSSPLATFORM ) docType = AscEditorType::etSpreadsheet;
+ if ( tplType > AVS_OFFICESTUDIO_FILE_SPREADSHEET and tplType < AVS_OFFICESTUDIO_FILE_CROSSPLATFORM ) docType = AscEditorType::etSpreadsheet; else
+ if ( tplType == AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF ) { docType = AscEditorType::etPdf; }
// else if ( tplType > AVS_OFFICESTUDIO_FILE_CROSSPLATFORM and tplType < AVS_OFFICESTUDIO_FILE_IMAGE ) {}
}
diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h
index 4f68fbd05..16fd2169c 100644
--- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h
+++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h
@@ -60,6 +60,7 @@ static NSString * const windowBackgroundColor = @"window-backg
+ (NSString*)currentThemeId;
+ (BOOL)isCurrentThemeDark;
+ (NSString*)defaultThemeId:(BOOL)isdark;
++ (NSString*)actualThemeId;
+ (NSColor*)color:(NSString*)name forTheme:(NSString*)theme;
+ (NSColor*)currentThemeColor:(NSString*)name;
+ (BOOL)isSystemDarkMode;
diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m
index eee3ccc15..35003f937 100644
--- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m
+++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m
@@ -121,6 +121,13 @@
return isdark ? uiThemeNight : uiThemeWhite;
}
++ (NSString*)actualThemeId {
+ NSString * theme = [self currentThemeId];
+ if ([uiThemeSystem isEqualToString:theme]) {
+ return [self defaultThemeId:[self isCurrentThemeDark]];
+ } else return theme;
+}
+
+ (NSColor*)currentThemeColor:(NSString*)name {
return [self color:name forTheme:[self currentThemeId]];
}
diff --git a/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm b/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm
index ab065a7ef..8ce255744 100644
--- a/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm
+++ b/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm
@@ -343,6 +343,7 @@ static float kASCRTLTabsRightMargin = 0;
NSDictionary * params = (NSDictionary *)notification.userInfo;
NSString * viewId = params[@"viewId"];
NSString * name = params[@"name"];
+ NSString * path = params[@"path"];
ASCTabView * tab = [self.tabsControl tabWithUUID:viewId];
@@ -350,6 +351,10 @@ static float kASCRTLTabsRightMargin = 0;
[tab setTitle:name];
[tab setToolTip:name];
+ if ( !(path == nil) && !(path.length == 0) ) {
+ tab.params[@"path"] = path;
+ }
+
[self.tabsControl updateTab:tab];
// if ([tab state] == NSControlStateValueOn) {
// [self.tabsControl reloadTab:tab];
diff --git a/macos/ONLYOFFICE/Code/Utils/ASCEditorJSVariables.mm b/macos/ONLYOFFICE/Code/Utils/ASCEditorJSVariables.mm
index 2b1157f90..1bb5e9e86 100644
--- a/macos/ONLYOFFICE/Code/Utils/ASCEditorJSVariables.mm
+++ b/macos/ONLYOFFICE/Code/Utils/ASCEditorJSVariables.mm
@@ -91,6 +91,7 @@
NSMutableDictionary * keybLangs = [NSMutableDictionary dictionary];
[keybLangs setObject:[ASCLinguist keyboardLanguages] forKey:@"langs"];
[_jsVariables setObject:keybLangs forKey:@"keyboard"];
+ [_jsVariables setValue:[ASCLinguist appLanguageCode] forKey:@"lang"];
}
return self;
diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
index 7d23c6776..bb9b306c5 100644
--- a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
+++ b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
@@ -95,9 +95,11 @@ using std::vector;
auto currentArch()->tstring
{
#ifdef _WIN32
-# ifdef _WIN64
+# if defined(_M_ARM64)
+ return L"_arm64";
+# elif defined(_M_X64)
return L"_x64";
-# else
+# elif defined(_M_IX86)
return L"_x86";
# endif
#else
@@ -513,9 +515,11 @@ void CSvcManager::onCompleteSlot(const int error, const tstring &filePath)
tstring curr_svc_version = _T(VER_FILEVERSION_STR);
JsonObject package = root.value(_T("package")).toObject();
#ifdef _WIN32
-# ifdef _WIN64
+# if defined(_M_ARM64)
+ JsonObject win = package.value(_T("win_arm64")).toObject();
+# elif defined(_M_X64)
JsonObject win = package.value(_T("win_64")).toObject();
-# else
+# elif defined(_M_IX86)
JsonObject win = package.value(_T("win_32")).toObject();
# endif
#else
diff --git a/win-linux/package/windows/DesktopEditors.aip b/win-linux/package/windows/DesktopEditors.aip
index a65d59efe..030ba65d8 100644
--- a/win-linux/package/windows/DesktopEditors.aip
+++ b/win-linux/package/windows/DesktopEditors.aip
@@ -111,7 +111,7 @@
|
|
|
- |
+ |
|
|
|
@@ -120,7 +120,7 @@
|
|
|
- |
+ |
|
@@ -1530,7 +1530,7 @@
|
- |
+ |
|
|
|
diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss
index 2c54de497..2d8aed464 100644
--- a/win-linux/package/windows/common.iss
+++ b/win-linux/package/windows/common.iss
@@ -79,10 +79,10 @@ AppMutex ={code:getAppMutex}
ChangesEnvironment =yes
SetupMutex =ASC
-#if str(ARCH) == "x64"
+#if ARCH == "x64" | ARCH == "arm64"
#if Int(DecodeVer(PREPROCVER,1)) >= 6
-ArchitecturesAllowed = x64compatible
-ArchitecturesInstallIn64BitMode = x64compatible
+ArchitecturesAllowed = x64compatible or arm64
+ArchitecturesInstallIn64BitMode = x64compatible or arm64
#else
ArchitecturesAllowed = x64
ArchitecturesInstallIn64BitMode = x64
@@ -1246,3 +1246,7 @@ Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}\Shell\Open\Command"; Value
Type: filesandordirs; Name: {commonappdata}\{#APP_PATH}\*; AfterInstall: RefreshEnvironment;
Type: filesandordirs; Name: "{app}\..\{#UPD_PATH}";
Type: files; Name: "{app}\svcrestart.bat";
+
+#ifdef PREPROCSAVE
+#expr SaveToFile(AddBackslash(SourcePath) + "desktop_preprocessed.iss")
+#endif
diff --git a/win-linux/package/windows/make.ps1 b/win-linux/package/windows/make.ps1
index 1a7491233..92badcd60 100644
--- a/win-linux/package/windows/make.ps1
+++ b/win-linux/package/windows/make.ps1
@@ -28,7 +28,7 @@ if (-not (Test-Path "$SourceDir")) {
Write-Error "Path `"$SourceDir`" does not exist"
}
if (-not $BuildDir) {
- $BuildDir = ".build.$Arch"
+ $BuildDir = "_$Arch"
}
Write-Host @"
@@ -100,16 +100,18 @@ if ($Sign) {
if ($LastExitCode -ne 0) { throw }
# VLC plugin cache
- if ($Arch -ne "arm64") {
+ if (
+ (($Arch -like "x??") -and ($env:PROCESSOR_ARCHITECTURE -eq "AMD64")) -or
+ (($Arch -eq "arm64") -and ($env:PROCESSOR_ARCHITECTURE -eq "ARM64"))
+ )
+ {
Write-Host ".\vlc-cache-gen $PWD\plugins"
& .\vlc-cache-gen "$PWD\plugins"
if ($LastExitCode -ne 0) { throw }
+
+ Write-Host "DELETE: vlc-cache-gen.exe"
+ Remove-Item -Force -LiteralPath "vlc-cache-gen.exe"
}
Set-Location $PSScriptRoot
}
-
-if (($Arch -ne "arm64") -and (Test-Path "$BuildDir\desktop\vlc-cache-gen.exe")) {
- Write-Host "DELETE: $BuildDir\desktop\vlc-cache-gen.exe"
- Remove-Item -Force -LiteralPath "$BuildDir\desktop\vlc-cache-gen.exe"
-}
diff --git a/win-linux/package/windows/make_advinst.ps1 b/win-linux/package/windows/make_advinst.ps1
index eed799a29..f0df20775 100644
--- a/win-linux/package/windows/make_advinst.ps1
+++ b/win-linux/package/windows/make_advinst.ps1
@@ -7,7 +7,8 @@
[string]$BuildDir,
[switch]$Sign,
[string]$CertName = "Ascensio System SIA",
- [string]$TimestampServer = "http://timestamp.digicert.com"
+ [string]$TimestampServer = "http://timestamp.digicert.com",
+ [switch]$Debug
)
$ErrorActionPreference = "Stop"
@@ -15,7 +16,7 @@ $ErrorActionPreference = "Stop"
Set-Location $PSScriptRoot
if (-not $BuildDir) {
- $BuildDir = ".build.$Arch"
+ $BuildDir = "_$Arch"
}
$MsiFile = switch ($Target) {
"commercial" { "$CompanyName-$ProductName-Enterprise-$Version-$Arch.msi" }
@@ -151,7 +152,6 @@ $AdvInstConfig += `
"NewSync APPDIR $BuildDir\desktop -existingfiles keep -feature Files", `
"NewSync APPDIR\$PluginManagerPath $BuildDir\desktop\$PluginManagerPath -existingfiles delete -feature PluginManager", `
"AddFile APPDIR $LicensePath\3dparty\3DPARTYLICENSE"
- # "GenerateReport -buildname $MsiBuild -output_path .\report.pdf", `
if ($Target -ne "commercial") {
$AdvInstConfig += `
"AddFile APPDIR $LicensePath\opensource\LICENSE.txt"
@@ -166,6 +166,9 @@ if ($Target -ne "commercial") {
"SetPackageName `"$MsiFile`" -buildname $MsiBuild", `
"AddFile APPDIR $LicensePath\commercial\EULA.txt"
}
+if ($Debug) {
+ $AdvInstConfig += "Save"
+}
$AdvInstConfig += `
"Rebuild -buildslist $MsiBuild"
$AdvInstConfig = ";aic", $AdvInstConfig
diff --git a/win-linux/package/windows/make_inno.ps1 b/win-linux/package/windows/make_inno.ps1
index 41a2de939..a59eff431 100644
--- a/win-linux/package/windows/make_inno.ps1
+++ b/win-linux/package/windows/make_inno.ps1
@@ -8,7 +8,8 @@
[string]$BrandingDir,
[switch]$Sign,
[string]$CertName = "Ascensio System SIA",
- [string]$TimestampServer = "http://timestamp.digicert.com"
+ [string]$TimestampServer = "http://timestamp.digicert.com",
+ [switch]$Debug
)
$ErrorActionPreference = "Stop"
@@ -16,7 +17,7 @@ $ErrorActionPreference = "Stop"
Set-Location $PSScriptRoot
if (-not $BuildDir) {
- $BuildDir = ".build.$Arch"
+ $BuildDir = "_$Arch"
}
if (-not (Test-Path "$BuildDir")) {
Write-Error "Path `"$BuildDir`" does not exist"
@@ -98,8 +99,7 @@ if ($Target -notlike "*update") {
Write-Host "`n[ Build Inno Setup project ]"
$IssFile = "common.iss"
-$InnoArgs = "/Qp",
- "/DVERSION=$Version",
+$InnoArgs = "/DVERSION=$Version",
"/DARCH=$Arch",
"/DBUILD_DIR=$BuildDir"
if ($BrandingDir) {
@@ -127,6 +127,9 @@ if ($Sign) {
$InnoArgs += "/DSIGN",
"/Sbyparam=signtool sign /a /v /n `$q$CertName`$q /t $TimestampServer `$f"
}
+if ($Debug) {
+ $InnoArgs += "/DPREPROCSAVE"
+}
Write-Host "iscc $InnoArgs $IssFile"
& iscc $InnoArgs $IssFile
diff --git a/win-linux/package/windows/make_zip.ps1 b/win-linux/package/windows/make_zip.ps1
index efa3b86f5..386f2683a 100644
--- a/win-linux/package/windows/make_zip.ps1
+++ b/win-linux/package/windows/make_zip.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
Set-Location $PSScriptRoot
if (-not $BuildDir) {
- $BuildDir = ".build.$Arch"
+ $BuildDir = "_$Arch"
}
if (-not (Test-Path "$BuildDir")) {
Write-Error "Path `"$BuildDir`" does not exist"
diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp
index 6089ec7e5..d229f86c8 100644
--- a/win-linux/src/cascapplicationmanagerwrapper.cpp
+++ b/win-linux/src/cascapplicationmanagerwrapper.cpp
@@ -2337,6 +2337,7 @@ QString CAscApplicationManagerWrapper::newFileName(int format)
switch ( format ) {
case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOTX:
case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: return tr("Document%1.docx").arg(++docx_count);
+ case AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF:
case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCXF: {
QString docname = tr("Document%1.docx").arg(++pdf_count);
return docname.replace("docx", "pdf");
diff --git a/win-linux/src/cupdatemanager.cpp b/win-linux/src/cupdatemanager.cpp
index a493f6f47..94ad3bbc8 100644
--- a/win-linux/src/cupdatemanager.cpp
+++ b/win-linux/src/cupdatemanager.cpp
@@ -163,9 +163,11 @@ void CUpdateManager::DialogSchedule::addToSchedule(const QString &method, const
auto currentArch()->QString
{
#ifdef _WIN32
-# ifdef _WIN64
+# if defined(_M_ARM64)
+ return "_arm64";
+# elif defined(_M_X64)
return "_x64";
-# else
+# elif defined(_M_IX86)
return "_x86";
# endif
#else
diff --git a/win-linux/src/prop/cmainwindowimpl.cpp b/win-linux/src/prop/cmainwindowimpl.cpp
index d1d7b28fe..ca7993104 100644
--- a/win-linux/src/prop/cmainwindowimpl.cpp
+++ b/win-linux/src/prop/cmainwindowimpl.cpp
@@ -103,10 +103,14 @@ void CMainWindowImpl::refreshAboutVersion()
_json_obj["version"] = VER_FILEVERSION_STR;
#ifdef Q_OS_WIN
-# ifdef Q_OS_WIN64
- _json_obj["arch"] = "x64";
-# else
- _json_obj["arch"] = "x86";
+# if defined(_M_ARM64)
+ _json_obj["arch"] = "arm64";
+# elif defined(_M_ARM)
+ _json_obj["arch"] = "arm";
+# elif defined(_M_X64)
+ _json_obj["arch"] = "x64";
+# elif defined(_M_IX86)
+ _json_obj["arch"] = "x86";
# endif
#endif
_json_obj["edition"] = _license;
|