From ed70024a2fe81158963d94131c984de5f9364010 Mon Sep 17 00:00:00 2001 From: fbormann Date: Thu, 9 Mar 2017 16:37:41 -0300 Subject: [PATCH] added template elements --- amadeus/static/css/base/amadeus.css | 14 +++++++++++++- reports/templates/reports/view.html | 17 ++++++++++++++++- reports/views.py | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 6bf406a..0b0d240 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -1209,10 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate { width: 15%; text-align: center; } +#report-header{ + padding-left: 0px; +} #report-header li { display: inline; - margin-right: 10px; + margin-right: 20px; font-size: 16px; } + +#report-info{ + padding-left: 0px; +} + +#report-info li{ + display: inline; + margin-right: 30px; +} /* End Reports */ \ No newline at end of file diff --git a/reports/templates/reports/view.html b/reports/templates/reports/view.html index 38a7a53..a95b5de 100644 --- a/reports/templates/reports/view.html +++ b/reports/templates/reports/view.html @@ -56,9 +56,24 @@
  • {% trans "Topic" %}: {{topic_name}}
  • {% trans "Initial Date" %}: {{init_date}}
  • {% trans "End Date" %}: {{end_date}}
  • -
  • +
  • + +
    + + + +
    diff --git a/reports/views.py b/reports/views.py index 3e85e9c..8ed87b1 100644 --- a/reports/views.py +++ b/reports/views.py @@ -77,6 +77,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView): context['topic_name'] = params_data['topic'] context['init_date'] = params_data['init_date'] context['end_date'] = params_data['end_date'] + context['subject'] = subject if params_data['from_mural']: context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date']) return context -- libgit2 0.21.2