From bcabe142a6e767967429ccc2246dbe25f80e44f8 Mon Sep 17 00:00:00 2001 From: Perry Woodin Date: Thu, 14 Jul 2016 07:34:04 -0400 Subject: [PATCH] Moved base.html login inline The base could not be included as a snippet because it causes a stack error due to a conflict with the i18n plugin. --- README.md | 2 +- _includes/nav-desktop.html | 14 +++ _includes/nav-mobile.html | 14 +++ _layouts/default.html | 32 +++--- _site/assets/img/favicon/favicon-16x16.png | Bin 0 -> 890 bytes _site/community/index.html | 98 ++++++++++--------- _site/currency/index.html | 94 ++++++++++-------- _site/es/community/index.html | 98 ++++++++++--------- _site/es/currency/index.html | 94 ++++++++++-------- _site/es/get-dash/index.html | 104 +++++++++++--------- _site/es/index.html | 108 +++++++++++---------- _site/es/participate/index.html | 104 +++++++++++--------- _site/get-dash/index.html | 104 +++++++++++--------- _site/index.html | 108 +++++++++++---------- _site/participate/index.html | 104 +++++++++++--------- assets/img/favicon/favicon-16x16.png | Bin 0 -> 890 bytes 16 files changed, 603 insertions(+), 475 deletions(-) create mode 100644 _site/assets/img/favicon/favicon-16x16.png create mode 100644 assets/img/favicon/favicon-16x16.png diff --git a/README.md b/README.md index 89860a2..37817ba 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ We are using Jekyll to generate the static html files. https://jekyllrb.com -### Requirements +### Requirements (mac) * Ruby: `brew install ruby` * Ruby Gems: https://rubygems.org/pages/download * NoddeJS: https://nodejs.org/en/ diff --git a/_includes/nav-desktop.html b/_includes/nav-desktop.html index e79fecf..1fce96c 100644 --- a/_includes/nav-desktop.html +++ b/_includes/nav-desktop.html @@ -1,3 +1,17 @@ +{% assign base = '' %} +{% assign depth = page.url | split: '/' | size | minus: 1 %} +{% if depth == -1 %}{% assign base = '.' %} +{% elsif depth == 1 %}{% assign base = '..' %} +{% elsif depth == 2 %}{% assign base = '../..' %} +{% elsif depth == 3 %}{% assign base = '../../..' %} +{% elsif depth == 4 %}{% assign base = '../../../..' %}{% endif %} + +{% if site.lang != "en" %} + {% assign base = base | prepend: '../' %} +{% endif %} + +{% capture basenav %}{{ base }}{% if site.lang != "en" %}/{{ site.lang }}{% endif %}{% endcapture %} +
diff --git a/_includes/nav-mobile.html b/_includes/nav-mobile.html index 6ff6266..8e28682 100644 --- a/_includes/nav-mobile.html +++ b/_includes/nav-mobile.html @@ -1,3 +1,17 @@ +{% assign base = '' %} +{% assign depth = page.url | split: '/' | size | minus: 1 %} +{% if depth == -1 %}{% assign base = '.' %} +{% elsif depth == 1 %}{% assign base = '..' %} +{% elsif depth == 2 %}{% assign base = '../..' %} +{% elsif depth == 3 %}{% assign base = '../../..' %} +{% elsif depth == 4 %}{% assign base = '../../../..' %}{% endif %} + +{% if site.lang != "en" %} + {% assign base = base | prepend: '../' %} +{% endif %} + +{% capture basenav %}{{ base }}{% if site.lang != "en" %}/{{ site.lang }}{% endif %}{% endcapture %} +
-
- + + + + + + + + +
+ @@ -128,10 +130,10 @@

Need some Dash?

-

Signup to our forum we'll send you some Dash!

+

Signup on our forum we'll send you some Dash!

Sign up for Dash -

Enter your Email Address

+

Enter Your Email Address

@@ -194,24 +196,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -160,24 +162,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -128,10 +130,10 @@

Need some Dash?

-

Signup to our forum we'll send you some Dash!

+

Signup on our forum we'll send you some Dash!

Sign up for Dash -

Enter your Email Address

+

Enter Your Email Address

@@ -194,24 +196,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -160,24 +162,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -112,7 +114,7 @@

Trade Dash on an exchange

-

Trade local currency for Dash on an Exchange Market

+

Trade local currency for Dash on an exchange

Trade Dash @@ -124,22 +126,22 @@

Shop direct with Dash

-

Instant and anonymous online purchases, direct from your Dash Wallet

+

Instant and anonymous online purchases, direct from your Dash wallet

More Merchants

Shop at Visa stores

-

Dash-Visa debit card with no foreign transaction fees & mobile tap & pay

+

Dash-Visa debit card with no foreign transaction fees and mobile "tap & pay"

Get Shake

Need some Dash?

-

Signup to our forum we'll send you some Dash!

+

Signup on our forum we'll send you some Dash!

Sign up for Dash -

Enter your Email Address

+

Enter Your Email Address

@@ -202,24 +204,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
-

Dash is Digital Cash you can Spend Online

-

Use Dash to make instant, anonymous payments online or in-store using our secure open-source platform hosted by 1,000's of users around the world.

+

Dash is Digital Cash You Can Spend Online

+

Use Dash to make instant, anonymous payments online or in-store using our secure open-source platform hosted by thousands of users around the world.

Watch Overview Video @@ -103,7 +105,7 @@

Shop direct with Dash

- Instant and anonymous purchases, direct from your Dash Wallet + Instant and anonymous purchases, direct from your Dash wallet More Merchants Become a Merchant @@ -111,13 +113,13 @@

Next-Gen Network Architecture

- The core of Dash's unique technology is a 2-tier P2P network design that rewards users that hold Dash to host a type of supernode called a Masternode and host it 24/7 on dedicated hardware.

Masternodes work together in clusters and can't be faked like fullnodes in other digital currencies. This means they can provide new kinds of decentralized services, like instant transactions, anonymization and governance, without the threat of low-cost network attacks. + The core of Dash's unique technology is a two-tier P2P network design that rewards users who run a special kind of node called a masternode and host it 24/7 on dedicated hardware. The network requires that those who run masternodes must provide cryptographic proof that they own 1,000 Dash per masternode. This secures the network against Sybil attacks by making such attacks prohibitively expensive.

Masternodes work together in clusters and can't be faked like fullnodes in other digital currencies. This means they can provide new kinds of decentralized services, like instant transactions, anonymization and governance, without the threat of low-cost network attacks. Learn More

First Self Governing, Self Funding Protocol

- Any important project of decision in Dash is agreed and funded by a decentralized public process that funds projects autonomously based on Masternode-netwok votes. This means Dash can fund it's own growth and adoption, consensus is guaranteed, and everyone is accountable to the network. And you can't game the system without buying over have the currency supply. + Any important project of decision in Dash is agreed and funded by a decentralized public process that funds projects autonomously based on masternode-netwok votes. This means Dash can fund its own growth and adoption, consensus is guaranteed, and everyone is accountable to the network. Not only that, but an attacker can't game the system without buying over half the currency supply. Proposals @@ -125,13 +127,13 @@

The Fastest Growing Network

- Thanks to incentivization, Dash's network has grown 3,700 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability. + Thanks to incentivization, Dash's network has grown to 3,900 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability. Network Stats

Digital Currency Evolution

- What's next? We are working on a new decentralized service hosted on the Masternode network that will open up Dash to web and mobile users and be as easy to use as PayPal but still fully decentralized. Stay tuned... + What's next? We are working on a new decentralized service hosted on the masternode network that will open up Dash to web and mobile while being as easy to use as PayPal but still fully decentralized. Stay tuned... Learn More @@ -205,24 +207,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -77,7 +79,7 @@

Join our Network

-

Earn Dash by powering, securing or developing the Dash Network

+

Earn Dash by powering, securing or developing the Dash network

Masternodes @@ -90,19 +92,19 @@

Setup a Masternode and power Dash's Network

-

Help power Dash by hosting a Masternode or join a shared hosting service. Masternodes operators are rewarded for providing decentralized services to our users and anyone can set one up.

+

Help power Dash by hosting a masternode or join a shared hosting service. Masternodes operators are rewarded for providing decentralized services to our users.

Setup a Masternode

Start Mining and Secure Dash's Network

-

Mine Dash using your computer or dedicated hardware. Miners are rewarded for securing the Dash Network.

+

Mine Dash using your computer or dedicated hardware. Miners are rewarded for securing the Dash network.

Start Mining -

Develop the Network with Blockchain funding

-

Dash's Network funds winning proposals each month for anything that can improve Dash like hiring developers, making decisions or integrating Dash payments into more online stores and retail outlets.

+

Develop the Network with Blockchain Funding

+

Dash's Network funds winning proposals each month for anything that can improve Dash, such as hiring developers, making decisions or integrating Dash payments into more online stores and retail outlets.

Submit a Proposal @@ -175,24 +177,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -112,7 +114,7 @@

Trade Dash on an exchange

-

Trade local currency for Dash on an Exchange Market

+

Trade local currency for Dash on an exchange

Trade Dash @@ -124,22 +126,22 @@

Shop direct with Dash

-

Instant and anonymous online purchases, direct from your Dash Wallet

+

Instant and anonymous online purchases, direct from your Dash wallet

More Merchants

Shop at Visa stores

-

Dash-Visa debit card with no foreign transaction fees & mobile tap & pay

+

Dash-Visa debit card with no foreign transaction fees and mobile "tap & pay"

Get Shake

Need some Dash?

-

Signup to our forum we'll send you some Dash!

+

Signup on our forum we'll send you some Dash!

Sign up for Dash -

Enter your Email Address

+

Enter Your Email Address

@@ -202,24 +204,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
-

Dash is Digital Cash you can Spend Online

-

Use Dash to make instant, anonymous payments online or in-store using our secure open-source platform hosted by 1,000's of users around the world.

+

Dash is Digital Cash You Can Spend Online

+

Use Dash to make instant, anonymous payments online or in-store using our secure open-source platform hosted by thousands of users around the world.

Watch Overview Video @@ -103,7 +105,7 @@

Shop direct with Dash

- Instant and anonymous purchases, direct from your Dash Wallet + Instant and anonymous purchases, direct from your Dash wallet More Merchants Become a Merchant @@ -111,13 +113,13 @@

Next-Gen Network Architecture

- The core of Dash's unique technology is a 2-tier P2P network design that rewards users that hold Dash to host a type of supernode called a Masternode and host it 24/7 on dedicated hardware.

Masternodes work together in clusters and can't be faked like fullnodes in other digital currencies. This means they can provide new kinds of decentralized services, like instant transactions, anonymization and governance, without the threat of low-cost network attacks. + The core of Dash's unique technology is a two-tier P2P network design that rewards users who run a special kind of node called a masternode and host it 24/7 on dedicated hardware. The network requires that those who run masternodes must provide cryptographic proof that they own 1,000 Dash per masternode. This secures the network against Sybil attacks by making such attacks prohibitively expensive.

Masternodes work together in clusters and can't be faked like fullnodes in other digital currencies. This means they can provide new kinds of decentralized services, like instant transactions, anonymization and governance, without the threat of low-cost network attacks. Learn More

First Self Governing, Self Funding Protocol

- Any important project of decision in Dash is agreed and funded by a decentralized public process that funds projects autonomously based on Masternode-netwok votes. This means Dash can fund it's own growth and adoption, consensus is guaranteed, and everyone is accountable to the network. And you can't game the system without buying over have the currency supply. + Any important project of decision in Dash is agreed and funded by a decentralized public process that funds projects autonomously based on masternode-netwok votes. This means Dash can fund its own growth and adoption, consensus is guaranteed, and everyone is accountable to the network. Not only that, but an attacker can't game the system without buying over half the currency supply. Proposals @@ -125,13 +127,13 @@

The Fastest Growing Network

- Thanks to incentivization, Dash's network has grown 3,700 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability. + Thanks to incentivization, Dash's network has grown to 3,900 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability. Network Stats

Digital Currency Evolution

- What's next? We are working on a new decentralized service hosted on the Masternode network that will open up Dash to web and mobile users and be as easy to use as PayPal but still fully decentralized. Stay tuned... + What's next? We are working on a new decentralized service hosted on the masternode network that will open up Dash to web and mobile while being as easy to use as PayPal but still fully decentralized. Stay tuned... Learn More @@ -205,24 +207,32 @@ Social - + } - + @@ -45,23 +39,31 @@
-
- + + + + + + + + +
+ @@ -77,7 +79,7 @@

Join our Network

-

Earn Dash by powering, securing or developing the Dash Network

+

Earn Dash by powering, securing or developing the Dash network

Masternodes @@ -90,19 +92,19 @@

Setup a Masternode and power Dash's Network

-

Help power Dash by hosting a Masternode or join a shared hosting service. Masternodes operators are rewarded for providing decentralized services to our users and anyone can set one up.

+

Help power Dash by hosting a masternode or join a shared hosting service. Masternodes operators are rewarded for providing decentralized services to our users.

Setup a Masternode

Start Mining and Secure Dash's Network

-

Mine Dash using your computer or dedicated hardware. Miners are rewarded for securing the Dash Network.

+

Mine Dash using your computer or dedicated hardware. Miners are rewarded for securing the Dash network.

Start Mining -

Develop the Network with Blockchain funding

-

Dash's Network funds winning proposals each month for anything that can improve Dash like hiring developers, making decisions or integrating Dash payments into more online stores and retail outlets.

+

Develop the Network with Blockchain Funding

+

Dash's Network funds winning proposals each month for anything that can improve Dash, such as hiring developers, making decisions or integrating Dash payments into more online stores and retail outlets.

Submit a Proposal @@ -175,24 +177,32 @@ Social - + }