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
64b8732b
Commit
64b8732b
authored
Mar 17, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] ImageSettingsAdvanced: добавлена настройка относительной позиции в процентах.
parent
312efd8e
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
288 additions
and
21 deletions
+288
-21
apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
...nteditor/main/app/template/ImageSettingsAdvanced.template
+33
-7
apps/documenteditor/main/app/view/ChartSettings.js
apps/documenteditor/main/app/view/ChartSettings.js
+1
-0
apps/documenteditor/main/app/view/DocumentHolder.js
apps/documenteditor/main/app/view/DocumentHolder.js
+1
-0
apps/documenteditor/main/app/view/ImageSettings.js
apps/documenteditor/main/app/view/ImageSettings.js
+1
-0
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
+251
-14
apps/documenteditor/main/app/view/ShapeSettings.js
apps/documenteditor/main/app/view/ShapeSettings.js
+1
-0
No files found.
apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
View file @
64b8732b
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
<div class="inner-content">
<div class="inner-content">
<table cols="3" style="width: 100%;">
<table cols="3" style="width: 100%;">
<tr>
<tr>
<td colspan="3"
class="padding-small"
>
<td colspan="3">
<label class="header"><%= scope.textHorizontal %></label>
<label class="header"><%= scope.textHorizontal %></label>
</td>
</td>
</tr>
</tr>
...
@@ -101,7 +101,20 @@
...
@@ -101,7 +101,20 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td colspan="3" class="padding-small">
<td style="vertical-align: bottom; padding-bottom: 19px;">
<div id="image-radio-hpositionpc"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textPositionPc %></label>
<div id="image-spin-xpc"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textRelative %></label>
<div id="image-combo-hpositionpc" style="width: 115px;"></div>
</td>
</tr>
<tr>
<td colspan="3">
<label class="header"><%= scope.textVertical %></label>
<label class="header"><%= scope.textVertical %></label>
</td>
</td>
</tr>
</tr>
...
@@ -119,25 +132,38 @@
...
@@ -119,25 +132,38 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 1
9
px;">
<td style="vertical-align: bottom; padding-bottom: 1
2
px;">
<div id="image-radio-vposition"></div>
<div id="image-radio-vposition"></div>
</td>
</td>
<td class="padding-
large
">
<td class="padding-
small
">
<label class="input-label"><%= scope.textPosition %></label>
<label class="input-label"><%= scope.textPosition %></label>
<div id="image-spin-y"></div>
<div id="image-spin-y"></div>
</td>
</td>
<td class="padding-
large
">
<td class="padding-
small
">
<label class="input-label"><%= scope.textBelow %></label>
<label class="input-label"><%= scope.textBelow %></label>
<div id="image-combo-vposition" style="width: 115px;"></div>
<div id="image-combo-vposition" style="width: 115px;"></div>
</td>
</td>
</tr>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 19px;">
<div id="image-radio-vpositionpc"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textPositionPc %></label>
<div id="image-spin-ypc"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textRelative %></label>
<div id="image-combo-vpositionpc" style="width: 115px;"></div>
</td>
</tr>
</table>
</table>
</div>
</div>
<div class="separator horizontal padding-
large
"></div>
<div class="separator horizontal padding-
small
"></div>
<div class="inner-content">
<div class="inner-content">
<table cols="2" style="width: 100%;">
<table cols="2" style="width: 100%;">
<tr>
<tr>
<td colspan="2"
class="padding-small"
>
<td colspan="2">
<label class="header"><%= scope.textOptions %></label>
<label class="header"><%= scope.textOptions %></label>
</td>
</td>
</tr>
</tr>
...
...
apps/documenteditor/main/app/view/ChartSettings.js
View file @
64b8732b
...
@@ -391,6 +391,7 @@ define([
...
@@ -391,6 +391,7 @@ define([
{
{
imageProps
:
elValue
,
imageProps
:
elValue
,
sizeMax
:
imgsizeMax
,
sizeMax
:
imgsizeMax
,
sectionProps
:
me
.
api
.
asc_GetSectionProps
(),
handler
:
function
(
result
,
value
)
{
handler
:
function
(
result
,
value
)
{
if
(
result
==
'
ok
'
)
{
if
(
result
==
'
ok
'
)
{
if
(
me
.
api
)
{
if
(
me
.
api
)
{
...
...
apps/documenteditor/main/app/view/DocumentHolder.js
View file @
64b8732b
...
@@ -1912,6 +1912,7 @@ define([
...
@@ -1912,6 +1912,7 @@ define([
imageProps
:
elValue
,
imageProps
:
elValue
,
sizeOriginal
:
imgsizeOriginal
,
sizeOriginal
:
imgsizeOriginal
,
sizeMax
:
imgsizeMax
,
sizeMax
:
imgsizeMax
,
sectionProps
:
me
.
api
.
asc_GetSectionProps
(),
handler
:
function
(
result
,
value
)
{
handler
:
function
(
result
,
value
)
{
if
(
result
==
'
ok
'
)
{
if
(
result
==
'
ok
'
)
{
if
(
me
.
api
)
{
if
(
me
.
api
)
{
...
...
apps/documenteditor/main/app/view/ImageSettings.js
View file @
64b8732b
...
@@ -304,6 +304,7 @@ define([
...
@@ -304,6 +304,7 @@ define([
imageProps
:
elValue
,
imageProps
:
elValue
,
sizeOriginal
:
imgsizeOriginal
,
sizeOriginal
:
imgsizeOriginal
,
sizeMax
:
imgsizeMax
,
sizeMax
:
imgsizeMax
,
sectionProps
:
me
.
api
.
asc_GetSectionProps
(),
handler
:
function
(
result
,
value
)
{
handler
:
function
(
result
,
value
)
{
if
(
result
==
'
ok
'
)
{
if
(
result
==
'
ok
'
)
{
if
(
me
.
api
)
{
if
(
me
.
api
)
{
...
...
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file @
64b8732b
This diff is collapsed.
Click to expand it.
apps/documenteditor/main/app/view/ShapeSettings.js
View file @
64b8732b
...
@@ -1143,6 +1143,7 @@ define([
...
@@ -1143,6 +1143,7 @@ define([
(
new
DE
.
Views
.
ImageSettingsAdvanced
(
(
new
DE
.
Views
.
ImageSettingsAdvanced
(
{
{
imageProps
:
elValue
,
imageProps
:
elValue
,
sectionProps
:
me
.
api
.
asc_GetSectionProps
(),
handler
:
function
(
result
,
value
)
{
handler
:
function
(
result
,
value
)
{
if
(
result
==
'
ok
'
)
{
if
(
result
==
'
ok
'
)
{
if
(
me
.
api
)
{
if
(
me
.
api
)
{
...
...
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