Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Expanded-Income/or/Adjusted-Income row buttons #797

Merged
merged 3 commits into from
Jan 10, 2018
Merged

Remove Expanded-Income/or/Adjusted-Income row buttons #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fd468b
remove row
GoFroggyRun Jan 9, 2018
59aa0d2
remove tooltips
GoFroggyRun Jan 9, 2018
28d8b59
remove tooltips in dynami
GoFroggyRun Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions static/js/taxbrain-tablebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ $(function() {
plan:'X',
payroll_tax: true,
income_tax: true,
income: 'expanded',
grouping: 'bin'
},

Expand Down Expand Up @@ -351,12 +350,6 @@ $(function() {
</ul>\
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li class="active" data-income="expanded"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.expanded %>" href="#">Expanded Income</a></li>\
<li class="disabled" data-income="adjusted"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.adjusted %>" href="#" disabled>Adjusted Income</a></li>\
</ul>\
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li class="active" data-grouping="bin"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.bins %>" href="#">Income Bins</a></li>\
<li data-grouping="dec"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.deciles %>" href="#">Income Deciles</a></li>\
Expand Down
7 changes: 0 additions & 7 deletions staticfiles/js/taxbrain-tablebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ $(function() {
plan:'X',
payroll_tax: true,
income_tax: true,
income: 'expanded',
grouping: 'bin'
},

Expand Down Expand Up @@ -351,12 +350,6 @@ $(function() {
</ul>\
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li class="active" data-income="expanded"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.expanded %>" href="#">Expanded Income</a></li>\
<li class="disabled" data-income="adjusted"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.adjusted %>" href="#" disabled>Adjusted Income</a></li>\
</ul>\
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li class="active" data-grouping="bin"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.bins %>" href="#">Income Bins</a></li>\
<li data-grouping="dec"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.deciles %>" href="#">Income Deciles</a></li>\
Expand Down
2 changes: 0 additions & 2 deletions webapp/apps/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
INCOME_TOOLTIP = "Include individual income taxes in output."
BASE_TOOLTIP = "Current law as defined by default parameters."
REFORM_TOOLTIP = "The reform proposal as defined by user-provided parameters."
EXPANDED_TOOLTIP = "The tab variable includes adjusted gross income, non-taxable interest income, taxable investment income excluded from AGI, non-taxable social security benefits, the employer's share of FICA, and above the line adjustments to AGI on form 1040."
ADJUSTED_TOOLTIP = "Not yet available."
INCOME_BINS_TOOLTIP = "Tax units are binned according to the income group to which they belong."
INCOME_DECILES_TOOLTIP = " Tax units are binned according to the income decile to which they belong."
FISCAL_CURRENT_LAW = "Fiscal Current Law"
Expand Down
5 changes: 1 addition & 4 deletions webapp/apps/dynamic/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@

from ..constants import (DISTRIBUTION_TOOLTIP, DIFFERENCE_TOOLTIP,
PAYROLL_TOOLTIP, INCOME_TOOLTIP, BASE_TOOLTIP,
REFORM_TOOLTIP, EXPANDED_TOOLTIP,
ADJUSTED_TOOLTIP, INCOME_BINS_TOOLTIP,
REFORM_TOOLTIP, INCOME_BINS_TOOLTIP,
INCOME_DECILES_TOOLTIP, START_YEAR, START_YEARS)

from ..formatters import format_dynamic_params, get_version
Expand Down Expand Up @@ -737,8 +736,6 @@ def behavior_results(request, pk):
'income': INCOME_TOOLTIP,
'base': BASE_TOOLTIP,
'reform': REFORM_TOOLTIP,
'expanded': EXPANDED_TOOLTIP,
'adjusted': ADJUSTED_TOOLTIP,
'bins': INCOME_BINS_TOOLTIP,
'deciles': INCOME_DECILES_TOOLTIP
}
Expand Down
9 changes: 3 additions & 6 deletions webapp/apps/taxbrain/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@

from ..constants import (DISTRIBUTION_TOOLTIP, DIFFERENCE_TOOLTIP,
PAYROLL_TOOLTIP, INCOME_TOOLTIP, BASE_TOOLTIP,
REFORM_TOOLTIP, EXPANDED_TOOLTIP, ADJUSTED_TOOLTIP,
FISCAL_CURRENT_LAW, FISCAL_REFORM, FISCAL_CHANGE,
INCOME_BINS_TOOLTIP, INCOME_DECILES_TOOLTIP, START_YEAR,
START_YEARS)
REFORM_TOOLTIP, FISCAL_CURRENT_LAW, FISCAL_REFORM,
FISCAL_CHANGE, INCOME_BINS_TOOLTIP,
INCOME_DECILES_TOOLTIP, START_YEAR, START_YEARS)

from ..formatters import get_version

Expand Down Expand Up @@ -848,8 +847,6 @@ def get_result_context(model, request, url):
'income': INCOME_TOOLTIP,
'base': BASE_TOOLTIP,
'reform': REFORM_TOOLTIP,
'expanded': EXPANDED_TOOLTIP,
'adjusted': ADJUSTED_TOOLTIP,
'bins': INCOME_BINS_TOOLTIP,
'deciles': INCOME_DECILES_TOOLTIP,
'fiscal_current_law': FISCAL_CURRENT_LAW,
Expand Down