Merge pull request #952 from hdoupe/update-links

Update links

RELEASES.md

@@ -14,7 +14,7 @@ Release 1.7.7 on 2019-01-14
 - [#951](https://github.com/ospc-org/ospc.org/pull/951) - Use pslmodels channel for webapp Dockerfile - Hank Doupe
 
 **Bug Fixes**
-- None
+- [#952](https://github.com/ospc-org/ospc.org/pull/952) - Update links - Hank Doupe
 
 
 Release 1.7.6 on 2018-11-09

templates/btax/header.html

@@ -22,7 +22,7 @@ <h2 class="sr-only">TaxBrain</h2>
           <div class="taxbrain-history">
             <h2>About Cost of Capital Calculator</h2>
             <h1> What is the Cost of Capital Calculator? </h1>
-            <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/open-source-economics" target="_blank">open source economic models</a> for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
+            <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/PSLmodels" target="_blank">open source economic models</a> for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
 
             <ul>
             <li> <strong>Step 1.</strong> Create a policy reform by modifying tax law parameters such as rates and depreciation schedules, adjust the economic assumptions, and request the static result.</li>
@@ -55,7 +55,7 @@ <h1>Static modeling (Step 1)</h1>
             have been compared to results for the same assets generated  ).
             <a href = 'https://www.cbo.gov/sites/default/files/109th-congress-2005-2006/reports/12-18-taxrates.pdf' target="_blank">by the Congressional Budget Office</a> (using CBO assumptions).
 
-            <p> Bugs aside, the results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration for other reasons. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in <a href = '//www.github.com/open-source-economics/B-Tax' target="_blank">the Cost of Capital Calculator</a>, so please conduct sensitivity analyses. Other assumptions can be made flexible in the Cost of Capital Calculator based on user requests.</p>
+            <p> Bugs aside, the results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration for other reasons. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in <a href = '//www.github.com/PSLmodels/B-Tax' target="_blank">the Cost of Capital Calculator</a>, so please conduct sensitivity analyses. Other assumptions can be made flexible in the Cost of Capital Calculator based on user requests.</p>
 
             <p><strong>
             Core Maintainers (static modeling):
@@ -72,7 +72,7 @@ <h2>PolicyBrain Code Build</h2>
           </div>
           <div class="taxbrain-build">
             <h2>B-Tax Code Build</h2>
-            <p><a href="https://github.com/open-source-economics/B-Tax/tree/{{btax_version}}">Version {{ btax_version }} - GitHub</a></p>
+            <p><a href="https://github.com/PSLmodels/B-Tax/tree/{{btax_version}}">Version {{ btax_version }} - GitHub</a></p>
           </div>
         </div>
       </section>

templates/btax/input_form.html

@@ -35,7 +35,7 @@ <h2 class="sr-only">TaxBrain</h2>
           <div class="taxbrain-history">
             <h2>About Cost of Capital Calculator</h2>
             <h1> What is the Cost of Capital Calculator? </h1>
-            <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/open-source-economics" target="_blank">open source economic models</a> for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
+            <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/PSLmodels" target="_blank">open source economic models</a> for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
 
             <ul>
             <li> <strong>Step 1.</strong> Create a policy reform by modifying tax law parameters such as rates and depreciation schedules, adjust the economic assumptions, and request the static result.</li>
@@ -68,7 +68,7 @@ <h1>Static modeling (Step 1)</h1>
             have been compared to results for the same assets generated  ).
             <a href = 'https://www.cbo.gov/sites/default/files/109th-congress-2005-2006/reports/12-18-taxrates.pdf' target="_blank">by the Congressional Budget Office</a> (using CBO assumptions).
 
-            <p> Bugs aside, the results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration for other reasons. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in <a href = '//www.github.com/open-source-economics/B-Tax' target="_blank">the Cost of Capital Calculator</a>, so please conduct sensitivity analyses. Other assumptions can be made flexible in the Cost of Capital Calculator based on user requests.</p>
+            <p> Bugs aside, the results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration for other reasons. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in <a href = '//www.github.com/PSLmodels/B-Tax' target="_blank">the Cost of Capital Calculator</a>, so please conduct sensitivity analyses. Other assumptions can be made flexible in the Cost of Capital Calculator based on user requests.</p>
 
             <p><strong>
             Core Maintainers (static modeling):
@@ -85,7 +85,7 @@ <h2>PolicyBrain Code Build</h2>
           </div>
           <div class="taxbrain-build">
             <h2>B-Tax Code Build</h2>
-            <p><a href="https://github.com/open-source-economics/B-Tax/tree/{{btax_version}}">Version {{ btax_version }} - GitHub</a></p>
+            <p><a href="https://github.com/PSLmodels/B-Tax/tree/{{btax_version}}">Version {{ btax_version }} - GitHub</a></p>
           </div>
         </div>
       </section>
@@ -132,7 +132,7 @@ <h2>B-Tax Code Build</h2>
               <div class="inputs-block inputs-block-intro">
                 <div class="inputs-block-header">
                     <h1> What is the Cost of Capital Calculator? </h1>
-                      <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/open-source-economics/b-tax" target="_blank">B-Tax</a>,  an open source economic model for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
+                      <p>The Cost of Capital Calculator is an interface to <a href = "//www.github.com/PSLmodels/b-tax" target="_blank">B-Tax</a>,  an open source economic model for tax policy analysis. <a href = '//www.github.com/opensourcepolicycenter/webapp-public' target="_blank">The code</a> for the Cost of Capital Calculator webapp interface is itself open source. </p>
 
 
                       <ul>
@@ -157,7 +157,7 @@ <h1> What is the Cost of Capital Calculator? </h1>
 
                       <h1>Effective Tax Rate Calculations</h1>
 
-                      <p>The Cost of Capital Calculator produces estimates of the marginal effective tax rates on new investment under the baseline tax policy and user-specified tax reforms. These effective rate calculations take two forms. The marginal effective tax rate (METR) provides the tax wedge on new investment at the level of the business entity. The marginal effective total tax rate (METTR) includes individual level taxes in the measure of the tax wedge on new investment. One can think of the former as indicating the effect of taxes on incentives to invest from the perspective of the firm and the latter as representing effect of taxes on incentives to invest from the perspective of the saver.  For more detail on the calculations and assumptions underlying this model, please see the <a href = "https://github.com/open-source-economics/B-Tax/blob/master/Guides/CCC_Guide.pdf" target = "_blank"> CCC Guide</a>.</p>
+                      <p>The Cost of Capital Calculator produces estimates of the marginal effective tax rates on new investment under the baseline tax policy and user-specified tax reforms. These effective rate calculations take two forms. The marginal effective tax rate (METR) provides the tax wedge on new investment at the level of the business entity. The marginal effective total tax rate (METTR) includes individual level taxes in the measure of the tax wedge on new investment. One can think of the former as indicating the effect of taxes on incentives to invest from the perspective of the firm and the latter as representing effect of taxes on incentives to invest from the perspective of the saver.  For more detail on the calculations and assumptions underlying this model, please see the <a href = "https://github.com/PSLmodels/B-Tax/blob/master/Guides/CCC_Guide.pdf" target = "_blank"> CCC Guide</a>.</p>
 
                       <p><strong>Accuracy notes</strong></p>
 
@@ -166,7 +166,7 @@ <h1>Effective Tax Rate Calculations</h1>
                       have been compared to results for the same assets generated
                       <a href = 'https://www.cbo.gov/sites/default/files/109th-congress-2005-2006/reports/12-18-taxrates.pdf' target="_blank">by the Congressional Budget Office</a> (using CBO assumptions).
 
-                      <p> Results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, the marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in the underlying model, <a href = '//www.github.com/open-source-economics/B-Tax' target="_blank">B-Tax</a>, so please conduct sensitivity analyses. Assumptions can be made flexible in this online interface, the Cost of Capital Calculator, based on user requests.</p>
+                      <p> Results from the Cost of Capital Calculator might differ in comparison to those produced by Congress or the Administration. Modeling requires many assumptions, and neither Congress nor the executive branch publicize all of their assumptions. For example, the marginal effective total tax rates produced by the Cost of Capital Calculator assume the "old view" of dividend taxation.  Others might assume the "new view" is more applicable.  These assumptions are all flexible in the underlying model, <a href = '//www.github.com/PSLmodels/B-Tax' target="_blank">B-Tax</a>, so please conduct sensitivity analyses. Assumptions can be made flexible in this online interface, the Cost of Capital Calculator, based on user requests.</p>
 
                       <p><strong>
                       Core Maintainers (static modeling):

templates/btax/not_avail.html

@@ -13,7 +13,7 @@ <h3>
     Go to the <a href = {{ edit_href }}>input page</a> and
     re-submit your parameters using the current version of PolicyBrain. Note that for older runs
     some parameters may have been deprecated. We recommend
-    <a href="https://github.com/open-source-economics/B-Tax/tree/{{btax_version}}"> B-Tax's</a> documentation for alternative parameter choices.
+    <a href="https://github.com/PSLmodels/B-Tax/tree/{{btax_version}}"> B-Tax's</a> documentation for alternative parameter choices.
 </h3>
 
 <h3>

templates/btax/results.html

@@ -88,7 +88,7 @@
       <h1> <p>Tables of Effective Tax Rates or Their Components by Asset or Industry</p> </h1>
     </div>
 
-    <p class="meta">These results were generated by <a href="https://github.com/OpenSourcePolicyCenter/webapp-public/tree/v{{webapp_version}}"> PolicyBrain version {{ webapp_version }}</a>  on {{ created_on|date:"D, M jS Y \a\t g:iA" }} UTC using <a href="https://github.com/open-source-economics/B-Tax/tree/{{btax_version}}"> B-Tax version {{ btax_version }}.</a> </p>
+    <p class="meta">These results were generated by <a href="https://github.com/OpenSourcePolicyCenter/webapp-public/tree/v{{webapp_version}}"> PolicyBrain version {{ webapp_version }}</a>  on {{ created_on|date:"D, M jS Y \a\t g:iA" }} UTC using <a href="https://github.com/PSLmodels/B-Tax/tree/{{btax_version}}"> B-Tax version {{ btax_version }}.</a> </p>
 
      <a href="/ccc/edit/{{ unique_url.pk }}/?start_year={{first_year}}" class="text-white btn btn-secondary">Edit Parameters</a>
   </div>