diff --git a/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/creatupdate.html b/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/creatupdate.html index 5ade683a0b19bb3146c7ab47036b8e41f156737e..98ae444ed9945c2ab5030bd9585574d535ab2170 100644 --- a/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/creatupdate.html +++ b/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/creatupdate.html @@ -29,8 +29,6 @@ {{ macros_form.render_form_item_select(form.mode) }} - {{ macros_form.render_form_item_select(form.attachments) }} - {{ macros_form.render_form_item_default(form.emails) }} {{ macros_form.render_form_item_default(form.template) }} @@ -39,14 +37,10 @@ {{ macros_form.render_form_item_select(form.timezone) }} - {{ macros_form.render_form_item_select(form.max_attachment_size) }} - {{ macros_form.render_form_item_radiobutton(form.mute) }} {{ macros_form.render_form_item_radiobutton(form.redirect) }} - {{ macros_form.render_form_item_radiobutton(form.compress) }} - <hr> {{ macros_form.render_form_item_radiobutton(form.timing) }} diff --git a/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/show.html b/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/show.html index 3b615474114dc61f56f402c07cbd813a1c2baac3..ce1d5a77d0853ad34649d75ac181971c82839bb7 100644 --- a/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/show.html +++ b/lib/hawat/blueprints/settings_reporting/templates/settings_reporting/show.html @@ -86,44 +86,6 @@ {{ system_default_repsettings.mode }} </td> </tr> - <tr> - <th> - {{ _('Report attachments') }}: - </th> - <td> - {%- if item.attachments is not none %} - {{ item.attachments }} - {%- else %} - {{ _('<< system default >>') }} - {%- endif %} - </td> - <td> - {{ system_default_repsettings.attachments }} - </td> - </tr> - <tr> - <th> - {{ _('Attachment size limit') }}: - </th> - <td> - {%- if item.max_attachment_size is not none %} - {%- if item.max_attachment_size %} - {{ babel_format_bytes(item.max_attachment_size) }} - {%- else %} - {{ _('<< no limit >>') }} - {%- endif %} - {%- else %} - {{ _('<< system default >>') }} - {%- endif %} - </td> - <td> - {%- if system_default_repsettings.max_size %} - {{ babel_format_bytes(system_default_repsettings.max_size) }} - {%- else %} - {{ _('<< no limit >>') }} - {%- endif %} - </td> - </tr> <tr> <th> {{ _('Report template') }}: @@ -199,21 +161,6 @@ {{ macros_site.render_label_item_state(system_default_repsettings.redirect, True) }} </td> </tr> - <tr> - <th> - {{ _('Attachment compression') }}: - </th> - <td> - {%- if item.compress is not none %} - {{ macros_site.render_label_item_state(item.compress, True) }} - {%- else %} - {{ _('<< system default >>') }} - {%- endif %} - </td> - <td> - {{ macros_site.render_label_item_state(system_default_repsettings.compress, True) }} - </td> - </tr> <tr> <th> {{ _('Reporting timing') }}: