Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
d7a4c3fc
Commit
d7a4c3fc
authored
Dec 11, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_run_my_doc: allow viewing/editing the slide title with the comment
parent
4e97f824
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
30 deletions
+25
-30
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
...tem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
+15
-20
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowEditor.zpt
...ests/renderjs_ui_run_my_doc_zuite/testSlideshowEditor.zpt
+7
-7
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowEditorDeleteFromList.zpt
...ui_run_my_doc_zuite/testSlideshowEditorDeleteFromList.zpt
+1
-1
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowViewer.zpt
...ests/renderjs_ui_run_my_doc_zuite/testSlideshowViewer.zpt
+2
-2
No files found.
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
View file @
d7a4c3fc
...
@@ -278,10 +278,11 @@
...
@@ -278,10 +278,11 @@
[
"
bottom
"
,
[[
"
your_slide_content
"
]]]
[
"
bottom
"
,
[[
"
your_slide_content
"
]]]
]
]
}
}
};
},
// Show chapter_title and slide_type inputs only during slide editing
extra_group_list
=
[];
if
(
title_html
!==
null
&&
type
!==
null
)
{
// Show chapter_title and slide_type inputs only during slide editing
if
(
title_html
!==
null
)
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_chapter_title
=
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_chapter_title
=
{
"
title
"
:
translation_dict
[
"
Chapter Title
"
],
"
title
"
:
translation_dict
[
"
Chapter Title
"
],
"
type
"
:
"
StringField
"
,
"
type
"
:
"
StringField
"
,
...
@@ -290,7 +291,10 @@
...
@@ -290,7 +291,10 @@
"
key
"
:
"
title_html
"
,
"
key
"
:
"
title_html
"
,
"
value
"
:
title_html
"
value
"
:
title_html
};
};
extra_group_list
.
push
([
"
your_chapter_title
"
]);
}
if
(
type
!==
null
)
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_slide_type
=
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_slide_type
=
{
"
title
"
:
translation_dict
[
"
Type of Slide
"
],
"
title
"
:
translation_dict
[
"
Type of Slide
"
],
"
type
"
:
"
ListField
"
,
"
type
"
:
"
ListField
"
,
...
@@ -305,6 +309,7 @@
...
@@ -305,6 +309,7 @@
],
],
value
:
type
value
:
type
};
};
extra_group_list
.
push
([
"
your_slide_type
"
]);
if
(
image_url
!==
null
)
{
if
(
image_url
!==
null
)
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_image_url
=
{
ck_editor_json
.
erp5_document
.
_embedded
.
_view
.
your_image_url
=
{
...
@@ -324,25 +329,15 @@
...
@@ -324,25 +329,15 @@
"
key
"
:
"
image_caption
"
,
"
key
"
:
"
image_caption
"
,
"
value
"
:
image_caption
"
value
"
:
image_caption
};
};
extra_group_list
.
push
([
"
your_image_url
"
],
[
"
your_image_caption
"
]);
ck_editor_json
.
form_definition
.
group_list
=
[
[
"
left
"
,
[
[
"
your_chapter_title
"
],
[
"
your_slide_type
"
],
[
"
your_image_url
"
],
[
"
your_image_caption
"
]
]]
].
concat
(
ck_editor_json
.
form_definition
.
group_list
);
}
else
{
ck_editor_json
.
form_definition
.
group_list
=
[
[
"
left
"
,
[
[
"
your_chapter_title
"
],
[
"
your_slide_type
"
]
]]
].
concat
(
ck_editor_json
.
form_definition
.
group_list
);
}
}
}
}
if
(
extra_group_list
.
length
!==
0
)
{
ck_editor_json
.
form_definition
.
group_list
=
[
[
"
left
"
,
extra_group_list
]
].
concat
(
ck_editor_json
.
form_definition
.
group_list
);
}
return
ck_editor_json
;
return
ck_editor_json
;
}
}
...
@@ -384,7 +379,7 @@
...
@@ -384,7 +379,7 @@
translation_dict
,
translation_dict
,
"
comment_html
"
,
"
comment_html
"
,
slide_dict
.
comment_html
,
slide_dict
.
comment_html
,
nul
l
,
slide_dict
.
title_htm
l
,
null
,
null
,
null
,
null
,
null
null
...
...
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowEditor.zpt
View file @
d7a4c3fc
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementNotPresent
</td>
<td>
waitForElementNotPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementNotPresent
</td>
<td>
waitForElementNotPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementNotPresent
</td>
<td>
waitForElementNotPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
@@ -372,7 +372,7 @@
...
@@ -372,7 +372,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
...
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowEditorDeleteFromList.zpt
View file @
d7a4c3fc
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
...
bt5/erp5_run_my_doc_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_run_my_doc_zuite/testSlideshowViewer.zpt
View file @
d7a4c3fc
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementNotPresent
</td>
<td>
waitForElementNotPresent
</td>
<td>
t
itle_html
</td>
<td>
t
ype
</td>
<td></td>
<td></td>
</tr>
</tr>
...
...
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