diff --git a/src/main/webapp/views/bill-html.jsp b/src/main/webapp/views/bill-html.jsp index a798f28a9..0bdbba789 100644 --- a/src/main/webapp/views/bill-html.jsp +++ b/src/main/webapp/views/bill-html.jsp @@ -1,4 +1,6 @@ -<%@ page language="java" import="gov.nysenate.openleg.util.*, java.util.Date, java.util.HashMap, java.util.ArrayList, java.util.Collections, java.util.List, java.util.Hashtable, java.util.TreeSet, java.util.StringTokenizer, java.util.regex.*, java.util.Iterator, java.text.* ,gov.nysenate.openleg.model.*" contentType="text/html" pageEncoding="utf-8"%> +<%@ page language="java" import="gov.nysenate.openleg.util.*, java.util.regex.*, java.text.* ,gov.nysenate.openleg.model.*" contentType="text/html" pageEncoding="utf-8"%> +<%@ page import="java.util.*" %> +<%@ page import="gov.nysenate.openleg.model.Calendar" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%! public ArrayList defaultList(ArrayList list) { @@ -68,6 +70,22 @@ return new ArrayList(set); } %> + +<% + /** This is related to http://dev.nysenate.gov/issues/8477. */ + HashMap billsWithExternalPdfLinks = new HashMap(); + billsWithExternalPdfLinks.put("S2000-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/StateOpsBudget.pdf"); + billsWithExternalPdfLinks.put("A3000-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/StateOpsBudget.pdf"); + billsWithExternalPdfLinks.put("S2001-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/Leg-Judi.pdf"); + billsWithExternalPdfLinks.put("A3001-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/Leg-Judi.pdf"); + billsWithExternalPdfLinks.put("S2002-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/DEBT.pdf"); + billsWithExternalPdfLinks.put("A3002-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/DEBT.pdf"); + billsWithExternalPdfLinks.put("S2003-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/Local.pdf"); + billsWithExternalPdfLinks.put("A3003-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/Local.pdf"); + billsWithExternalPdfLinks.put("S2004-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/CapitalProjectsBudget.pdf"); + billsWithExternalPdfLinks.put("A3004-2015", "https://www.budget.ny.gov/pubs/executive/eBudget1516/fy1516appropbills/CapitalProjectsBudget.pdf"); +%> + <% Bill bill = (Bill)request.getAttribute("bill"); @@ -143,8 +161,12 @@
@@ -377,7 +399,12 @@

Text

-
<%=TextFormatter.htmlTextPrintable(bill)%>
+ <% if (billsWithExternalPdfLinks.containsKey(bill.getOid()) && bill.getFulltext().isEmpty()) { %> + <%= "

Note: The full text of this budget bill is currently available here.

" %> + <% } %> +
<%=TextFormatter.htmlTextPrintable(bill)%>
+ +