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
139
Merge Requests
139
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
2bcb7f04
Commit
2bcb7f04
authored
Feb 28, 2020
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_project_ui: correct prepend of styles in project home pages
parent
d3f681f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
23 deletions
+27
-23
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.js
...em/web_page_module/project_gadget_page_project_page_js.js
+23
-19
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.xml
...m/web_page_module/project_gadget_page_project_page_js.xml
+2
-2
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_redirector_html.xml
...m/web_page_module/project_gadget_page_redirector_html.xml
+2
-2
No files found.
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.js
View file @
2bcb7f04
...
@@ -18,15 +18,19 @@
...
@@ -18,15 +18,19 @@
function
parseHTMLLinks
(
html
,
url
)
{
function
parseHTMLLinks
(
html
,
url
)
{
var
parser
=
new
DOMParser
(),
i
,
var
parser
=
new
DOMParser
(),
i
,
//TODO create head and link html elements and prepend to doc instead of using text
styles_link
=
document
.
createElement
(
'
link
'
),
styles_header
=
'
<head><link rel="stylesheet" type="text/css" href="gadget_erp5_page_project.css"></head>
'
,
oSerializer
=
new
XMLSerializer
(),
oSerializer
=
new
XMLSerializer
(),
doc
=
parser
.
parseFromString
(
html
,
"
text/html
"
),
doc
=
parser
.
parseFromString
(
html
,
"
text/html
"
),
link_list
=
doc
.
getElementsByTagName
(
"
a
"
);
link_list
=
doc
.
querySelectorAll
(
"
a
"
),
header
=
doc
.
querySelector
(
"
head
"
);
styles_link
.
href
=
"
gadget_erp5_page_project.css
"
;
styles_link
.
type
=
"
text/css
"
;
styles_link
.
rel
=
"
stylesheet
"
;
header
.
appendChild
(
styles_link
);
for
(
i
=
0
;
i
<
link_list
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
link_list
.
length
;
i
+=
1
)
{
link_list
[
i
].
setAttribute
(
'
href
'
,
addRedirectionToReference
(
link_list
[
i
].
getAttribute
(
'
href
'
),
url
));
link_list
[
i
].
setAttribute
(
'
href
'
,
addRedirectionToReference
(
link_list
[
i
].
getAttribute
(
'
href
'
),
url
));
}
}
return
styles_header
+
oSerializer
.
serializeToString
(
doc
);
return
oSerializer
.
serializeToString
(
doc
);
}
}
function
enableLink
(
link_element
,
url
)
{
function
enableLink
(
link_element
,
url
)
{
...
@@ -76,20 +80,20 @@
...
@@ -76,20 +80,20 @@
switch
(
state
)
{
switch
(
state
)
{
case
'
started
'
:
case
'
started
'
:
svg_element
.
classList
.
add
(
"
running
"
);
svg_element
.
classList
.
add
(
"
running
"
);
document
.
querySelector
(
"
test_result_running
"
).
classList
.
remove
(
"
ui-hidden
"
);
document
.
querySelector
(
"
#
test_result_running
"
).
classList
.
remove
(
"
ui-hidden
"
);
break
;
break
;
case
'
failed
'
:
case
'
failed
'
:
svg_element
.
classList
.
add
(
"
fail
"
);
svg_element
.
classList
.
add
(
"
fail
"
);
document
.
querySelector
(
"
test_result_fail
"
).
classList
.
remove
(
"
ui-hidden
"
);
document
.
querySelector
(
"
#
test_result_fail
"
).
classList
.
remove
(
"
ui-hidden
"
);
break
;
break
;
case
'
cancelled
'
:
case
'
cancelled
'
:
svg_element
.
classList
.
add
(
"
cancelled
"
);
svg_element
.
classList
.
add
(
"
cancelled
"
);
document
.
querySelector
(
"
test_result_running
"
).
classList
.
remove
(
"
ui-hidden
"
);
document
.
querySelector
(
"
#
test_result_running
"
).
classList
.
remove
(
"
ui-hidden
"
);
break
;
break
;
case
'
stopped
'
:
case
'
stopped
'
:
case
'
public_stopped
'
:
case
'
public_stopped
'
:
svg_element
.
classList
.
add
(
"
pass
"
);
svg_element
.
classList
.
add
(
"
pass
"
);
document
.
querySelector
(
"
test_result_pass
"
).
classList
.
remove
(
"
ui-hidden
"
);
document
.
querySelector
(
"
#
test_result_pass
"
).
classList
.
remove
(
"
ui-hidden
"
);
break
;
break
;
default
:
default
:
svg_element
.
classList
.
add
(
"
ui-hidden
"
);
svg_element
.
classList
.
add
(
"
ui-hidden
"
);
...
@@ -293,20 +297,20 @@
...
@@ -293,20 +297,20 @@
return
gadget
.
getUrlForList
(
url_parameter_list
);
return
gadget
.
getUrlForList
(
url_parameter_list
);
})
})
.
push
(
function
(
url_list
)
{
.
push
(
function
(
url_list
)
{
enableLink
(
document
.
querySelector
(
"
milestone_link
"
),
url_list
[
0
]);
enableLink
(
document
.
querySelector
(
"
#
milestone_link
"
),
url_list
[
0
]);
enableLink
(
document
.
querySelector
(
"
task_link
"
),
url_list
[
1
]);
enableLink
(
document
.
querySelector
(
"
#
task_link
"
),
url_list
[
1
]);
enableLink
(
document
.
querySelector
(
"
support_request_link
"
),
url_list
[
2
]);
enableLink
(
document
.
querySelector
(
"
#
support_request_link
"
),
url_list
[
2
]);
enableLink
(
document
.
querySelector
(
"
bug_link
"
),
url_list
[
3
]);
enableLink
(
document
.
querySelector
(
"
#
bug_link
"
),
url_list
[
3
]);
enableLink
(
document
.
querySelector
(
"
report_link
"
),
url_list
[
4
]);
enableLink
(
document
.
querySelector
(
"
#
report_link
"
),
url_list
[
4
]);
enableLink
(
document
.
querySelector
(
"
test_result_link
"
),
url_list
[
5
]);
enableLink
(
document
.
querySelector
(
"
#
test_result_link
"
),
url_list
[
5
]);
enableLink
(
document
.
querySelector
(
"
test_suite_link
"
),
url_list
[
6
]);
enableLink
(
document
.
querySelector
(
"
#
test_suite_link
"
),
url_list
[
6
]);
enableLink
(
document
.
querySelector
(
"
document_link
"
),
url_list
[
7
]);
enableLink
(
document
.
querySelector
(
"
#
document_link
"
),
url_list
[
7
]);
enableLink
(
document
.
querySelector
(
"
activity_link
"
),
url_list
[
8
]);
enableLink
(
document
.
querySelector
(
"
#
activity_link
"
),
url_list
[
8
]);
if
(
web_page_info
)
{
if
(
web_page_info
)
{
enableLink
(
document
.
querySelector
(
"
web_page_link
"
),
url_list
[
9
]);
enableLink
(
document
.
querySelector
(
"
#
web_page_link
"
),
url_list
[
9
]);
}
}
//TODO move into a job to call it async
//TODO move into a job to call it async
setLatestTestResult
(
gadget
,
document
.
querySelector
(
"
test_result_svg
"
),
modification_dict
.
jio_key
);
setLatestTestResult
(
gadget
,
document
.
querySelector
(
"
#
test_result_svg
"
),
modification_dict
.
jio_key
);
});
});
})
})
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.xml
View file @
2bcb7f04
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.9
671.43908.33962
</string>
</value>
<value>
<string>
982.9
724.24492.17920
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
158290
3924.09
</float>
<float>
158290
5483.25
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_redirector_html.xml
View file @
2bcb7f04
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
79.47685.23740.1223
6
</string>
</value>
<value>
<string>
9
82.9627.1029.4720
6
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
73472973.73
</float>
<float>
15
82900659.95
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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