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.

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

Kudos: Cleanup, remove unused templates, general love #2571

Merged
merged 1 commit into from
Oct 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion app/assets/v2/js/pages/kudos_receive.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ $(document).ready(function() {
numClones: numClones,
holding_address: holding_address,
kudosPriceInWei: kudosPriceInWei.toString(10)
}
};

console.log('params for kudos clone:');
console.log(params);

Expand Down
6 changes: 2 additions & 4 deletions app/dashboard/templates/grants_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<html lang="en">
<head>
<style>

.grant-item {
border: 1px solid #D3D3D3;
border-radius: 5px;
Expand Down Expand Up @@ -120,7 +119,7 @@
background-color: transparent !important;
color: none !important;
text-decoration: none !important;
}
}

img {
object-fit: cover;
Expand Down Expand Up @@ -150,7 +149,7 @@ <h1 class="font-title-xl">{% trans 'Gitcoin Grants' %}</h1>
<p class="mt-4 pt-1 mb-2 font-subheader">
{% blocktrans %}
Want to provide sustainable funding for Open Source? Creating a Gitcoin Grant is a great way to do it! Gitcoin Grants, powered by the
<a target="_blank" rel="noopener noreferrer" href="http://1337alliance.com/">EIP 1337 standard</a>
<a target="_blank" rel="noopener noreferrer" href="https://1337alliance.com/">EIP 1337 standard</a>
, are a fast, easy, & secure way to provide recurring token contributions to your favorite OSS maintainers. Show your appreciation for maintainers in your dependancy tree with a Gitcoin Grant today.
{% endblocktrans %}
</p>
Expand Down Expand Up @@ -288,7 +287,6 @@ <h2 class="grant-item__title font-subheader">The Community Audit Fund</h2>

</div>
</div>

{% include 'shared/bottom_notification.html' %}
{% include 'shared/analytics.html' %}
{% include 'shared/footer_scripts.html' %}
Expand Down
1 change: 0 additions & 1 deletion app/kudos/management/commands/mint_kudos.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,3 @@ def handle(self, *args, **options):

args = (options['name'], options['description'], options['rarity'], options['price'],
options['numClonesAllowed'], options['tags'], image_path)

5 changes: 2 additions & 3 deletions app/kudos/templates/shared/kudos_banner.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% comment %}
Copyright (C) 2017 Gitcoin Core
Copyright (C) 2018 Gitcoin Core

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
Expand All @@ -14,8 +14,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
{% endcomment %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
<div class="container text-center mb-5 mt-5">
<a href="{% url 'kudos_main' %}"><img class="mw-100" src="{% static "v2/images/kudos/logo.svg" %}" alt="kudos" width="258px"></a>
</div>
11 changes: 5 additions & 6 deletions app/kudos/templates/shared/kudos_card_profile.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% comment %}
Copyright (C) 2017 Gitcoin Core
Copyright (C) 2018 Gitcoin Core

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
Expand All @@ -14,28 +14,27 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
{% endcomment %}
{% load i18n staticfiles %}
{% load kudos_extras %}
{% load i18n static kudos_extras %}
{% if kudos_data == 'sent_kudos' %}
{% for kudo in sent_kudos|slice:":8" %}
<div class="col-xs-12 col-sm-6 col-lg-3 mb-3">
<div class="kd-card kd-extended" aria-haspopup="true" tabindex="0">
<a href="/kudos/{{ kudo.id }}" class="" title="{{ kudo.name|humanize_name }}" tabindex="0">
<a href="{% url 'kudos_details' kudo.id %}" class="" title="{{ kudo.name|humanize_name }}" tabindex="0">
<img src="{% static kudo.image %}" alt="{{ kudo.name|humanize_name }}" class="img-thumbnail border-transparent kd-shadow" width="250">
</a>
<div class="kd-content">
<div class="kd-title">{{ kudo.name|humanize_name }}</div>
{{ kudo.description|truncatechars:60 }}
</div>
<div class="content-hover">
<a class="kd-title" href="/kudos/{{ kudo.id }}/{{ kudos.name }}">{{ kudo.name|humanize_name }}</a>
<a class="kd-title" href="{% url 'kudos_details' kudo.id kudos.name %}">{{ kudo.name|humanize_name }}</a>
{% if kudo.kudos_transfer %}
<p>Sent to <a href="{% url 'profile' kudo.kudos_transfer.username|slice:'1:' %}">{{kudo.kudos_transfer.username|slice:"1:"}}</a></p>
<p>
<a href="{% if not kudo.kudos_transfer == 'mainnet' %}https://{{ kudo.kudos_transfer.network }}.etherscan.io/tx/{{ kudo.kudos_transfer.txid }}{% else %}https://etherscan.io/tx/{{ kudo.kudos_transfer.txid }}{% endif %}" target="_blank" class="d-block mb-1">{{ kudo.kudos_transfer.txid|humanize_address }}</a>
</p>
{% if kudo.kudos_transfer.comments_public %}
Comment:
{% trans "Comment:" %}
<p>{{kudo.kudos_transfer.comments_public}}</p>
{% endif %}
{% endif %}
Expand Down
6 changes: 1 addition & 5 deletions app/kudos/templates/transaction/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<!DOCTYPE HTML>
<html>
<head>

{% include 'shared/head.html' %}
{% include 'shared/cards_pic.html' %}
<link rel="stylesheet" href="{% static "v2/css/kudos/styles.css" %}" />
Expand All @@ -41,25 +40,22 @@
{% block 'main' %} {% endblock %}
<!-- Footer -->
<footer id="footer" class="copyright d-flex font-smaller-1 justify-content-center mt-5 p-4">
<a href="/" class="mr-4">&copy; Gitcoin.co</a>
<a href="{% url 'index' %}" class="mr-4">&copy; Gitcoin.co</a>
{% if not hide_send_tip %}
<a href="{% url 'kudos_marketplace' %}">{% trans "Kudos Marketplace" %}</a>
{% endif %}
</footer>
</main>
{% include 'shared/rain.html' with class="color" %}
<!-- Scripts -->

{% include 'shared/footer_scripts.html' with slim=1 %}
{% block 'scripts' %}{% endblock %}

<script>
if ('addEventListener' in window) {
window.addEventListener('load', function () {
document.body.className = document.body.className.replace(/\bis-loading\b/, '');
});
}
</script>

</body>
</html>
12 changes: 3 additions & 9 deletions app/kudos/templates/transaction/kudos_auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
{% endcomment %}
{% load i18n static %}
{% load is_in_list %}

{% load i18n static is_in_list %}
<div class="navbar navbar-expand-md w-100 p-0 m-0 mb-2">
<a class="navbar-brand p-1" href="{% url 'kudos_marketplace' %}">
<img class="mw-100 mx-4" src="{% static "v2/images/kudos/logo.svg" %}" alt="kudos" height="50">
<!-- <img id="logo" src="{% static "v2/images/helmet_icon.png" %}" height="50" class="w-auto" /> -->
{% if request.path|is_in_list:"/gas,/gas/history,/gas/intro,/gas/calculator,/gas/faq,/gas/faucets" %}
<img id="addon" src="{% static "v2/images/gas_white.gif" %}"/>
<p style="color:white; font-size: 12px;">Gas Station</p>
<img id="addon" src="{% static "v2/images/gas_white.gif" %}"/>
<p style="color:white; font-size: 12px;">{% trans "Gas Station" %}</p>
{% endif %}
</a>

Expand Down Expand Up @@ -94,6 +91,3 @@
}
}
</style>

<!-- <script src="{% static "v2/js/tooltip.js" %}"></script> -->
<!-- <script src="{% static "v2/js/base.js" %}"></script> -->
84 changes: 0 additions & 84 deletions app/kudos/templates/transaction/receive_legacy.html

This file was deleted.

71 changes: 0 additions & 71 deletions app/kudos/templates/transaction/receive_v2.html

This file was deleted.

Loading