Merge branch '2-0_release'

README.md

@@ -59,7 +59,7 @@ Dkron dashboard is built using a combinations of golang templates and AngularJS
 
 To start developing the dashboard enter the `static` directory and run `npm install` to get the frontend dependencies.
 
-Change code in JS files or in templates, then run `make gen` to generate `bindata.go` file. This is a method of embedding resources in Go applications.
+Change code in JS files or in templates, then run `make gen` to generate assets files. This is a method of embedding resources in Go applications.
 
 ### Resources
 
@@ -75,9 +75,13 @@ https://github.com/jobandtalent/dkron-rb
 PHP client
 https://github.com/gromo/dkron-php-adapter
 
+Terraform provider
+https://github.com/peertransfer/terraform-provider-dkron
+
 ## Get in touch
 
-- Twitter: [@distribworks](https://twitter.com/distribworks) or [@distribworks](https://twitter.com/distribworks)
+- Twitter: [@distribworks](https://twitter.com/distribworks)
+- Chat: https://gitter.im/distribworks/dkron
 - Email: victor at distrib.works
 
 # Sponsor

website/content/pro/commercial-faq.md

@@ -30,7 +30,7 @@ You must have an active subscription to run Dkron Pro. After a one week grace pe
 
 This is a common requirement for "on-site installs" or "appliances" sold to large corporations.
 
-The standard license is only appropriate for SaaS usage as it does not allow distribution. Dkron Pro have an Appliance license option which **does** allow you to distribute them. The Appliance license is $3,950/yr for Pro. It allows you to distribute the Pro binaries as part of your application and each of your customers to run Dkron Pro **as part of your application only**. Email [support@distrib.works](mailto:support@distrib.works) to purchase.
+The standard license is only appropriate for SaaS usage as it does not allow distribution. Dkron Pro have an Appliance license option which **does** allow you to distribute them. The Appliance license is $7,500/yr for Pro. It allows you to distribute the Pro binaries as part of your application and each of your customers to run Dkron Pro **as part of your application only**. Email [support@distrib.works](mailto:support@distrib.works) to purchase.
 
 ### Can you transfer a license?
 

website/content/products/pro.html

@@ -23,12 +23,6 @@ <h2>Improved security, features and reliability for your scheduled jobs</h2>
       <div class="main-content">
         <h2>Key features</h2>
 
-        <h3>Embedded storage <span class="glyphicon glyphicon-hdd" /></h3>
-
-        <p>When it comes to choosing a storage you could be making a wrong decision. Easy of use comes from having a
-          well tested and supported storage.</p>
-        <p>The embedded etcd storage is tuned for use with dkron out of the box.</p>
-
         <h3>Security <span class="glyphicon glyphicon-lock" /></h3>
 
         <p>Pro has enhanced security using industry standard SSL encryption for communication between all components of
@@ -39,6 +33,12 @@ <h3>Pro plugins <span class="glyphicon glyphicon-heart" /></h3>
 
         <p>Do you need to store job output in Elasticsearch? Do you need to run docker based jobs?</p>
         <p>Dkron Pro adds some commercially supported plugins ready to cover your needs.</p>
+
+        <h3>Support <span class="glyphicon glyphicon-send" /></h3>
+
+        <p>Priority support from the author</p>
+        <p>Workload automation is a critical process in your business. Guarantee direct access to a Dkron expert.
+          Your subscription gives you priority support for any unforeseen issues.</p>
       </div>
     </div>
   </div>
@@ -55,7 +55,7 @@ <h3>FEATURES</h3>
 
         <ul>
           <li>
-            <p>Works out of the box with the embedded storage
+            <p>Multi-region support
           </li>
           <li>
             <p>Full SSL encryption
@@ -93,7 +93,7 @@ <h3>INSTALLATION</h3>
         to install the package corresponding to your architecture. You configure and use Dkron Pro exactly like you
         would Dkron.</p>
 
-      <p>Pro tip: use a mailing list for your email when purchasing to ensure you get critical email updates, even if
+      <p><strong>Pro tip</strong> : use a mailing list for your email when purchasing to ensure you get critical email updates, even if
         employees leave the company.</p>
 
       <h3>UPGRADES</h3>

website/layouts/index.html

@@ -167,7 +167,7 @@ <h3><a href="/products/pro/">Pro</a></h3>
             <td class="key">
               <a href="{{"usage/storage/" | relURL}}">Embedded storage engine</a>
             </td>
-            <td><span class="glyphicon glyphicon-minus-sign text-success"></span></td>
+            <td><span class="glyphicon glyphicon-ok-sign text-success"></span></td>
             <td><span class="glyphicon glyphicon-ok-sign text-success"></span></td>
           </tr>
           <tr>
@@ -248,7 +248,7 @@ <h3><a href="/products/pro/">Pro</a></h3>
           <tr>
             <td class="key">Pricing</td>
             <td>Free</td>
-            <td>$395 / year<br>
+            <td>$750 / year<br>
               <small>Unlimited Usage</small>
             </td>
           </tr>

website/layouts/partials/gfooter.html

@@ -38,7 +38,12 @@ <h2>Some of our users</h2>
                 <a href="https://www.wetafx.co.nz/" target="_blank">
                     <img width="150" src="{{"img/weta_logo.png" | relURL}}" />
                 </a>
-            </div>    
+            </div>
+            <div class="col-md-3 users">
+                <a href="https://www.flywire.com/" target="_blank">
+                    <img width="150" src="{{"img/flywire-logo.svg" | relURL}}" />
+                </a>
+            </div>  
         </div>
     </div>
     <div class="container">

website/layouts/partials/gheader.html

@@ -37,8 +37,13 @@
 </head>
 
 <body class="page-home ">
-
     <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+        <div class="panel text-center" style="padding: 5px 0; margin: auto;">
+            <span class="glyphicon glyphicon-volume-up"></span>
+            <strong>Dkron 2.0 is here!. Read the 
+                <a class="" href="https://victorcastell.com/dkron-2-0">announcement</a>
+            </strong>
+        </div>
         <div class="container">
 
             <!-- Collapsed navigation -->