Skip to content

W
web-apps
Commit 49cef9fa authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

[PE mobile] Added text and paragraph settings.

parent 4e61dc35
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1714 additions and 34 deletions
apps/presentationeditor/mobile/app-dev.js
View file @ 49cef9fa
......@@ -140,8 +140,8 @@ require([
// 'DocumentHolder',
'Settings',
'EditContainer',
// 'EditText',
// 'EditParagraph',
'EditText',
'EditParagraph',
// 'EditTable',
// 'EditImage',
// 'EditShape',
......@@ -205,8 +205,8 @@ require([
// 'presentationeditor/mobile/app/controller/DocumentHolder',
'presentationeditor/mobile/app/controller/Settings',
'presentationeditor/mobile/app/controller/edit/EditContainer',
// 'presentationeditor/mobile/app/controller/edit/EditText',
// 'presentationeditor/mobile/app/controller/edit/EditParagraph',
'presentationeditor/mobile/app/controller/edit/EditText',
'presentationeditor/mobile/app/controller/edit/EditParagraph',
// 'presentationeditor/mobile/app/controller/edit/EditTable',
// 'presentationeditor/mobile/app/controller/edit/EditImage',
// 'presentationeditor/mobile/app/controller/edit/EditShape',
......
apps/presentationeditor/mobile/app.js
View file @ 49cef9fa
......@@ -147,12 +147,12 @@ require([
'Editor',
'Toolbar',
// 'Search',
'Main'
'Main',
// 'DocumentHolder',
// 'Settings',
// 'EditContainer',
// 'EditText',
// 'EditParagraph',
'EditText',
'EditParagraph'
// 'EditTable',
// 'EditImage',
// 'EditShape',
......@@ -212,12 +212,12 @@ require([
'presentationeditor/mobile/app/controller/Editor',
'presentationeditor/mobile/app/controller/Toolbar',
// 'presentationeditor/mobile/app/controller/Search',
'presentationeditor/mobile/app/controller/Main'
'presentationeditor/mobile/app/controller/Main',
// 'presentationeditor/mobile/app/controller/DocumentHolder',
// 'presentationeditor/mobile/app/controller/Settings',
// 'presentationeditor/mobile/app/controller/edit/EditContainer',
// 'presentationeditor/mobile/app/controller/edit/EditText',
// 'presentationeditor/mobile/app/controller/edit/EditParagraph',
'presentationeditor/mobile/app/controller/edit/EditContainer',
'presentationeditor/mobile/app/controller/edit/EditText',
'presentationeditor/mobile/app/controller/edit/EditParagraph'
// 'presentationeditor/mobile/app/controller/edit/EditTable',
// 'presentationeditor/mobile/app/controller/edit/EditImage',
// 'presentationeditor/mobile/app/controller/edit/EditShape',
......
apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
View file @ 49cef9fa
......@@ -109,13 +109,20 @@ define([
editors = [];
// TODO: Debug only
editors.push(me._emptyEditController());
return editors;
// editors.push(me._emptyEditController());
// return editors;
if (_settings.length < 0) {
editors.push(me._emptyEditController());
} else {
if (_.contains(_settings, 'slide')) {
editors.push({
caption: me.textSlide,
id: 'edit-text',
layout: PE.getController('EditText').getView('EditSlide').rootLayout()
})
}
if (_.contains(_settings, 'text')) {
editors.push({
caption: me.textText,
......@@ -319,35 +326,33 @@ define([
onApiFocusObject: function (objects) {
_settings = [];
// Paragraph : 0,
// Table : 1,
// Image : 2,
// Header : 3,
// Shape : 4,
// Slide : 5,
// Chart : 6,
// MailMerge : 7,
// TextArt : 8
var no_text = true;
_.each(objects, function(object) {
var type = object.get_ObjectType();
if (Asc.c_oAscTypeSelectElement.Paragraph == type) {
_settings.push('text', 'paragraph');
_settings.push('paragraph');
no_text = false;
} else if (Asc.c_oAscTypeSelectElement.Table == type) {
_settings.push('table');
// _settings.push('table');
no_text = false;
} else if (Asc.c_oAscTypeSelectElement.Slide == type) {
// _settings.push('slide');
no_text = false;
} else if (Asc.c_oAscTypeSelectElement.Image == type) {
if (object.get_ObjectValue().get_ChartProperties()) {
_settings.push('chart');
} else if (object.get_ObjectValue().get_ShapeProperties()) {
_settings.push('shape');
} else {
_settings.push('image');
}
// _settings.push('image');
} else if (Asc.c_oAscTypeSelectElement.Chart == type) {
// _settings.push('chart');
no_text = false;
} else if (Asc.c_oAscTypeSelectElement.Shape == type) {
// _settings.push('shape');
no_text = false;
} else if (Asc.c_oAscTypeSelectElement.Hyperlink == type) {
_settings.push('hyperlink');
// _settings.push('hyperlink');
}
});
if (!no_text)
_settings.unshift('text');
// Exclude shapes if chart exist
if (_settings.indexOf('chart') > -1) {
......@@ -364,7 +369,8 @@ define([
textShape: 'Shape',
textImage: 'Image',
textChart: 'Chart',
textHyperlink: 'Hyperlink'
textHyperlink: 'Hyperlink',
textSlide: 'Slide'
}
})(), PE.Controllers.EditContainer || {}))
......
apps/presentationeditor/mobile/app/controller/edit/EditText.js 0 → 100644
View file @ 49cef9fa
This diff is collapsed.
apps/presentationeditor/mobile/app/template/EditText.template 0 → 100644
View file @ 49cef9fa
This diff is collapsed.
apps/presentationeditor/mobile/app/view/edit/EditParagraph.js 0 → 100644
View file @ 49cef9fa
/*
*
* (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
*
*/
/**
* EditParagraph.js
* Presentation Editor
*
* Created by Alexander Yuzhin on 10/14/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'text!presentationeditor/mobile/app/template/EditParagraph.template',
'jquery',
'underscore',
'backbone'
], function (editTemplate, $, _, Backbone) {
'use strict';
PE.Views.EditParagraph = Backbone.View.extend(_.extend((function() {
// private
var _bullets = [
[
{type: -1, thumb: ''},
{type: 1, thumb: 'bullet-01.png'},
{type: 2, thumb: 'bullet-02.png'},
{type: 3, thumb: 'bullet-03.png'}
],
[
{type: 4, thumb: 'bullet-04.png'},
{type: 5, thumb: 'bullet-05.png'},
{type: 6, thumb: 'bullet-06.png'},
{type: 7, thumb: 'bullet-07.png'}
]
];
var _numbers = [
[
{type: -1, thumb: ''},
{type: 4, thumb: 'number-01.png'},
{type: 5, thumb: 'number-02.png'},
{type: 6, thumb: 'number-03.png'}
],
[
{type: 1, thumb: 'number-04.png'},
{type: 2, thumb: 'number-05.png'},
{type: 3, thumb: 'number-06.png'},
{type: 7, thumb: 'number-07.png'}
]
];
return {
// el: '.view-main',
template: _.template(editTemplate),
events: {
},
initialize: function () {
Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this));
},
initEvents: function () {
var me = this;
$('#font-line-spacing').single('click', _.bind(me.showLineSpacing, me));
$('#font-bullets').single('click', _.bind(me.showBullets, me));
$('#font-numbers').single('click', _.bind(me.showNumbers, me));
PE.getController('EditParagraph').initSettings();
},
// Render layout
render: function () {
this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'),
scope : this,
bullets : _bullets,
numbers : _numbers
}));
return this;
},
rootLayout: function () {
if (this.layout) {
return this.layout
.find('#edit-paragraph-root')
.html();
}
return '';
},
showPage: function (templateId, suspendEvent) {
var rootView = PE.getController('EditContainer').rootView;
if (rootView && this.layout) {
var $content = this.layout.find(templateId);
// Android fix for navigation
if (Framework7.prototype.device.android) {
$content.find('.page').append($content.find('.navbar'));
}
rootView.router.load({
content: $content.html()
});
if (suspendEvent !== true) {
this.fireEvent('page:show', [this, templateId]);
}
}
},
showLineSpacing: function () {
this.showPage('#edit-text-linespacing');
},
showBullets: function () {
this.showPage('#edit-text-bullets');
},
showNumbers: function () {
this.showPage('#edit-text-numbers');
},
textBack: 'Back',
textFromText: 'Distance from Text',
textBefore: 'Before',
textAfter: 'After',
textLineSpacing: 'Line Spacing',
textBullets: 'Bullets',
textNone: 'None',
textNumbers: 'Numbers'
}
})(), PE.Views.EditParagraph || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/view/edit/EditText.js 0 → 100644
View file @ 49cef9fa
/*
*
* (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
*
*/
/**
* EditText.js
* Presentation Editor
*
* Created by Alexander Yuzhin on 10/4/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'text!presentationeditor/mobile/app/template/EditText.template',
'jquery',
'underscore',
'backbone',
'common/mobile/lib/component/ThemeColorPalette'
], function (editTemplate, $, _, Backbone) {
'use strict';
PE.Views.EditText = Backbone.View.extend(_.extend((function() {
// private
var _fontsList,
_editTextController;
return {
// el: '.view-main',
template: _.template(editTemplate),
events: {
},
initialize: function () {
_editTextController = PE.getController('EditText');
Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this));
},
initEvents: function () {
var me = this;
$('#font-fonts').single('click', _.bind(me.showFonts, me));
$('#font-color').single('click', _.bind(me.showFontColor, me));
$('#font-additional').single('click', _.bind(me.showAdditional, me));
me.initControls();
},
// Render layout
render: function () {
this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'),
scope : this
}));
return this;
},
rootLayout: function () {
if (this.layout) {
return this.layout
.find('#edit-text-root')
.html();
}
return '';
},
initControls: function () {
//
},
showPage: function (templateId, suspendEvent) {
var rootView = PE.getController('EditContainer').rootView;
if (rootView && this.layout) {
var $content = this.layout.find(templateId);
// Android fix for navigation
if (Framework7.prototype.device.android) {
$content.find('.page').append($content.find('.navbar'));
}
rootView.router.load({
content: $content.html()
});
if (suspendEvent !== true) {
this.fireEvent('page:show', [this, templateId]);
}
}
},
showFonts: function () {
this.showPage('#edit-text-fonts');
var me = this,
$template = $(
'<div>' +
'<li>' +
'<label class="label-radio item-content">' +
'<input type="radio" name="font-name" value="{{name}}">' +
(Framework7.prototype.device.android ? '<div class="item-media"><i class="icon icon-form-radio"></i></div>' : '') +
'<div class="item-inner">' +
'<div class="item-title" style="font-family: \'{{name}}\';">{{name}}</div>' +
'</div>' +
'</label>' +
'</li>' +
'</div>'
);
_fontsList = uiApp.virtualList('#font-list.virtual-list', {
items: PE.getController('EditText').getFonts(),
template: $template.html(),
onItemsAfterInsert: function (list, fragment) {
var fontInfo = _editTextController.getFontInfo();
$('#font-list input[name=font-name]').val([fontInfo.name]);
$('#font-list li').single('click', _.buffered(function (e) {
me.fireEvent('font:click', [me, e]);
}, 100));
}
});
},
showFontColor: function () {
this.showPage('#edit-text-color', true);
this.paletteTextColor = new Common.UI.ThemeColorPalette({
el: $('.page[data-page=edit-text-font-color] .page-content')
});
this.fireEvent('page:show', [this, '#edit-text-color']);
},
showAdditional: function () {
this.showPage('#edit-text-additional');
},
textFonts: 'Fonts',
textFontColor: 'Font Color',
textAdditionalFormat: 'Additional Formatting',
textBack: 'Back',
textSize: 'Size',
textFontColors: 'Font Colors',
textAutomatic: 'Automatic',
textAdditional: 'Additional',
textStrikethrough: 'Strikethrough',
textDblStrikethrough: 'Double Strikethrough',
textDblSuperscript: 'Superscript',
textSubscript: 'Subscript',
textSmallCaps: 'Small Caps',
textAllCaps: 'All Caps',
textLetterSpacing: 'Letter Spacing'
}
})(), PE.Views.EditText || {}))
});
\ No newline at end of file
apps/presentationeditor/mobile/resources/css/app-ios.css
View file @ 49cef9fa
......@@ -6500,3 +6500,36 @@ i.icon.icon-link {
height: 100%;
background-color: #DF6737;
}
.bullets ul,
.numbers ul {
margin-top: 10px;
}
.bullets li,
.numbers li {
width: 70px;
height: 70px;
margin-right: 1px;
border: 1px solid #c4c4c4;
}
html.pixel-ratio-2 .bullets li,
html.pixel-ratio-2 .numbers li {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 .bullets li,
html.pixel-ratio-3 .numbers li {
border: 0.33px solid #c4c4c4;
}
.bullets li .thumb,
.numbers li .thumb {
width: 100%;
height: 100%;
background-color: #ffffff;
background-size: cover;
}
.bullets li .thumb label,
.numbers li .thumb label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
}
apps/presentationeditor/mobile/resources/css/app-material.css
View file @ 49cef9fa
......@@ -6099,3 +6099,36 @@ textarea {
height: 100%;
background-color: #DF6737;
}
.bullets ul,
.numbers ul {
margin-top: 10px;
}
.bullets li,
.numbers li {
width: 70px;
height: 70px;
margin-right: 1px;
border: 1px solid #c4c4c4;
}
html.pixel-ratio-2 .bullets li,
html.pixel-ratio-2 .numbers li {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 .bullets li,
html.pixel-ratio-3 .numbers li {
border: 0.33px solid #c4c4c4;
}
.bullets li .thumb,
.numbers li .thumb {
width: 100%;
height: 100%;
background-color: #ffffff;
background-size: cover;
}
.bullets li .thumb label,
.numbers li .thumb label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
}
apps/presentationeditor/mobile/resources/less/app-ios.less
View file @ 49cef9fa
......@@ -126,3 +126,43 @@ input, textarea {
}
}
}
// Bullets and numbers
.bullets,
.numbers {
ul {
margin-top: 10px;
}
li {
width: 70px;
height: 70px;
margin-right: 1px;
border: 1px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
&.active {
//
}
.thumb {
width: 100%;
height: 100%;
background-color: @white;
background-size: cover;
label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
}
}
}
}
\ No newline at end of file
apps/presentationeditor/mobile/resources/less/app-material.less
View file @ 49cef9fa
......@@ -120,3 +120,43 @@ input, textarea {
}
}
// Bullets and numbers
.bullets,
.numbers {
ul {
margin-top: 10px;
}
li {
width: 70px;
height: 70px;
margin-right: 1px;
border: 1px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
&.active {
//
}
.thumb {
width: 100%;
height: 100%;
background-color: @white;
background-size: cover;
label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
}
}
}
}
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