diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js index 8cbd08a7a..fda543034 100644 --- a/apps/common/main/lib/component/ThemeColorPalette.js +++ b/apps/common/main/lib/component/ThemeColorPalette.js @@ -64,7 +64,7 @@ define([ '<% var me = this; %>' + '<% $(colors).each(function(num, item) { %>' + '<% if (me.isBlankSeparator(item)) { %>
' + - '<% } else if (me.isSeparator(item)) { %>
' + + '<% } else if (me.isSeparator(item)) { %>
' + '<% } else if (me.isColor(item)) { %> ' + '' + ' ' + diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 745ba5079..0efe310ff 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -48,7 +48,7 @@ define([ uithemes: true }; - var native = window.AscDesktopEditor; + var native = window.desktop || window.AscDesktopEditor; !!native && native.execCommand('webapps:features', JSON.stringify(features)); var Desktop = function () { @@ -86,6 +86,9 @@ define([ $('.asc-window.modal').css('top', obj.skiptoparea); Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea); + } else + if ( obj.lockthemes != undefined ) { + Common.UI.Themes.setAvailable(!obj.lockthemes); } } else if (/editor:config/.test(cmd)) { diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 0e952e05d..1c11545a3 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -226,7 +226,11 @@ define([ }, available: function () { - return !Common.Utils.isIE; + return !Common.Utils.isIE && !this.locked; + }, + + setAvailable: function (value) { + this.locked = value; }, map: function () { @@ -253,8 +257,8 @@ define([ return themes_map[this.currentThemeId()].type == 'dark'; }, - setTheme: function (id) { - if ( !!themes_map[id] ) { + setTheme: function (id, force) { + if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) { var classname = document.body.className.replace(/theme-\w+\s?/, ''); document.body.className = classname; diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index ee318c53c..d9f186d37 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -132,9 +132,10 @@ var utils = new(function() { me = this, checkSize = function() { var scale = {}; - if ( !!window.AscCommon && !!window.AscCommon.checkDeviceScale ) + if ( !!window.AscCommon && !!window.AscCommon.checkDeviceScale ) { scale = window.AscCommon.checkDeviceScale(); - else { + AscCommon.correctApplicationScale(scale); + } else { var str_mq_150 = "screen and (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), " + "screen and (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx)"; var str_mq_200 = "screen and (-webkit-min-device-pixel-ratio: 2), " + diff --git a/apps/common/main/resources/img/about/logo-white_s.svg b/apps/common/main/resources/img/about/logo-white_s.svg index 95b51b5ca..ae110aed0 100644 --- a/apps/common/main/resources/img/about/logo-white_s.svg +++ b/apps/common/main/resources/img/about/logo-white_s.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/apps/common/main/resources/img/controls/Scroll_center@1.5x.png b/apps/common/main/resources/img/controls/Scroll_center@1.5x.png index 743ca5769..c276d6bd9 100644 Binary files a/apps/common/main/resources/img/controls/Scroll_center@1.5x.png and b/apps/common/main/resources/img/controls/Scroll_center@1.5x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png index 06748aa9b..b15018e92 100755 Binary files a/apps/common/main/resources/img/controls/common-controls.png and b/apps/common/main/resources/img/controls/common-controls.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@1.5x.png b/apps/common/main/resources/img/controls/common-controls@1.5x.png index 07cd6907c..1f8971c0c 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@1.5x.png and b/apps/common/main/resources/img/controls/common-controls@1.5x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index 7284ca270..b76b70469 100755 Binary files a/apps/common/main/resources/img/controls/common-controls@2x.png and b/apps/common/main/resources/img/controls/common-controls@2x.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars index cc6aa1b2a..e31cffe7e 100644 --- a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars @@ -4,7 +4,7 @@ (min-resolution: 1.5dppx) and (max-resolution: 1.7dppx), (min-resolution: 144dpi) and (max-resolution: 167dpi) { - .x-huge .toolbar__icon { + .x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big { background-image: url(resources/{{{escaped_image}}}); background-size: {{scaled width 1.5}}px auto; } diff --git a/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars index ddb2130e0..fa7e149e8 100644 --- a/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars @@ -1,6 +1,14 @@ {{#spritesheet}} -.options__icon.options__icon-huge { - background-size: 80px auto; - background-size: var(--huge-icon-background-image-width) auto; +@media only screen { + @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), + (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), + (min-resolution: 144dpi) and (max-resolution: 191dpi) + { + .options__icon.options__icon-huge { + background-image: url(resources/{{{escaped_image}}}); + background-size: 80px auto; + background-size: var(--huge-icon-background-image-width) auto; + } + } } {{/spritesheet}} diff --git a/apps/common/main/resources/img/toolbar/1x/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/.css.handlebars index 73e7a0dc0..bdaae82c9 100644 --- a/apps/common/main/resources/img/toolbar/1x/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/.css.handlebars @@ -3,7 +3,7 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon { - @btn-active-icon-offset: 0; + @btn-active-icon-offset: -20px; background-position-x: @btn-active-icon-offset; background-position-x: var(--button-small-active-icon-offset-x, 0); @@ -13,7 +13,7 @@ } .menu__icon { .no-checkmark.checked & { - background-position-x: 0; + background-position-x: -20px; background-position-x: @menu-icon-item-checked-offset-x; } } diff --git a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars index 1479c86a4..c97af05b1 100644 --- a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars @@ -4,7 +4,7 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon { - background-position-x: 0; + background-position-x: -28px; background-position-x: var(--button-xhuge-active-icon-offset-x,0); } } @@ -14,18 +14,15 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon.toolbar__icon-big { - background-position-x: 0; + background-position-x: -28px; background-position-x: var(--button-xhuge-active-icon-offset-x,0); } } } } -.x-huge .toolbar__icon { +.x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big { background-image: url(resources/{{{escaped_image}}}); } -.toolbar__icon.toolbar__icon-big { - background-image: var(--big-icon-background-image); -} {{/spritesheet}} {{#sprites}} {{#parselang name}}.x-huge .{{name}}{{/parselang}}, diff --git a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars index 58fd2acc4..a516dc0e9 100644 --- a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars @@ -1,14 +1,14 @@ {{#spritesheet}} .btn { .options__icon.options__icon-huge { - background-position-x: 0; + background-position-x: -40px; background-position-x: var(--button-huge-normal-icon-offset-x,0); } &.active, &:active { &:not(:disabled):not(.disabled) { .options__icon.options__icon-huge { - @btn-active-icon-offset: 0; + @btn-active-icon-offset: -40px; background-position-x: @btn-active-icon-offset; background-position-x: var(--button-huge-active-icon-offset-x,0); } @@ -17,7 +17,7 @@ } .options__icon.options__icon-huge { - background-image: var(--huge-icon-background-image); + background-image: url(resources/{{{escaped_image}}}); } {{/spritesheet}} {{#sprites}} diff --git a/apps/common/main/resources/img/toolbar/2x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/2x/big/.css.handlebars index 382ce91c8..77dd44477 100644 --- a/apps/common/main/resources/img/toolbar/2x/big/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/2x/big/.css.handlebars @@ -3,7 +3,7 @@ @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx), (min-resolution: 192dpi) { - .x-huge .toolbar__icon { + .x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big { background-image: url(resources/{{{escaped_image}}}); background-size: {{half width}}px auto; } diff --git a/apps/common/main/resources/img/toolbar/2x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/2x/huge/.css.handlebars index 1bb31ab87..8ebef7651 100644 --- a/apps/common/main/resources/img/toolbar/2x/huge/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/2x/huge/.css.handlebars @@ -1,5 +1,12 @@ {{#spritesheet}} -.options__icon.options__icon-huge { - background-size: var(--huge-icon-background-image-width) auto; +@media only screen { + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 2dppx), (min-resolution: 192dpi) + { + .options__icon.options__icon-huge { + background-image: url(resources/{{{escaped_image}}}); + background-size: var(--huge-icon-background-image-width) auto; + } + } } {{/spritesheet}} diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index e553350aa..8622e9525 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -433,8 +433,8 @@ height: 3px; background-color: red; &.bordered { - border: 1px solid @border-regular-control-ie; - border: 1px solid @border-regular-control; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; + border: @scaled-one-px-value solid @border-regular-control; } @@ -576,8 +576,8 @@ &.over:not(.disabled), &.open { - box-shadow: inset 0 0 0 1px @highlight-button-hover-ie; - box-shadow: inset 0 0 0 1px @highlight-button-hover; + box-shadow: inset 0 0 0 @scaled-one-px-value-ie @highlight-button-hover-ie; + box-shadow: inset 0 0 0 @scaled-one-px-value @highlight-button-hover; button:not(.active):not(.btn-text-split-default) { background-color: transparent; @@ -733,6 +733,12 @@ background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } + + &.large { + min-width: 28px; + width: 28px; + height: 28px; + } } .btn-text-default { @@ -911,10 +917,6 @@ &.template-table { width: 92px; } - &.sheet-template-table { - width: 83px; - height: 54px; - } .icon-template-slicer.icon { min-width: 36px; @@ -935,6 +937,17 @@ position: relative; } + &.sheet-template-table { + width: 83px; + height: 54px; + + .icon { + border: none; + .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); + .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); + } + } + svg.icon { vertical-align: middle; width: 52px; @@ -1035,8 +1048,8 @@ color: @text-normal; background-color: @background-normal-ie; background-color: @background-normal; - border: 1px solid @border-regular-control-ie; - border: 1px solid @border-regular-control; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; + border: @scaled-one-px-value solid @border-regular-control; &:hover:not(.disabled), &.hover:not(.disabled) { diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index ef46dff77..33f7e75bc 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -38,10 +38,10 @@ --text-normal-pressed: #fff; --text-secondary: #a5a5a5; --text-tertiary: #a5a5a5; - --text-link: #acbfff; - --text-link-hover: #acbfff; - --text-link-active: #acbfff; - --text-link-visited: #acbfff; + --text-link: #445799; + --text-link-hover: #445799; + --text-link-active: #445799; + --text-link-visited: #445799; --text-inverse: #fff; --text-toolbar-header: #fff; --text-contrast-background: #fff; @@ -54,46 +54,47 @@ --icon-contrast-popover: #fff; --icon-success: #5b9f27; - // Canvas colors + // Canvas + --canvas-background: #e2e2e2; --canvas-content-background: #fff; - --canvas-page-border: #ccc; + --canvas-page-border: #bbbec2; - --canvas-ruler-background: #555; - --canvas-ruler-margins-background: #444; - --canvas-ruler-mark: #b2b2b2; - --canvas-ruler-handle-border: #b2b2b2; - --canvas-ruler-handle-border-disabled: #717171; + --canvas-ruler-background: #fff; + --canvas-ruler-margins-background: #d6d6d6; + --canvas-ruler-mark: #585b5e; + --canvas-ruler-handle-border: #555; + --canvas-ruler-handle-border-disabled: #a9afb5; - --canvas-high-contrast: #fff; - --canvas-high-contrast-disabled: #888; + --canvas-high-contrast: #000; + --canvas-high-contrast-disabled: #82878f; --canvas-cell-border: fade(#000, 10%); - --canvas-cell-title-border: #757575; - --canvas-cell-title-border-hover: #858585; - --canvas-cell-title-border-selected: #9e9e9e; - --canvas-cell-title-hover: #787878; - --canvas-cell-title-selected: #939393; + --canvas-cell-title-hover: #d6d6d6; + --canvas-cell-title-selected: #c1c1c1; + --canvas-cell-title-border: #cdcdcd; + --canvas-cell-title-border-hover: #afafaf; + --canvas-cell-title-border-selected: #929292; - --canvas-dark-cell-title: #111; - --canvas-dark-cell-title-hover: #000; - --canvas-dark-cell-title-selected: #333; - --canvas-dark-cell-title-border: #282828; - --canvas-dark-cell-title-border-hover: #191919; - --canvas-dark-cell-title-border-selected: #474747; + --canvas-dark-cell-title: #444; + --canvas-dark-cell-title-hover: #666 ; + --canvas-dark-cell-title-selected: #111; + --canvas-dark-cell-title-border: #3d3d3d; + --canvas-dark-cell-title-border-hover: #5c5c5c; + --canvas-dark-cell-title-border-selected: #0f0f0f; - --canvas-scroll-thumb: #404040; - --canvas-scroll-thumb-hover: #999; + --canvas-scroll-thumb: #f1f1f1; + --canvas-scroll-thumb-hover: #cfcfcf; --canvas-scroll-thumb-pressed: #adadad; - --canvas-scroll-thumb-border: #2a2a2a; - --canvas-scroll-thumb-border-hover: #2a2a2a; - --canvas-scroll-thumb-border-pressed: #2a2a2a; - --canvas-scroll-arrow: #999; - --canvas-scroll-arrow-hover: #404040; - --canvas-scroll-arrow-pressed: #404040; - --canvas-scroll-thumb-target: #999; - --canvas-scroll-thumb-target-hover: #404040; - --canvas-scroll-thumb-target-pressed: #404040; + --canvas-scroll-thumb-border: #cfcfcf; + --canvas-scroll-thumb-border-hover: #cfcfcf; + --canvas-scroll-thumb-border-pressed: #adadad; + --canvas-scroll-arrow: #adadad; + --canvas-scroll-arrow-hover: #f1f1f1; + --canvas-scroll-arrow-pressed: #f1f1f1; + --canvas-scroll-thumb-target: #cfcfcf; + --canvas-scroll-thumb-target-hover: #f1f1f1; + --canvas-scroll-thumb-target-pressed: #f1f1f1; // Others @@ -117,7 +118,7 @@ --component-hover-icon-opacity: .8; --component-active-icon-opacity: 1; --component-active-hover-icon-opacity: 1; - --component-disabled-opacity: .3; + --component-disabled-opacity: .4; --header-component-normal-icon-opacity: 1; --header-component-hover-icon-opacity: 1; diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index 8707a7755..7ebf68cad 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -16,7 +16,7 @@ --background-loader: fade(#181818, 90%); --highlight-button-hover: #555; - --highlight-button-pressed: #606060; + --highlight-button-pressed: #707070; --highlight-button-pressed-hover: #808080; --highlight-primary-dialog-button-hover: #fcfcfc; --highlight-header-button-hover: fade(#fff, 5%); @@ -26,12 +26,12 @@ --border-toolbar: #2a2a2a; --border-divider: #505050; - --border-regular-control: #666666; + --border-regular-control: #666; --border-toolbar-button-hover: #5a5a5a; - --border-preview-hover: #5a5a5a; - --border-preview-select: #666666; + --border-preview-hover: #757575; + --border-preview-select: #bdbdbd; --border-control-focus: #ccc; - --border-color-shading: fade(#fff, 5%); + --border-color-shading: fade(#fff, 10%); --border-error: #f62211; --text-normal: fade(#fff, 80%); @@ -54,8 +54,9 @@ --icon-contrast-popover: #fff; --icon-success: #090; - // Canvas colors - --canvas-background: #666666; + // Canvas + + --canvas-background: #666; --canvas-content-background: #fff; --canvas-page-border: #555; @@ -66,7 +67,7 @@ --canvas-ruler-handle-border-disabled: #808080; --canvas-high-contrast: #fff; - --canvas-high-contrast-disabled: #888; + --canvas-high-contrast-disabled: #ccc; --canvas-cell-border: fade(#000, 10%); --canvas-cell-title-border: #757575; @@ -117,7 +118,7 @@ --component-hover-icon-opacity: .8; --component-active-icon-opacity: 1; --component-active-hover-icon-opacity: 1; - --component-disabled-opacity: .3; + --component-disabled-opacity: .4; --header-component-normal-icon-opacity: .8; --header-component-hover-icon-opacity: .8; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 573027e92..83727731c 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -26,7 +26,7 @@ --background-loader: fade(#181818, 90%); --highlight-button-hover: #e0e0e0; - --highlight-button-pressed: #ccc; + --highlight-button-pressed: #cbcbcb; --highlight-button-pressed-hover: #bababa; --highlight-primary-dialog-button-hover: #1c1c1c; --highlight-header-button-hover: fade(#fff, 15%); @@ -38,10 +38,10 @@ --border-divider: #dfdfdf; --border-regular-control: #c0c0c0; --border-toolbar-button-hover: #e0e0e0; - --border-preview-hover: #cfcfcf; - --border-preview-select: #aaa; + --border-preview-hover: #bababa; + --border-preview-select: #888; --border-control-focus: #848484; - --border-color-shading: fade(#000, 10%); + --border-color-shading: fade(#000, 15%); --border-error: #f62211; --text-normal: fade(#000, 80%); @@ -77,14 +77,14 @@ --canvas-ruler-handle-border-disabled: #aaa; --canvas-high-contrast: #000; - --canvas-high-contrast-disabled: #999; + --canvas-high-contrast-disabled: #666; - --canvas-cell-border: fade(black, 10%); + --canvas-cell-border: fade(#000, 10%); + --canvas-cell-title-hover: #dfdfdf; + --canvas-cell-title-selected: #cfcfcf; --canvas-cell-title-border: #d8d8d8; --canvas-cell-title-border-hover: #c9c9c9; --canvas-cell-title-border-selected: #bbb; - --canvas-cell-title-hover: #dfdfdf; - --canvas-cell-title-selected: #cfcfcf; --canvas-dark-cell-title: #444; --canvas-dark-cell-title-hover: #666 ; @@ -229,4 +229,6 @@ // Canvas // --------------------------- +@canvas-background: var(--canvas-background); @canvas-content-background: var(--canvas-content-background); +@canvas-page-border: var(--canvas-page-border); diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 2c45bfc83..f27acd1de 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -7,6 +7,7 @@ .form-control:not(input) { padding-top: 0; padding-bottom: 0; + display: block; } } diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 6e39cb83c..64b972abc 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -103,7 +103,8 @@ margin: 0 @minus-px-ie @minus-px-ie 0; margin: 0 @minus-px @minus-px 0; height: @combo-dataview-height; - background-color: @canvas-content-background; + background-color: @background-normal-ie; + background-color: @background-normal; &:hover { .box-inner-shadow(0 0 0 2px @border-preview-hover-ie); @@ -145,6 +146,7 @@ border: none; //.box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie); //.box-shadow(0 0 0 @scaled-one-px-value @background-normal); + background-color: @canvas-content-background; > div { background-repeat: no-repeat; diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 4720f2cbe..415f98a0c 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -39,6 +39,7 @@ line-height: normal; border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value dotted @text-normal; + border-radius: 0; padding-top: 12px; outline: none; height: 29px; diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 4fc041b2e..d732bc597 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -269,4 +269,20 @@ textarea { .doc-content-color { background-color: @canvas-content-background; +} + +a { + color: @text-link; + + &:hover { + color: @text-link-hover; + } + + &:active { + color: @text-link-active; + } + + &:visited { + color: @text-link-visited; + } } \ No newline at end of file diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index 1c4c53fee..29eb93dc9 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -31,6 +31,10 @@ .box-shadow(0 0 0 2px @border-preview-select-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select); } + + .options__icon { + opacity: @component-normal-icon-opacity; + } } .grouped-data { diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index f0faa74bf..7f51067d9 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -157,7 +157,6 @@ .dataview { .item { .options__icon { - opacity: @component-normal-icon-opacity; } .options__icon-huge { diff --git a/apps/common/main/resources/less/hsb-colorpicker.less b/apps/common/main/resources/less/hsb-colorpicker.less index a6693567c..dfefc37c0 100644 --- a/apps/common/main/resources/less/hsb-colorpicker.less +++ b/apps/common/main/resources/less/hsb-colorpicker.less @@ -68,7 +68,9 @@ .cnt-sat-arrow { width: 14px; height: 9px; - margin: -4px -3px; + margin-top: -4px; + margin-left: -3px; + margin-left: calc(-2px - @scaled-one-px-value); position: absolute; background-position: -11px -196px; } diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less index ec8b0d2ac..66f7a9df6 100644 --- a/apps/common/main/resources/less/multislider-gradient.less +++ b/apps/common/main/resources/less/multislider-gradient.less @@ -50,8 +50,8 @@ border-radius: 2px; box-sizing: content-box; .thumb-bottom-inner { - border: solid @scaled-one-px-value-ie @border-regular-control-ie; - border: solid @scaled-one-px-value @border-regular-control; + border: solid @scaled-one-px-value-ie @background-normal-ie; + border: solid @scaled-one-px-value @background-normal; border-top: none; height: 100%; } @@ -59,10 +59,10 @@ &.active { .thumb-top { - border-top: solid @scaled-one-px-value-ie @border-regular-control-ie; - border-top: solid @scaled-one-px-value @border-regular-control; - border-left: solid @scaled-one-px-value-ie @border-regular-control-ie; - border-left: solid @scaled-one-px-value @border-regular-control; + border-top: solid @scaled-one-px-value-ie @border-control-focus-ie; + border-top: solid @scaled-one-px-value @border-control-focus; + border-left: solid @scaled-one-px-value-ie @border-control-focus-ie; + border-left: solid @scaled-one-px-value @border-control-focus; } .thumb-bottom { border: solid @scaled-one-px-value-ie @border-control-focus-ie; diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less index 6d94e4a7f..328b0082f 100644 --- a/apps/common/main/resources/less/scroller.less +++ b/apps/common/main/resources/less/scroller.less @@ -92,8 +92,8 @@ .pixel-ratio__1_5 & { //background-image: ~"url(@{common-image-const-path}/controls/Scroll_center@1.5x.png)"; - background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAATAgMAAAACIK4YAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABRJREFUeNpjYAxl4FrBwYAK6CwIAOsnB3Hkb0WyAAAAAElFTkSuQmCC'); - background-size: 14px auto; + background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAATAgMAAAAG1X4lAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABNJREFUeNpjYAx14FrFgAboLAgAVgQJB86JyMQAAAAASUVORK5CYII='); + background-size: 15px auto; } background-repeat: no-repeat; diff --git a/apps/common/main/resources/less/table-styler.less b/apps/common/main/resources/less/table-styler.less index ad979147e..304cf4f76 100644 --- a/apps/common/main/resources/less/table-styler.less +++ b/apps/common/main/resources/less/table-styler.less @@ -25,7 +25,16 @@ .tablestyler-cell .cell-content .content-text { display: block; - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAECAQAAAAO5iayAAAAAXNSR0IArs4c6QAAAAJiS0dEAP+Hj8y/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4AkeChACzh0FVAAAABFJREFUCNdjPPCfgYGJAQUAACB0AcMrPC7hAAAAAElFTkSuQmCC') repeat 0 0 scroll; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAEAQMAAACeIXx6AAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA1JREFUeNpjOMDEAAIABVQAw/N8ALEAAAAASUVORK5CYII=') repeat 0 0 scroll; + background-size: 2px auto; height: 100%; + + .pixel-ratio__1_5 & { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGAQMAAAA8K7ZPAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpjeMAAgmAAABesAqGy0C2BAAAAAElFTkSuQmCC'); + } + + .pixel-ratio__2 & { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAIAQMAAADk/cxGAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpj+MAAgVAAAC0QA8HkpvUHAAAAAElFTkSuQmCC'); + } } } \ No newline at end of file diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 6b0fc5ce8..c10a760df 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -791,7 +791,7 @@ @nocolor-offset-y: -137px; // Plus -@plus-offset-x: -81px; +@plus-offset-x: -80px; @plus-offset-y: -184px; @dl-horizontal-offset: @component-offset-horizontal; diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index dddf680f1..9ef385626 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -170,7 +170,7 @@ define([ }, onControlsSelect: function(type) { - if (!(this.toolbar.mode && this.toolbar.mode.canFeatureContentControl)) return; + if (!(this.toolbar.mode && this.toolbar.mode.canFeatureContentControl && this.toolbar.mode.canFeatureForms)) return; var oPr, oFormPr = new AscCommon.CSdtFormPr(); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 06f37f7a2..9ece5dbc1 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -392,6 +392,7 @@ define([ this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures; this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison"); this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-controls"); + this.appOptions.canFeatureForms = true; this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this)); diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 58dcd0367..8a36cc75b 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1561,7 +1561,7 @@ define([ this.toolbar.fireEvent('insertimage', this.toolbar); if (this.api) - this.api.asc_addImage(); + setTimeout(function() {me.api.asc_addImage();}, 1); Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Image'); @@ -3116,8 +3116,8 @@ define([ onAppShowed: function (config) { var me = this; - var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms); - if ( config.isEdit || config.isRestrictedEdit && config.canFillForms) { + var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms); + if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) { if ( Common.localStorage.itemExists("de-compact-toolbar") ) { compactview = Common.localStorage.getBool("de-compact-toolbar"); } else @@ -3165,21 +3165,23 @@ define([ Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons()); } if ( config.isEdit && config.canFeatureContentControl || config.isRestrictedEdit && config.canFillForms ) { - tab = {caption: me.textTabForms, action: 'forms'}; - var forms = me.getApplication().getController('FormsTab'); - forms.setApi(me.api).setConfig({toolbar: me, config: config}); - $panel = forms.createToolbarPanel(); - if ($panel) { - me.toolbar.addTab(tab, $panel, 4); - me.toolbar.setVisible('forms', true); - if (config.isEdit && config.canFeatureContentControl) { - Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons()); - me.onChangeSdtGlobalSettings(); - } else if (!compactview) { - me.toolbar.setTab('forms'); + if (config.canFeatureForms) { + tab = {caption: me.textTabForms, action: 'forms'}; + var forms = me.getApplication().getController('FormsTab'); + forms.setApi(me.api).setConfig({toolbar: me, config: config}); + $panel = forms.createToolbarPanel(); + if ($panel) { + me.toolbar.addTab(tab, $panel, 4); + me.toolbar.setVisible('forms', true); + if (config.isEdit && config.canFeatureContentControl) { + Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons()); + } else if (!compactview) { + me.toolbar.setTab('forms'); + } } } } + config.isEdit && config.canFeatureContentControl && me.onChangeSdtGlobalSettings(); }, onAppReady: function (config) { diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 3b234b489..80e01e5c5 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -165,7 +165,7 @@ define([ me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]); - if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms) || + if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) || ( !Common.localStorage.itemExists("de-compact-toolbar") && config.customization && config.customization.compactToolbar )) { @@ -205,8 +205,8 @@ define([ onAppReady: function (config) { var me = this; if ( me.header.btnOptions ) { - var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms); - if ( config.isEdit || config.isRestrictedEdit && config.canFillForms) { + var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms); + if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) { if ( Common.localStorage.itemExists("de-compact-toolbar") ) { compactview = Common.localStorage.getBool("de-compact-toolbar"); } else diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 431f4d129..8fd2b0f35 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -338,6 +338,7 @@ define([ if (this.api) { // this.api.asc_registerCallback('asc_onParaSpacingLine', _.bind(this._onLineSpacing, this)); } + Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this)); return this; }, diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index a43799142..7c7a11f94 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -336,6 +336,8 @@ define([ }); this.levelsList.on('item:select', _.bind(this.onSelectLevel, this)); + this.on('animate:after', _.bind(this.onAnimateAfter, this)); + this.afterRender(); }, @@ -347,6 +349,12 @@ define([ return this.type > 0 ? this.cmbFormat : this.cmbAlign; }, + onAnimateAfter: function() { + if (this.api) { + this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2); + } + }, + afterRender: function() { this.updateThemeColors(); this._setDefaults(this.props); @@ -552,9 +560,6 @@ define([ } else this.cmbFormat.setValue((format!==undefined) ? format : ''); } - if (this.api) { - this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2); - } }, txtTitle: 'List Settings', diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index cdb98130c..9a65bdb86 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -100,7 +100,7 @@ define([ '
', '
', '', - '
', + '
', '
', '' ].join(''); diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index dfadc2c5c..974fc87e1 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -211,7 +211,7 @@ define([ this.signatureSettings = new DE.Views.SignatureSettings(); } - if (mode && mode.canFeatureContentControl && mode.canEditContentControl) { + if (mode && mode.canFeatureContentControl && mode.canEditContentControl && mode.canFeatureForms) { this.btnForm = new Common.UI.Button({ hint: this.txtFormSettings, asctype: Common.Utils.documentSettingsType.Form, diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 4b44c621a..0f0757a29 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -15,13 +15,22 @@ --background-toolbar: #404040; --border-toolbar: #2a2a2a; --highlight-button-hover: #e0e0e0; + --highlight-header-button-hover: rgba(255,255,255,.05); --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } .theme-classic-light { - --highlight-button-hover: #d8dadc; + } + + .theme-light { + --background-toolbar: #f7f7f7; + /*--border-toolbar: #cbcbcb;*/ + --highlight-button-hover: #ccc; + --highlight-header-button-hover: rgba(255,255,255,.15); + --canvas-background: #eee; + --canvas-page-border: #ccc; } .loadmask { @@ -32,8 +41,8 @@ width: 100%; overflow: hidden; border: none; - background: #f0f0f0; - background: var(--canvas-background, #f0f0f0); + background: #e2e2e2; + background: var(--canvas-background, #e2e2e2); z-index: 1001; } @@ -73,12 +82,13 @@ height: 12px; border-radius: 3px; margin: 0 10px; - background: rgba(255, 255, 255, 0.2); + background: rgba(255,255,255,.2); + background: var(--highlight-header-button-hover, rgba(255,255,255,.2)); } .loadmask > .sktoolbar { - background: #f7f7f7; - background: var(--background-toolbar, #f7f7f7); + background: #f1f1f1; + background: var(--background-toolbar, #f1f1f1); border-bottom: 1px solid #cbcbcb; border-bottom: var(--scaled-one-px-value, 1px) solid var(--border-toolbar, #cbcbcb); height: 46px; @@ -94,8 +104,8 @@ } .loadmask > .sktoolbar li { - background: #ccc; - background: var(--highlight-button-hover, #ccc); + background: #d8dadc; + background: var(--highlight-button-hover, #d8dadc); border-radius: 3px; width: 20px; height: 20px; @@ -124,15 +134,15 @@ width: 794px; margin: 46px auto; height: 100%; - border: 1px solid #ccc; - border: var(--scaled-one-px-value, 1px) solid var(--canvas-page-border, #ccc); + border: 1px solid #bbbec2; + border: var(--scaled-one-px-value, 1px) solid var(--canvas-page-border, #bbbec2); padding-top: 50px; } .loadmask > .placeholder > .line { height: 15px; margin: 30px 80px; - background: #e2e2e2; + background: rgba(0,0,0,.05); overflow: hidden; position: relative; diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 70a90f658..6387529ff 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -19,8 +19,8 @@ width: 100%; overflow: hidden; border: none; - background: #f0f0f0; - background: var(--canvas-background, #f0f0f0); + background: #e2e2e2; + background: var(--canvas-background, #e2e2e2); z-index: 1001; } @@ -60,12 +60,13 @@ height: 12px; border-radius: 3px; margin: 0 10px; - background: rgba(255, 255, 255, 0.2); + background: rgba(255,255,255,.2); + background: var(--highlight-header-button-hover, rgba(255,255,255,.2)); } .loadmask > .sktoolbar { - background: #f7f7f7; - background: var(--background-toolbar, #f7f7f7); + background: #f1f1f1; + background: var(--background-toolbar, #f1f1f1); border-bottom: 1px solid #cbcbcb; border-bottom: var(--scaled-one-px-value, 1px) solid var(--border-toolbar, #cbcbcb); height: 46px; @@ -81,8 +82,8 @@ } .loadmask > .sktoolbar li { - background: #ccc; - background: var(--highlight-button-hover, #ccc); + background: #d8dadc; + background: var(--highlight-button-hover, #d8dadc); border-radius: 3px; width: 20px; height: 20px; @@ -111,15 +112,15 @@ width: 794px; margin: 46px auto; height: 100%; - border: 1px solid #ccc; - border: var(--scaled-one-px-value, 1px) solid var(--canvas-page-border, #ccc); + border: 1px solid #bbbec2; + border: var(--scaled-one-px-value, 1px) solid var(--canvas-page-border, #bbbec2); padding-top: 50px; } .loadmask > .placeholder > .line { height: 15px; margin: 30px 80px; - background: #e2e2e2; + background: rgba(0,0,0,.05); overflow: hidden; position: relative; @@ -216,6 +217,7 @@ !window.native_message_cmd && (window.native_message_cmd = []); window.native_message_cmd[cmd] = param; } + window.desktop.execCommand('webapps:entry', ''); } diff --git a/apps/documenteditor/main/resources/help/de/Contents.json b/apps/documenteditor/main/resources/help/de/Contents.json index 38611d265..0ea3240e3 100644 --- a/apps/documenteditor/main/resources/help/de/Contents.json +++ b/apps/documenteditor/main/resources/help/de/Contents.json @@ -1,245 +1,77 @@ [ - { - "src": "ProgramInterface/ProgramInterface.htm", - "name": "Einführung in die Benutzeroberfläche des Dokumenteneditors", - "headername": "Benutzeroberfläche" - }, - { - "src": "ProgramInterface/FileTab.htm", - "name": "Registerkarte Datei" - }, - { - "src": "ProgramInterface/HomeTab.htm", - "name": "Registerkarte Start" - }, - { - "src": "ProgramInterface/InsertTab.htm", - "name": "Registerkarte Einfügen" - }, - { - "src": "ProgramInterface/LayoutTab.htm", - "name": "Registerkarte Layout" - }, - { - "src": "ProgramInterface/ReferencesTab.htm", - "name": "Registerkarte Verweise" - }, - { - "src": "ProgramInterface/ReviewTab.htm", - "name": "Registerkarte Zusammenarbeit" - }, - { - "src": "ProgramInterface/PluginsTab.htm", - "name": "Registerkarte Plug-ins" - }, - { - "src": "UsageInstructions/OpenCreateNew.htm", - "name": "Ein neues Dokument erstellen oder ein vorhandenes öffnen", - "headername": "Grundfunktionen" - }, - { - "src": "UsageInstructions/CopyPasteUndoRedo.htm", - "name": "Textpassagen kopieren/einfügen, Vorgänge rückgängig machen/wiederholen" - }, - { - "src": "UsageInstructions/ChangeColorScheme.htm", - "name": "Farbschema ändern" - }, - { - "src": "UsageInstructions/SetPageParameters.htm", - "name": "Seitenparameter festlegen", - "headername": "Seitenparameter festlegen" - }, - { - "src": "UsageInstructions/NonprintingCharacters.htm", - "name": "Formatierungszeichen ein-/ausblenden" - }, - { - "src": "UsageInstructions/SectionBreaks.htm", - "name": "Abschnittsumbrüche einfügen" - }, - { - "src": "UsageInstructions/InsertHeadersFooters.htm", - "name": "Kopf- und Fußzeilen einfügen" - }, - {"src": "UsageInstructions/InsertDateTime.htm", "name": "Datum und Uhrzeit einfügen"}, - { - "src": "UsageInstructions/InsertPageNumbers.htm", - "name": "Seitenzahlen einfügen" - }, - { - "src": "UsageInstructions/InsertFootnotes.htm", - "name": "Fußnoten einfügen" - }, + { "src": "ProgramInterface/ProgramInterface.htm", "name": "Einführung in die Benutzeroberfläche des Dokumenteneditors", "headername": "Benutzeroberfläche" }, + { "src": "ProgramInterface/FileTab.htm", "name": "Registerkarte Datei" }, + { "src": "ProgramInterface/HomeTab.htm", "name": "Registerkarte Start" }, + { "src": "ProgramInterface/InsertTab.htm", "name": "Registerkarte Einfügen" }, + { "src": "ProgramInterface/LayoutTab.htm", "name": "Registerkarte Layout" }, + { "src": "ProgramInterface/ReferencesTab.htm", "name": "Registerkarte Verweise" }, + { "src": "ProgramInterface/ReviewTab.htm", "name": "Registerkarte Zusammenarbeit" }, + { "src": "ProgramInterface/PluginsTab.htm", "name": "Registerkarte Plug-ins" }, + { "src": "UsageInstructions/OpenCreateNew.htm", "name": "Ein neues Dokument erstellen oder ein vorhandenes öffnen", "headername": "Grundfunktionen" }, + { "src": "UsageInstructions/CopyPasteUndoRedo.htm", "name": "Textpassagen kopieren/einfügen, Vorgänge rückgängig machen/wiederholen" }, + { "src": "UsageInstructions/ChangeColorScheme.htm", "name": "Farbschema ändern" }, + { "src": "UsageInstructions/SetPageParameters.htm", "name": "Seitenparameter festlegen", "headername": "Seitenparameter festlegen" }, + { "src": "UsageInstructions/NonprintingCharacters.htm", "name": "Formatierungszeichen ein-/ausblenden" }, + { "src": "UsageInstructions/SectionBreaks.htm", "name": "Abschnittsumbrüche einfügen" }, + { "src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Kopf- und Fußzeilen einfügen" }, + { "src": "UsageInstructions/InsertDateTime.htm", "name": "Datum und Uhrzeit einfügen"}, + { "src": "UsageInstructions/InsertPageNumbers.htm", "name": "Seitenzahlen einfügen" }, + { "src": "UsageInstructions/InsertFootnotes.htm", "name": "Fußnoten einfügen" }, { "src": "UsageInstructions/InsertEndnotes.htm", "name": "Endnoten einfügen" }, { "src": "UsageInstructions/ConvertFootnotesEndnotes.htm", "name": "Endnoten und Fußnoten einfügen" }, - { - "src": "UsageInstructions/InsertBookmarks.htm", - "name": "Lesezeichen hinzufügen" - }, - {"src": "UsageInstructions/AddWatermark.htm", "name": "Wasserzeichen hinzufügen"}, - { - "src": "UsageInstructions/AlignText.htm", - "name": "Text in einem Absatz ausrichten", - "headername": "Absatzformatierung" - }, - { - "src": "UsageInstructions/BackgroundColor.htm", - "name": "Hintergrundfarbe für einen Absatz festlegen" - }, - {"src": "UsageInstructions/SetOutlineLevel.htm", "name": "Gliederungsebene konfigurieren"}, - { - "src": "UsageInstructions/ParagraphIndents.htm", - "name": "Absatzeinzüge ändern" - }, - { - "src": "UsageInstructions/LineSpacing.htm", - "name": "Zeilenabstand in Absätzen festlegen" - }, - { - "src": "UsageInstructions/PageBreaks.htm", - "name": "Seitenumbrüche einfügen" - }, - { - "src": "UsageInstructions/AddBorders.htm", - "name": "Rahmenlinien hinzufügen" - }, - { - "src": "UsageInstructions/SetTabStops.htm", - "name": "Tabstopps setzen" - }, - { - "src": "UsageInstructions/CreateLists.htm", - "name": "Listen erstellen" - }, - { - "src": "UsageInstructions/FormattingPresets.htm", - "name": "Formatvorlagen anwenden", - "headername": "Textformatierung" - }, - { - "src": "UsageInstructions/FontTypeSizeColor.htm", - "name": "Schriftart, -größe und -farbe festlegen" - }, - { - "src": "UsageInstructions/DecorationStyles.htm", - "name": "Dekoschriften anwenden" - }, - { - "src": "UsageInstructions/CopyClearFormatting.htm", - "name": "Textformatierung übernehmen/entfernen" - }, - { - "src": "UsageInstructions/AddHyperlinks.htm", - "name": "Hyperlink einfügen" - }, - {"src": "UsageInstructions/InsertCrossReference.htm", "name": "Querverweise einfügen"}, - { - "src": "UsageInstructions/InsertDropCap.htm", - "name": "Initialbuchstaben einfügen" - }, - { - "src": "UsageInstructions/InsertTables.htm", - "name": "Tabellen einfügen", - "headername": "Objekte bearbeiten" - }, - { - "src": "UsageInstructions/AddFormulasInTables.htm", - "name": "Formeln in Tabellen verwenden" - }, - { - "src": "UsageInstructions/InsertImages.htm", - "name": "Bilder einfügen" - }, - { - "src": "UsageInstructions/InsertAutoshapes.htm", - "name": "AutoFormen einfügen" - }, - { - "src": "UsageInstructions/InsertCharts.htm", - "name": "Diagramme einfügen" - }, - { - "src": "UsageInstructions/InsertTextObjects.htm", - "name": "Textobjekte einfügen" - }, - { "src": "UsageInstructions/AddCaption.htm", "name": "Beschriftungen einfügen" }, - { "src": "UsageInstructions/InsertSymbols.htm", "name": "Symbole und Sonderzeichen einfügen" }, - { - "src": "UsageInstructions/InsertContentControls.htm", - "name": "Inhaltssteuerelemente einfügen" - }, - { - "src": "UsageInstructions/CreateTableOfContents.htm", - "name": "Inhaltsverzeichnis erstellen" - }, - {"src": "UsageInstructions/AddTableofFigures.htm", "name": "Abbildungsverzeichnis hinzufügen und formatieren" }, - { - "src": "UsageInstructions/AlignArrangeObjects.htm", - "name": "Objekte auf einer Seite anordnen und ausrichten" - }, - { - "src": "UsageInstructions/ChangeWrappingStyle.htm", - "name": "Umbruchstil ändern" - }, - { - "src": "UsageInstructions/UseMailMerge.htm", - "name": "Seriendruck verwenden", - "headername": "Seriendruck" - }, - { - "src": "UsageInstructions/InsertEquation.htm", - "name": "Formeln einfügen", - "headername": "Mathematische Formeln" - }, - { - "src": "HelpfulHints/CollaborativeEditing.htm", - "name": "Gemeinsame Bearbeitung von Dokumenten", - "headername": "Co-Bearbeitung" - }, - { - "src": "HelpfulHints/Review.htm", - "name": "Dokumentenprüfung" - }, - - {"src": "HelpfulHints/Comparison.htm", "name": "Dokumente vergleichen"}, - { - "src": "UsageInstructions/ViewDocInfo.htm", - "name": "Dokumenteigenschaften anzeigen", - "headername": "Werkzeuge und Einstellungen" - }, - { - "src": "UsageInstructions/SavePrintDownload.htm", - "name": "Dokument speichern/runterladen/drucken" - }, - { - "src": "HelpfulHints/AdvancedSettings.htm", - "name": "Erweiterte Einstellungen des Dokumenteneditors" - }, - { - "src": "HelpfulHints/Navigation.htm", - "name": "Ansichtseinstellungen und Navigationswerkzeuge" - }, - { - "src": "HelpfulHints/Search.htm", - "name": "Suchen und Ersetzen" - }, - { - "src": "HelpfulHints/SpellChecking.htm", - "name": "Rechtschreibprüfung" - }, - {"src": "UsageInstructions/MathAutoCorrect.htm", "name": "AutoKorrekturfunktionen" }, - { - "src": "HelpfulHints/About.htm", - "name": "Über den Dokumenteneditor", - "headername": "Nützliche Hinweise" - }, - { - "src": "HelpfulHints/SupportedFormats.htm", - "name": "Unterstützte Formate von elektronischen Dokumenten" - }, - { - "src": "HelpfulHints/KeyboardShortcuts.htm", - "name": "Tastaturkürzel" - } + { "src": "UsageInstructions/InsertBookmarks.htm", "name": "Lesezeichen hinzufügen" }, + { "src": "UsageInstructions/AddWatermark.htm", "name": "Wasserzeichen hinzufügen"}, + { "src": "UsageInstructions/AlignText.htm", "name": "Text in einem Absatz ausrichten", "headername": "Absatzformatierung" }, + { "src": "UsageInstructions/BackgroundColor.htm", "name": "Hintergrundfarbe für einen Absatz festlegen" }, + { "src": "UsageInstructions/SetOutlineLevel.htm", "name": "Gliederungsebene konfigurieren"}, + { "src": "UsageInstructions/ParagraphIndents.htm", "name": "Absatzeinzüge ändern" }, + { "src": "UsageInstructions/LineSpacing.htm", "name": "Zeilenabstand in Absätzen festlegen" }, + { "src": "UsageInstructions/PageBreaks.htm", "name": "Seitenumbrüche einfügen" }, + { "src": "UsageInstructions/AddBorders.htm", "name": "Rahmenlinien hinzufügen" }, + { "src": "UsageInstructions/SetTabStops.htm", "name": "Tabstopps setzen" }, + { "src": "UsageInstructions/CreateLists.htm", "name": "Listen erstellen" }, + { "src": "UsageInstructions/FormattingPresets.htm", "name": "Formatvorlagen anwenden", "headername": "Textformatierung" }, + { "src": "UsageInstructions/FontTypeSizeColor.htm", "name": "Schriftart, -größe und -farbe festlegen" }, + { "src": "UsageInstructions/DecorationStyles.htm", "name": "Dekoschriften anwenden" }, + { "src": "UsageInstructions/CopyClearFormatting.htm", "name": "Textformatierung übernehmen/entfernen" }, + { "src": "UsageInstructions/AddHyperlinks.htm", "name": "Hyperlink einfügen" }, + { "src": "UsageInstructions/InsertCrossReference.htm", "name": "Querverweise einfügen"}, + { "src": "UsageInstructions/InsertDropCap.htm", "name": "Initialbuchstaben einfügen" }, + { "src": "UsageInstructions/InsertTables.htm", "name": "Tabellen einfügen", "headername": "Objekte bearbeiten" }, + { "src": "UsageInstructions/AddFormulasInTables.htm", "name": "Formeln in Tabellen verwenden" }, + { "src": "UsageInstructions/InsertImages.htm", "name": "Bilder einfügen" }, + { "src": "UsageInstructions/InsertAutoshapes.htm", "name": "AutoFormen einfügen" }, + { "src": "UsageInstructions/InsertCharts.htm", "name": "Diagramme einfügen" }, + { "src": "UsageInstructions/InsertTextObjects.htm", "name": "Textobjekte einfügen" }, + { "src": "UsageInstructions/AddCaption.htm", "name": "Beschriftungen einfügen" }, + { "src": "UsageInstructions/InsertSymbols.htm", "name": "Symbole und Sonderzeichen einfügen" }, + { "src": "UsageInstructions/InsertContentControls.htm", "name": "Inhaltssteuerelemente einfügen" }, + { "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Inhaltsverzeichnis erstellen" }, + { "src": "UsageInstructions/AddTableofFigures.htm", "name": "Abbildungsverzeichnis hinzufügen und formatieren" }, + { "src": "UsageInstructions/AlignArrangeObjects.htm", "name": "Objekte auf einer Seite anordnen und ausrichten" }, + { "src": "UsageInstructions/ChangeWrappingStyle.htm", "name": "Umbruchstil ändern" }, + { "src": "UsageInstructions/UseMailMerge.htm", "name": "Seriendruck verwenden", "headername": "Seriendruck" }, + { "src": "UsageInstructions/InsertEquation.htm", "name": "Formeln einfügen", "headername": "Mathematische Formeln" }, + { "src": "HelpfulHints/CollaborativeEditing.htm", "name": "Gemeinsame Bearbeitung von Dokumenten", "headername": "Co-Bearbeitung" }, + { "src": "HelpfulHints/Review.htm", "name": "Dokumentenprüfung" }, + { "src": "HelpfulHints/Comparison.htm", "name": "Dokumente vergleichen" }, + { "src": "UsageInstructions/PhotoEditor.htm", "name": "Bild bearbeiten", "headername": "Plugins" }, + { "src": "UsageInstructions/YouTube.htm", "name": "Verweise einfügen" }, + { "src": "UsageInstructions/HighlightedCode.htm", "name": "Hervorgehobenen Code einfügen" }, + { "src": "UsageInstructions/InsertReferences.htm", "name": "Verweise einfügen" }, + { "src": "UsageInstructions/Translator.htm", "name": "Text übersetzen" }, + { "src": "UsageInstructions/OCR.htm", "name": "Text aus einem Bild extrahieren" }, + { "src": "UsageInstructions/Speech.htm", "name": "Text laut vorlesen" }, + { "src": "UsageInstructions/Thesaurus.htm", "name": "Wort durch Synonym ersetzen" }, + { "src": "UsageInstructions/Wordpress.htm", "name": "Dokument in WordPress hochladen"}, + { "src": "UsageInstructions/ViewDocInfo.htm", "name": "Dokumenteigenschaften anzeigen", "headername": "Werkzeuge und Einstellungen" }, + { "src": "UsageInstructions/SavePrintDownload.htm", "name": "Dokument speichern/runterladen/drucken" }, + { "src": "HelpfulHints/AdvancedSettings.htm", "name": "Erweiterte Einstellungen des Dokumenteneditors" }, + { "src": "HelpfulHints/Navigation.htm", "name": "Ansichtseinstellungen und Navigationswerkzeuge" }, + { "src": "HelpfulHints/Search.htm", "name": "Suchen und Ersetzen" }, + { "src": "HelpfulHints/SpellChecking.htm", "name": "Rechtschreibprüfung" }, + { "src": "UsageInstructions/MathAutoCorrect.htm", "name": "AutoKorrekturfunktionen" }, + { "src": "HelpfulHints/About.htm", "name": "Über den Dokumenteneditor", "headername": "Nützliche Hinweise" }, + { "src": "HelpfulHints/SupportedFormats.htm", "name": "Unterstützte Formate von elektronischen Dokumenten" }, + { "src": "HelpfulHints/KeyboardShortcuts.htm", "name": "Tastaturkürzel" } ] \ No newline at end of file diff --git a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm index c24598250..de520b18c 100644 --- a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm +++ b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm @@ -14,8 +14,8 @@

Über den Dokumenteneditor

-

Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente direkt in Ihrem Browser betrachten und bearbeiten können.

-

Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF- oder HTML-Dateien speichern.

+

Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente direkt in Ihrem Browser betrachten und bearbeiten können.

+

Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF-, HTML-, FB2, EPUB-Dateien speichern.

Wenn Sie in der Online-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol Über in der linken Seitenleiste. Wenn Sie in der Desktop-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, wählen Sie das Menü Über in der linken Seitenleiste des Hauptfensters.

diff --git a/apps/documenteditor/main/resources/help/de/HelpfulHints/AdvancedSettings.htm b/apps/documenteditor/main/resources/help/de/HelpfulHints/AdvancedSettings.htm index c8128b6a4..2828b76d0 100644 --- a/apps/documenteditor/main/resources/help/de/HelpfulHints/AdvancedSettings.htm +++ b/apps/documenteditor/main/resources/help/de/HelpfulHints/AdvancedSettings.htm @@ -14,10 +14,11 @@

Erweiterte Einstellungen des Dokumenteneditors

-

Über die Funktion erweiterten Einstellungen können Sie die Grundeinstellungen im Dokumenteneditor ändern. Klicken Sie dazu in der oberen Symbolleiste auf die Registerkarte Datei und wählen Sie die Option Erweiterte Einstellungen.... Sie können auch auf das Symbol Einstellungen anzeigen Einstellungen anzeigen rechts neben der Kopfzeile des Editors klicken und die Option Erweiterte Einstellungen auswählen.

+

Über die Funktion erweiterten Einstellungen können Sie die Grundeinstellungen im Dokumenteneditor ändern. Klicken Sie dazu in der oberen Symbolleiste auf die Registerkarte Datei und wählen Sie die Option Erweiterte Einstellungen.... Sie können auch auf das Symbol Einstellungen anzeigen Einstellungen anzeigen rechts neben der Kopfzeile des Editors klicken und die Option Erweiterte Einstellungen auswählen.

Die erweiterten Einstellungen umfassen: