Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
d3843067
Commit
d3843067
authored
Nov 18, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Localization EditChart.
parent
2abb5bec
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
44 deletions
+97
-44
apps/documenteditor/mobile/app/controller/edit/EditChart.js
apps/documenteditor/mobile/app/controller/edit/EditChart.js
+2
-2
apps/documenteditor/mobile/app/template/EditChart.template
apps/documenteditor/mobile/app/template/EditChart.template
+37
-37
apps/documenteditor/mobile/app/view/edit/EditChart.js
apps/documenteditor/mobile/app/view/edit/EditChart.js
+31
-4
apps/documenteditor/mobile/locale/en.json
apps/documenteditor/mobile/locale/en.json
+27
-1
No files found.
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file @
d3843067
...
...
@@ -46,7 +46,7 @@ define([
],
function
(
core
)
{
'
use strict
'
;
DE
.
Controllers
.
EditChart
=
Backbone
.
Controller
.
extend
((
function
()
{
DE
.
Controllers
.
EditChart
=
Backbone
.
Controller
.
extend
(
_
.
extend
(
(
function
()
{
// Private
var
_stack
=
[],
_chartObject
=
undefined
,
...
...
@@ -593,5 +593,5 @@ define([
return
chartExist
;
}
};
})()
);
})()
,
DE
.
Controllers
.
EditChart
||
{}))
});
\ No newline at end of file
apps/documenteditor/mobile/app/template/EditChart.template
View file @
d3843067
...
...
@@ -6,7 +6,7 @@
<a id="chart-style" class="item-link">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Style
</div>
<div class="item-title">
<%= scope.textStyle %>
</div>
</div>
</div>
</a>
...
...
@@ -15,7 +15,7 @@
<a id="chart-wrap" class="item-link">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Wrap
</div>
<div class="item-title">
<%= scope.textWrap %>
</div>
</div>
</div>
</a>
...
...
@@ -24,7 +24,7 @@
<a id="chart-reorder" class="item-link">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Reorder
</div>
<div class="item-title">
<%= scope.textReorder %>
</div>
</div>
</div>
</a>
...
...
@@ -35,11 +35,11 @@
<% if (!android) { %>
<ul>
<li>
<a id="chart-remove" class="item-link list-button" style="text-align: center; color: #f00">
Remove Chart
</a>
<a id="chart-remove" class="item-link list-button" style="text-align: center; color: #f00">
<%= scope.textRemoveChart %>
</a>
</li>
</ul>
<% } else { %>
<a id="chart-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;">
Remove Chart
</a>
<a id="chart-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;">
<%= scope.textRemoveChart %>
</a>
<% } %>
</div>
</div>
...
...
@@ -48,8 +48,8 @@
<div id="edit-chart-reorder">
<div class="navbar">
<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="center sliding">
Reorder
</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">
<%= scope.textReorder %>
</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>
...
...
@@ -62,7 +62,7 @@
<div class="item-content">
<div class="item-media"><i class="icon icon-search"></i></div>
<div class="item-inner">
<div class="item-title">
Bring to Foreground
</div>
<div class="item-title">
<%= scope.textToForeground %>
</div>
</div>
</div>
</a>
...
...
@@ -72,7 +72,7 @@
<div class="item-content">
<div class="item-media"><i class="icon icon-search"></i></div>
<div class="item-inner">
<div class="item-title">
Send to Background
</div>
<div class="item-title">
<%= scope.textToBackground %>
</div>
</div>
</div>
</a>
...
...
@@ -82,7 +82,7 @@
<div class="item-content">
<div class="item-media"><i class="icon icon-search"></i></div>
<div class="item-inner">
<div class="item-title">
Move Forward
</div>
<div class="item-title">
<%= scope.textForward %>
</div>
</div>
</div>
</a>
...
...
@@ -92,7 +92,7 @@
<div data-type="move-down" class="item-content">
<div class="item-media"><i class="icon icon-search"></i></div>
<div class="item-inner">
<div class="item-title">
Move Backward
</div>
<div class="item-title">
<%= scope.textBackward %>
</div>
</div>
</div>
</a>
...
...
@@ -107,8 +107,8 @@
<div id="edit-chart-wrap">
<div class="navbar">
<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="center sliding">
Wrap
</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">
<%= scope.textWrap %>
</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>
...
...
@@ -125,7 +125,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Inline
</div>
<div class="item-title">
<%= scope.textInline %>
</div>
</div>
</label>
</li>
...
...
@@ -138,7 +138,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Square
</div>
<div class="item-title">
<%= scope.textSquare %>
</div>
</div>
</label>
</li>
...
...
@@ -151,7 +151,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Tight
</div>
<div class="item-title">
<%= scope.textTight %>
</div>
</div>
</label>
</li>
...
...
@@ -164,7 +164,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Through
</div>
<div class="item-title">
<%= scope.textThrough %>
</div>
</div>
</label>
</li>
...
...
@@ -177,7 +177,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Top and Bottom
</div>
<div class="item-title">
<%= scope.textTopBottom %>
</div>
</div>
</label>
</li>
...
...
@@ -190,7 +190,7 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
In Front
</div>
<div class="item-title">
<%= scope.textInFront %>
</div>
</div>
</label>
</li>
...
...
@@ -203,13 +203,13 @@
<div class="item-media"><i class="icon icon-search"></i></div>
<% } %>
<div class="item-inner">
<div class="item-title">
Behind
</div>
<div class="item-title">
<%= scope.textBehind %>
</div>
</div>
</label>
</li>
</ul>
</div>
<div class="content-block-title align">
Align
</div>
<div class="content-block-title align">
<%= scope.textAlign %>
</div>
<div class="list-block align">
<ul>
<li id="edit-chart-align">
...
...
@@ -230,7 +230,7 @@
<li id="edit-chart-movetext">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Move with Text
</div>
<div class="item-title">
<%= scope.textMoveText %>
</div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
...
...
@@ -243,7 +243,7 @@
<li id="edit-chart-overlap">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Allow Overlap
</div>
<div class="item-title">
<%= scope.textOverlap %>
</div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
...
...
@@ -255,7 +255,7 @@
</li>
</ul>
</div>
<div class="content-block-title distance">
Distance from text
</div>
<div class="content-block-title distance">
<%= scope.textDistanceText %>
</div>
<div class="list-block distance" style="margin-bottom: 40px;">
<ul>
<li id="table-distance">
...
...
@@ -280,23 +280,23 @@
<div id="edit-chart-style">
<div class="navbar">
<div class="navbar-inner edit-chart-style" data-page="edit-chart-style">
<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 categories">
<% if (android) { %>
<div class="toolbar tabbar">
<div data-page="index" class="toolbar-inner">
<a href="#tab-chart-type" data-type="type" class="tab-link active">
Type
</a>
<a href="#tab-chart-style" data-type="style" class="tab-link">
Style
</a>
<a href="#tab-chart-fill" data-type="fill" class="tab-link">
Fill
</a>
<a href="#tab-chart-border" data-type="border" class="tab-link">
Border
</a>
<a href="#tab-chart-type" data-type="type" class="tab-link active">
<%= scope.textType %>
</a>
<a href="#tab-chart-style" data-type="style" class="tab-link">
<%= scope.textStyle %>
</a>
<a href="#tab-chart-fill" data-type="fill" class="tab-link">
<%= scope.textFill %>
</a>
<a href="#tab-chart-border" data-type="border" class="tab-link">
<%= scope.textBorder %>
</a>
</div>
</div>
<% } else { %>
<div class="buttons-row">
<a href="#tab-chart-type" data-type="type" class="tab-link button active">
Type
</a>
<a href="#tab-chart-style" data-type="style" class="tab-link button">
Style
</a>
<a href="#tab-chart-fill" data-type="fill" class="tab-link button">
Fill
</a>
<a href="#tab-chart-border" data-type="border" class="tab-link button">
Border
</a>
<a href="#tab-chart-type" data-type="type" class="tab-link button active">
<%= scope.textType %>
</a>
<a href="#tab-chart-style" data-type="style" class="tab-link button">
<%= scope.textStyle %>
</a>
<a href="#tab-chart-fill" data-type="fill" class="tab-link button">
<%= scope.textFill %>
</a>
<a href="#tab-chart-border" data-type="border" class="tab-link button">
<%= scope.textBorder %>
</a>
</div>
<% } %>
</div>
...
...
@@ -335,7 +335,7 @@
<div class="list-block">
<ul>
<li id="edit-chart-bordersize">
<div style="padding: 15px 0 0 15px;">
Size
</div>
<div style="padding: 15px 0 0 15px;">
<%= scope.textSize %>
</div>
<div class="item-content">
<div class="item-inner">
<div class="item-input">
...
...
@@ -351,7 +351,7 @@
<a id="edit-chart-bordercolor" class="item-link">
<div class="item-content">
<div class="item-inner">
<div class="item-title">
Color
</div>
<div class="item-title">
<%= scope.textColor %>
</div>
<div class="item-after"><div class="color-preview"></div></div>
</div>
</div>
...
...
@@ -369,8 +369,8 @@
<div id="edit-chart-border-color-view">
<div class="navbar">
<div class="navbar-inner" data-page="edit-chart-border-color">
<div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span>
Back
</span><% } %></a></div>
<div class="center sliding">
Color
</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">
<%= scope.textColor %>
</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>
...
...
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file @
d3843067
...
...
@@ -49,7 +49,7 @@ define([
],
function
(
editTemplate
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Views
.
EditChart
=
Backbone
.
View
.
extend
((
function
()
{
DE
.
Views
.
EditChart
=
Backbone
.
View
.
extend
(
_
.
extend
(
(
function
()
{
// private
var
_styles
=
[];
...
...
@@ -128,7 +128,8 @@ define([
this
.
layout
=
$
(
'
<div/>
'
).
append
(
this
.
template
({
android
:
Common
.
SharedSettings
.
get
(
'
android
'
),
phone
:
Common
.
SharedSettings
.
get
(
'
phone
'
),
types
:
groupsOfTypes
types
:
groupsOfTypes
,
scope
:
this
}));
return
this
;
...
...
@@ -241,7 +242,33 @@ define([
});
this
.
fireEvent
(
'
page:show
'
,
[
this
,
selector
]);
},
textStyle
:
'
Style
'
,
textWrap
:
'
Wrap
'
,
textReorder
:
'
Reorder
'
,
textRemoveChart
:
'
Remove Chart
'
,
textBack
:
'
Back
'
,
textToForeground
:
'
Bring to Foreground
'
,
textToBackground
:
'
Send to Background
'
,
textForward
:
'
Move Forward
'
,
textBackward
:
'
Move Backward
'
,
textInline
:
'
Inline
'
,
textSquare
:
'
Square
'
,
textTight
:
'
Tight
'
,
textThrough
:
'
Through
'
,
textTopBottom
:
'
Top and Bottom
'
,
textInFront
:
'
In Front
'
,
textBehind
:
'
Behind
'
,
textAlign
:
'
Align
'
,
textMoveText
:
'
Move with Text
'
,
textOverlap
:
'
Allow Overlap
'
,
textDistanceText
:
'
Distance from Text
'
,
textType
:
'
Type
'
,
textFill
:
'
Fill
'
,
textBorder
:
'
Border
'
,
textSize
:
'
Size
'
,
textColor
:
'
Color
'
}
}
})());
})(),
DE
.
Views
.
EditChart
||
{}))
});
\ No newline at end of file
apps/documenteditor/mobile/locale/en.json
View file @
d3843067
...
...
@@ -179,5 +179,31 @@
"DE.Controllers.AddTable.textTableSize"
:
"Table Size"
,
"DE.Controllers.AddTable.textColumns"
:
"Columns"
,
"DE.Controllers.AddTable.textRows"
:
"Rows"
,
"DE.Controllers.AddTable.textCancel"
:
"Cancel"
"DE.Controllers.AddTable.textCancel"
:
"Cancel"
,
"DE.Views.EditChart.textStyle"
:
"Style"
,
"DE.Views.EditChart.textWrap"
:
"Wrap"
,
"DE.Views.EditChart.textReorder"
:
"Reorder"
,
"DE.Views.EditChart.textRemoveChart"
:
"Remove Chart"
,
"DE.Views.EditChart.textBack"
:
"Back"
,
"DE.Views.EditChart.textToForeground"
:
"Bring to Foreground"
,
"DE.Views.EditChart.textToBackground"
:
"Send to Background"
,
"DE.Views.EditChart.textForward"
:
"Move Forward"
,
"DE.Views.EditChart.textBackward"
:
"Move Backward"
,
"DE.Views.EditChart.textInline"
:
"Inline"
,
"DE.Views.EditChart.textSquare"
:
"Square"
,
"DE.Views.EditChart.textTight"
:
"Tight"
,
"DE.Views.EditChart.textThrough"
:
"Through"
,
"DE.Views.EditChart.textTopBottom"
:
"Top and Bottom"
,
"DE.Views.EditChart.textInFront"
:
"In Front"
,
"DE.Views.EditChart.textBehind"
:
"Behind"
,
"DE.Views.EditChart.textAlign"
:
"Align"
,
"DE.Views.EditChart.textMoveText"
:
"Move with Text"
,
"DE.Views.EditChart.textOverlap"
:
"Allow Overlap"
,
"DE.Views.EditChart.textDistanceText"
:
"Distance from Text"
,
"DE.Views.EditChart.textType"
:
"Type"
,
"DE.Views.EditChart.textFill"
:
"Fill"
,
"DE.Views.EditChart.textBorder"
:
"Border"
,
"DE.Views.EditChart.textSize"
:
"Size"
,
"DE.Views.EditChart.textColor"
:
"Color"
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment