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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Boxiang Sun
erp5
Commits
5362a395
Commit
5362a395
authored
Jul 29, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Stop loading fontawesome from a third party site
parent
3686e1ee
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
18 deletions
+32
-18
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
...TemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
+8
-9
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
...teItem/web_page_module/rjs_gadget_erp5_launcher_html.html
+0
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
...ateItem/web_page_module/rjs_gadget_erp5_launcher_html.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
+7
-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
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_site_module/renderjs_runner.xml
...s_ui/PathTemplateItem/web_site_module/renderjs_runner.xml
+3
-3
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
+8
-0
bt5/erp5_web_renderjs_ui/bt/dependency_list
bt5/erp5_web_renderjs_ui/bt/dependency_list
+2
-1
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
View file @
5362a395
...
@@ -108,16 +108,15 @@
...
@@ -108,16 +108,15 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
CACHE MANIFEST\n
CACHE MANIFEST\n
# generated on Tue, 2
4 Jun 2016 16
:00:00 GMT .\n
# generated on Tue, 2
9 Jul 2016 13
:00:00 GMT .\n
# XXX + fonts\n
# XXX + fonts\n
# images/ajax-loader.gif\n
# images/ajax-loader.gif\n
CACHE:\n
CACHE:\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.eot?v=4.2.0\n
font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.eot?#iefix&v=4.2.0\n
font-awesome/font-awesome-webfont.woff?v=4.6.3\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.woff?v=4.2.0\n
font-awesome/font-awesome-webfont.ttf?v=4.6.3\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.ttf?v=4.2.0\n
font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular\n
https://netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular\n
URI.js\n
URI.js\n
erp5_launcher_nojqm.js\n
erp5_launcher_nojqm.js\n
gadget_erp5_nojqm.css\n
gadget_erp5_nojqm.css\n
...
@@ -355,7 +354,7 @@ NETWORK:\n
...
@@ -355,7 +354,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.5
4415.21673.50380
</string>
</value>
<value>
<string>
952.5
7579.5740.15394
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -373,7 +372,7 @@ NETWORK:\n
...
@@ -373,7 +372,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1469
697772.1
3
</float>
<float>
1469
799631.3
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
View file @
5362a395
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<title>
${application_title}
</title>
<title>
${application_title}
</title>
<link
href=
"//netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"gadget_erp5_nojqm.css"
>
<link
rel=
"stylesheet"
href=
"gadget_erp5_nojqm.css"
>
<script
data-renderjs-configuration=
"application_title"
type=
"text/x-renderjs-configuration"
>
$
{
application_title
}
</script>
<script
data-renderjs-configuration=
"application_title"
type=
"text/x-renderjs-configuration"
>
$
{
application_title
}
</script>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
View file @
5362a395
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.5
5888.33090.2730
</string>
</value>
<value>
<string>
952.5
7378.47936.47257
</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>
1469
697640.18
</float>
<float>
1469
799227.55
</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 @
5362a395
...
@@ -139,6 +139,13 @@ table {
...
@@ -139,6 +139,13 @@ table {
/**********************************************
/**********************************************
* Default
* Default
**********************************************/
**********************************************/
@font-face
{
font-family
:
'FontAwesome'
;
src
:
url('font-awesome/font-awesome-webfont.eot?v=4.6.3')
;
src
:
url('font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3')
format
(
'embedded-opentype'
),
url('font-awesome/font-awesome-webfont.woff2?v=4.6.3')
format
(
'woff2'
),
url('font-awesome/font-awesome-webfont.woff?v=4.6.3')
format
(
'woff'
),
url('font-awesome/font-awesome-webfont.ttf?v=4.6.3')
format
(
'truetype'
),
url('font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular')
format
(
'svg'
);
font-weight
:
normal
;
font-style
:
normal
;
}
html
{
html
{
height
:
100%
;
height
:
100%
;
width
:
100%
;
width
:
100%
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
5362a395
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.5
6107.51025.273
57
</string>
</value>
<value>
<string>
952.5
7378.47936.472
57
</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>
14697
80228.94
</float>
<float>
14697
98919.15
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_site_module/renderjs_runner.xml
View file @
5362a395
...
@@ -317,7 +317,7 @@
...
@@ -317,7 +317,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_content_security_policy
</string>
</key>
<key>
<string>
configuration_content_security_policy
</string>
</key>
<value>
<string>
default-src \'self\'
netdna.bootstrapcdn.com; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' data:; script-src \'self\' \'unsafe-eval\'; font-src \'self\' netdna.bootstrapcdn.com; style-src \'self\' netdna.bootstrapcdn.com
data:; frame-src \'self\' data:
</string>
</value>
<value>
<string>
default-src \'self\'
; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' data:; script-src \'self\' \'unsafe-eval\'; font-src \'self\'; style-src \'self\'
data:; frame-src \'self\' data:
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_default_view_action_reference
</string>
</key>
<key>
<string>
configuration_default_view_action_reference
</string>
</key>
...
@@ -586,7 +586,7 @@
...
@@ -586,7 +586,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.5738
6.6731.30600
</string>
</value>
<value>
<string>
952.5738
7.22464.30771
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -604,7 +604,7 @@
...
@@ -604,7 +604,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14697
87560.52
</float>
<float>
14697
99124.69
</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 @
5362a395
...
@@ -170,6 +170,14 @@ table {
...
@@ -170,6 +170,14 @@ table {
* Default
* Default
**********************************************/
**********************************************/
@font-face {
font-family: 'FontAwesome';
src: url('font-awesome/font-awesome-webfont.eot?v=4.6.3');
src: url('font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('font-awesome/font-awesome-webfont.woff2?v=4.6.3') format('woff2'), url('font-awesome/font-awesome-webfont.woff?v=4.6.3') format('woff'), url('font-awesome/font-awesome-webfont.ttf?v=4.6.3') format('truetype'), url('font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
html {
html {
height: 100%;
height: 100%;
width: 100%;
width: 100%;
...
...
bt5/erp5_web_renderjs_ui/bt/dependency_list
View file @
5362a395
erp5_hal_json_style
erp5_hal_json_style
erp5_dms
erp5_dms
erp5_font
\ 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