Skip to content

W
web-apps
Commit 5fa7723d authored by Maxim Kadushkin's avatar Maxim Kadushkin
Browse files
Options

Merge branch 'feature/new-mobile' with local

parents 4e34dd17 09f93da1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1224 additions and 757 deletions
apps/common/mobile/resources/less/ios/_about.less
View file @ 5fa7723d
......@@ -33,5 +33,6 @@
.logo {
background: url('../../../../common/mobile/resources/img/about/onlyoffice.svg') no-repeat center;
margin-top: 20px;
}
}
\ No newline at end of file
apps/common/mobile/resources/less/ios/_contextmenu.less
View file @ 5fa7723d
......@@ -8,6 +8,7 @@
background-color: @contextMenuBg;
width: auto;
border-radius: 8px;
z-index: 12500;
.popover-angle {
&:after {
......
apps/common/mobile/resources/less/material/_contextmenu.less
View file @ 5fa7723d
......@@ -3,6 +3,7 @@
.document-menu {
width: auto;
line-height: 1 !important;
z-index: 12500;
.popover-inner {
overflow: hidden;
......
apps/documenteditor/mobile/app/controller/DocumentHolder.js
View file @ 5fa7723d
......@@ -43,13 +43,17 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'documenteditor/mobile/app/view/DocumentHolder'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
DE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() {
// private
var _stack,
_view,
_isEdit = false;
return {
......@@ -68,10 +72,12 @@ define([
},
setApi: function(api) {
this.api = api;
var me = this;
me.api = api;
this.api.asc_registerCallback('asc_onShowPopMenu', _.bind(this.onApiShowPopMenu, this));
this.api.asc_registerCallback('asc_onHidePopMenu', _.bind(this.onApiHidePopMenu, this));
me.api.asc_registerCallback('asc_onShowPopMenu', _.bind(me.onApiShowPopMenu, me));
me.api.asc_registerCallback('asc_onHidePopMenu', _.bind(me.onApiHidePopMenu, me));
},
setMode: function (mode) {
......@@ -82,7 +88,7 @@ define([
onLaunch: function() {
var me = this;
me.view = me.createView('DocumentHolder').render();
_view = me.createView('DocumentHolder').render();
$$(window).on('resize', _.bind(me.onEditorResize, me));
},
......@@ -101,11 +107,11 @@ define([
} else if ('delete' == eventName) {
me.api.asc_Remove();
} else if ('edit' == eventName) {
me.view.hideMenu();
_view.hideMenu();
DE.getController('EditContainer').showModal();
} else if ('addlink' == eventName) {
me.view.hideMenu();
_view.hideMenu();
DE.getController('AddContainer').showModal();
DE.getController('AddOther').getView('AddOther').showLink();
......@@ -118,7 +124,7 @@ define([
});
}
me.view.hideMenu();
_view.hideMenu();
},
// API Handlers
......@@ -128,17 +134,21 @@ define([
},
onApiShowPopMenu: function(posX, posY) {
if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) {
return;
}
var me = this,
items;
_stack = me.api.getSelectedElements();
items = me._initMenu(_stack);
me.view.showMenu(items, posX, posY);
_view.showMenu(items, posX, posY);
},
onApiHidePopMenu: function() {
this.view.hideMenu();
_view && _view.hideMenu();
},
// Internal
......
apps/documenteditor/mobile/app/controller/Settings.js
View file @ 5fa7723d
......@@ -102,6 +102,8 @@ define([
},
showModal: function() {
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) {
modalView = uiApp.popup(
'<div class="popup settings container-settings">' +
......
apps/documenteditor/mobile/app/view/Search.js
View file @ 5fa7723d
......@@ -91,9 +91,11 @@ define([
showSettings: function (e) {
var me = this;
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) {
me.picker = $$(uiApp.popup([
'<div class="popup">',
'<div class="popup settings">',
'<div class="view search-settings-view navbar-through">',
_layout.find('#search-settings-view').html(),
'</div>',
......
apps/documenteditor/mobile/locale/en.json
View file @ 5fa7723d
......@@ -299,31 +299,31 @@
"DE.Views.EditShape.textColor": "Color",
"DE.Views.EditShape.textOpacity": "Opacity",
"DE.Views.EditTabletextRemoveTable": "Remove Table",
"DE.Views.EditTabletextTableOptions": "Table Options",
"DE.Views.EditTabletextStyle": "Style",
"DE.Views.EditTabletextWrap": "Wrap",
"DE.Views.EditTabletextBack": "Back",
"DE.Views.EditTabletextInline": "Inline",
"DE.Views.EditTabletextFlow": "Flow",
"DE.Views.EditTabletextWithText": "Move with Text",
"DE.Views.EditTabletextFromText": "Distance from Text",
"DE.Views.EditTabletextAlign": "Align",
"DE.Views.EditTabletextOptions": "Options",
"DE.Views.EditTabletextRepeatHeader": "Repeat as Header Row",
"DE.Views.EditTabletextResizeFit": "Resize to Fit Content",
"DE.Views.EditTabletextCellMargins": "Cell Margins",
"DE.Views.EditTabletextFill": "Fill",
"DE.Views.EditTabletextBorder": "Border",
"DE.Views.EditTabletextStyleOptions": "Style Options",
"DE.Views.EditTabletextSize": "Size",
"DE.Views.EditTabletextColor": "Color",
"DE.Views.EditTabletextHeaderRow": "Header Row",
"DE.Views.EditTabletextTotalRow": "Total Row",
"DE.Views.EditTabletextBandedRow": "Banded Row",
"DE.Views.EditTabletextFirstColumn": "First Column",
"DE.Views.EditTabletextLastColumn": "Last Column",
"DE.Views.EditTabletextBandedColumn": "Banded Column",
"DE.Views.EditTable.textRemoveTable": "Remove Table",
"DE.Views.EditTable.textTableOptions": "Table Options",
"DE.Views.EditTable.textStyle": "Style",
"DE.Views.EditTable.textWrap": "Wrap",
"DE.Views.EditTable.textBack": "Back",
"DE.Views.EditTable.textInline": "Inline",
"DE.Views.EditTable.textFlow": "Flow",
"DE.Views.EditTable.textWithText": "Move with Text",
"DE.Views.EditTable.textFromText": "Distance from Text",
"DE.Views.EditTable.textAlign": "Align",
"DE.Views.EditTable.textOptions": "Options",
"DE.Views.EditTable.textRepeatHeader": "Repeat as Header Row",
"DE.Views.EditTable.textResizeFit": "Resize to Fit Content",
"DE.Views.EditTable.textCellMargins": "Cell Margins",
"DE.Views.EditTable.textFill": "Fill",
"DE.Views.EditTable.textBorder": "Border",
"DE.Views.EditTable.textStyleOptions": "Style Options",
"DE.Views.EditTable.textSize": "Size",
"DE.Views.EditTable.textColor": "Color",
"DE.Views.EditTable.textHeaderRow": "Header Row",
"DE.Views.EditTable.textTotalRow": "Total Row",
"DE.Views.EditTable.textBandedRow": "Banded Row",
"DE.Views.EditTable.textFirstColumn": "First Column",
"DE.Views.EditTable.textLastColumn": "Last Column",
"DE.Views.EditTable.textBandedColumn": "Banded Column",
"DE.Controllers.EditText.textFonts": "Fonts",
"DE.Controllers.EditText.textAuto": "Auto",
......
apps/presentationeditor/mobile/app-dev.js
View file @ 5fa7723d
......@@ -138,6 +138,7 @@ require([
'Search',
'Main',
'DocumentHolder',
'DocumentPreview',
'Settings',
'EditContainer',
'EditText',
......@@ -204,6 +205,7 @@ require([
'presentationeditor/mobile/app/controller/Search',
'presentationeditor/mobile/app/controller/Main',
'presentationeditor/mobile/app/controller/DocumentHolder',
'presentationeditor/mobile/app/controller/DocumentPreview',
'presentationeditor/mobile/app/controller/Settings',
'presentationeditor/mobile/app/controller/edit/EditContainer',
'presentationeditor/mobile/app/controller/edit/EditText',
......
apps/presentationeditor/mobile/app.js
View file @ 5fa7723d
......@@ -149,6 +149,7 @@ require([
'Search',
'Main',
'DocumentHolder',
'DocumentPreview',
'Settings',
'EditContainer',
'EditText',
......@@ -215,6 +216,7 @@ require([
'presentationeditor/mobile/app/controller/Search',
'presentationeditor/mobile/app/controller/Main',
'presentationeditor/mobile/app/controller/DocumentHolder',
'presentationeditor/mobile/app/controller/DocumentPreview',
'presentationeditor/mobile/app/controller/Settings',
'presentationeditor/mobile/app/controller/edit/EditContainer',
'presentationeditor/mobile/app/controller/edit/EditText',
......
apps/presentationeditor/mobile/app/controller/DocumentHolder.js
View file @ 5fa7723d
......@@ -43,14 +43,19 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'presentationeditor/mobile/app/view/DocumentHolder'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() {
// private
var _stack,
_isEdit = false;
_view,
_isEdit = false,
_isPopMenuHidden = false;
return {
models: [],
......@@ -68,10 +73,12 @@ define([
},
setApi: function(api) {
this.api = api;
var me = this;
me.api = api;
this.api.asc_registerCallback('asc_onShowPopMenu', _.bind(this.onApiShowPopMenu, this));
this.api.asc_registerCallback('asc_onHidePopMenu', _.bind(this.onApiHidePopMenu, this));
me.api.asc_registerCallback('asc_onShowPopMenu', _.bind(me.onApiShowPopMenu, me));
me.api.asc_registerCallback('asc_onHidePopMenu', _.bind(me.onApiHidePopMenu, me));
},
setMode: function (mode) {
......@@ -82,7 +89,7 @@ define([
onLaunch: function() {
var me = this;
me.view = me.createView('DocumentHolder').render();
_view = me.createView('DocumentHolder').render();
$$(window).on('resize', _.bind(me.onEditorResize, me));
},
......@@ -101,11 +108,11 @@ define([
} else if ('delete' == eventName) {
me.api.asc_Remove();
} else if ('edit' == eventName) {
me.view.hideMenu();
_view.hideMenu();
PE.getController('EditContainer').showModal();
} else if ('addlink' == eventName) {
me.view.hideMenu();
_view.hideMenu();
PE.getController('AddContainer').showModal();
uiApp.showTab('#add-link');
......@@ -119,7 +126,16 @@ define([
});
}
me.view.hideMenu();
_view.hideMenu();
},
stopApiPopMenu: function() {
_isPopMenuHidden = true;
this.onApiHidePopMenu();
},
startApiPopMenu: function() {
_isPopMenuHidden = false;
},
// API Handlers
......@@ -129,17 +145,20 @@ define([
},
onApiShowPopMenu: function(posX, posY) {
if (_isPopMenuHidden || $('.popover.settings, .popup.settings, .picker-modal.settings').length > 0)
return;
var me = this,
items;
_stack = me.api.getSelectedElements();
items = me._initMenu(_stack);
me.view.showMenu(items, posX, posY);
_view.showMenu(items, posX, posY);
},
onApiHidePopMenu: function() {
this.view.hideMenu();
_view && _view.hideMenu();
},
// Internal
......
apps/presentationeditor/mobile/app/controller/DocumentPreview.js 0 → 100644
View file @ 5fa7723d
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* DocumentPreview.js
* Presentation Editor
*
* Created by Julia Radzhabova on 12/22/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'core',
'jquery',
'underscore',
'backbone',
'presentationeditor/mobile/app/view/DocumentPreview'
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.DocumentPreview = Backbone.Controller.extend(_.extend((function() {
// private
var _view,
_touches,
_touchStart,
_touchEnd;
return {
models: [],
collections: [],
views: [
'DocumentPreview'
],
initialize: function() {
},
setApi: function(api) {
var me = this;
me.api = api;
me.api.asc_registerCallback('asc_onEndDemonstration', _.bind(me.onEndDemonstration, me));
},
// When our application is ready, lets get started
onLaunch: function() {
var me = this;
_view = me.createView('DocumentPreview').render();
$$('#pe-preview').on('touchstart', _.bind(me.onTouchStart, me))
.on('touchmove', _.bind(me.onTouchMove, me))
.on('touchend', _.bind(me.onTouchEnd, me))
.on('click', _.bind(me.onClick, me));
},
// Handlers
show: function() {
_view.$el.css('display', 'block');
$('.view.view-main').css('z-index','0');
PE.getController('DocumentHolder').stopApiPopMenu();
this.api.StartDemonstration('presentation-preview', this.api.getCurrentPage());
},
onTouchStart: function(event) {
event.preventDefault();
_touches = [];
for (var i=0; i<event.touches.length; i++) {
_touches.push([event.touches[i].pageX, event.touches[i].pageY]);
}
_touchEnd = _touchStart = [event.touches[0].pageX, event.touches[0].pageY];
},
onTouchMove: function(event) {
event.preventDefault();
_touchEnd = [event.touches[0].pageX, event.touches[0].pageY];
if (event.touches.length<2) return;
for (var i=0; i<event.touches.length; i++) {
if (Math.abs(event.touches[i].pageX - _touches[i][0]) > 20 || Math.abs(event.touches[i].pageY - _touches[i][1]) > 20 ) {
this.api.EndDemonstration();
break;
}
}
},
onTouchEnd: function(event) {
event.preventDefault();
if (_touchEnd[0] - _touchStart[0] > 20)
this.api.DemonstrationPrevSlide();
else if (_touchStart[0] - _touchEnd[0] > 20)
this.api.DemonstrationNextSlide();
},
onClick: function(event) {
this.api.DemonstrationNextSlide();
},
// API Handlers
onEndDemonstration: function() {
_view.$el.css('display', 'none');
$('.view.view-main').css('z-index','auto');
PE.getController('DocumentHolder').startApiPopMenu();
}
// Internal
}
})(), PE.Controllers.DocumentPreview || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/controller/Main.js
View file @ 5fa7723d
......@@ -42,9 +42,12 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'irregularstack',
'common/main/lib/util/LocalStorage'
], function () {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.Main = Backbone.Controller.extend(_.extend((function() {
......@@ -1131,8 +1134,6 @@ define([
txtSldLtTVertTitleAndTxOverChart: 'Vertical Title and Text Over Chart',
txtSldLtTVertTx: 'Vertical Text',
textLoadingDocument: 'Loading presentation',
warnBrowserZoom: 'Your browser\'s current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.',
warnBrowserIE9: 'The application has low capabilities on IE9. Use IE10 or higher',
loadThemeTitleText: 'Loading Theme',
loadThemeTextText: 'Loading theme...',
txtBasicShapes: 'Basic Shapes',
......@@ -1174,8 +1175,7 @@ define([
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.',
......
apps/presentationeditor/mobile/app/controller/Settings.js
View file @ 5fa7723d
......@@ -43,8 +43,11 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'presentationeditor/mobile/app/view/Settings'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.Settings = Backbone.Controller.extend(_.extend((function() {
......@@ -98,6 +101,8 @@ define([
},
showModal: function() {
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) {
modalView = uiApp.popup(
'<div class="popup settings container-settings">' +
......@@ -228,8 +233,7 @@ define([
},
txtLoading : 'Loading...',
notcriticalErrorTitle : 'Warning',
warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?'
notcriticalErrorTitle : 'Warning'
}
})(), PE.Controllers.Settings || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/controller/add/AddContainer.js
View file @ 5fa7723d
......@@ -87,20 +87,6 @@ define([
}
},
_dummyEditController: function () {
var layout =
'<div class="content-block inset">' +
'<div class="content-block-inner"> ' +
'<p>Under Construction</p>' +
'</div>' +
'</div>';
return {
getCaption: function () { return 'Dummy' },
getLayout : function () { return layout }
}
},
_layoutEditorsByStack: function () {
var me = this,
addViews = [];
......
apps/presentationeditor/mobile/app/controller/add/AddSlide.js
View file @ 5fa7723d
......@@ -116,12 +116,7 @@ define([
this.getView('AddSlide').updateLayouts(_layouts);
$('#add-slide .slide-layout li').single('click', _.buffered(me.onLayoutClick, 100, me));
},
textTableSize: 'Table Size',
textColumns: 'Columns',
textRows: 'Rows',
textCancel: 'Cancel'
}
}
})(), PE.Controllers.AddSlide || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
View file @ 5fa7723d
......@@ -40,8 +40,11 @@
*
*/
define([
'core'
], function (core) {
'core',
'jquery',
'underscore',
'backbone'
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.EditContainer = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditImage.js
View file @ 5fa7723d
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditImage'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditImage',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditImage = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditShape.js
View file @ 5fa7723d
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditShape'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditShape',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditShape = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
View file @ 5fa7723d
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditSlide'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditSlide',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditSlide = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditTable.js
View file @ 5fa7723d
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditTable'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditTable',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditTable = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditText.js
View file @ 5fa7723d
......@@ -42,8 +42,12 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditText'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditText',
'jquery',
'underscore',
'backbone',
'common/mobile/lib/component/ThemeColorPalette'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditText = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/template/Settings.template
View file @ 5fa7723d
......@@ -188,7 +188,7 @@
<a data-format="513" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-search"></i>
<i class="icon icon-format-pdf"></i>
</div>
<div class="item-inner">
<div class="item-title">PDF</div>
......@@ -223,7 +223,7 @@
</div>
<div class="content-block">
<h3>PRESENTATION EDITOR</h3>
<h3><%= scope.textVersion %> 4.2</h3>
<h3><%= scope.textVersion %> 4.3</h3>
</div>
<div class="content-block">
<h3 class="vendor">Ascensio System SIA</h3>
......@@ -242,7 +242,6 @@
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></a></div>
<div class="center sliding"><%= scope.textSlideSize %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div>
</div>
<div class="page" id="page-settings-setup-view" data-page="settings-setup-view">
......
apps/presentationeditor/mobile/app/template/Toolbar.template
View file @ 5fa7723d
......@@ -28,6 +28,9 @@
<i class="icon icon-redo"></i>
</a>
<% } %>
<a href="#" id="toolbar-preview" class="link icon-only">
<i class="icon icon-edit"></i>
</a>
<a href="#" id="toolbar-edit" class="link icon-only" style="display: none;">
<i class="icon icon-edit"></i>
</a>
......
apps/presentationeditor/mobile/app/view/DocumentPreview.js 0 → 100644
View file @ 5fa7723d
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* DocumentPreview.js
* Presentation Editor
*
* Created by Julia Radzhabova on 12/22/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'jquery',
'underscore',
'backbone'
], function ($, _, Backbone) {
'use strict';
PE.Views.DocumentPreview = Backbone.View.extend((function() {
// private
return {
el: '#pe-preview',
template: _.template('<div id="presentation-preview" style="width:100%; height:100%"></div>'),
// Delegated events for creating new items, and clearing completed ones.
events: {
},
// Set innerHTML and get the references to the DOM elements
initialize: function() {
//
},
// Render layout
render: function() {
var el = $(this.el);
el.append(this.template({}));
return this;
}
}
})());
});
\ No newline at end of file
apps/presentationeditor/mobile/app/view/Search.js
View file @ 5fa7723d
......@@ -131,7 +131,7 @@ define([
uiApp.hideNavbar(searchBar);
}, 10);
}
},
}
}
})(), PE.Views.Search || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/view/Toolbar.js
View file @ 5fa7723d
......@@ -62,7 +62,8 @@ define([
"click #toolbar-search" : "searchToggle",
"click #toolbar-edit" : "showEdition",
"click #toolbar-add" : "showInserts",
"click #toolbar-settings" : "showSettings"
"click #toolbar-settings" : "showSettings",
"click #toolbar-preview" : "showPreview"
},
// Set innerHTML and get the references to the DOM elements
......@@ -148,6 +149,10 @@ define([
PE.getController('Settings').showModal();
},
showPreview: function () {
PE.getController('DocumentPreview').show();
},
textBack: 'Back'
}
})(), PE.Views.Toolbar || {}))
......
apps/presentationeditor/mobile/app/view/add/AddLink.js
View file @ 5fa7723d
......@@ -124,7 +124,6 @@ define([
textLink: 'Link',
textLinkSlide: 'Link to',
textBack: 'Back',
textAddLink: 'Add Link',
textDisplay: 'Display',
textTip: 'Screen Tip',
textInsert: 'Insert',
......
apps/presentationeditor/mobile/app/view/edit/EditLink.js
View file @ 5fa7723d
......@@ -125,10 +125,8 @@ define([
textLink: 'Link',
textLinkSlide: 'Link to',
textBack: 'Back',
textAddLink: 'Add Link',
textDisplay: 'Display',
textTip: 'Screen Tip',
textInsert: 'Insert',
textNext: 'Next Slide',
textPrev: 'Previous Slide',
textFirst: 'First Slide',
......
apps/presentationeditor/mobile/locale/en.json 0 → 100644
View file @ 5fa7723d
This diff is collapsed.
apps/presentationeditor/mobile/resources/less/ios/_icons.less
View file @ 5fa7723d
......@@ -195,6 +195,12 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M12.4,9.8c0,0-2.1-0.1-3.8,1.2c-2.8,2-3.3,4.3-3.3,4.3s1.6-1.7,3.5-2.5c1.7-0.7,3.7-0.4,3.7-0.4v1.9l4.8-3.3V11l-4.8-3.3V9.8z M11,1C5.5,1,1,5.5,1,11c0,5.5,4.5,10,10,10s10-4.5,10-10C21,5.5,16.5,1,11,1z M11,20c-5,0-9-4.1-9-9C2,6,6,2,11,2s9,4.1,9,9C20,16,16,20,11,20z"/></g></svg>');
}
&.icon-image-library {
width: 22px;
height: 22px;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22"><defs><style>.cls-1{isolation:isolate;}.cls-2{opacity:0.2;}.cls-3{fill:#fff;}.cls-10,.cls-11,.cls-4,.cls-6,.cls-7,.cls-8,.cls-9{mix-blend-mode:multiply;}.cls-4{fill:url(#grad_8);}.cls-5{fill:url(#grad_10);}.cls-6{fill:url(#grad_12);}.cls-7{fill:url(#grad_14);}.cls-8{fill:url(#grad_79);}.cls-9{fill:url(#grad_77);}.cls-10{fill:url(#grad_75);}.cls-11{fill:url(#grad_81);}</style><linearGradient id="grad_8" x1="11.08" y1="10.26" x2="11.08" y2="1.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f3e916"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_10" x1="11.08" y1="20.44" x2="11.08" y2="11.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5eb6e8"/><stop offset="1" stop-color="#958cc3"/></linearGradient><linearGradient id="grad_12" x1="1.46" y1="11.05" x2="10.46" y2="11.05" gradientTransform="translate(17 5.09) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cc8dba"/><stop offset="1" stop-color="#f86867"/></linearGradient><linearGradient id="grad_14" x1="11.73" y1="11.05" x2="20.73" y2="11.05" gradientTransform="translate(27.28 -5.18) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ac07f"/><stop offset="1" stop-color="#c5da3d"/></linearGradient><linearGradient id="grad_79" x1="11.74" y1="10.42" x2="17.52" y2="4.63" gradientTransform="translate(30.29 2.51) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5da3d"/><stop offset="1" stop-color="#f3e916"/></linearGradient><linearGradient id="grad_77" x1="4.7" y1="17.49" x2="10.48" y2="11.71" gradientTransform="translate(23.24 19.65) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9595c3"/><stop offset="1" stop-color="#cc8dba"/></linearGradient><linearGradient id="grad_75" x1="4.69" y1="4.64" x2="10.47" y2="10.42" gradientTransform="translate(7.54 -3.15) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f86867"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_81" x1="11.77" y1="11.78" x2="17.55" y2="17.56" gradientTransform="translate(14.63 -6.05) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ec0e8"/><stop offset="1" stop-color="#6ac07f"/></linearGradient></defs><title>icons_for_svg</title><g class="cls-1"><g id="Слой_1" data-name="Слой 1"><rect class="cls-2" x="0.09" y="0.01" width="22" height="22" rx="4" ry="4"/><rect class="cls-3" x="0.57" y="0.49" width="21.04" height="21.04" rx="3.6" ry="3.6"/><rect class="cls-4" x="8.33" y="1.26" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-5" x="8.33" y="11.76" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-6" x="3.21" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-5.09 17) rotate(-90)"/><rect class="cls-7" x="13.48" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(5.18 27.28) rotate(-90)"/><rect class="cls-8" x="11.87" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(19.64 23.19) rotate(-135)"/><rect class="cls-9" x="4.8" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(2.54 30.33) rotate(-135)"/><rect class="cls-10" x="4.83" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-3.1 7.56) rotate(-45)"/><rect class="cls-11" x="11.87" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-6.07 14.63) rotate(-45)"/></g></g></svg>');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
......@@ -286,4 +292,12 @@ i.icon {
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><path opacity="0.3" d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path opacity="0.3" d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/><rect x="8" y="8" width="13" height="13"/></g></svg>');
}
// Formats
&.icon-format-pdf {
width: 28px;
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28"><defs><style>.cls-1{fill:#a83a30;}.cls-2{fill:#f6f6f6;}.cls-3{fill:#7f2e27;}</style></defs><path class="cls-1" d="M18,1H5A1,1,0,0,0,4,2V26a1,1,0,0,0,1,1H23a1,1,0,0,0,1-1V7Z"/><path class="cls-2" d="M16.75,17a9,9,0,0,1-1.2-.79,7.18,7.18,0,0,1-2-3.25,17.46,17.46,0,0,0,.2-2.9c-0.09.44-.16,1.17-0.4,2.21a6,6,0,0,1-.19-2.91,0.81,0.81,0,0,1,.19-0.3,0.89,0.89,0,0,1,.44.76C14,9,13.54,9,13.43,9H13.17a0.39,0.39,0,0,0-.33.35A7.56,7.56,0,0,0,13.16,13a20.42,20.42,0,0,1-1.39,3.53c-1.69,3.4-3,5.12-3.86,5.12-0.06-.45.83-1.69,2.05-2.6-2.06,1.09-2.49,2.34-2.3,2.58L8,21.81c0.6,0.31,1.63-.51,3.24-3.29a23.72,23.72,0,0,1,5.32-1.13c1.73,0.93,3.72,1.25,3.82.65-0.45.21-1.73-.09-3-0.71,1.78-.11,3.12,0,3.09.58C20.84,17,19.11,16.75,16.75,17ZM11.24,18.5c0.28-.49.58-1,0.9-1.65a14.64,14.64,0,0,0,1.25-3.14,7,7,0,0,0,1.83,2.81,6.78,6.78,0,0,0,.83.6A19.7,19.7,0,0,0,11.24,18.5Z"/><path class="cls-3" d="M18,1V6a1,1,0,0,0,1,1h5Z"/></svg>');
}
}
\ No newline at end of file
apps/presentationeditor/mobile/resources/less/ios/_search.less
View file @ 5fa7723d
......@@ -27,11 +27,6 @@
flex-direction: column;
}
.left {
min-width: 22px;
max-width: 22px;
}
.center {
width: 100%;
......
apps/presentationeditor/mobile/resources/less/material/_icons.less
View file @ 5fa7723d
......@@ -165,6 +165,12 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M12.4,9.8c0,0-2.1-0.1-3.8,1.2c-2.8,2-3.3,4.3-3.3,4.3s1.6-1.7,3.5-2.5c1.7-0.7,3.7-0.4,3.7-0.4v1.9l4.8-3.3V11l-4.8-3.3V9.8z M11,1C5.5,1,1,5.5,1,11c0,5.5,4.5,10,10,10s10-4.5,10-10C21,5.5,16.5,1,11,1z M11,20c-5,0-9-4.1-9-9C2,6,6,2,11,2s9,4.1,9,9C20,16,16,20,11,20z"/></g></svg>');
}
&.icon-image-library {
width: 22px;
height: 22px;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22"><defs><style>.cls-1{isolation:isolate;}.cls-2{opacity:0.2;}.cls-3{fill:#fff;}.cls-10,.cls-11,.cls-4,.cls-6,.cls-7,.cls-8,.cls-9{mix-blend-mode:multiply;}.cls-4{fill:url(#grad_8);}.cls-5{fill:url(#grad_10);}.cls-6{fill:url(#grad_12);}.cls-7{fill:url(#grad_14);}.cls-8{fill:url(#grad_79);}.cls-9{fill:url(#grad_77);}.cls-10{fill:url(#grad_75);}.cls-11{fill:url(#grad_81);}</style><linearGradient id="grad_8" x1="11.08" y1="10.26" x2="11.08" y2="1.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f3e916"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_10" x1="11.08" y1="20.44" x2="11.08" y2="11.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5eb6e8"/><stop offset="1" stop-color="#958cc3"/></linearGradient><linearGradient id="grad_12" x1="1.46" y1="11.05" x2="10.46" y2="11.05" gradientTransform="translate(17 5.09) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cc8dba"/><stop offset="1" stop-color="#f86867"/></linearGradient><linearGradient id="grad_14" x1="11.73" y1="11.05" x2="20.73" y2="11.05" gradientTransform="translate(27.28 -5.18) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ac07f"/><stop offset="1" stop-color="#c5da3d"/></linearGradient><linearGradient id="grad_79" x1="11.74" y1="10.42" x2="17.52" y2="4.63" gradientTransform="translate(30.29 2.51) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5da3d"/><stop offset="1" stop-color="#f3e916"/></linearGradient><linearGradient id="grad_77" x1="4.7" y1="17.49" x2="10.48" y2="11.71" gradientTransform="translate(23.24 19.65) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9595c3"/><stop offset="1" stop-color="#cc8dba"/></linearGradient><linearGradient id="grad_75" x1="4.69" y1="4.64" x2="10.47" y2="10.42" gradientTransform="translate(7.54 -3.15) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f86867"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_81" x1="11.77" y1="11.78" x2="17.55" y2="17.56" gradientTransform="translate(14.63 -6.05) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ec0e8"/><stop offset="1" stop-color="#6ac07f"/></linearGradient></defs><title>icons_for_svg</title><g class="cls-1"><g id="Слой_1" data-name="Слой 1"><rect class="cls-2" x="0.09" y="0.01" width="22" height="22" rx="4" ry="4"/><rect class="cls-3" x="0.57" y="0.49" width="21.04" height="21.04" rx="3.6" ry="3.6"/><rect class="cls-4" x="8.33" y="1.26" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-5" x="8.33" y="11.76" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-6" x="3.21" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-5.09 17) rotate(-90)"/><rect class="cls-7" x="13.48" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(5.18 27.28) rotate(-90)"/><rect class="cls-8" x="11.87" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(19.64 23.19) rotate(-135)"/><rect class="cls-9" x="4.8" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(2.54 30.33) rotate(-135)"/><rect class="cls-10" x="4.83" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-3.1 7.56) rotate(-45)"/><rect class="cls-11" x="11.87" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-6.07 14.63) rotate(-45)"/></g></g></svg>');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
......@@ -256,6 +262,14 @@ i.icon {
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><path opacity="0.3" d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path opacity="0.3" d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/><rect x="8" y="8" width="13" height="13"/></g></svg>');
}
// Formats
&.icon-format-pdf {
width: 28px;
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28"><defs><style>.cls-1{fill:#a83a30;}.cls-2{fill:#f6f6f6;}.cls-3{fill:#7f2e27;}</style></defs><path class="cls-1" d="M18,1H5A1,1,0,0,0,4,2V26a1,1,0,0,0,1,1H23a1,1,0,0,0,1-1V7Z"/><path class="cls-2" d="M16.75,17a9,9,0,0,1-1.2-.79,7.18,7.18,0,0,1-2-3.25,17.46,17.46,0,0,0,.2-2.9c-0.09.44-.16,1.17-0.4,2.21a6,6,0,0,1-.19-2.91,0.81,0.81,0,0,1,.19-0.3,0.89,0.89,0,0,1,.44.76C14,9,13.54,9,13.43,9H13.17a0.39,0.39,0,0,0-.33.35A7.56,7.56,0,0,0,13.16,13a20.42,20.42,0,0,1-1.39,3.53c-1.69,3.4-3,5.12-3.86,5.12-0.06-.45.83-1.69,2.05-2.6-2.06,1.09-2.49,2.34-2.3,2.58L8,21.81c0.6,0.31,1.63-.51,3.24-3.29a23.72,23.72,0,0,1,5.32-1.13c1.73,0.93,3.72,1.25,3.82.65-0.45.21-1.73-.09-3-0.71,1.78-.11,3.12,0,3.09.58C20.84,17,19.11,16.75,16.75,17ZM11.24,18.5c0.28-.49.58-1,0.9-1.65a14.64,14.64,0,0,0,1.25-3.14,7,7,0,0,0,1.83,2.81,6.78,6.78,0,0,0,.83.6A19.7,19.7,0,0,0,11.24,18.5Z"/><path class="cls-3" d="M18,1V6a1,1,0,0,0,1,1h5Z"/></svg>');
}
}
// Overwrite color for toolbar
......
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file @ 5fa7723d
......@@ -127,6 +127,10 @@ define([
},
onApiShowPopMenu: function(posX, posY) {
if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) {
return;
}
var me = this,
items;
......
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file @ 5fa7723d
......@@ -538,7 +538,7 @@ define([
} else {
value = 0;
}
// me.api.asc_setAutoSaveGap(value);
me.api.asc_setAutoSaveGap(value);
if (me.needToUpdateVersion) {
Common.NotificationCenter.trigger('api:disconnect');
......
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file @ 5fa7723d
......@@ -95,6 +95,8 @@ define([
},
showModal: function() {
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) {
modalView = uiApp.popup(
'<div class="popup settings container-settings">' +
......
apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
View file @ 5fa7723d
......@@ -453,10 +453,10 @@ define([
// Cross
setOptions('horizontal-axis-cross', [
{display: this.textAuto, value: Asc.c_oAscCrossesRule.auto},
{display: this.textValue, value: Asc.c_oAscCrossesRule.value},
{display: this.textMinValue, value: Asc.c_oAscCrossesRule.minValue},
{display: this.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue}
{display: me.textAuto, value: Asc.c_oAscCrossesRule.auto},
{display: me.textValue, value: Asc.c_oAscCrossesRule.value},
{display: me.textMinValue, value: Asc.c_oAscCrossesRule.minValue},
{display: me.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue}
]);
var crossValue = axisProps.getCrossesRule();
......@@ -469,8 +469,8 @@ define([
// Pos
setOptions('horizontal-axis-position', [
{display: this.textOnTickMarks, value: Asc.c_oAscLabelsPosition.byDivisions},
{display: this.textBetweenTickMarks, value: Asc.c_oAscLabelsPosition.betweenDivisions}
{display: me.textOnTickMarks, value: Asc.c_oAscLabelsPosition.byDivisions},
{display: me.textBetweenTickMarks, value: Asc.c_oAscLabelsPosition.betweenDivisions}
]);
setValue('horizontal-axis-position', axisProps.getLabelsPosition());
......@@ -478,10 +478,10 @@ define([
// Tick
var tickOptions = [
{display: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE},
{display: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS},
{display: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN},
{display: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT}
{display: me.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE},
{display: me.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS},
{display: me.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN},
{display: me.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT}
];
setOptions('horizontal-axis-tick-major', tickOptions);
......@@ -492,10 +492,10 @@ define([
// Label
setOptions('horizontal-axis-label-pos', [
{display: this.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE},
{display: this.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW},
{display: this.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH},
{display: this.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO}
{display: me.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE},
{display: me.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW},
{display: me.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH},
{display: me.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO}
]);
setValue('horizontal-axis-label-pos', axisProps.getTickLabelsPos());
......@@ -1059,33 +1059,9 @@ define([
return clr;
},
textChart: 'Chart',
textLayout: 'Layout',
textLegendPos: 'Legend',
textHorTitle: 'Horizontal Axis Title',
textVertTitle: 'Vertical Axis Title',
textDataLabels: 'Data Labels',
textSeparator: 'Data Labels Separator',
textSeriesName: 'Series Name',
textCategoryName: 'Category Name',
textValue: 'Value',
textAxisOptions: 'Axis Options',
textMinValue: 'Minimum Value',
textMaxValue: 'Maximum Value',
textAxisCrosses: 'Axis Crosses',
textUnits: 'Display Units',
textTickOptions: 'Tick Options',
textMajorType: 'Major Type',
textMinorType: 'Minor Type',
textLabelOptions: 'Label Options',
textLabelPos: 'Label Position',
textReverse: 'Values in reverse order',
textVertAxis: 'Vertical Axis',
textHorAxis: 'Horizontal Axis',
textMarksInterval: 'Interval between Marks',
textLabelDist: 'Axis Label Distance',
textLabelInterval: 'Interval between Labels',
textAxisPos: 'Axis Position',
textLeftOverlay: 'Left Overlay',
textRightOverlay: 'Right Overlay',
textOverlay: 'Overlay',
......@@ -1118,24 +1094,8 @@ define([
textManual: 'Manual',
textBetweenTickMarks: 'Between Tick Marks',
textOnTickMarks: 'On Tick Marks',
textHorGrid: 'Horizontal Gridlines',
textVertGrid: 'Vertical Gridlines',
textLines: 'Lines',
textMarkers: 'Markers',
textMajor: 'Major',
textMinor: 'Minor',
textMajorMinor: 'Major and Minor',
textStraight: 'Straight',
textSmooth: 'Smooth',
textType: 'Type',
textTypeData: 'Type & Data',
textStyle: 'Style',
errorMaxRows: 'ERROR! The maximum number of data series per chart is 255.',
errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.',
textAxisSettings: 'Axis Settings',
textGridLines: 'Gridlines',
textShow: 'Show',
textHide: 'Hide',
textLeft: 'Left',
textRight: 'Right',
textTop: 'Top',
......
apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
View file @ 5fa7723d
......@@ -103,7 +103,7 @@ define([
$('#edit-link-sheet select').html(sheets.join(''));
$('#edit-link-type select').val(linkInfo.asc_getType());
$('#edit-link-type .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'Internal Data Range' : 'External Link');
$('#edit-link-type .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink);
$('#edit-link-sheet, #edit-link-range').css('display', (linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none');
$('#edit-link-link').css('display', (linkInfo.asc_getType() != Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none');
......@@ -217,6 +217,8 @@ define([
SSE.getController('EditContainer').hideModal();
},
textExternalLink: 'External Link',
textInternalLink: 'Internal Data Range',
textDefault: 'Selected range',
textInvalidRange: 'Invalid cells range',
textEmptyImgUrl: 'You need to specify image URL.',
......
apps/spreadsheeteditor/mobile/app/template/AddOther.template
View file @ 5fa7723d
......@@ -83,8 +83,10 @@
<div id="add-link-range" class="item-content">
<div class="item-inner">
<div class="item-title label"><%= scope.textRange %></div>
<div class="item-input">
<input type="text" class="field right range" placeholder="<%= scope.textRange %>">
<div class="item-after">
<div class="item-input">
<input type="text" class="field right range" placeholder="<%= scope.textRequired %>">
</div>
</div>
</div>
</div>
......@@ -92,8 +94,10 @@
<div id="add-link-url" class="item-content">
<div class="item-inner">
<div class="item-title label"><%= scope.textLink %></div>
<div class="item-input">
<input type="url" class="field right" placeholder="<%= scope.textLink %>">
<div class="item-after">
<div class="item-input">
<input type="url" class="field right" placeholder="<%= scope.textRequired %>">
</div>
</div>
</div>
</div>
......@@ -102,8 +106,10 @@
<div id="add-link-display" class="item-content">
<div class="item-inner">
<div class="item-title label"><%= scope.textDisplay %></div>
<div class="item-input">
<input type="text" class="field right" placeholder="<%= scope.textDisplay %>">
<div class="item-after">
<div class="item-input">
<input type="text" class="field right">
</div>
</div>
</div>
</div>
......@@ -112,8 +118,10 @@
<div id="add-link-tip" class="item-content">
<div class="item-inner">
<div class="item-title label"><%= scope.textTip %></div>
<div class="item-input">
<input type="text" class="field right" placeholder="<%= scope.textTip %>">
<div class="item-after">
<div class="item-input">
<input type="text" class="field right">
</div>
</div>
</div>
</div>
......
apps/spreadsheeteditor/mobile/app/template/EditHyperlink.template
View file @ 5fa7723d
......@@ -5,13 +5,13 @@
<li>
<a id="edit-link-type" class="item-link smart-select" data-back-on-select="true">
<select name="edit-link-type">
<option value="1" selected>External Link</option>
<option value="2">Internal Data Range</option>
<option value="1" selected><%= scope.textExternalLink %></option>
<option value="2"><%= scope.textInternalLink %></option>
</select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Link Type</div>
<div class="item-after">External Link</div>
<div class="item-title"><%= scope.textLinkType %></div>
<div class="item-after"><%= scope.textExternalLink %></div>
</div>
</div>
</a>
......@@ -21,7 +21,7 @@
<select name="edit-link-sheet"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Sheet</div>
<div class="item-title"><%= scope.textSheet %></div>
<div class="item-after"></div>
</div>
</div>
......@@ -30,7 +30,7 @@
<li id="edit-link-range">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Range</div>
<div class="item-title"><%= scope.textRange %></div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="text" placeholder="Required">
......@@ -42,7 +42,7 @@
<li id="edit-link-link">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Link</div>
<div class="item-title"><%= scope.textLink %></div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="url" placeholder="Required">
......@@ -54,10 +54,10 @@
<li id="edit-link-display">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Display</div>
<div class="item-title"><%= scope.textDisplay %></div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="text" placeholder="Display">
<input class="field right" type="text">
</div>
</div>
</div>
......@@ -66,10 +66,10 @@
<li id="edit-link-tip">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Screen Tip</div>
<div class="item-title"><%= scope.textScreenTip %></div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="text" placeholder="Screen Tip">
<input class="field right" type="text">
</div>
</div>
</div>
......@@ -79,15 +79,15 @@
</div>
<div class="list-block">
<% if (android) { %>
<a href="#" id="edit-link-edit" class="button button-raised button-fill disabled" style="margin: 20px 16px;">Edit Link</a>
<a href="#" id="edit-link-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;">Remove Link</a>
<a href="#" id="edit-link-edit" class="button button-raised button-fill disabled" style="margin: 20px 16px;"><%= scope.textEditLink %></a>
<a href="#" id="edit-link-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemoveLink %></a>
<% } else { %>
<ul>
<li>
<a href="#" id="edit-link-edit" class="list-button item-link disabled" style="text-align: center;">Edit Link</a>
<a href="#" id="edit-link-edit" class="list-button item-link disabled" style="text-align: center;"><%= scope.textEditLink %></a>
</li>
<li>
<a href="#" id="edit-link-remove" class="list-button item-link" style="text-align: center; color: #f00">Remove Link</a>
<a href="#" id="edit-link-remove" class="list-button item-link" style="text-align: center; color: #f00"><%= scope.textRemoveLink %></a>
</li>
</ul>
<% } %>
......
apps/spreadsheeteditor/mobile/app/template/Toolbar.template
View file @ 5fa7723d
......@@ -34,9 +34,11 @@
<a href="#" id="toolbar-add" class="link icon-only" style="display: none;">
<i class="icon icon-plus"></i>
</a>
<% if (!phone) { %>
<a href="#" id="toolbar-search" class="link icon-only">
<i class="icon icon-search"></i>
</a>
<% } %>
<a href="#" id="toolbar-settings" class="link icon-only">
<i class="icon icon-settings"></i>
</a>
......
apps/spreadsheeteditor/mobile/app/view/Search.js
View file @ 5fa7723d
......@@ -91,9 +91,11 @@ define([
showSettings: function (e) {
var me = this;
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) {
me.picker = $$(uiApp.popup([
'<div class="popup">',
'<div class="popup settings">',
'<div class="view search-settings-view navbar-through">',
_layout.find('#search-settings-view').html(),
'</div>',
......
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
View file @ 5fa7723d
......@@ -293,7 +293,8 @@ define([
textExternalLink: 'External Link',
textInternalLink: 'Internal Data Range',
textSheet: 'Sheet',
textRange: 'Range'
textRange: 'Range',
textRequired: 'Required'
}
})(), SSE.Views.AddOther || {}))
});
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
View file @ 5fa7723d
......@@ -221,6 +221,47 @@ define([
textToBackground: 'Send to Background',
textForward: 'Move Forward',
textBackward: 'Move Backward',
textStyle: 'Style',
textLayout: 'Layout',
textVerAxis: 'Vertical Axis',
textHorAxis: 'Horizontal Axis',
textType: 'Type',
textFill: 'Fill',
textBorder: 'Border',
textSize: 'Size',
textColor: 'Color',
textOverlay: 'Overlay',
textNoOverlay: 'No Overlay',
textChartTitle: 'Chart Title',
textLeft: 'Left',
textTop: 'Top',
textRight: 'Right',
textBottom: 'Bottom',
textLeftOverlay: 'Left Overlay',
textRightOverlay: 'Right Overlay',
textLegend: 'Legend',
textAxisTitle: 'Axis Title',
textHorizontal: 'Horizontal',
textRotated: 'Rotated',
textVertical: 'Vertical',
textMajor: 'Major',
textMinor: 'Minor',
textMajorMinor: 'Major and Minor',
textDataLabels: 'Data Labels',
textAxisOptions: 'Axis Options',
textMinValue: 'Minimum Value',
textMaxValue: 'Maximum Value',
textAxisCrosses: 'Axis Crosses',
textAuto: 'Auto',
textCrossesValue: 'Crosses Value',
textDisplayUnits: 'Display Units',
textValReverseOrder: 'Values in Reverse Order',
textTickOptions: 'Tick Options',
textMajorType: 'Major Type',
textLabelOptions: 'Label Options',
textLabelPos: 'Label Position',
textAxisPosition: 'Axis Position',
textNone: 'None'
}
})(), SSE.Views.EditChart || {}))
});
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js
View file @ 5fa7723d
......@@ -97,7 +97,17 @@ define([
//
},
textBack: 'Back'
textBack: 'Back',
textExternalLink: 'External Link',
textInternalLink: 'Internal Data Range',
textLinkType: 'Link Type',
textSheet: 'Sheet',
textRange: 'Range',
textLink: 'Link',
textDisplay: 'Display',
textScreenTip: 'Screen Tip',
textEditLink: 'Edit Link',
textRemoveLink: 'Remove Link'
}
})(), SSE.Views.EditHyperlink || {}))
});
apps/spreadsheeteditor/mobile/locale/en.json 0 → 100644
View file @ 5fa7723d
{
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"SSE.Controllers.EditChart.textValue": "Value",
"SSE.Controllers.EditChart.textMinValue": "Minimum Value",
"SSE.Controllers.EditChart.textMaxValue": "Maximum Value",
"SSE.Controllers.EditChart.textLeftOverlay": "Left Overlay",
"SSE.Controllers.EditChart.textRightOverlay": "Right Overlay",
"SSE.Controllers.EditChart.textOverlay": "Overlay",
"SSE.Controllers.EditChart.textNoOverlay": "No Overlay",
"SSE.Controllers.EditChart.textRotated": "Rotated",
"SSE.Controllers.EditChart.textHorizontal": "Horizontal",
"SSE.Controllers.EditChart.textInnerBottom": "Inner Bottom",
"SSE.Controllers.EditChart.textInnerTop": "Inner Top",
"SSE.Controllers.EditChart.textOuterTop": "Outer Top",
"SSE.Controllers.EditChart.textNone": "None",
"SSE.Controllers.EditChart.textCenter": "Center",
"SSE.Controllers.EditChart.textFixed": "Fixed",
"SSE.Controllers.EditChart.textAuto": "Auto",
"SSE.Controllers.EditChart.textCross": "Cross",
"SSE.Controllers.EditChart.textIn": "In",
"SSE.Controllers.EditChart.textOut": "Out",
"SSE.Controllers.EditChart.textLow": "Low",
"SSE.Controllers.EditChart.textHigh": "High",
"SSE.Controllers.EditChart.textNextToAxis": "Next to axis",
"SSE.Controllers.EditChart.textHundreds": "Hundreds",
"SSE.Controllers.EditChart.textThousands": "Thousands",
"SSE.Controllers.EditChart.textTenThousands": "10 000",
"SSE.Controllers.EditChart.textHundredThousands": "100 000",
"SSE.Controllers.EditChart.textMillions": "Millions",
"SSE.Controllers.EditChart.textTenMillions": "10 000 000",
"SSE.Controllers.EditChart.textHundredMil": "100 000 000",
"SSE.Controllers.EditChart.textBillions": "Billions",
"SSE.Controllers.EditChart.textTrillions": "Trillions",
"SSE.Controllers.EditChart.textCustom": "Custom",
"SSE.Controllers.EditChart.textManual": "Manual",
"SSE.Controllers.EditChart.textBetweenTickMarks": "Between Tick Marks",
"SSE.Controllers.EditChart.textOnTickMarks": "On Tick Marks",
"SSE.Controllers.EditChart.errorMaxRows": "ERROR! The maximum number of data series per chart is 255.",
"SSE.Controllers.EditChart.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"SSE.Controllers.EditChart.textLeft": "Left",
"SSE.Controllers.EditChart.textRight": "Right",
"SSE.Controllers.EditChart.textTop": "Top",
"SSE.Controllers.EditChart.textBottom": "Bottom",
"SSE.Controllers.EditChart.textFit": "Fit Width",
"SSE.Views.EditChart.textBack": "Back",
"SSE.Views.EditChart.textChart": "Chart",
"SSE.Views.EditChart.textReorder": "Reorder",
"SSE.Views.EditChart.textRemoveChart": "Remove Chart",
"SSE.Views.EditChart.textToForeground": "Bring to Foreground",
"SSE.Views.EditChart.textToBackground": "Send to Background",
"SSE.Views.EditChart.textForward": "Move Forward",
"SSE.Views.EditChart.textBackward": "Move Backward",
"SSE.Views.EditChart.textStyle": "Style",
"SSE.Views.EditChart.textLayout": "Layout",
"SSE.Views.EditChart.textVerAxis": "Vertical Axis",
"SSE.Views.EditChart.textHorAxis": "Horizontal Axis",
"SSE.Views.EditChart.textType": "Type",
"SSE.Views.EditChart.textFill": "Fill",
"SSE.Views.EditChart.textBorder": "Border",
"SSE.Views.EditChart.textSize": "Size",
"SSE.Views.EditChart.textColor": "Color",
"SSE.Views.EditChart.textOverlay": "Overlay",
"SSE.Views.EditChart.textNoOverlay": "No Overlay",
"SSE.Views.EditChart.textChartTitle": "Chart Title",
"SSE.Views.EditChart.textLeft": "Left",
"SSE.Views.EditChart.textTop": "Top",
"SSE.Views.EditChart.textRight": "Right",
"SSE.Views.EditChart.textBottom": "Bottom",
"SSE.Views.EditChart.textLeftOverlay": "Left Overlay",
"SSE.Views.EditChart.textRightOverlay": "Right Overlay",
"SSE.Views.EditChart.textLegend": "Legend",
"SSE.Views.EditChart.textAxisTitle": "Axis Title",
"SSE.Views.EditChart.textHorizontal": "Horizontal",
"SSE.Views.EditChart.textRotated": "Rotated",
"SSE.Views.EditChart.textVertical": "Vertical",
"SSE.Views.EditChart.textMajor": "Major",
"SSE.Views.EditChart.textMinor": "Minor",
"SSE.Views.EditChart.textMajorMinor": "Major and Minor",
"SSE.Views.EditChart.textDataLabels": "Data Labels",
"SSE.Views.EditChart.textAxisOptions": "Axis Options",
"SSE.Views.EditChart.textMinValue": "Minimum Value",
"SSE.Views.EditChart.textMaxValue": "Maximum Value",
"SSE.Views.EditChart.textAxisCrosses": "Axis Crosses",
"SSE.Views.EditChart.textAuto": "Auto",
"SSE.Views.EditChart.textCrossesValue": "Crosses Value",
"SSE.Views.EditChart.textDisplayUnits": "Display Units",
"SSE.Views.EditChart.textValReverseOrder": "Values in Reverse Order",
"SSE.Views.EditChart.textTickOptions": "Tick Options",
"SSE.Views.EditChart.textMajorType": "Major Type",
"SSE.Views.EditChart.textLabelOptions": "Label Options",
"SSE.Views.EditChart.textLabelPos": "Label Position",
"SSE.Views.EditChart.textAxisPosition": "Axis Position",
"SSE.Views.EditChart.textNone": "None",
"SSE.Views.EditImage.textReplace": "Replace",
"SSE.Views.EditImage.textReorder": "Reorder",
"SSE.Views.EditImage.textDefault": "Default Size",
"SSE.Views.EditImage.textRemove": "Remove Image",
"SSE.Views.EditImage.textBack": "Back",
"SSE.Views.EditImage.textToForeground": "Bring to Foreground",
"SSE.Views.EditImage.textToBackground": "Send to Background",
"SSE.Views.EditImage.textForward": "Move Forward",
"SSE.Views.EditImage.textBackward": "Move Backward",
"SSE.Views.EditImage.textFromLibrary": "Picture from Library",
"SSE.Views.EditImage.textFromURL": "Picture from URL",
"SSE.Views.EditImage.textLinkSettings": "Link Settings",
"SSE.Views.EditImage.textAddress": "Address",
"SSE.Views.EditImage.textImageURL": "Image URL",
"SSE.Views.EditImage.textReplaceImg": "Replace Image",
"SSE.Views.EditShape.textStyle": "Style",
"SSE.Views.EditShape.textReplace": "Replace",
"SSE.Views.EditShape.textReorder": "Reorder",
"SSE.Views.EditShape.textRemoveShape": "Remove Shape",
"SSE.Views.EditShape.textBack": "Back",
"SSE.Views.EditShape.textToForeground": "Bring to Foreground",
"SSE.Views.EditShape.textToBackground": "Send to Background",
"SSE.Views.EditShape.textForward": "Move Forward",
"SSE.Views.EditShape.textBackward": "Move Backward",
"SSE.Views.EditShape.textFill": "Fill",
"SSE.Views.EditShape.textBorder": "Border",
"SSE.Views.EditShape.textEffects": "Effects",
"SSE.Views.EditShape.textSize": "Size",
"SSE.Views.EditShape.textColor": "Color",
"SSE.Views.EditShape.textOpacity": "Opacity",
"SSE.Views.EditText.textBack": "Back",
"SSE.Views.EditText.textFonts": "Fonts",
"SSE.Views.EditText.textTextColor": "Text Color",
"SSE.Views.EditText.textFillColor": "Fill Color",
"SSE.Views.EditText.textSize": "Size",
"SSE.Controllers.EditHyperlink.textExternalLink": "External Link",
"SSE.Controllers.EditHyperlink.textInternalLink": "Internal Data Range",
"SSE.Controllers.EditHyperlink.textDefault": "Selected range",
"SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range",
"SSE.Controllers.EditHyperlink.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
"SSE.Views.EditHyperlink.textBack": "Back",
"SSE.Views.EditHyperlink.textExternalLink": "External Link",
"SSE.Views.EditHyperlink.textInternalLink": "Internal Data Range",
"SSE.Views.EditHyperlink.textLinkType": "Link Type",
"SSE.Views.EditHyperlink.textSheet": "Sheet",
"SSE.Views.EditHyperlink.textRange": "Range",
"SSE.Views.EditHyperlink.textLink": "Link",
"SSE.Views.EditHyperlink.textDisplay": "Display",
"SSE.Views.EditHyperlink.textScreenTip": "Screen Tip",
"SSE.Views.EditHyperlink.textEditLink": "Edit Link",
"SSE.Views.EditHyperlink.textRemoveLink": "Remove Link"
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7