From 19fc93eff0246ebf8515d17e91ba24760c9baa7c Mon Sep 17 00:00:00 2001 From: VitaliyTr Date: Thu, 23 Feb 2017 22:28:40 +0700 Subject: [PATCH] cleaned up governance page; budget page=> governance page --- _i18n/en.yml | 22 +- .../hero/{budget.html => governance.html} | 10 +- budget/index.html | 229 ------------------ governance/index.html | 78 ++++++ masternodes/index.html | 4 +- 5 files changed, 96 insertions(+), 247 deletions(-) rename _includes/hero/{budget.html => governance.html} (52%) delete mode 100644 budget/index.html create mode 100644 governance/index.html diff --git a/_i18n/en.yml b/_i18n/en.yml index c9dc5a0..59c5cb2 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -76,11 +76,12 @@ pages: how-btc-text: The system would work as a decentralized voting mechanism setup ipay them directly after approval of the work in a decentralized fashion. how-btc-btn: Show Video - budget: + governance: title: Dash Official Website | Dash Crypto Currency description: Dash is Digital Cash - hero-heading: Budget System + hero-heading: Decentralized Governance System + hero-text: > Decentralized Governance by Blockchain, or DGBB, is Dash's attempt to solve two important problems in cryptocurrency: governance and funding. @@ -104,9 +105,9 @@ pages: At that time, the block rewards that were not paid out (10% of each block) will be used to fund approved proposals. The network thus funds itself by reserving 10% of the block reward for budget projects. - governance-heading: Goverment Tools + governance-meaning: What is Governance and what does it mean for Dash - voting-header: How to Voting + voting-header: How to Vote voting-automatic: Automated Voting voting-automatic-text: > One of the greatest challenges of building a crypto currency platform is ensuring you create a decentralized system of governance to manage, @@ -122,14 +123,13 @@ pages: The system would work as a decentralized voting mechanism setup in the software, where budgets for specific projects are proposed, then the masternodes as a whole vote on them. Each project, if it passes, is added to the total budget and paid directly from the blockchain to the person doing the work. With this, we could hire core developers and pay them directly after approval of the work in a decentralized fashion. - decentralized-governance-link: Self-sustainable Decentralized Governance - masternode-budget-link: Masternode Budget API - using-link: > - Using Decentralized Governance: Proposals, Voting, and Budgets - dgb-link: DGBB Document templates - budget-finalization-link: Budget Finalization Procedure + generator-link: Budget Proposal Generator + dashcentral-link: DashCentral + votetracker-link: VoteTracker + budget-monitoring-link: Budget Monitoring + proposal-status-link: Proposal Status - exchange-heading: Full Exchange Listing + proposal-service: Proposal Automated Service woocommerce: title: Dash Official Website | Dash Crypto Currency diff --git a/_includes/hero/budget.html b/_includes/hero/governance.html similarity index 52% rename from _includes/hero/budget.html rename to _includes/hero/governance.html index e16d433..71f3050 100644 --- a/_includes/hero/budget.html +++ b/_includes/hero/governance.html @@ -11,13 +11,13 @@
-

{% t pages.budget.hero-heading %}

-

{% t pages.budget.hero-text %}

+

{% t pages.governance.hero-heading %}

+

{% t pages.governance.hero-text %}

- {% t pages.budget.hero-how-to-btn %} - {% t pages.budget.hero-guide-btn %} - {% t pages.budget.hero-pools-btn %} + {% t pages.governance.hero-how-to-btn %} + {% t pages.governance.hero-guide-btn %} + {% t pages.governance.hero-pools-btn %}
diff --git a/budget/index.html b/budget/index.html deleted file mode 100644 index a55704a..0000000 --- a/budget/index.html +++ /dev/null @@ -1,229 +0,0 @@ ---- -layout: default -title: pages.budget.title -description: pages.budget.description ---- - - -{% include hero/budget.html %} -{% include base.html %} - - -
- - -
-
-
{% tmd pages.budget.description-text-hero %}
-
-

{% t pages.budget.description %}

-
-
- - - - -
-
-
-

{% t pages.community.discussion-heading %}

- - {% tmd pages.community.discussion-text %} -
-
-
- - - - -
-
-
-
-
-
-

{% t pages.budget.voting-header %}

-
-
-

{% t pages.budget.voting-automatic %}

-

{% t pages.budget.voting-automatic-text %}

- {% t pages.budget.voting-guide-btn %} - {% t pages.budget.voting-manual-btn %} - {% t pages.budget.voting-central-btn %} -
-
-

{% t pages.budget.voting-tools %}

-

{% t pages.budget.voting-tools-text %}

- {% t pages.budget.decentralized-governance-link %} - {% t pages.budget.masternode-budget-link %} - {% t pages.budget.using-link %} - {% t pages.budget.dgb-link %} - {% t pages.budget.budget-finalization-link %} -
-
-
-
- -
-

{% t pages.budget.exchange-heading %}

- - - - - - - - - - - - - -
HeightBlock TimeTransactionsValue OutDifficulty
-
-
- diff --git a/governance/index.html b/governance/index.html new file mode 100644 index 0000000..5fe0853 --- /dev/null +++ b/governance/index.html @@ -0,0 +1,78 @@ +--- +layout: default +title: pages.governance.title +description: pages.governance.description +--- + + +{% include hero/governance.html %} +{% include base.html %} + + +
+ + +
+
+
{% tmd pages.governance.description-text-hero %}
+
+

{% t pages.governance.description %}

+
+
+ +
+
+

{% t pages.governance.governance-meaning %}

+
+
+ +
+
+
+
+ + +
+
+

{% t pages.governance.voting-header %}

+
+
+

{% t pages.governance.voting-automatic %}

+

{% t pages.governance.voting-automatic-text %}

+ + {% t pages.governance.voting-guide-btn %} + + + {% t pages.governance.voting-manual-btn %} + + + {% t pages.governance.voting-central-btn %} + +
+
+

{% t pages.governance.voting-tools %}

+

{% t pages.governance.voting-tools-text %}

+ {% t pages.governance.generator-link %} + {% t pages.governance.dashcentral-link %} + {% t pages.governance.votetracker-link %} + {% t pages.governance.budget-monitoring-link %} + {% t pages.governance.proposal-status-link %} +
+
+
+
+ +
+
+
+

{% t pages.governance.proposal-service %}

+ +
+
+ {% t pages.update.proposal-btn %} +
+
+
+
diff --git a/masternodes/index.html b/masternodes/index.html index 9acc8f9..9476a28 100644 --- a/masternodes/index.html +++ b/masternodes/index.html @@ -25,7 +25,7 @@ description: pages.budget.description
-

{% t pages.masternodes.earn-heading %}

+

{% t pages.masternodes.earn-heading %}

{% t pages.masternodes.earn-text %}

@@ -87,7 +87,7 @@ description: pages.budget.description
-

P2P

+

P2P

{% tmd pages.masternodes.p2p-text %}