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

[DE mobile] Localization EditText, ThemeColorPalette.

Browse source
This commit is contained in:
Alexander Yuzhin 2016-11-21 12:05:28 +03:00 committed by Maxim Kadushkin
parent 932d5b3d10
commit 9e9e738dbd
5 changed files with 99 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/component/ThemeColorPalette.js
View file

@ -204,6 +204,6 @@ define([
}, },
textThemeColors: 'Theme Colors', textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors' textStandartColors: 'Standard Colors'
}, Common.UI.ThemeColorPalette || {})); }, Common.UI.ThemeColorPalette || {}));
}); });

14
apps/documenteditor/mobile/app/controller/edit/EditText.js
View file

@ -46,7 +46,7 @@ define([
], function (core) { ], function (core) {
'use strict'; 'use strict';
DE.Controllers.EditText = Backbone.Controller.extend((function() { DE.Controllers.EditText = Backbone.Controller.extend(_.extend((function() {
var _fontsArray = [], var _fontsArray = [],
_stack = [], _stack = [],
_paragraphObject = undefined, _paragraphObject = undefined,
@ -491,7 +491,7 @@ define([
}, },
onApiChangeFont: function(font) { onApiChangeFont: function(font) {
var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName()) || 'Fonts'; var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName()) || this.textFonts;
_fontInfo.name = name; _fontInfo.name = name;
$('#font-fonts .item-title').html(name); $('#font-fonts .item-title').html(name);
@ -501,7 +501,7 @@ define([
_fontInfo.size = size; _fontInfo.size = size;
var displaySize = _fontInfo.size; var displaySize = _fontInfo.size;
_.isUndefined(displaySize) ? displaySize = 'Auto' : displaySize = displaySize + ' ' + 'pt'; _.isUndefined(displaySize) ? displaySize = this.textAuto : displaySize = displaySize + ' ' + this.textPt;
$('#font-fonts .item-after span:first-child').html(displaySize); $('#font-fonts .item-after span:first-child').html(displaySize);
$('#font-size .item-after label').html(displaySize); $('#font-size .item-after label').html(displaySize);
@ -592,7 +592,11 @@ define([
// Helpers // Helpers
_toggleButton: function (e) { _toggleButton: function (e) {
return $(e.currentTarget).toggleClass('active').hasClass('active'); return $(e.currentTarget).toggleClass('active').hasClass('active');
},
textFonts: 'Fonts',
textAuto: 'Auto',
textPt: 'pt'
} }
} })(), DE.Controllers.EditText || {}))
})());
}); });

66
apps/documenteditor/mobile/app/template/EditText.template
View file

@ -5,7 +5,7 @@
<li><a id="font-fonts" class="item-link"> <li><a id="font-fonts" class="item-link">
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Fonts</div> <div class="item-title"><%= scope.textFonts %></div>
<div class="item-after" style="color: #000;"><span></span><span style="margin-left: 5px;"></span></div> <div class="item-after" style="color: #000;"><span></span><span style="margin-left: 5px;"></span></div>
</div> </div>
</div></a></li> </div></a></li>
@ -24,7 +24,7 @@
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Font color</div> <div class="item-title"><%= scope.textFontColor %></div>
<% if (android) { %><div class="item-after"><div class="color-preview"></div></div><% } %> <% if (android) { %><div class="item-after"><div class="color-preview"></div></div><% } %>
</div> </div>
</div> </div>
@ -34,7 +34,7 @@
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-text-selection"><span class="color-preview"></span></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-text-selection"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Highlight color</div> <div class="item-title"><%= scope.textHighlightColor %></div>
<% if (android) { %><div class="item-after"><div class="color-preview"></div></div><% } %> <% if (android) { %><div class="item-after"><div class="color-preview"></div></div><% } %>
</div> </div>
</div> </div>
@ -45,7 +45,7 @@
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-text-additional"></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-text-additional"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Additional formatting</div> <div class="item-title"><%= scope.textAdditionalFormat %></div>
</div> </div>
</div> </div>
</a> </a>
@ -76,21 +76,21 @@
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-bullets"></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-bullets"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Bullets</div> <div class="item-title"><%= scope.textBullets %></div>
</div> </div>
</div></a></li> </div></a></li>
<li><a id="font-numbers" class="item-link"> <li><a id="font-numbers" class="item-link">
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-numbers"></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-numbers"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Numbers</div> <div class="item-title"><%= scope.textNumbers %></div>
</div> </div>
</div></a></li> </div></a></li>
<li><a id="font-line-spacing" class="item-link"> <li><a id="font-line-spacing" class="item-link">
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media"><i class="icon icon-linespacing"></i></div><% } %> <% if (!android) { %><div class="item-media"><i class="icon icon-linespacing"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Line Spacing</div> <div class="item-title"><%= scope.textLineSpacing %></div>
</div> </div>
</div></a></li> </div></a></li>
</ul> </ul>
@ -101,8 +101,8 @@
<div id="edit-text-fonts"> <div id="edit-text-fonts">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding">Fonts</div> <div class="center sliding"><%= scope.textFonts %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -113,7 +113,7 @@
<li id="font-size"> <li id="font-size">
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Size</div> <div class="item-title"><%= scope.textSize %></div>
<div class="item-after splitter"> <div class="item-after splitter">
<% if (!android) { %><label></label><% } %> <% if (!android) { %><label></label><% } %>
<p class="buttons-row"> <p class="buttons-row">
@ -127,7 +127,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="content-block-title">Fonts</div> <div class="content-block-title"><%= scope.textFonts %></div>
<div id="font-list" class="list-block virtual-list"> <div id="font-list" class="list-block virtual-list">
<!-- Fonts List --> <!-- Fonts List -->
</div> </div>
@ -139,8 +139,8 @@
<div id="edit-text-color"> <div id="edit-text-color">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Font Colors</div> <div class="center sliding"><%= scope.textFontColors %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -155,7 +155,7 @@
<div style="width:22px; height: 22px; background-color: #000;"></div> <div style="width:22px; height: 22px; background-color: #000;"></div>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Automatic</div> <div class="item-title"><%= scope.textAutomatic %></div>
</div> </div>
</div> </div>
</a> </a>
@ -170,8 +170,8 @@
<div id="edit-text-background"> <div id="edit-text-background">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Highlight Colors</div> <div class="center sliding"><%= scope.textHighlightColors %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -186,8 +186,8 @@
<div id="edit-text-additional"> <div id="edit-text-additional">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Additional</div> <div class="center sliding"><%= scope.textAdditional %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -200,7 +200,7 @@
<input type="radio" name="text-strikethrough" value="strikethrough"> <input type="radio" name="text-strikethrough" value="strikethrough">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Strikethrough</div> <div class="item-title"><%= scope.textStrikethrough %></div>
</div> </div>
</label> </label>
</li> </li>
@ -209,7 +209,7 @@
<input type="radio" name="text-strikethrough" value="double-strikethrough"> <input type="radio" name="text-strikethrough" value="double-strikethrough">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Double Strikethrough</div> <div class="item-title"><%= scope.textDblStrikethrough %></div>
</div> </div>
</label> </label>
</li> </li>
@ -218,7 +218,7 @@
<input type="radio" name="text-script" value="superscript"> <input type="radio" name="text-script" value="superscript">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Superscript</div> <div class="item-title"><%= scope.textDblSuperscript %></div>
</div> </div>
</label> </label>
</li> </li>
@ -227,7 +227,7 @@
<input type="radio" name="text-script" value="subscript"> <input type="radio" name="text-script" value="subscript">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Subscript</div> <div class="item-title"><%= scope.textSubscript %></div>
</div> </div>
</label> </label>
</li> </li>
@ -236,7 +236,7 @@
<input type="radio" name="text-caps" value="small"> <input type="radio" name="text-caps" value="small">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Small Caps</div> <div class="item-title"><%= scope.textSmallCaps %></div>
</div> </div>
</label> </label>
</li> </li>
@ -245,7 +245,7 @@
<input type="radio" name="text-caps" value="all"> <input type="radio" name="text-caps" value="all">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %> <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner"> <div class="item-inner">
<div class="item-title">All Caps</div> <div class="item-title"><%= scope.textAllCaps %></div>
</div> </div>
</label> </label>
</li> </li>
@ -256,7 +256,7 @@
<li id="letter-spacing" id="letter-spacing"> <li id="letter-spacing" id="letter-spacing">
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Letter Spacing</div> <div class="item-title"><%= scope.textLetterSpacing %></div>
<div class="item-after splitter"> <div class="item-after splitter">
<% if (!android) { %><label></label><% } %> <% if (!android) { %><label></label><% } %>
<p class="buttons-row"> <p class="buttons-row">
@ -278,8 +278,8 @@
<div id="edit-text-linespacing"> <div id="edit-text-linespacing">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Line Spacing</div> <div class="center sliding"><%= scope.textLineSpacing %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -351,8 +351,8 @@
<div id="edit-text-bullets"> <div id="edit-text-bullets">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Bullets</div> <div class="center sliding"><%= scope.textBullets %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -363,7 +363,7 @@
<% _.each(row, function(bullet) { %> <% _.each(row, function(bullet) { %>
<li data-type="<%= bullet.type %>"> <li data-type="<%= bullet.type %>">
<% if (bullet.thumb.length < 1) { %> <% if (bullet.thumb.length < 1) { %>
<div class="thumb" style="position: relative;"><label>None</label></div> <div class="thumb" style="position: relative;"><label><%= scope.textNone %></label></div>
<% } else { %> <% } else { %>
<div class="thumb" style="background-image:url('../mobile/resources/img/bullets/<%= bullet.thumb %>')"></div> <div class="thumb" style="background-image:url('../mobile/resources/img/bullets/<%= bullet.thumb %>')"></div>
<% } %> <% } %>
@ -379,8 +379,8 @@
<div id="edit-text-numbers"> <div id="edit-text-numbers">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></a></div> <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">Numbers</div> <div class="center sliding"><%= scope.textNumbers %></div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></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> </div>
@ -391,7 +391,7 @@
<% _.each(row, function(number) { %> <% _.each(row, function(number) { %>
<li data-type="<%= number.type %>"> <li data-type="<%= number.type %>">
<% if (number.thumb.length < 1) { %> <% if (number.thumb.length < 1) { %>
<div class="thumb" style="position: relative;"><label>None</label></div> <div class="thumb" style="position: relative;"><label><%= scope.textNone %></label></div>
<% } else { %> <% } else { %>
<div class="thumb" style="background-image:url('../mobile/resources/img/numbers/<%= number.thumb %>')"></div> <div class="thumb" style="background-image:url('../mobile/resources/img/numbers/<%= number.thumb %>')"></div>
<% } %> <% } %>

28
apps/documenteditor/mobile/app/view/edit/EditText.js
View file

@ -49,7 +49,7 @@ define([
], function (editTemplate, $, _, Backbone) { ], function (editTemplate, $, _, Backbone) {
'use strict'; 'use strict';
DE.Views.EditText = Backbone.View.extend((function() { DE.Views.EditText = Backbone.View.extend(_.extend((function() {
// private // private
var _fontsList, var _fontsList,
_editTextController; _editTextController;
@ -116,6 +116,7 @@ define([
this.layout = $('<div/>').append(this.template({ this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
scope : this,
bullets : _bullets, bullets : _bullets,
numbers : _numbers numbers : _numbers
})); }));
@ -225,8 +226,29 @@ define([
showNumbers: function () { showNumbers: function () {
this.showPage('#edit-text-numbers'); this.showPage('#edit-text-numbers');
} },
textFonts: 'Fonts',
textFontColor: 'Font Color',
textHighlightColor: 'Highlight Color',
textAdditionalFormat: 'Additional Formatting',
textBack: 'Back',
textSize: 'Size',
textFontColors: 'Font Colors',
textAutomatic: 'Automatic',
textHighlightColors: 'Highlight Colors',
textAdditional: 'Additional',
textStrikethrough: 'Strikethrough',
textDblStrikethrough: 'Double Strikethrough',
textDblSuperscript: 'Superscript',
textSubscript: 'Subscript',
textSmallCaps: 'Small Caps',
textAllCaps: 'All Caps',
textLetterSpacing: 'Letter Spacing',
textLineSpacing: 'Line Spacing',
textBullets: 'Bullets',
textNone: 'None',
textNumbers: 'Numbers'
} }
})()); })(), DE.Views.EditText || {}))
}); });

30
apps/documenteditor/mobile/locale/en.json
View file

@ -1,4 +1,7 @@
{ {
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"DE.Controllers.Main.criticalErrorTitle": "Error", "DE.Controllers.Main.criticalErrorTitle": "Error",
@ -319,5 +322,30 @@
"DE.Views.EditTabletextBandedRow": "Banded Row", "DE.Views.EditTabletextBandedRow": "Banded Row",
"DE.Views.EditTabletextFirstColumn": "First Column", "DE.Views.EditTabletextFirstColumn": "First Column",
"DE.Views.EditTabletextLastColumn": "Last Column", "DE.Views.EditTabletextLastColumn": "Last Column",
"DE.Views.EditTabletextBandedColumn": "Banded Column" "DE.Views.EditTabletextBandedColumn": "Banded Column",
"DE.Controllers.EditText.textFonts": "Fonts",
"DE.Controllers.EditText.textAuto": "Auto",
"DE.Controllers.EditText.textPt": "pt",
"DE.Views.EditText.textFonts": "Fonts",
"DE.Views.EditText.textFontColor": "Font Color",
"DE.Views.EditText.textHighlightColor": "Highlight Color",
"DE.Views.EditText.textAdditionalFormat": "Additional Formatting",
"DE.Views.EditText.textBack": "Back",
"DE.Views.EditText.textSize": "Size",
"DE.Views.EditText.textFontColors": "Font Colors",
"DE.Views.EditText.textAutomatic": "Automatic",
"DE.Views.EditText.textHighlightColors": "Highlight Colors",
"DE.Views.EditText.textAdditional": "Additional",
"DE.Views.EditText.textStrikethrough": "Strikethrough",
"DE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
"DE.Views.EditText.textDblSuperscript": "Superscript",
"DE.Views.EditText.textSubscript": "Subscript",
"DE.Views.EditText.textSmallCaps": "Small Caps",
"DE.Views.EditText.textAllCaps": "All Caps",
"DE.Views.EditText.textLetterSpacing": "Letter Spacing",
"DE.Views.EditText.textLineSpacing": "Line Spacing",
"DE.Views.EditText.textBullets": "Bullets",
"DE.Views.EditText.textNone": "None",
"DE.Views.EditText.textNumbers": "Numbers"
} }