diff --git a/bmsapp/static/bmsapp/scripts/energy-reports.coffee b/bmsapp/static/bmsapp/scripts/energy-reports.coffee index f7b35df785d16d7a29baa9b3e59c27ccf7e30708..673bcf33fd66ca4b59861311ece9c0ef081e303f 100644 --- a/bmsapp/static/bmsapp/scripts/energy-reports.coffee +++ b/bmsapp/static/bmsapp/scripts/energy-reports.coffee @@ -79,6 +79,7 @@ load_report = -> report_url = "#{ _base_url }organization/#{ $("#select_org").val() }/#{ report_file_name }" $("#report-content").attr("src", report_url) + $("#print-link").attr("href", report_url) # update link to printable version of report # --------------------------------------------------------------- # function that runs when the document is ready. @@ -119,3 +120,4 @@ $ -> $("#select_org").change update_bldg_list $("#select_org").change update_report_list $("#select_bldg").change update_report_list + \ No newline at end of file diff --git a/bmsapp/static/bmsapp/scripts/energy-reports.js b/bmsapp/static/bmsapp/scripts/energy-reports.js index ff496ecfe64a7404566770a34de1655ef7df08e2..b88f569d4389a968d072f404432bfb443469d573 100644 --- a/bmsapp/static/bmsapp/scripts/energy-reports.js +++ b/bmsapp/static/bmsapp/scripts/energy-reports.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.12.7 (function() { - var _base_url, _bldg_reports, _last_bldg, _last_org, _org_reports, _org_to_bldgs, load_report, update_bldg_list, update_report_list; + var _base_url, _bldg_reports, _org_reports, _org_to_bldgs, load_report, update_bldg_list, update_report_list; _base_url = ""; @@ -30,10 +30,6 @@ } }; - _last_bldg = ""; - - _last_org = ""; - update_report_list = function() { var add_report, bldg, i, j, len, len1, org, ref, ref1, rpt; org = $("#select_org").val(); @@ -71,7 +67,8 @@ } else { report_url = _base_url + "organization/" + ($("#select_org").val()) + "/" + report_file_name; } - return $("#report-content").attr("src", report_url); + $("#report-content").attr("src", report_url); + return $("#print-link").attr("href", report_url); }; $(function() { diff --git a/bmsapp/templates/bmsapp/base.html b/bmsapp/templates/bmsapp/base.html index 76da42c6d41c652d54e2be26391f8189ab1014f1..575e82394e9641a3730bc989895346e60facba55 100644 --- a/bmsapp/templates/bmsapp/base.html +++ b/bmsapp/templates/bmsapp/base.html @@ -109,13 +109,19 @@ - +

{% block title %}{% endblock %}

{% block content %}{% endblock %} - +
+ +
+ {% block fullwidth %}{% endblock %} +
+ +

diff --git a/bmsapp/templates/bmsapp/energy-reports.html b/bmsapp/templates/bmsapp/energy-reports.html index 069124fc6c48cf74871a0cc411cb26ef26396ed9..7be6d390b584a695697e9e8e6419e8a22c7d0b60 100644 --- a/bmsapp/templates/bmsapp/energy-reports.html +++ b/bmsapp/templates/bmsapp/energy-reports.html @@ -10,12 +10,12 @@ {% block this_nav_link %}link_energy-reports{% endblock %} +{% block title %}Energy Reports{% endblock %} + {% block content %} -

Energy Reports

-
Under Construction: Formatting Improvements in Progress

@@ -39,10 +39,19 @@
-
- -
+{% endblock %} +{% block fullwidth %} + +
+ +
{% endblock %} {% block scripts %}