Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1666 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 56383
This commit is contained in:
Julia Radzhabova 2022-03-30 19:33:36 +03:00 committed by GitHub
parent 3d419cd23a 2d04ab6994
commit 58c4729ddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/documenteditor/main/app/template/StatusBar.template
View file

@ -1,36 +1,36 @@
<div class="statusbar" style="display:table;">
<div class="status-group dropup">
<label id="label-pages" class="status-label dropdown-toggle" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
<label id="label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
<div id="status-goto-box" class="dropdown-menu">
<label style="float:left;line-height:22px;"><%= textGotoPage %></label>
<div id="status-goto-page" style="display:inline-block;"></div>
</div>
</div>
<div class="status-group" style="width:100%; text-align:center;">
<label id="label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
<label id="label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
</div>
<div class="status-group" style="">
<div class="separator short el-edit"></div>
<span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
<span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
<span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
<span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
<div class="separator short el-edit space"></div>
<span id="btn-doc-spell" class="el-edit"></span>
<span id="btn-doc-spell" class="el-edit margin-top-small"></span>
<div class="separator short el-edit el-lang"></div>
<div id="btn-doc-review" class="el-edit el-review" style="display: inline-block;"></div>
<div id="btn-doc-review" class="el-edit el-review margin-top-small" style="display: inline-block;"></div>
<div class="separator short el-edit el-review"></div>
<div class="separator short hide-select-tools"></div>
<button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
<button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
<button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
<button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
<div class="separator short hide-select-tools"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
<label id="label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
</div>
</div>

19
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -4,15 +4,11 @@
.status-label {
position: relative;
top: 1px;
}
#label-pages, #label-zoom {
cursor: pointer;
}
#label-pages, #label-action {
margin-top: 2px;
}
#users-icon,#status-users-count {
display: inline-block;
@ -41,11 +37,20 @@
.status-group {
display: table-cell;
white-space: nowrap;
padding-top: 3px;
vertical-align: top;
&.dropup {
position: static;
}
.status-label.margin-top-large {
margin-top: 6px;
}
button.margin-top-small,
.margin-top-small > button,
.margin-top-small > .btn-group {
margin-top: 3px;
}
}
.separator {
@ -53,7 +58,6 @@
&.short {
height: 25px;
margin-top: -2px;
}
&.space {
@ -70,7 +74,8 @@
.cnt-zoom {
display: inline-block;
vertical-align: middle;
margin-top: 4px;
.dropdown-menu {
min-width: 80px;
margin-left: -4px;

20
apps/presentationeditor/main/app/template/StatusBar.template
View file

@ -1,10 +1,10 @@
<div class="statusbar" style="display:table;">
<div class="status-group">
<div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;"></div>
<div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;" class="margin-top-small"></div>
</div>
<div class="status-group dropup">
<label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<label id="status-label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<div id="status-goto-box" class="dropdown-menu">
<label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
<div id="status-goto-page" style="display:inline-block;"></div>
@ -24,22 +24,22 @@
<div class="separator short" style="margin-left: 10px;"></div>
</div>
<div class="status-group" style="width:100%; text-align:center;">
<label id="status-label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
<label id="status-label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
</div>
<div class="status-group" style="">
<span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
<span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
<span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
<span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
<div class="separator short el-edit space"></div>
<span id="btn-doc-spell" class="el-edit"></span>
<span id="btn-doc-spell" class="el-edit margin-top-small"></span>
<div class="separator short el-edit el-lang"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtoslide"></i></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth"></i></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown"></i></button>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtoslide">&nbsp;</span></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
<label id="status-label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup"></i></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
</div>
</div>

20
apps/presentationeditor/main/resources/less/statusbar.less
View file

@ -4,17 +4,12 @@
.status-label {
position: relative;
top: 1px;
}
#status-label-pages, #status-label-zoom {
cursor: pointer;
}
#status-label-pages, #status-label-action {
margin-top: 2px;
}
#status-users-icon, #status-users-count {
display: inline-block;
cursor: pointer;
@ -44,10 +39,19 @@
display: table-cell;
white-space: nowrap;
vertical-align: top;
padding-top: 3px;
&.dropup {
position: static;
}
.status-label.margin-top-large {
margin-top: 6px;
}
button.margin-top-small,
.margin-top-small > button,
.margin-top-small > .btn-group {
margin-top: 3px;
}
}
.separator {
@ -55,7 +59,6 @@
&.short {
height: 25px;
margin-top: -2px;
}
&.space {
@ -72,7 +75,8 @@
.cnt-zoom {
display: inline-block;
vertical-align: middle;
margin-top: 4px;
.dropdown-menu {
min-width: 80px;
margin-left: -4px;

2
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -368,7 +368,7 @@
.status-label {
font-weight: bold;
color: @text-normal;
margin-top: 5px;
margin-top: 6px;
width: 100%;
text-align: center;
}