Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:criticaljuncture/fr2

  • Loading branch information...
commit d1e0df7d94b6c8717df69bb41c83b31832f08062 2 parents a6e69a2 + d6a4aad
@peregrinator peregrinator authored
View
2  app/presenters/executive_order_presenter.rb
@@ -15,7 +15,7 @@ def executive_orders
:type => "PRESDOCU",
:presidential_document_type_id => 2,
:correction => '0',
- }, :order => "executive_order_number", :per_page => 200).results.reverse
+ }, :order => "executive_order_number", :per_page => 200).results(:select => "id, document_number, publication_date, signing_date, title, length, start_page, end_page, citation, executive_order_number, executive_order_notes").reverse
end
def count
View
4 app/stylesheets/design/_page.scss
@@ -446,6 +446,10 @@ p:target {
#fulltext_content_area p {
text-indent: 2em;
}
+#fulltext_content_area p.document_details {
+ text-indent: 0;
+ color: #CCC;
+ }
#fulltext_content_area p.flush {
text-indent: 0;
}
View
2  app/views/entries/_full_text.html.xslt
@@ -16,7 +16,7 @@
<xsl:value-of disable-output-escaping="yes" select="'&lt;div class=&quot;body_column&quot; &gt;'" />
<xsl:call-template name="table_of_contents" />
- <xsl:call-template name="table_of_graphics" />
+ <!-- <xsl:call-template name="table_of_graphics" />-->
<xsl:call-template name="table_of_tables" />
<!-- apply default content rules -->
View
6 app/views/entries/by_date.html.erb
@@ -1,5 +1,11 @@
<% feed_autodiscovery entries_url(:format => :rss), 'All Articles from the Federal Register', :search_conditions => {} %>
+<% if controller.action_name == 'current_issue' %>
+ <% description "Today Federal Register issue, including notices, proposed and final rules, and presidential documents." %>
+<% else %>
+ <% description "Notices, proposed and final rules, and presidential documents published in the Federal Register on #{@publication_date.to_formatted_s(:pretty)}." %>
+<% end %>
+
<% title "Articles for #{@publication_date.to_formatted_s(:pretty)}" %>
<div class="title"><span><%= @publication_date %> Issue</span></div>
View
2  app/views/entries/xslt/ignore.html.xslt
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- Tags being Ignored -->
- <xsl:template match="AGENCY | SUBAGY | AGY | ACT | CFR | DEPDOC | RIN | SUBJECT | FTNT | SUM | CNTNTS | UNITNAME | INCLUDES | EDITOR | EAR | FRDOCBP | HRULE | FTREF | NOLPAGES | OLPAGES | SECHD">
+ <xsl:template match="AGENCY | SUBAGY | AGY | ACT | CFR | DEPDOC | RIN | SUBJECT | FTNT | SUM | CNTNTS | UNITNAME | INCLUDES | EDITOR | EAR | FRDOCBP | HRULE | FTREF | NOLPAGES | OLPAGES | SECHD | TITLE3 | PRES">
</xsl:template>
</xsl:stylesheet>
View
4 app/views/entries/xslt/table_of_contents.html.xslt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template name="table_of_contents">
- <xsl:if test="count(//HD) &gt; 0">
+ <xsl:if test="count(//HD[not(ancestor::NOTE|ancestor::FP|ancestor::REGTEXT)]) &gt; 2">
<xsl:call-template name="manual_header">
<xsl:with-param name="id" select="'table_of_contents'"/>
<xsl:with-param name="name" select="'Table of Contents'"/>
@@ -17,7 +17,7 @@
</xsl:if>
</xsl:template>
- <xsl:template match="HD[@SOURCE='HED' or @SOURCE='HD1' or @SOURCE = 'HD2' or @SOURCE = 'HD3' or @SOURCE = 'HD4']" mode="table_of_contents">
+ <xsl:template match="HD[@SOURCE='HED' or @SOURCE='HD1' or @SOURCE = 'HD2' or @SOURCE = 'HD3' or @SOURCE = 'HD4'][not(ancestor::NOTE|ancestor::FP|ancestor::REGTEXT)]" mode="table_of_contents">
<xsl:choose>
<xsl:when test="text() = 'AGENCY:' or text() = 'ACTION:' or text() = 'SUMMARY:'"/>
<xsl:otherwise>
View
27 app/views/entries/xslt/text.html.xslt
@@ -40,7 +40,7 @@
</p>
</xsl:template>
- <xsl:template match="P | FP | AMDPAR | BILCOD">
+ <xsl:template match="P | FP | AMDPAR">
<xsl:choose>
<xsl:when test="starts-with(text(),'&#x2022;')">
<xsl:if test="not(preceding-sibling::*[name() != 'PRTPAGE'][1][starts-with(text(),'&#x2022;')])">
@@ -108,11 +108,32 @@
</p>
</xsl:template>
+ <xsl:template match="FILED | BILCOD"></xsl:template>
+ <xsl:template name="filing_date">
+ <xsl:for-each select="//FILED">
+ <xsl:text > </xsl:text>
+ <span class="filed"><xsl:value-of select="text()" /></span>
+ </xsl:for-each>
+ </xsl:template>
+ <xsl:template name="billing_code">
+ <xsl:for-each select="//BILCOD">
+ <br />
+ <span class="billing_code"><xsl:value-of select="text()" /></span>
+ </xsl:for-each>
+ </xsl:template>
<xsl:template match="FRDOC">
- <p class="fr_doc">
- <xsl:apply-templates />
+ <p class="document_details">
+ <span class="fr_doc"><xsl:apply-templates /></span>
+ <xsl:call-template name="filing_date" />
+ <xsl:call-template name="billing_code" />
</p>
</xsl:template>
+
+ <xsl:template match="EXECORDR">
+ <h3 class="executive_order_number">
+ <xsl:apply-templates />
+ </h3>
+ </xsl:template>
<xsl:template match="PRTPAGE[not(ancestor::FTNT)]">
<span class="printed_page">
View
9 app/views/regulatory_plans/_sidebar.html.erb
@@ -1,4 +1,9 @@
<% aside_tag(:id => 'sidebar') do %>
+ <div class='aside_box subscribe'>
+ <%= link_to 'Subscribe', new_subscription_path(:subscription => {:search_conditions => {:regulation_id_number => regulatory_plan.regulation_id_number}}), :class => 'subscription' %>
+ <%= add_template('subscription_modal', 'subscription-modal') %>
+ </div>
+
<% section_tag(:id => 'metadata') do %>
<div class="aside_box">
<div class="download_separator">
@@ -21,10 +26,6 @@
</div>
<% end -%>
- <div class='aside_box subscribe'>
- <%= link_to 'Subscribe', regulatory_plan_url(regulatory_plan, :format => :rss), :class => 'rss' %>
- </div>
-
<% if regulatory_plan.agencies.present? %>
<% section_tag(:id => 'agencies') do %>
<h1 class="title_bar">Agencies</h1>
Please sign in to comment.
Something went wrong with that request. Please try again.