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

cleanup grant/fund #4302

Merged
merged 1 commit into from
Apr 29, 2019
Merged

cleanup grant/fund #4302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions app/grants/templates/grants/fund.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
{% include 'grants/banner.html' %}

<div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
<p class="col-12 font-weight-semibold my-4">
<p class="col-12 font-weight-semibold my-4 text-center">
{{ grant.admin_profile }} {% trans "is accepting contributions in "%}
{% if grant_has_no_token %}
{% trans "any token." %}
Expand All @@ -67,16 +67,17 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
<div id="grants_form" class="col-12">
<form method="POST" id="js-fundGrant">
{% csrf_token %}
<div class="row">
<div class="row mx-0">
<div class="col-12">

<div class="form__group-horizontal">
<label class="form__label" id="amount_label">{% trans "Amount Per Period" %}</label>
<div class="row">
<div class="col-8">
<div class="col-6 col-sm-8">
<label class="form__label" id="amount_label">{% trans "Amount Per Period" %}</label>
<input type="number" min="0.001" id="amount" name="amount_per_period" class="form__input" value="5" required />
</div>
<div class="col-4">
<div class="col-6 col-sm-4">
<label class="form__label" id="token_label">{% trans "Token" %}</label>
{% if grant_has_no_token %}
<div class="form__select2">
<select class='js-select2' name='denomination' id='js-token'> </select>
Expand All @@ -89,25 +90,32 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
</div>

<div class="form__group-horizontal contribution_type">
<label class="form__label">{% trans "Contribution Type" %}</label>
<div class="row">
<div class="col-12 font-body">
<div class="col-12 col-sm-8 font-body">
<label class="form__label">{% trans "Contribution Type" %}</label>
<select name="recurring_or_not" id="recurring_or_not" class="js-select2" style="width: 100%">
<option value="once">{% trans "One Time" %}</option>
<option value="recurring" selected="selected">{% trans "Recurring" %}</option>
</select>
</div>

<div class="col-12 col-sm-4 font-body num_recurring">
<label class="form__label">
{% trans "Number of Contribution Periods" %}
</label>
<input id="period" type="number" min="1" step="1" name="num_periods" class="form__input" value="12" required />
</div>
</div>
</div>


<div class="form__group-horizontal frequency">
<label class="form__label">{% trans "Payment Period" %}</label>
<div class="row">
<div class="col-8">
<div class="col-6 col-sm-8 font-body">
<input type="number" min=0 step="1" id="frequency_count" name="frequency" class="form__input" value='30' required />
</div>
<div class="col-4 font-body">
<div class="col-6 col-sm-4 font-body">
<select name="frequency_unit" id="frequency_unit" class="js-select2" style="width: 100%">
{% if user.is_staff %}
<option value="minutes" selected="selected">{% trans "minutes" %}</option>
Expand All @@ -120,17 +128,6 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
</div>
</div>

<div class="form__group-horizontal num_recurring">
<div class="row">
<div class="col-12">
<label class="form__label">
{% trans "Number of Contribution Periods" %}
</label>
<input id="period" type="number" min="1" step="1" name="num_periods" class="form__input" value="12" required />
</div>
</div>
</div>

<div id="gas-section" class="form__group-horizontal">
<div class="row">
<div class="col-12">
Expand Down Expand Up @@ -248,5 +245,10 @@ <h5>Thanks for Contributing!</h5>
<script src="{% static "v2/js/ipfs-api.js" %}"></script>
<script src="{% static "v2/js/ipfs.js" %}"></script>
<script src="{% static "v2/js/bootstrap.min.js" %}"></script>
<script>
let bootstrapTooltip = $.fn.tooltip.noConflict()
let bootstrapModal = $.fn.modal.noConflict()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the noConflict game is getting bigger and bigger. 😂

$.fn.bootstrapModal = bootstrapModal
</script>
<script src="{% static "v2/js/waiting_room_entertainment.js" %}"></script>
</html>