From 885147b135963a4c95b35443f753adecc52a0b4a Mon Sep 17 00:00:00 2001
From: Diego Salazar <rehrar@tuta.io>
Date: Thu, 20 Dec 2018 12:02:54 -0700
Subject: [PATCH] Took out all static "example" content. Ready for production.
- ALSO SOLVED THAT ONE THING I'VE bEEN WORKING ON FOR TWO yeARS. HAHAHA TAKE
THAT JEKYLL!
---
_data/completed-proposals.yml | 44 ++++++++++++-------
_data/ffs.yml | 44 ++++++++-----------
_layouts/ffs-cp.html | 14 ++++--
_layouts/ffs-fr.html | 18 +++++---
_layouts/ffs-wip.html | 14 ++++--
.../completed-proposals/index.html | 8 ++--
.../funding-required/index.html | 8 ++--
forum-funding-system/ideas/index.html | 2 +-
.../work-in-progress/index.html | 10 ++---
9 files changed, 96 insertions(+), 66 deletions(-)
diff --git a/_data/completed-proposals.yml b/_data/completed-proposals.yml
index e48b018..df2c173 100644
--- a/_data/completed-proposals.yml
+++ b/_data/completed-proposals.yml
@@ -1,44 +1,58 @@
- stage: Completed Proposals
proposals:
- name: Documentation and cleanup of source code
- url: /forum-funding-system/proposals/documentation-cleanup.html
+ local-url: /forum-funding-system/proposals/documentation-cleanup.html
author: tewinget
+ date:
- name: What is Monero? is produced and open-sourced
- url: /forum-funding-system/proposals/whatismonero-produced.html
+ local-url: /forum-funding-system/proposals/whatismonero-produced.html
author: savandra
+ date:
- name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
- url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
+ local-url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
author: bigredmachine
+ date:
- name: A continuation for all purpose programming of what needs to get done in monero
- url: /forum-funding-system/proposals/mooo-continuation-programming.html
+ local-url: /forum-funding-system/proposals/mooo-continuation-programming.html
author: moneromooo
+ date:
- name: Create End-User Kovri documentation
- url: /forum-funding-system/proposals/kovri-end-user-docs.html
+ local-url: /forum-funding-system/proposals/kovri-end-user-docs.html
author: anonimal
+ date:
- name: fluffypony's Conference Circuit Jan 2017 Edition
- url: /forum-funding-system/proposals/fp-conference-2017.html
+ local-url: /forum-funding-system/proposals/fp-conference-2017.html
author: fluffypony
+ date:
- name: The official Qt GUI Project
- url: /forum-funding-system/proposals/official-qt-gui.html
+ local-url: /forum-funding-system/proposals/official-qt-gui.html
author: othe
+ date:
- name: Justin's Local Meetup Talks Proposal 1
- url: /forum-funding-system/proposals/justin-local-meetups-1.html
+ local-url: /forum-funding-system/proposals/justin-local-meetups-1.html
author: samsunggalaxyplayer
+ date:
- name: Justin's Local Meetup Talks Proposal 2
- url: /forum-funding-system/proposals/justin-local-meetups-2.html
+ local-url: /forum-funding-system/proposals/justin-local-meetups-2.html
author: samsunggalaxyplayer
+ date:
- name: More mooo coding goodness
- url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
+ local-url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
author: moneromooo
+ date:
- name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
- url: /forum-funding-system/proposals/monero-subforum-8btc.html
+ local-url: /forum-funding-system/proposals/monero-subforum-8btc.html
author: firperfect
+ date:
- name: Additional GUI Developer
- url: /forum-funding-system/proposals/additional-gui-dev.html
+ local-url: /forum-funding-system/proposals/additional-gui-dev.html
author: Jaquee
+ date:
- name: Release of new/updated pool software
- url: /forum-funding-system/proposals/release-pool-software.html
+ local-url: /forum-funding-system/proposals/release-pool-software.html
author: Snipa22
+ date:
- name: Monero integrations with web apps
- url: /forum-funding-system/proposals/monero-integrations.html
- author: serhack
\ No newline at end of file
+ local-url: /forum-funding-system/proposals/monero-integrations.html
+ author: serhack
+ date:
\ No newline at end of file
diff --git a/_data/ffs.yml b/_data/ffs.yml
index f7bc4eb..0d3defd 100644
--- a/_data/ffs.yml
+++ b/_data/ffs.yml
@@ -1,39 +1,33 @@
- stage: Ideas
proposals:
- name: Fake. Nothing here yet. Check WiP and Completed Proposals.
- url: #
+ gitlab-url: #
author: rehrar
- - name: Diego's Example
- url: #
- author: rehrar
- - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
- url: #
- author: rehrar
- - name: Diego's Example
- url: #
- author: rehrar
- - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
- url: #
- author: rehrar
- - name: Diego's Example
- url: #
- author: rehrar
- - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
- url: #
- author: rehrar
- - name: Diego's Example
- url: #
- author: rehrar
+ date: this date
- stage: Funding Required
proposals:
- name: Monero Bounty For HackerOne
- url: /forum-funding-system/proposals/monero-bounty-hackerone.html
+ gitlab-url:
+ local-url: /forum-funding-system/proposals/monero-bounty-hackerone.html
author: anonimal
+ amount: 1500
+ amount-funded: 1,447.21
+ percentage: 96
+ date: March 15, 2017
+ donate-url: #
- stage: Work in Progress
proposals:
- name: Getmonero.org Redesign
- url: /forum-funding-system/proposals/getmonero-redesign.html
- author: rehrar
\ No newline at end of file
+ gitlab-url:
+ local-url: /forum-funding-system/proposals/getmonero-redesign.html
+ author: rehrar
+ date: February 24, 2017
+ milestones: 4
+ milestones-completed: 4
+ milestones-percentage: 100
+ amount: 100
+ amount-funded: 100
+ percentage: 100
\ No newline at end of file
diff --git a/_layouts/ffs-cp.html b/_layouts/ffs-cp.html
index 7cd2d11..09bd9c2 100644
--- a/_layouts/ffs-cp.html
+++ b/_layouts/ffs-cp.html
@@ -16,14 +16,22 @@ layout: base
<div class="info-block">
<div class="row">
<div class="col-xs-12">
+ {% for toplevel in site.data.completed-proposals %}
+ {% if toplevel.stage == "Completed Proposals" %}
+ {% for proposal in toplevel.proposals%}
+ {% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
- <p class="author-list"><span><img src="/img/author-filled.png"></span>by {{page.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>12/11/2017</p>
- <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>100 XMR</p>
+ <p class="author-list"><span><img src="/img/author-filled.png"></span>by {{proposal.author}}</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
+ <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>{{proposal.amount}} XMR</p>
<p class="bar-work-status">Completed</p>
<div class="progress-bar">
<span class="work-progress" style="width: 100%; background-color: #70af71;"></span>
</div>
+ {%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
</div>
diff --git a/_layouts/ffs-fr.html b/_layouts/ffs-fr.html
index ee6fa3f..e348278 100644
--- a/_layouts/ffs-fr.html
+++ b/_layouts/ffs-fr.html
@@ -48,16 +48,24 @@ layout: base
<div class="info-block">
<div class="row">
<div class="col-xs-12">
+ {% for toplevel in site.data.ffs %}
+ {% if toplevel.stage == "Funding Required" %}
+ {% for proposal in toplevel.proposals%}
+ {% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
<div class="row middle-xs between-xs">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{page.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{page.date}}</p>
- <p class="bar-fund-status">Raised <span class="progress-number-funded">75</span> of <span class="progress-number-goal">100</span> XMR</p>
+ <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
+ <p class="bar-fund-status">Raised <span class="progress-number-funded">{{proposal.amount-funded}}</span> of <span class="progress-number-goal">{{proposal.amount}}</span> XMR</p>
</div>
<div class="progress-bar">
- <span class="fund-progress" style="width: 75%"></span>
+ <span class="fund-progress" style="width: {{proposal-percentage}}%"></span>
</div>
- <p><a href="#" class="btn btn-primary">Contribute</a></p>
+ <p><a href="{{proposal.donate-url}}" class="btn btn-primary">Contribute</a></p>
+ {%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
</div>
diff --git a/_layouts/ffs-wip.html b/_layouts/ffs-wip.html
index 45bac9a..ca958d1 100644
--- a/_layouts/ffs-wip.html
+++ b/_layouts/ffs-wip.html
@@ -18,14 +18,22 @@ layout: base
<div class="info-block">
<div class="row">
<div class="col-xs-12">
+ {% for toplevel in site.data.ffs %}
+ {% if toplevel.stage == "Work in Progress" %}
+ {% for proposal in toplevel.proposals%}
+ {% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{page.author}}</p>
<p class="date-list"><span><img src="/img/calendar.png"></span>{{page.date}}</p>
- <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>100 XMR</p>
- <p class="bar-work-status">Completed <span class="progress-number-funded">1</span> of <span class="progress-number-goal">3</span> milestones</p>
+ <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>{{proposal.amount}} XMR</p>
+ <p class="bar-work-status">Completed <span class="progress-number-funded">{{proposal.milestones-completed}}</span> of <span class="progress-number-goal">{{proposal.milestones}}</span> milestones</p>
<div class="progress-bar">
- <span class="work-progress" style="width: 30%"></span>
+ <span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>
</div>
+ {%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
</div>
diff --git a/forum-funding-system/completed-proposals/index.html b/forum-funding-system/completed-proposals/index.html
index 45a8d40..de5691e 100644
--- a/forum-funding-system/completed-proposals/index.html
+++ b/forum-funding-system/completed-proposals/index.html
@@ -17,22 +17,20 @@ title: Completed Tasks
<div class="col-xs-12">
<h1>{{page.title}}</h1>
</div>
- {% for toplevel in site.data.ffs %}
- {% if toplevel.stage == "Completed Proposals" %}
+ {% for toplevel in site.data.completed-proposals %}
{% for proposal in toplevel.proposals%}
<div class="col-xs-12">
- <a href="{{proposal.url}}" class="row middle-xs ffs-idea">
+ <a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
<div class="row">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>11/24/2016</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
</div>
</div>
</a>
</div>
{%endfor%}
- {%endif%}
{%endfor%}
</div>
</section>
\ No newline at end of file
diff --git a/forum-funding-system/funding-required/index.html b/forum-funding-system/funding-required/index.html
index 54b6a3c..09079a3 100644
--- a/forum-funding-system/funding-required/index.html
+++ b/forum-funding-system/funding-required/index.html
@@ -21,16 +21,16 @@ title: Funding Required
{% if toplevel.stage == "Funding Required" %}
{% for proposal in toplevel.proposals%}
<div class="col-xs-12">
- <a href="{{proposal.url}}" class="row middle-xs ffs-idea">
+ <a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
<div class="row between-xs middle-xs">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>11/24/2016</p>
- <p class="bar-fund-status">Raised <span class="progress-number-funded">75</span> of <span class="progress-number-goal">100</span> XMR</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
+ <p class="bar-fund-status">Raised <span class="progress-number-funded">{{proposal.amount-funded}}</span> of <span class="progress-number-goal">{{proposal.amount}}</span> XMR</p>
</div>
<div class="progress-bar">
- <span class="fund-progress" style="width: 75%"></span>
+ <span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
</div>
</div>
</a>
diff --git a/forum-funding-system/ideas/index.html b/forum-funding-system/ideas/index.html
index af94f1f..4f34e89 100644
--- a/forum-funding-system/ideas/index.html
+++ b/forum-funding-system/ideas/index.html
@@ -29,7 +29,7 @@ title: Ideas
<h3>{{proposal.name}}</h3>
<div class="row">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>11/24/2016</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
</div>
</div>
</a>
diff --git a/forum-funding-system/work-in-progress/index.html b/forum-funding-system/work-in-progress/index.html
index e393439..12ee614 100644
--- a/forum-funding-system/work-in-progress/index.html
+++ b/forum-funding-system/work-in-progress/index.html
@@ -21,16 +21,16 @@ title: Work in Progress
{% if toplevel.stage == "Work in Progress" %}
{% for proposal in toplevel.proposals%}
<div class="col-xs-12">
- <a href="{{proposal.url}}" class="row middle-xs ffs-idea">
+ <a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
<div class="row between-xs middle-xs">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>samsunggalaxyplayer</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>11/24/2016</p>
- <p class="bar-work-status">Completed <span class="progress-number-funded">1</span> of <span class="progress-number-goal">3</span> milestones</p>
+ <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
+ <p class="bar-work-status">Completed <span class="progress-number-funded">{{proposal.milestones-completed}}</span> of <span class="progress-number-goal">{{proposal.milestones}}</span> milestones</p>
</div>
<div class="progress-bar">
- <span class="work-progress" style="width: 30%"></span>
+ <span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>
</div>
</div>
</a>
--
GitLab