Commit 7f6071ae authored by Diego Salazar's avatar Diego Salazar
Browse files

Merge branch 'finishing-touches' into 'master'

Took out all static "example" content. Ready for production.

See merge request monero-project/forum-funding-system!5
parents e4735c55 885147b1
- stage: Completed Proposals - stage: Completed Proposals
proposals: proposals:
- name: Documentation and cleanup of source code - 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 author: tewinget
date:
- name: What is Monero? is produced and open-sourced - 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 author: savandra
date:
- name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples - 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 author: bigredmachine
date:
- name: A continuation for all purpose programming of what needs to get done in monero - 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 author: moneromooo
date:
- name: Create End-User Kovri documentation - 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 author: anonimal
date:
- name: fluffypony's Conference Circuit Jan 2017 Edition - 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 author: fluffypony
date:
- name: The official Qt GUI Project - 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 author: othe
date:
- name: Justin's Local Meetup Talks Proposal 1 - 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 author: samsunggalaxyplayer
date:
- name: Justin's Local Meetup Talks Proposal 2 - 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 author: samsunggalaxyplayer
date:
- name: More mooo coding goodness - 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 author: moneromooo
date:
- name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC - 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 author: firperfect
date:
- name: Additional GUI Developer - 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 author: Jaquee
date:
- name: Release of new/updated pool software - 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 author: Snipa22
date:
- name: Monero integrations with web apps - name: Monero integrations with web apps
url: /forum-funding-system/proposals/monero-integrations.html local-url: /forum-funding-system/proposals/monero-integrations.html
author: serhack author: serhack
date:
\ No newline at end of file
- stage: Ideas - stage: Ideas
proposals: proposals:
- name: Fake. Nothing here yet. Check WiP and Completed 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 author: rehrar
date: this date
- stage: Funding Required - stage: Funding Required
proposals: proposals:
- name: Monero Bounty For HackerOne - 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 author: anonimal
amount: 1500
amount-funded: 1,447.21
percentage: 96
date: March 15, 2017
donate-url: #
- stage: Work in Progress - stage: Work in Progress
proposals: proposals:
- name: Getmonero.org Redesign - name: Getmonero.org Redesign
url: /forum-funding-system/proposals/getmonero-redesign.html gitlab-url:
author: rehrar local-url: /forum-funding-system/proposals/getmonero-redesign.html
\ No newline at end of file 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
...@@ -16,14 +16,22 @@ layout: base ...@@ -16,14 +16,22 @@ layout: base
<div class="info-block"> <div class="info-block">
<div class="row"> <div class="row">
<div class="col-xs-12"> <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> <h2>{{page.title}}</h2>
<p class="author-list"><span><img src="/img/author-filled.png"></span>by {{page.author}}</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>12/11/2017</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>100 XMR</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> <p class="bar-work-status">Completed</p>
<div class="progress-bar"> <div class="progress-bar">
<span class="work-progress" style="width: 100%; background-color: #70af71;"></span> <span class="work-progress" style="width: 100%; background-color: #70af71;"></span>
</div> </div>
{%endif%}
{%endfor%}
{%endif%}
{%endfor%}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -48,16 +48,24 @@ layout: base ...@@ -48,16 +48,24 @@ layout: base
<div class="info-block"> <div class="info-block">
<div class="row"> <div class="row">
<div class="col-xs-12"> <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> <h2>{{page.title}}</h2>
<div class="row middle-xs between-xs"> <div class="row middle-xs between-xs">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{page.author}}</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>{{page.date}}</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">75</span> of <span class="progress-number-goal">100</span> XMR</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>
<div class="progress-bar"> <div class="progress-bar">
<span class="fund-progress" style="width: 75%"></span> <span class="fund-progress" style="width: {{proposal-percentage}}%"></span>
</div> </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> </div>
</div> </div>
......
...@@ -18,14 +18,22 @@ layout: base ...@@ -18,14 +18,22 @@ layout: base
<div class="info-block"> <div class="info-block">
<div class="row"> <div class="row">
<div class="col-xs-12"> <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> <h2>{{page.title}}</h2>
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{page.author}}</p> <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="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="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">1</span> of <span class="progress-number-goal">3</span> milestones</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"> <div class="progress-bar">
<span class="work-progress" style="width: 30%"></span> <span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>
</div> </div>
{%endif%}
{%endfor%}
{%endif%}
{%endfor%}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -17,22 +17,20 @@ title: Completed Tasks ...@@ -17,22 +17,20 @@ title: Completed Tasks
<div class="col-xs-12"> <div class="col-xs-12">
<h1>{{page.title}}</h1> <h1>{{page.title}}</h1>
</div> </div>
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.completed-proposals %}
{% if toplevel.stage == "Completed Proposals" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <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"> <div class="col-xs-12">
<h3>{{proposal.name}}</h3> <h3>{{proposal.name}}</h3>
<div class="row"> <div class="row">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</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>11/24/2016</p> <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
</div> </div>
</div> </div>
</a> </a>
</div> </div>
{%endfor%} {%endfor%}
{%endif%}
{%endfor%} {%endfor%}
</div> </div>
</section> </section>
\ No newline at end of file
...@@ -21,16 +21,16 @@ title: Funding Required ...@@ -21,16 +21,16 @@ title: Funding Required
{% if toplevel.stage == "Funding Required" %} {% if toplevel.stage == "Funding Required" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <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"> <div class="col-xs-12">
<h3>{{proposal.name}}</h3> <h3>{{proposal.name}}</h3>
<div class="row between-xs middle-xs"> <div class="row between-xs middle-xs">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</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>11/24/2016</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">75</span> of <span class="progress-number-goal">100</span> XMR</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>
<div class="progress-bar"> <div class="progress-bar">
<span class="fund-progress" style="width: 75%"></span> <span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
</div> </div>
</div> </div>
</a> </a>
......
...@@ -29,7 +29,7 @@ title: Ideas ...@@ -29,7 +29,7 @@ title: Ideas
<h3>{{proposal.name}}</h3> <h3>{{proposal.name}}</h3>
<div class="row"> <div class="row">
<p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</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>11/24/2016</p> <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
</div> </div>
</div> </div>
</a> </a>
......
...@@ -21,16 +21,16 @@ title: Work in Progress ...@@ -21,16 +21,16 @@ title: Work in Progress
{% if toplevel.stage == "Work in Progress" %} {% if toplevel.stage == "Work in Progress" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <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"> <div class="col-xs-12">
<h3>{{proposal.name}}</h3> <h3>{{proposal.name}}</h3>
<div class="row between-xs middle-xs"> <div class="row between-xs middle-xs">
<p class="author-list"><span><img src="/img/author-filled.png"></span>samsunggalaxyplayer</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>11/24/2016</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">1</span> of <span class="progress-number-goal">3</span> milestones</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>
<div class="progress-bar"> <div class="progress-bar">
<span class="work-progress" style="width: 30%"></span> <span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>
</div> </div>
</div> </div>
</a> </a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment