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
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
Eteri
erp5
Commits
caee5344
Commit
caee5344
authored
Oct 28, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Stop setting local CSS
Support will be removed with CSP
parent
3e075f4f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
11 deletions
+6
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js
...ateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js
+0
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml
...teItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
+2
-2
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
...teItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
+1
-1
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js
View file @
caee5344
...
@@ -83,11 +83,6 @@
...
@@ -83,11 +83,6 @@
if
(
field_json
.
css_class
)
{
if
(
field_json
.
css_class
)
{
gadget_element
.
setAttribute
(
"
class
"
,
field_json
.
css_class
);
gadget_element
.
setAttribute
(
"
class
"
,
field_json
.
css_class
);
}
}
if
(
field_json
.
sandbox
===
"
iframe
"
)
{
iframe
=
gadget_element
.
querySelector
(
"
iframe
"
);
iframe
.
style
.
width
=
"
100%
"
;
iframe
.
style
.
height
=
"
100%
"
;
}
// Trigger render methods
// Trigger render methods
gadget
.
props
.
field_gadget
=
field_gadget
;
gadget
.
props
.
field_gadget
=
field_gadget
;
gadget
.
props
.
service_deferred
.
resolve
(
field_gadget
);
gadget
.
props
.
service_deferred
.
resolve
(
field_gadget
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml
View file @
caee5344
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
48.41569.55434.38451
</string>
</value>
<value>
<string>
9
54.58962.6524.44134
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
53977502.69
</float>
<float>
14
77660162.48
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
caee5344
...
@@ -432,7 +432,7 @@ svg text {
...
@@ -432,7 +432,7 @@ svg text {
}
}
iframe
{
iframe
{
width
:
100%
;
width
:
100%
;
height
:
25
em
;
height
:
50
em
;
background-color
:
white
;
background-color
:
white
;
}
}
img
{
img
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
caee5344
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
954.
44246.45584.9130
</string>
</value>
<value>
<string>
954.
58960.41752.27153
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
147
6777160.07
</float>
<float>
147
7660036.34
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
caee5344
...
@@ -499,7 +499,7 @@ svg {
...
@@ -499,7 +499,7 @@ svg {
iframe {
iframe {
width: 100%;
width: 100%;
height:
25
em;
height:
50
em;
background-color: white;
background-color: white;
}
}
...
...
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