Skip to content

Commit

Permalink
Merge branch 'release/v7.6.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxkadushkin
maxkadushkin committed Dec 5, 2023
2 parents 57fcffc + 7ed103d commit 3d1c470
Show file tree
Hide file tree
Showing 31 changed files with 947 additions and 306 deletions.
47 changes: 47 additions & 0 deletions common/changes/7.6.0/changes.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<h1>ONLYOFFICE Desktop Editors 7.6.0<span class="releasedate"> - {{DATE}}</span></h1>

<h2>New Features</h2>

<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>

<h2>Fixes</h2>

<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
47 changes: 47 additions & 0 deletions common/changes/7.6.0/changes_ru.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<h1>ONLYOFFICE Desktop Editors 7.6.0<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Новые функции</h2>

<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>

<h2>Исправления</h2>

<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
2 changes: 1 addition & 1 deletion common/loginpage/res/img/update_status/lastcheck.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/loginpage/res/img/update_status/load.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 12 additions & 4 deletions common/loginpage/src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,33 @@
<h3 class="createnew" l10n>Create new</h3>
<li class="menu-item">
<a action="new:docx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="docx" data-precls="img-el">
<use href="#docx-big"></use>
</svg>
<span class="text" l10n>DOCUMENT</span>
</a>
</li>
<li class="menu-item">
<a action="new:xlsx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="xlsx" data-precls="img-el">
<use href="#xlsx-big"></use>
</svg>
<span class="text" l10n>SPREADSHEET</span>
</a>
</li>
<li class="menu-item">
<a action="new:pptx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="pptx" data-precls="img-el">
<use href="#pptx-big"></use>
</svg>
<span class="text" l10n>PRESENTATION</span>
</a>
</li>
<li class="menu-item" style="padding-bottom:0;">
<a action="new:form">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="form" data-precls="img-el">
<use href="#docxf-big"></use>
</svg>
<span class="text" l10n="newForm">MASTER FORM</span>
</a>
</li>
Expand Down
19 changes: 14 additions & 5 deletions common/loginpage/src/index.html.deploy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,34 @@
<h3 class="createnew" l10n>Create new</h3>
<li class="menu-item">
<a action="new:docx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="docx" data-precls="img-el">
<use href="#docx-big"></use>
</svg>
<span class="text" l10n>DOCUMENT</span>
</a>
</li>
<li class="menu-item">
<a action="new:xlsx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="xlsx" data-precls="img-el">
<use href="#xlsx-big"></use>
</svg>
<span class="text" l10n>SPREADSHEET</span>
</a>
</li>
<li class="menu-item">
<a action="new:pptx">
<i class="icon img-el"></i>
<svg class="icon" data-iconname="pptx" data-precls="img-el">
<use href="#pptx-big"></use>
</svg>
<span class="text" l10n>PRESENTATION</span>
</a>
</li>
<li class="menu-item" style="padding-bottom:0;">
<a action="new:form">
<i class="icon img-el"></i>
<span class="text" l10n>MASTER FORM</span>
<svg class="icon" data-iconname="form" data-precls="img-el">
<use href="#docxf-big"></use>
</svg>
<span class="text" l10n="newForm">MASTER FORM</span>
</a>
</li>
</div>
Expand All @@ -117,6 +125,7 @@
<inline src="../res/img/generated/logo.svg" />
<inline src="../res/img/generated/update_status.svg" />
<inline src="../res/img/generated/formats.svg" />
<inline src="../res/img/generated/common.svg" />
<inline src="../noconnect/connection_error.svg" />
</div>

Expand Down
1 change: 1 addition & 0 deletions common/loginpage/src/locale.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ l10n.en = {
updateNoUpdates: 'App is up to date',
updateAvialable: 'Version $1 is available. Click to download.',
settOptThemeSystem: 'Same as system',
settOptThemeAddLocal: 'Add local theme',
settOptThemeContrastDark: 'Contrast Dark',
settAUpdateMode: 'Autoupdate mode',
settOptAUpdateSilent: 'Silent mode',
Expand Down
11 changes: 10 additions & 1 deletion common/loginpage/src/panelconnect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,17 @@

let info = {domain:model.path};
const _provider = config.portals.providers.find(model.provider);
if ( _provider && !!_provider.extraLogout )
if ( _provider ) {
if ( !!_provider.entryPage ) {
if ( !_provider.extraLogout )
_provider.extraLogout = [];

if ( !_provider.extraLogout.includes(_provider.entryPage) )
_provider.extraLogout.push(_provider.entryPage);
}

info.extra = _provider.extraLogout;
};

window.sdk.execCommand('portal:logout', JSON.stringify(info));
};
Expand Down
2 changes: 1 addition & 1 deletion common/loginpage/src/panelrecent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
let _html = `<div class="action-panel ${args.action}">
<div class="flexbox">
<div id="box-recovery" class="flex-item">
<div class="flexbox">'+
<div class="flexbox">
<h3 class="table-caption" l10n>${_lang.listRecoveryTitle}</h3>
<div class="table-box flex-fill">
<table id="tbl-filesrcv" class="table-files list"></table>
Expand Down
24 changes: 17 additions & 7 deletions common/loginpage/src/panels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ $(document).ready(function() {
$('a[action="new:xlsx"] > .text').text(utils.Lang.newXlsx);
$('a[action="new:pptx"] > .text').text(utils.Lang.newPptx);
$('a[action="new:form"] > .text').text(utils.Lang.newForm);
replaceIcons(window.devicePixelRatio>=2 || window.devicePixelRatio==1);
CommonEvents.on("icons:svg", replaceIcons);

if (!localStorage.welcome) {
app.controller.welcome = (new ControllerWelcome).init();
Expand Down Expand Up @@ -159,15 +157,27 @@ var Scroll_offset = '16px';
const mq = "screen and (-webkit-min-device-pixel-ratio: 1.01) and (-webkit-max-device-pixel-ratio: 1.99), " +
"screen and (min-resolution: 1.01dppx) and (max-resolution: 1.99dppx)";

window.matchMedia(mq).addEventListener('change', e => {
const mql = window.matchMedia(mq);
mql.addEventListener('change', e => {
CommonEvents.fire("icons:svg", [!e.target.matches]);
replaceIcons(!e.target.matches);
});

replaceIcons(!mql.matches);
}

function replaceIcons(pasteSvg) {
if(pasteSvg && !$('.tool-quick-menu').find('svg.icon').length) {
['docx', 'xlsx', 'pptx', 'form'].forEach(function (e) {
$(`a[action="new:${e}"]`).prepend($(`<svg class="icon"><use xlink:href="#${e == 'form' ? 'docxf' : e}-big"></use> </svg>`));
function replaceIcons(usesvg) {
if ( usesvg ) {
} else {
$('svg.icon', $('.tool-quick-menu')).each((i, el) => {
el = $(el);
const p = el.parent();
if ( $('i.icon', p).length == 0 ) {
const icon_pre_class = el.data("precls");
const icon_class = el.data("iconname");
const t = `<i class="icon ${icon_pre_class? icon_pre_class : ''} ${icon_class}" />`;
$(t).insertAfter(el);
}
});
}
}
Expand Down
40 changes: 27 additions & 13 deletions common/loginpage/src/panelsettings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
<section class='box-cmp-select'>
<select class='combobox' data-size='5'></select>
</section>
<button class="btn btn--primary hidden" id="idx-btn-addtheme" l10n>Add theme</button>
</div>
</div>
<div class='settings-field' id="opts-launch-mode" style='display:none;'>
Expand Down Expand Up @@ -326,14 +325,19 @@
if ( objs ) {
!(objs instanceof Array) && (objs = [objs]);

const _divider = _combo.find('[data-divider]');
objs.forEach(t => {
const _css = create_colors_css(t.id, t.colors);
if ( _css ) {
write_theme_css(_css);
themes_map[t.id] = {text: t.name, type: t.type, l10n: t.l10n};

const _theme_title = t.l10n[utils.Lang.id] || t.name;
_combo.append(`<option value=${t.id} l10n>${_theme_title}</option>`);
const _theme_menu_item = `<option value=${t.id} l10n>${_theme_title}</option>`;

if ( _divider.length )
_divider.before(_theme_menu_item);
else _combo.append(_theme_menu_item);
}
});
$optsUITheme.selectpicker('refresh');
Expand Down Expand Up @@ -512,9 +516,6 @@
if ( nativevars.theme ) {
if ( nativevars.theme.system == 'disabled' )
_themes.shift();

if ( nativevars.theme.addlocal == 'on' )
$('#idx-btn-addtheme').show();
}

const _combo = $('#opts-ui-theme select', $panel).empty();
Expand All @@ -533,13 +534,32 @@
if ( !$optsUITheme ) {
($optsUITheme = _combo)
.val(opts.uitheme)
.selectpicker().on('change', e => {
$btnApply.isdisabled() && $btnApply.disable(false);})
.selectpicker().on('changed.bs.select', (e, index, selected, previous) => {
$btnApply.isdisabled() && $btnApply.disable(false);

console.log('select theme', index, selected, previous);
if ( selected && e.target.value == 'add' ) {
sdk.command("uitheme:add", "local");

$optsUITheme.val(previous)
.selectpicker('refresh');
}
})
.parents('.settings-field').show();
} else {
$optsUITheme.val(opts.uitheme)
.selectpicker('refresh');
}

if ( nativevars.theme ) {
if ( nativevars.theme.addlocal == 'on' ) {
const _combo = $('#opts-ui-theme select', $panel);
_combo.append(`<option data-divider="true"></option>
<option value="add" l10n>${utils.Lang.settOptThemeAddLocal}</option>`);

$optsUITheme.selectpicker('refresh');
}
}
}
_apply_theme(!!opts.uitheme ? opts.uitheme : 'theme-classic-light');

Expand Down Expand Up @@ -683,10 +703,6 @@
// }
};

const _on_click_add_theme = function() {
sdk.command("uitheme:add", "local");
}

return {
init: function() {
baseController.prototype.init.apply(this, arguments);
Expand Down Expand Up @@ -715,8 +731,6 @@
$btnApply.prop('disabled', false);
});

$('#idx-btn-addtheme').on('click', _on_click_add_theme);

let _user_name = localStorage.getItem('username') || '';
let _open_mode = localStorage.getItem('docopenmode') || 'edit';

Expand Down
Loading

0 comments on commit 3d1c470

Please sign in to comment.