diff --git a/print_designer/print_designer/page/print_designer/jinja/macros/relative_containers.html b/print_designer/print_designer/page/print_designer/jinja/macros/relative_containers.html index 6327524..3204af7 100644 --- a/print_designer/print_designer/page/print_designer/jinja/macros/relative_containers.html +++ b/print_designer/print_designer/page/print_designer/jinja/macros/relative_containers.html @@ -1,7 +1,7 @@ {% from 'print_designer/page/print_designer/jinja/macros/render_element.html' import render_element with context %} -{% macro relative_containers(element, send_to_jinja) -%} -
{% if element.childrens %} {% for object in element.childrens %} @@ -9,4 +9,15 @@ {% endfor %} {% endif %}
+{%- endmacro %} + +{% macro relative_containers(element, send_to_jinja) -%} +
+ {% if element.childrens %} + {% for object in element.childrens %} + {{ relative_columns(object, send_to_jinja) }} + {% endfor %} + {% endif %} +
{%- endmacro %} \ No newline at end of file diff --git a/print_designer/print_designer/page/print_designer/jinja/macros/styles.html b/print_designer/print_designer/page/print_designer/jinja/macros/styles.html index 0dcb4e8..7b479aa 100644 --- a/print_designer/print_designer/page/print_designer/jinja/macros/styles.html +++ b/print_designer/print_designer/page/print_designer/jinja/macros/styles.html @@ -24,6 +24,16 @@ margin: auto !important; } } + /* set margin to 0 for print (Ctrl + p) on client browsers + and remove margin container that was added for screen ( viewing ) */ + @media print { + .print-format { + margin: 0 !important; + } + .printview-header-margin { + display: none; + } + } .print-designer-container { position: absolute; } @@ -71,8 +81,19 @@ .flexDirectionColumn .baseSpanTag .valueSpanTag { display: block; } + /* https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1522 */ + .relative-row { + display: -webkit-box; + display: -webkit-flex; + display: flex; + border-width: 0 !important; + } .relative-column { - margin-right: -4px; + border-width: 1px !important; + border-color: white !important; + } + * { + -webkit-box-sizing: border-box; } {% endmacro %} \ No newline at end of file diff --git a/print_designer/print_designer/page/print_designer/jinja/print_format.html b/print_designer/print_designer/page/print_designer/jinja/print_format.html index 485cb37..8624edb 100644 --- a/print_designer/print_designer/page/print_designer/jinja/print_format.html +++ b/print_designer/print_designer/page/print_designer/jinja/print_format.html @@ -11,12 +11,14 @@
+
+
{% if headerElement %}{{ render(pd_format.header, send_to_jinja) }}{%endif%}
{% if bodyElement %}{{ render(pd_format.body, send_to_jinja) }}{%endif%}