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
Aurélien Vermylen
erp5
Commits
6b343fc6
Commit
6b343fc6
authored
Dec 12, 2017
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_corporate_identity: add back previously corrupt pdf, fixes for tests
parent
e5e197df
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
327 additions
and
4 deletions
+327
-4
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.pdf
...ocument_module/template_test_leaflet_input_001_en_pdf.pdf
+0
-0
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.xml
...ocument_module/template_test_leaflet_input_001_en_pdf.xml
+315
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Document_createScreenshot.py
...kins/erp5_corporate_identity/Document_createScreenshot.py
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createLinkOverview.py
...ins/erp5_corporate_identity/WebPage_createLinkOverview.py
+5
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_viewAsLeaflet.py
.../erp5_corporate_identity_leaflet/WebPage_viewAsLeaflet.py
+4
-1
bt5/erp5_corporate_identity/TestTemplateItem/portal_components/test.erp5.testCorporateIdentityTemplates.py
...al_components/test.erp5.testCorporateIdentityTemplates.py
+2
-2
No files found.
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.pdf
0 → 100644
View file @
6b343fc6
File added
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.xml
0 → 100644
View file @
6b343fc6
This diff is collapsed.
Click to expand it.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Document_createScreenshot.py
View file @
6b343fc6
...
...
@@ -2,7 +2,7 @@ if id is None:
return
"Failed. Missing image id."
if
context
.
getPortalType
()
!=
"PDF"
:
return
"Failed. Not a pdf."
if
context
.
getId
().
find
(
"template_
test
"
)
==
-
1
:
if
context
.
getId
().
find
(
"template_"
)
==
-
1
:
return
"Failed. Not a template test item."
pdf_page
=
context
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createLinkOverview.py
View file @
6b343fc6
...
...
@@ -34,6 +34,11 @@ citation_ad_doubles = {}
citation_rd_doubles
=
{}
for
citation
in
re
.
findall
(
'
\
[(.*?)
\
]'
,
document_content
or
''
):
# disregard empty brackets
if
citation
==
blank
:
continue
citation_href
=
(
re
.
findall
(
match_href
,
citation
)
or
[
""
])[
0
]
# RD = Referenced Document / AD = Applicable Document
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_viewAsLeaflet.py
View file @
6b343fc6
...
...
@@ -84,7 +84,7 @@ leaflet_display_svg = setToNone(kw.get('display_svg', "png"))
leaflet_download
=
setToNone
(
kw
.
get
(
'document_download'
,
None
))
leaflet_save
=
setToNone
(
kw
.
get
(
'document_save'
,
None
))
override_leaflet_header_title
=
kw
.
get
(
'override_leaflet_header_title'
,
None
)
override_leaflet_header_title
=
setToNone
(
kw
.
get
(
'override_leaflet_header_title'
,
None
)
)
override_source_person_title
=
kw
.
get
(
'override_source_person_title'
,
None
)
override_source_organisation_title
=
kw
.
get
(
"override_source_organisation_title"
,
...
...
@@ -126,8 +126,11 @@ leaflet_theme = leaflet.Base_getThemeDict(
url
=
leaflet_url
,
css_path
=
"/leaflet_css/leaflet"
)
# set leaflet title, but not to theme (used elsewhere, but not on leaflet)
if
override_leaflet_header_title
is
not
None
:
leaflet_theme
[
"theme_logo_description"
]
=
html_quote
(
override_leaflet_header_title
)
if
leaflet_theme
.
get
(
"theme"
).
lower
()
==
leaflet_theme
.
get
(
"theme_logo_description"
).
lower
():
leaflet_theme
[
"theme_logo_description"
]
=
blank
leaflet_recycle_url
=
''
.
join
([
leaflet_url
,
"/leaflet_img/recycle.png?portal_skin=Leaflet"
])
leaflet_css
=
''
.
join
([
'html .ci-leaflet #left-summary:before {'
,
...
...
bt5/erp5_corporate_identity/TestTemplateItem/portal_components/test.erp5.testCorporateIdentityTemplates.py
View file @
6b343fc6
...
...
@@ -230,7 +230,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
"""
test_page
=
getattr
(
self
.
portal
.
web_page_module
,
id1
)
expected_page
=
getattr
(
self
.
portal
.
web_page_module
,
id2
)
dump
=
getattr
(
self
.
portal
,
'dump_data'
)
dump
=
getattr
(
self
.
portal
,
'dump_data'
,
None
)
kw
[
"override_date"
]
=
kw
.
get
(
"override_date"
,
test_page
.
getModificationDate
())
html
=
getattr
(
test_page
,
kw
.
get
(
"test_method"
))(
portal_skin
=
kw
.
get
(
"use_skin"
),
**
kw
)
...
...
@@ -248,7 +248,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
test_page
=
getattr
(
self
.
portal
.
web_page_module
,
id1
)
expected_image
=
getattr
(
self
.
portal
.
image_module
,
id2
)
image_source_pdf_doc
=
getattr
(
self
.
portal
.
document_module
,
id3
)
dump
=
getattr
(
self
.
portal
,
'dump_data'
)
dump
=
getattr
(
self
.
portal
,
'dump_data'
,
None
)
kw
[
"override_date"
]
=
kw
.
get
(
"override_date"
,
test_page
.
getModificationDate
())
pdf_kw
=
dict
(
...
...
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