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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
44c68ede
Commit
44c68ede
authored
Apr 06, 2018
by
Xiaowu Zhang
Committed by
Romain Courteaud
Jun 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: inline style is blocked by CSP
parent
39926539
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
8 deletions
+17
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
...ateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
...lateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
+3
-3
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
+3
-0
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
+6
-4
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
+4
-0
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
View file @
44c68ede
...
@@ -211,7 +211,7 @@
...
@@ -211,7 +211,7 @@
<script
id=
"error-message-template"
type=
"text/x-handlebars-template"
>
<script
id=
"error-message-template"
type=
"text/x-handlebars-template"
>
<
div
class
=
"
ui-listbox-error
"
>
<
div
class
=
"
ui-listbox-error
"
>
<
a
class
=
"
ui-btn ui-corner-all ui-btn-inline
"
href
=
"
{{reset_url}}
"
>
<
a
class
=
"
ui-btn ui-corner-all ui-btn-inline
"
href
=
"
{{reset_url}}
"
>
<
span
style
=
"
color:red
"
data
-
i18n
=
"
Invalid Search Criteria
"
>
Invalid
Search
Criteria
<
/span
>
<
span
class
=
'
ui-info-error
'
data
-
i18n
=
"
Invalid Search Criteria
"
>
Invalid
Search
Criteria
<
/span
>
<
span
>-<
/span
>
<
span
>-<
/span
>
<
span
data
-
i18n
=
"
Reset
"
>
Reset
<
/span
>
<
span
data
-
i18n
=
"
Reset
"
>
Reset
<
/span
>
<
/a
>
<
/a
>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
View file @
44c68ede
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
7.44852.3400.70
82
</string>
</value>
<value>
<string>
96
6.44549.11438.134
82
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,8 +252,8 @@
...
@@ -252,8 +252,8 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
152
8106932.21
</float>
<float>
152
3030835.06
</float>
<string>
UTC
</string>
<string>
GMT+2
</string>
</tuple>
</tuple>
</state>
</state>
</object>
</object>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
44c68ede
...
@@ -448,6 +448,9 @@ iframe {
...
@@ -448,6 +448,9 @@ iframe {
img
{
img
{
image-orientation
:
from-image
;
image-orientation
:
from-image
;
}
}
.ui-info-error
{
color
:
red
;
}
/**********************************************
/**********************************************
* Gadget: panel
* Gadget: panel
**********************************************/
**********************************************/
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
44c68ede
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -58,6 +59,7 @@
...
@@ -58,6 +59,7 @@
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -195,7 +197,7 @@
...
@@ -195,7 +197,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
527842617.9
1
</float>
<float>
1
469697744.7
1
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
@@ -240,7 +242,7 @@
...
@@ -240,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
8.4008.27622.9574
</string>
</value>
<value>
<string>
96
6.44071.41960.10069
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -258,8 +260,8 @@
...
@@ -258,8 +260,8 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
152
8376917.25
</float>
<float>
152
3030992.07
</float>
<string>
UTC
</string>
<string>
GMT+2
</string>
</tuple>
</tuple>
</state>
</state>
</object>
</object>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
44c68ede
...
@@ -568,6 +568,10 @@ img {
...
@@ -568,6 +568,10 @@ img {
}
}
.ui-info-error {
color: red;
}
/**********************************************
/**********************************************
* Gadget: panel
* Gadget: panel
**********************************************/
**********************************************/
...
...
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